Skip to content

P
PERFORMA_REPLICA
Commit 9189c55a by Harsh Shah
Options

Minor changes

parent 8dfb62e3
Showing with 25 additions and 231 deletions
cmsWebApp/sql/FactorLevelLink.xml
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
<column name="object_id" type="Long" nullable="false" length="11"/> <column name="object_id" type="Long" nullable="false" length="11"/>
<column name="object_last_updated_date" type="Date" nullable="false" length="22"/> <column name="object_last_updated_date" type="Date" nullable="false" length="22"/>
<column name="object_created_date" type="Date" nullable="false" length="22"/> <column name="object_created_date" type="Date" nullable="false" length="22"/>
<column name="factor_hdr_desc" type="String" nullable="true" length="30"/>
<column name="class_code" type="String" nullable="true" length="15"/> <column name="class_code" type="String" nullable="true" length="15"/>
<column name="factor_hdr_notes" type="CLOB" nullable="true"/> <column name="factor_hdr_notes" type="CLOB" nullable="true"/>
<column name="left_annot" type="String" nullable="true" length="60"/> <column name="left_annot" type="String" nullable="true" length="60"/>
......
cmsWebApp/sql/ms/FactorLevelLink.sql
...@@ -8,7 +8,6 @@ CREATE TABLE factor_hdr ( ...@@ -8,7 +8,6 @@ CREATE TABLE factor_hdr (
object_last_updated_date datetime DEFAULT getdate() NOT NULL , object_last_updated_date datetime DEFAULT getdate() NOT NULL ,
object_created_date datetime DEFAULT getdate() NOT NULL object_created_date datetime DEFAULT getdate() NOT NULL
, ,
factor_hdr_desc varchar(30) NULL,
class_code varchar(15) NULL, class_code varchar(15) NULL,
factor_hdr_notes text NULL, factor_hdr_notes text NULL,
left_annot varchar(60) NULL, left_annot varchar(60) NULL,
......
cmsWebApp/sql/oracle/FactorLevelLink.sql
...@@ -9,7 +9,6 @@ CREATE TABLE factor_hdr ( ...@@ -9,7 +9,6 @@ CREATE TABLE factor_hdr (
object_last_updated_date date DEFAULT SYSDATE NOT NULL , object_last_updated_date date DEFAULT SYSDATE NOT NULL ,
object_created_date date DEFAULT SYSDATE NOT NULL object_created_date date DEFAULT SYSDATE NOT NULL
, ,
factor_hdr_desc varchar2(30) NULL,
class_code varchar2(15) NULL, class_code varchar2(15) NULL,
factor_hdr_notes clob NULL, factor_hdr_notes clob NULL,
left_annot varchar2(60) NULL, left_annot varchar2(60) NULL,
......
cmsWebApp/sql/postgres/FactorLevelLink.sql
...@@ -9,7 +9,6 @@ CREATE TABLE factor_hdr ( ...@@ -9,7 +9,6 @@ CREATE TABLE factor_hdr (
object_last_updated_date timestamp DEFAULT NOW() NOT NULL , object_last_updated_date timestamp DEFAULT NOW() NOT NULL ,
object_created_date timestamp DEFAULT NOW() NOT NULL object_created_date timestamp DEFAULT NOW() NOT NULL
, ,
factor_hdr_desc varchar(30) NULL,
class_code varchar(15) NULL, class_code varchar(15) NULL,
factor_hdr_notes text NULL, factor_hdr_notes text NULL,
left_annot varchar(60) NULL, left_annot varchar(60) NULL,
......
cmsWebApp/src/performa/form/ImportCSVFP.java → cmsWebApp/src/performa/form/TestAnalysisFP.java
...@@ -18,9 +18,9 @@ import performa.orm.TestAnalysis; ...@@ -18,9 +18,9 @@ import performa.orm.TestAnalysis;
* *
* @author Pradip J. Sabhadiya * @author Pradip J. Sabhadiya
*/ */
public class ImportCSVFP extends ORMProcessFormProcessor public class TestAnalysisFP extends ORMProcessFormProcessor
{ {
private static List<String> SUPPORTED_TYPES = new ArrayList<>(Arrays.asList("text/csv", "text/plain")); private static final List<String> SUPPORTED_TYPES = new ArrayList<>(Arrays.asList("text/csv", "text/plain"));
@Override @Override
public SuccessfulResult processForm(ORMProcessState process, SubmissionDetails submission, Map params) throws BusinessException, StorageException public SuccessfulResult processForm(ORMProcessState process, SubmissionDetails submission, Map params) throws BusinessException, StorageException
...@@ -52,7 +52,7 @@ public class ImportCSVFP extends ORMProcessFormProcessor ...@@ -52,7 +52,7 @@ public class ImportCSVFP extends ORMProcessFormProcessor
private static ExcelExporter.ExportAppender getExportAppender(BinaryContent file) throws IOException private static ExcelExporter.ExportAppender getExportAppender(BinaryContent file) throws IOException
{ {
Properties props = new Properties(); Properties props = new Properties();
props.load(ImportCSVFP.class.getClassLoader().getResourceAsStream("excel-styles.properties")); props.load(TestAnalysisFP.class.getClassLoader().getResourceAsStream("excel-styles.properties"));
props.put("subheader.font-style", "bold"); props.put("subheader.font-style", "bold");
props.put("header.horizontal-alignment", "center"); props.put("header.horizontal-alignment", "center");
......
cmsWebApp/src/performa/orm/Answer.xml
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
<ROOT xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:noNamespaceSchemaLocation='http://www.oneit.com.au/schemas/5.2/BusinessObject.xsd'> <ROOT xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:noNamespaceSchemaLocation='http://www.oneit.com.au/schemas/5.2/BusinessObject.xsd'>
<BUSINESSCLASS name="Answer" package="performa.orm"> <BUSINESSCLASS name="Answer" package="performa.orm">
<TABLE name="answer" tablePrefix="object" polymorphic="FALSE"> <TABLE name="answer" tablePrefix="object" polymorphic="FALSE">
<ATTRIB name="AnswerNo" type="Integer" dbcol="answer_number"/> <ATTRIB name="AnswerNo" type="Integer" dbcol="answer_number"/>
<!--<SINGLEREFERENCE name="Section" type="Section" dbcol="section_number" />--> <!--<SINGLEREFERENCE name="Section" type="Section" dbcol="section_number" />-->
<SINGLEREFERENCE name="Candidate" type="Candidate" dbcol="candidate_id" /> <SINGLEREFERENCE name="Candidate" type="Candidate" dbcol="candidate_id" />
......
cmsWebApp/src/performa/orm/BaseFactorLevelLink.java
...@@ -38,7 +38,6 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass ...@@ -38,7 +38,6 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass
// Static constants corresponding to field names // Static constants corresponding to field names
public static final String FIELD_Description = "Description";
public static final String FIELD_ClassCode = "ClassCode"; public static final String FIELD_ClassCode = "ClassCode";
public static final String FIELD_Notes = "Notes"; public static final String FIELD_Notes = "Notes";
public static final String FIELD_LeftAnnot = "LeftAnnot"; public static final String FIELD_LeftAnnot = "LeftAnnot";
...@@ -55,7 +54,6 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass ...@@ -55,7 +54,6 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass
// Static constants corresponding to attribute helpers // Static constants corresponding to attribute helpers
private static final DefaultAttributeHelper<FactorLevelLink> HELPER_Description = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper<FactorLevelLink> HELPER_ClassCode = DefaultAttributeHelper.INSTANCE; private static final DefaultAttributeHelper<FactorLevelLink> HELPER_ClassCode = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper<FactorLevelLink> HELPER_Notes = DefaultAttributeHelper.INSTANCE; private static final DefaultAttributeHelper<FactorLevelLink> HELPER_Notes = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper<FactorLevelLink> HELPER_LeftAnnot = DefaultAttributeHelper.INSTANCE; private static final DefaultAttributeHelper<FactorLevelLink> HELPER_LeftAnnot = DefaultAttributeHelper.INSTANCE;
...@@ -65,7 +63,6 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass ...@@ -65,7 +63,6 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass
// Private attributes corresponding to business object data // Private attributes corresponding to business object data
private String _Description;
private String _ClassCode; private String _ClassCode;
private String _Notes; private String _Notes;
private String _LeftAnnot; private String _LeftAnnot;
...@@ -86,7 +83,6 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass ...@@ -86,7 +83,6 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass
private static final Map ATTRIBUTES_METADATA_FactorLevelLink = new HashMap (); private static final Map ATTRIBUTES_METADATA_FactorLevelLink = new HashMap ();
// Arrays of validators for each attribute // Arrays of validators for each attribute
private static final AttributeValidator[] FIELD_Description_Validators;
private static final AttributeValidator[] FIELD_ClassCode_Validators; private static final AttributeValidator[] FIELD_ClassCode_Validators;
private static final AttributeValidator[] FIELD_Notes_Validators; private static final AttributeValidator[] FIELD_Notes_Validators;
private static final AttributeValidator[] FIELD_LeftAnnot_Validators; private static final AttributeValidator[] FIELD_LeftAnnot_Validators;
...@@ -110,7 +106,6 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass ...@@ -110,7 +106,6 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass
setupAssocMetaData_Level(); setupAssocMetaData_Level();
setupAssocMetaData_Factor(); setupAssocMetaData_Factor();
FIELD_Description_Validators = (AttributeValidator[])setupAttribMetaData_Description(validatorMapping).toArray (new AttributeValidator[0]);
FIELD_ClassCode_Validators = (AttributeValidator[])setupAttribMetaData_ClassCode(validatorMapping).toArray (new AttributeValidator[0]); FIELD_ClassCode_Validators = (AttributeValidator[])setupAttribMetaData_ClassCode(validatorMapping).toArray (new AttributeValidator[0]);
FIELD_Notes_Validators = (AttributeValidator[])setupAttribMetaData_Notes(validatorMapping).toArray (new AttributeValidator[0]); FIELD_Notes_Validators = (AttributeValidator[])setupAttribMetaData_Notes(validatorMapping).toArray (new AttributeValidator[0]);
FIELD_LeftAnnot_Validators = (AttributeValidator[])setupAttribMetaData_LeftAnnot(validatorMapping).toArray (new AttributeValidator[0]); FIELD_LeftAnnot_Validators = (AttributeValidator[])setupAttribMetaData_LeftAnnot(validatorMapping).toArray (new AttributeValidator[0]);
...@@ -162,25 +157,6 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass ...@@ -162,25 +157,6 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass
// Meta Info setup // Meta Info setup
private static List setupAttribMetaData_Description(Map validatorMapping)
{
Map metaInfo = new HashMap ();
metaInfo.put ("dbcol", "factor_hdr_desc");
metaInfo.put ("length", "30");
metaInfo.put ("name", "Description");
metaInfo.put ("type", "String");
LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG2, "Metadata for FactorLevelLink.Description:", metaInfo);
ATTRIBUTES_METADATA_FactorLevelLink.put (FIELD_Description, Collections.unmodifiableMap (metaInfo));
List validators = BaseBusinessClass.getAttribValidators(FactorLevelLink.class, "Description", metaInfo, validatorMapping);
LogMgr.log (BUSINESS_OBJECTS, LogLevel.DEBUG1, "Validators for FactorLevelLink.Description:", validators);
return validators;
}
// Meta Info setup
private static List setupAttribMetaData_ClassCode(Map validatorMapping) private static List setupAttribMetaData_ClassCode(Map validatorMapping)
{ {
Map metaInfo = new HashMap (); Map metaInfo = new HashMap ();
...@@ -318,7 +294,6 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass ...@@ -318,7 +294,6 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass
super._initialiseNewObjAttributes (transaction); super._initialiseNewObjAttributes (transaction);
_Description = (String)(HELPER_Description.initialise (_Description));
_ClassCode = (String)(HELPER_ClassCode.initialise (_ClassCode)); _ClassCode = (String)(HELPER_ClassCode.initialise (_ClassCode));
_Notes = (String)(HELPER_Notes.initialise (_Notes)); _Notes = (String)(HELPER_Notes.initialise (_Notes));
_LeftAnnot = (String)(HELPER_LeftAnnot.initialise (_LeftAnnot)); _LeftAnnot = (String)(HELPER_LeftAnnot.initialise (_LeftAnnot));
...@@ -354,104 +329,6 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass ...@@ -354,104 +329,6 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass
/** /**
* Get the attribute Description
*/
public String getDescription ()
{
assertValid();
String valToReturn = _Description;
for (FactorLevelLinkBehaviourDecorator bhd : FactorLevelLink_BehaviourDecorators)
{
valToReturn = bhd.getDescription ((FactorLevelLink)this, valToReturn);
}
return valToReturn;
}
/**
* Called prior to the attribute changing. Subclasses need not call super. If a field exception
* is thrown, the attribute change will fail. The new value is different to the old value.
*/
protected void preDescriptionChange (String newDescription) throws FieldException
{
}
/**
* Called after the attribute changes.
* If a field exception is thrown, the value is still changed, however it
* may lead to the TX being rolled back
*/
protected void postDescriptionChange () throws FieldException
{
}
public FieldWriteability getWriteability_Description ()
{
return getFieldWritabilityUtil (FieldWriteability.TRUE);
}
/**
* Set the attribute Description. Checks to ensure a new value
* has been supplied. If so, marks the field as altered and sets the attribute.
*/
public void setDescription (String newDescription) throws FieldException
{
boolean oldAndNewIdentical = HELPER_Description.compare (_Description, newDescription);
try
{
for (FactorLevelLinkBehaviourDecorator bhd : FactorLevelLink_BehaviourDecorators)
{
newDescription = bhd.setDescription ((FactorLevelLink)this, newDescription);
oldAndNewIdentical = HELPER_Description.compare (_Description, newDescription);
}
if (FIELD_Description_Validators.length > 0)
{
Object newDescriptionObj = HELPER_Description.toObject (newDescription);
if (newDescriptionObj != null)
{
int loopMax = FIELD_Description_Validators.length;
Map metadata = (Map)ATTRIBUTES_METADATA_FactorLevelLink.get (FIELD_Description);
for (int v = 0 ; v < loopMax ; ++v)
{
FIELD_Description_Validators[v].checkAttribute (this, FIELD_Description, metadata, newDescriptionObj);
}
}
}
}
catch (FieldException e)
{
if (!oldAndNewIdentical)
{
e.setWouldModify ();
}
throw e;
}
if (!oldAndNewIdentical)
{
assertValid();
Debug.assertion (getWriteability_Description () != FieldWriteability.FALSE, "Field Description is not writeable");
preDescriptionChange (newDescription);
markFieldChange (FIELD_Description);
_Description = newDescription;
postFieldChange (FIELD_Description);
postDescriptionChange ();
}
}
/**
* Get the attribute ClassCode * Get the attribute ClassCode
*/ */
public String getClassCode () public String getClassCode ()
...@@ -1579,7 +1456,6 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass ...@@ -1579,7 +1456,6 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass
PersistentSet factor_hdrPSet = allSets.getPersistentSet (myID, "factor_hdr", myPSetStatus); PersistentSet factor_hdrPSet = allSets.getPersistentSet (myID, "factor_hdr", myPSetStatus);
factor_hdrPSet.setAttrib (FIELD_ObjectID, myID); factor_hdrPSet.setAttrib (FIELD_ObjectID, myID);
factor_hdrPSet.setAttrib (FIELD_Description, HELPER_Description.toObject (_Description)); //
factor_hdrPSet.setAttrib (FIELD_ClassCode, HELPER_ClassCode.toObject (_ClassCode)); // factor_hdrPSet.setAttrib (FIELD_ClassCode, HELPER_ClassCode.toObject (_ClassCode)); //
factor_hdrPSet.setAttrib (FIELD_Notes, HELPER_Notes.toObject (_Notes)); // factor_hdrPSet.setAttrib (FIELD_Notes, HELPER_Notes.toObject (_Notes)); //
factor_hdrPSet.setAttrib (FIELD_LeftAnnot, HELPER_LeftAnnot.toObject (_LeftAnnot)); // factor_hdrPSet.setAttrib (FIELD_LeftAnnot, HELPER_LeftAnnot.toObject (_LeftAnnot)); //
...@@ -1602,7 +1478,6 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass ...@@ -1602,7 +1478,6 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass
PersistentSet factor_hdrPSet = allSets.getPersistentSet (objectID, "factor_hdr"); PersistentSet factor_hdrPSet = allSets.getPersistentSet (objectID, "factor_hdr");
_Description = (String)(HELPER_Description.fromObject (_Description, factor_hdrPSet.getAttrib (FIELD_Description))); //
_ClassCode = (String)(HELPER_ClassCode.fromObject (_ClassCode, factor_hdrPSet.getAttrib (FIELD_ClassCode))); // _ClassCode = (String)(HELPER_ClassCode.fromObject (_ClassCode, factor_hdrPSet.getAttrib (FIELD_ClassCode))); //
_Notes = (String)(HELPER_Notes.fromObject (_Notes, factor_hdrPSet.getAttrib (FIELD_Notes))); // _Notes = (String)(HELPER_Notes.fromObject (_Notes, factor_hdrPSet.getAttrib (FIELD_Notes))); //
_LeftAnnot = (String)(HELPER_LeftAnnot.fromObject (_LeftAnnot, factor_hdrPSet.getAttrib (FIELD_LeftAnnot))); // _LeftAnnot = (String)(HELPER_LeftAnnot.fromObject (_LeftAnnot, factor_hdrPSet.getAttrib (FIELD_LeftAnnot))); //
...@@ -1628,15 +1503,6 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass ...@@ -1628,15 +1503,6 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass
try try
{ {
setDescription (otherFactorLevelLink.getDescription ());
}
catch (FieldException ex)
{
e.addException (ex);
}
try
{
setClassCode (otherFactorLevelLink.getClassCode ()); setClassCode (otherFactorLevelLink.getClassCode ());
} }
catch (FieldException ex) catch (FieldException ex)
...@@ -1704,7 +1570,6 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass ...@@ -1704,7 +1570,6 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass
{ {
BaseFactorLevelLink sourceFactorLevelLink = (BaseFactorLevelLink)(source); BaseFactorLevelLink sourceFactorLevelLink = (BaseFactorLevelLink)(source);
_Description = sourceFactorLevelLink._Description;
_ClassCode = sourceFactorLevelLink._ClassCode; _ClassCode = sourceFactorLevelLink._ClassCode;
_Notes = sourceFactorLevelLink._Notes; _Notes = sourceFactorLevelLink._Notes;
_LeftAnnot = sourceFactorLevelLink._LeftAnnot; _LeftAnnot = sourceFactorLevelLink._LeftAnnot;
...@@ -1765,7 +1630,6 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass ...@@ -1765,7 +1630,6 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass
{ {
super.readExternalData(vals); super.readExternalData(vals);
_Description = (String)(HELPER_Description.readExternal (_Description, vals.get(FIELD_Description))); //
_ClassCode = (String)(HELPER_ClassCode.readExternal (_ClassCode, vals.get(FIELD_ClassCode))); // _ClassCode = (String)(HELPER_ClassCode.readExternal (_ClassCode, vals.get(FIELD_ClassCode))); //
_Notes = (String)(HELPER_Notes.readExternal (_Notes, vals.get(FIELD_Notes))); // _Notes = (String)(HELPER_Notes.readExternal (_Notes, vals.get(FIELD_Notes))); //
_LeftAnnot = (String)(HELPER_LeftAnnot.readExternal (_LeftAnnot, vals.get(FIELD_LeftAnnot))); // _LeftAnnot = (String)(HELPER_LeftAnnot.readExternal (_LeftAnnot, vals.get(FIELD_LeftAnnot))); //
...@@ -1785,7 +1649,6 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass ...@@ -1785,7 +1649,6 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass
{ {
super.writeExternalData(vals); super.writeExternalData(vals);
vals.put (FIELD_Description, HELPER_Description.writeExternal (_Description));
vals.put (FIELD_ClassCode, HELPER_ClassCode.writeExternal (_ClassCode)); vals.put (FIELD_ClassCode, HELPER_ClassCode.writeExternal (_ClassCode));
vals.put (FIELD_Notes, HELPER_Notes.writeExternal (_Notes)); vals.put (FIELD_Notes, HELPER_Notes.writeExternal (_Notes));
vals.put (FIELD_LeftAnnot, HELPER_LeftAnnot.writeExternal (_LeftAnnot)); vals.put (FIELD_LeftAnnot, HELPER_LeftAnnot.writeExternal (_LeftAnnot));
...@@ -1807,10 +1670,6 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass ...@@ -1807,10 +1670,6 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass
BaseFactorLevelLink otherFactorLevelLink = (BaseFactorLevelLink)(other); BaseFactorLevelLink otherFactorLevelLink = (BaseFactorLevelLink)(other);
if (!HELPER_Description.compare(this._Description, otherFactorLevelLink._Description))
{
listener.notifyFieldChange(this, other, FIELD_Description, HELPER_Description.toObject(this._Description), HELPER_Description.toObject(otherFactorLevelLink._Description));
}
if (!HELPER_ClassCode.compare(this._ClassCode, otherFactorLevelLink._ClassCode)) if (!HELPER_ClassCode.compare(this._ClassCode, otherFactorLevelLink._ClassCode))
{ {
listener.notifyFieldChange(this, other, FIELD_ClassCode, HELPER_ClassCode.toObject(this._ClassCode), HELPER_ClassCode.toObject(otherFactorLevelLink._ClassCode)); listener.notifyFieldChange(this, other, FIELD_ClassCode, HELPER_ClassCode.toObject(this._ClassCode), HELPER_ClassCode.toObject(otherFactorLevelLink._ClassCode));
...@@ -1859,7 +1718,6 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass ...@@ -1859,7 +1718,6 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass
{ {
super.visitAttributes (visitor); super.visitAttributes (visitor);
visitor.visitField(this, FIELD_Description, HELPER_Description.toObject(getDescription()));
visitor.visitField(this, FIELD_ClassCode, HELPER_ClassCode.toObject(getClassCode())); visitor.visitField(this, FIELD_ClassCode, HELPER_ClassCode.toObject(getClassCode()));
visitor.visitField(this, FIELD_Notes, HELPER_Notes.toObject(getNotes())); visitor.visitField(this, FIELD_Notes, HELPER_Notes.toObject(getNotes()));
visitor.visitField(this, FIELD_LeftAnnot, HELPER_LeftAnnot.toObject(getLeftAnnot())); visitor.visitField(this, FIELD_LeftAnnot, HELPER_LeftAnnot.toObject(getLeftAnnot()));
...@@ -1909,10 +1767,6 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass ...@@ -1909,10 +1767,6 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass
{ {
throw new RuntimeException ("Game over man!!"); throw new RuntimeException ("Game over man!!");
} }
else if (attribName.equals (FIELD_Description))
{
return filter.matches (getDescription ());
}
else if (attribName.equals (FIELD_ClassCode)) else if (attribName.equals (FIELD_ClassCode))
{ {
return filter.matches (getClassCode ()); return filter.matches (getClassCode ());
...@@ -1976,12 +1830,6 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass ...@@ -1976,12 +1830,6 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass
} }
public SearchAll andDescription (QueryFilter<String> filter)
{
filter.addFilter (context, "factor_hdr.factor_hdr_desc", "Description");
return this;
}
public SearchAll andClassCode (QueryFilter<String> filter) public SearchAll andClassCode (QueryFilter<String> filter)
{ {
filter.addFilter (context, "factor_hdr.class_code", "ClassCode"); filter.addFilter (context, "factor_hdr.class_code", "ClassCode");
...@@ -2065,10 +1913,6 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass ...@@ -2065,10 +1913,6 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass
{ {
throw new RuntimeException ("Game over man!!"); throw new RuntimeException ("Game over man!!");
} }
else if (attribName.equals (FIELD_Description))
{
return HELPER_Description.toObject (getDescription ());
}
else if (attribName.equals (FIELD_ClassCode)) else if (attribName.equals (FIELD_ClassCode))
{ {
return HELPER_ClassCode.toObject (getClassCode ()); return HELPER_ClassCode.toObject (getClassCode ());
...@@ -2106,10 +1950,6 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass ...@@ -2106,10 +1950,6 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass
{ {
throw new RuntimeException ("Game over man!!"); throw new RuntimeException ("Game over man!!");
} }
else if (attribName.equals (FIELD_Description))
{
return HELPER_Description;
}
else if (attribName.equals (FIELD_ClassCode)) else if (attribName.equals (FIELD_ClassCode))
{ {
return HELPER_ClassCode; return HELPER_ClassCode;
...@@ -2147,10 +1987,6 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass ...@@ -2147,10 +1987,6 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass
{ {
throw new RuntimeException ("Game over man!!"); throw new RuntimeException ("Game over man!!");
} }
else if (attribName.equals (FIELD_Description))
{
setDescription ((String)(HELPER_Description.fromObject (_Description, attribValue)));
}
else if (attribName.equals (FIELD_ClassCode)) else if (attribName.equals (FIELD_ClassCode))
{ {
setClassCode ((String)(HELPER_ClassCode.fromObject (_ClassCode, attribValue))); setClassCode ((String)(HELPER_ClassCode.fromObject (_ClassCode, attribValue)));
...@@ -2195,10 +2031,6 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass ...@@ -2195,10 +2031,6 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass
{ {
throw new RuntimeException ("Game over man!!"); throw new RuntimeException ("Game over man!!");
} }
else if (fieldName.equals (FIELD_Description))
{
return getWriteability_Description ();
}
else if (fieldName.equals (FIELD_ClassCode)) else if (fieldName.equals (FIELD_ClassCode))
{ {
return getWriteability_ClassCode (); return getWriteability_ClassCode ();
...@@ -2241,11 +2073,6 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass ...@@ -2241,11 +2073,6 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass
public void putUnwriteable (Set<String> fields) public void putUnwriteable (Set<String> fields)
{ {
if (getWriteability_Description () != FieldWriteability.TRUE)
{
fields.add (FIELD_Description);
}
if (getWriteability_ClassCode () != FieldWriteability.TRUE) if (getWriteability_ClassCode () != FieldWriteability.TRUE)
{ {
fields.add (FIELD_ClassCode); fields.add (FIELD_ClassCode);
...@@ -2285,7 +2112,6 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass ...@@ -2285,7 +2112,6 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass
List result = super.getAttributes (); List result = super.getAttributes ();
result.add(HELPER_Description.getAttribObject (getClass (), _Description, false, FIELD_Description));
result.add(HELPER_ClassCode.getAttribObject (getClass (), _ClassCode, false, FIELD_ClassCode)); result.add(HELPER_ClassCode.getAttribObject (getClass (), _ClassCode, false, FIELD_ClassCode));
result.add(HELPER_Notes.getAttribObject (getClass (), _Notes, false, FIELD_Notes)); result.add(HELPER_Notes.getAttribObject (getClass (), _Notes, false, FIELD_Notes));
result.add(HELPER_LeftAnnot.getAttribObject (getClass (), _LeftAnnot, false, FIELD_LeftAnnot)); result.add(HELPER_LeftAnnot.getAttribObject (getClass (), _LeftAnnot, false, FIELD_LeftAnnot));
...@@ -2343,24 +2169,6 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass ...@@ -2343,24 +2169,6 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass
{ {
/** /**
* Get the attribute Description
*/
public String getDescription (FactorLevelLink obj, String original)
{
return original;
}
/**
* Change the value set for attribute Description.
* May modify the field beforehand
* Occurs before validation.
*/
public String setDescription (FactorLevelLink obj, String newDescription) throws FieldException
{
return newDescription;
}
/**
* Get the attribute ClassCode * Get the attribute ClassCode
*/ */
public String getClassCode (FactorLevelLink obj, String original) public String getClassCode (FactorLevelLink obj, String original)
...@@ -2520,10 +2328,6 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass ...@@ -2520,10 +2328,6 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass
public PipeLine<From, ? extends Object> to(String name) public PipeLine<From, ? extends Object> to(String name)
{ {
if (name.equals ("Description"))
{
return toDescription ();
}
if (name.equals ("ClassCode")) if (name.equals ("ClassCode"))
{ {
return toClassCode (); return toClassCode ();
...@@ -2562,8 +2366,6 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass ...@@ -2562,8 +2366,6 @@ public abstract class BaseFactorLevelLink extends BaseBusinessClass
} }
public PipeLine<From, String> toDescription () { return pipe(new ORMAttributePipe<Me, String>(FIELD_Description)); }
public PipeLine<From, String> toClassCode () { return pipe(new ORMAttributePipe<Me, String>(FIELD_ClassCode)); } public PipeLine<From, String> toClassCode () { return pipe(new ORMAttributePipe<Me, String>(FIELD_ClassCode)); }
public PipeLine<From, String> toNotes () { return pipe(new ORMAttributePipe<Me, String>(FIELD_Notes)); } public PipeLine<From, String> toNotes () { return pipe(new ORMAttributePipe<Me, String>(FIELD_Notes)); }
......
cmsWebApp/src/performa/orm/Factor.xml
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<TABLE name="factor" tablePrefix="object" polymorphic="FALSE"> <TABLE name="factor" tablePrefix="object" polymorphic="FALSE">
<ATTRIB name="Description" type="String" dbcol="factor_hdr_desc" length="30"/> <ATTRIB name="Description" type="String" dbcol="factor_hdr_desc" length="30"/>
</TABLE> </TABLE>
......
cmsWebApp/src/performa/orm/FactorLevelLink.xml
...@@ -4,15 +4,14 @@ ...@@ -4,15 +4,14 @@
<BUSINESSCLASS name="FactorLevelLink" package="performa.orm"> <BUSINESSCLASS name="FactorLevelLink" package="performa.orm">
<TABLE name="factor_hdr" tablePrefix="object" polymorphic="FALSE"> <TABLE name="factor_hdr" tablePrefix="object" polymorphic="FALSE">
<ATTRIB name="Description" type="String" dbcol="factor_hdr_desc" length="30"/> <ATTRIB name="ClassCode" type="String" dbcol="class_code" length="15"/>
<ATTRIB name="ClassCode" type="String" dbcol="class_code" length="15"/>
<ATTRIB name="Notes" type="String" dbcol="factor_hdr_notes"/> <ATTRIB name="Notes" type="String" dbcol="factor_hdr_notes"/>
<ATTRIB name="LeftAnnot" type="String" dbcol="left_annot" length="60"/> <ATTRIB name="LeftAnnot" type="String" dbcol="left_annot" length="60"/>
<ATTRIB name="RightAnnot" type="String" dbcol="right_annot" length="60"/> <ATTRIB name="RightAnnot" type="String" dbcol="right_annot" length="60"/>
<ATTRIB name="ZScoreWeight" type="Double" dbcol="z_score_wght"/> <ATTRIB name="ZScoreWeight" type="Double" dbcol="z_score_wght" />
<ATTRIB name="ZScoreWeight2" type="Double" dbcol="z_score_wght_2"/> <ATTRIB name="ZScoreWeight2" type="Double" dbcol="z_score_wght_2" />
<SINGLEREFERENCE name="Level" type="Level" dbcol="level_number" backreferenceName="Factors" /> <SINGLEREFERENCE name="Level" type="Level" dbcol="level_number" backreferenceName="Factors" />
<SINGLEREFERENCE name="Factor" type="Factor" dbcol="factor_number" backreferenceName="Levels" /> <SINGLEREFERENCE name="Factor" type="Factor" dbcol="factor_number" backreferenceName="Levels" />
......
cmsWebApp/src/performa/orm/FactorLevelLinkPersistenceMgr.java
...@@ -26,7 +26,6 @@ public class FactorLevelLinkPersistenceMgr extends ObjectPersistenceMgr ...@@ -26,7 +26,6 @@ public class FactorLevelLinkPersistenceMgr extends ObjectPersistenceMgr
private static final LoggingArea FactorLevelLinkPersistence = LoggingArea.createLoggingArea(ObjectPersistenceMgr.OBJECT_PERSISTENCE, "FactorLevelLink"); private static final LoggingArea FactorLevelLinkPersistence = LoggingArea.createLoggingArea(ObjectPersistenceMgr.OBJECT_PERSISTENCE, "FactorLevelLink");
// Private attributes corresponding to business object data // Private attributes corresponding to business object data
private String dummyDescription;
private String dummyClassCode; private String dummyClassCode;
private String dummyNotes; private String dummyNotes;
private String dummyLeftAnnot; private String dummyLeftAnnot;
...@@ -36,7 +35,6 @@ public class FactorLevelLinkPersistenceMgr extends ObjectPersistenceMgr ...@@ -36,7 +35,6 @@ public class FactorLevelLinkPersistenceMgr extends ObjectPersistenceMgr
// Static constants corresponding to attribute helpers // Static constants corresponding to attribute helpers
private static final DefaultAttributeHelper HELPER_Description = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper HELPER_ClassCode = DefaultAttributeHelper.INSTANCE; private static final DefaultAttributeHelper HELPER_ClassCode = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper HELPER_Notes = DefaultAttributeHelper.INSTANCE; private static final DefaultAttributeHelper HELPER_Notes = DefaultAttributeHelper.INSTANCE;
private static final DefaultAttributeHelper HELPER_LeftAnnot = DefaultAttributeHelper.INSTANCE; private static final DefaultAttributeHelper HELPER_LeftAnnot = DefaultAttributeHelper.INSTANCE;
...@@ -49,7 +47,6 @@ public class FactorLevelLinkPersistenceMgr extends ObjectPersistenceMgr ...@@ -49,7 +47,6 @@ public class FactorLevelLinkPersistenceMgr extends ObjectPersistenceMgr
public FactorLevelLinkPersistenceMgr () public FactorLevelLinkPersistenceMgr ()
{ {
dummyDescription = (String)(HELPER_Description.initialise (dummyDescription));
dummyClassCode = (String)(HELPER_ClassCode.initialise (dummyClassCode)); dummyClassCode = (String)(HELPER_ClassCode.initialise (dummyClassCode));
dummyNotes = (String)(HELPER_Notes.initialise (dummyNotes)); dummyNotes = (String)(HELPER_Notes.initialise (dummyNotes));
dummyLeftAnnot = (String)(HELPER_LeftAnnot.initialise (dummyLeftAnnot)); dummyLeftAnnot = (String)(HELPER_LeftAnnot.initialise (dummyLeftAnnot));
...@@ -59,7 +56,7 @@ public class FactorLevelLinkPersistenceMgr extends ObjectPersistenceMgr ...@@ -59,7 +56,7 @@ public class FactorLevelLinkPersistenceMgr extends ObjectPersistenceMgr
} }
private String SELECT_COLUMNS = "{PREFIX}factor_hdr.object_id as id, {PREFIX}factor_hdr.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}factor_hdr.object_CREATED_DATE as CREATED_DATE, {PREFIX}factor_hdr.factor_hdr_desc, {PREFIX}factor_hdr.class_code, {PREFIX}factor_hdr.factor_hdr_notes, {PREFIX}factor_hdr.left_annot, {PREFIX}factor_hdr.right_annot, {PREFIX}factor_hdr.z_score_wght, {PREFIX}factor_hdr.z_score_wght_2, {PREFIX}factor_hdr.level_number, {PREFIX}factor_hdr.factor_number, 1 AS commasafe "; private String SELECT_COLUMNS = "{PREFIX}factor_hdr.object_id as id, {PREFIX}factor_hdr.object_LAST_UPDATED_DATE as LAST_UPDATED_DATE, {PREFIX}factor_hdr.object_CREATED_DATE as CREATED_DATE, {PREFIX}factor_hdr.class_code, {PREFIX}factor_hdr.factor_hdr_notes, {PREFIX}factor_hdr.left_annot, {PREFIX}factor_hdr.right_annot, {PREFIX}factor_hdr.z_score_wght, {PREFIX}factor_hdr.z_score_wght_2, {PREFIX}factor_hdr.level_number, {PREFIX}factor_hdr.factor_number, 1 AS commasafe ";
private String SELECT_JOINS = ""; private String SELECT_JOINS = "";
public BaseBusinessClass fetchByID(ObjectID id, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException public BaseBusinessClass fetchByID(ObjectID id, PersistentSetCollection allPSets, RDBMSPersistenceContext context, SQLManager sqlMgr) throws SQLException, StorageException
...@@ -110,7 +107,6 @@ public class FactorLevelLinkPersistenceMgr extends ObjectPersistenceMgr ...@@ -110,7 +107,6 @@ public class FactorLevelLinkPersistenceMgr extends ObjectPersistenceMgr
// Check for persistent sets already prefetched // Check for persistent sets already prefetched
if (false || !factor_hdrPSet.containsAttrib(BaseBusinessClass.FIELD_ObjectLastModified) || if (false || !factor_hdrPSet.containsAttrib(BaseBusinessClass.FIELD_ObjectLastModified) ||
!factor_hdrPSet.containsAttrib(FactorLevelLink.FIELD_Description)||
!factor_hdrPSet.containsAttrib(FactorLevelLink.FIELD_ClassCode)|| !factor_hdrPSet.containsAttrib(FactorLevelLink.FIELD_ClassCode)||
!factor_hdrPSet.containsAttrib(FactorLevelLink.FIELD_Notes)|| !factor_hdrPSet.containsAttrib(FactorLevelLink.FIELD_Notes)||
!factor_hdrPSet.containsAttrib(FactorLevelLink.FIELD_LeftAnnot)|| !factor_hdrPSet.containsAttrib(FactorLevelLink.FIELD_LeftAnnot)||
...@@ -208,10 +204,10 @@ public class FactorLevelLinkPersistenceMgr extends ObjectPersistenceMgr ...@@ -208,10 +204,10 @@ public class FactorLevelLinkPersistenceMgr extends ObjectPersistenceMgr
{ {
int rowsUpdated = executeStatement (sqlMgr, int rowsUpdated = executeStatement (sqlMgr,
"UPDATE {PREFIX}factor_hdr " + "UPDATE {PREFIX}factor_hdr " +
"SET factor_hdr_desc = ?, class_code = ?, factor_hdr_notes = ?, left_annot = ?, right_annot = ?, z_score_wght = ?, z_score_wght_2 = ?, level_number = ? , factor_number = ? , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " + "SET class_code = ?, factor_hdr_notes = ?, left_annot = ?, right_annot = ?, z_score_wght = ?, z_score_wght_2 = ?, level_number = ? , factor_number = ? , object_LAST_UPDATED_DATE = " + sqlMgr.getPortabilityServices ().getTimestampExpression () + " " +
"WHERE factor_hdr.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ", "WHERE factor_hdr.object_id = ? AND " + getConcurrencyCheck (sqlMgr, "object_LAST_UPDATED_DATE", obj.getObjectLastModified ()) + " ",
CollectionUtils.listEntry (HELPER_Description.getForSQL(dummyDescription, factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_Description))).listEntry (HELPER_ClassCode.getForSQL(dummyClassCode, factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_ClassCode))).listEntry (HELPER_Notes.getForSQL(dummyNotes, factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_Notes))).listEntry (HELPER_LeftAnnot.getForSQL(dummyLeftAnnot, factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_LeftAnnot))).listEntry (HELPER_RightAnnot.getForSQL(dummyRightAnnot, factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_RightAnnot))).listEntry (HELPER_ZScoreWeight.getForSQL(dummyZScoreWeight, factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_ZScoreWeight))).listEntry (HELPER_ZScoreWeight2.getForSQL(dummyZScoreWeight2, factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_ZScoreWeight2))).listEntry (SQLManager.CheckNull((Long)(factor_hdrPSet.getAttrib (FactorLevelLink.SINGLEREFERENCE_Level)))).listEntry (SQLManager.CheckNull((Long)(factor_hdrPSet.getAttrib (FactorLevelLink.SINGLEREFERENCE_Factor)))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray()); CollectionUtils.listEntry (HELPER_ClassCode.getForSQL(dummyClassCode, factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_ClassCode))).listEntry (HELPER_Notes.getForSQL(dummyNotes, factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_Notes))).listEntry (HELPER_LeftAnnot.getForSQL(dummyLeftAnnot, factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_LeftAnnot))).listEntry (HELPER_RightAnnot.getForSQL(dummyRightAnnot, factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_RightAnnot))).listEntry (HELPER_ZScoreWeight.getForSQL(dummyZScoreWeight, factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_ZScoreWeight))).listEntry (HELPER_ZScoreWeight2.getForSQL(dummyZScoreWeight2, factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_ZScoreWeight2))).listEntry (SQLManager.CheckNull((Long)(factor_hdrPSet.getAttrib (FactorLevelLink.SINGLEREFERENCE_Level)))).listEntry (SQLManager.CheckNull((Long)(factor_hdrPSet.getAttrib (FactorLevelLink.SINGLEREFERENCE_Factor)))).listEntry (objectID.longID ()).listEntry (obj.getObjectLastModified ()).toList().toArray());
if (rowsUpdated != 1) if (rowsUpdated != 1)
{ {
...@@ -467,7 +463,6 @@ public class FactorLevelLinkPersistenceMgr extends ObjectPersistenceMgr ...@@ -467,7 +463,6 @@ public class FactorLevelLinkPersistenceMgr extends ObjectPersistenceMgr
// Object Created // Object Created
factor_hdrPSet.setAttrib(BaseBusinessClass.FIELD_ObjectCreated, r.getTimestamp ("CREATED_DATE")); factor_hdrPSet.setAttrib(BaseBusinessClass.FIELD_ObjectCreated, r.getTimestamp ("CREATED_DATE"));
factor_hdrPSet.setAttrib(FactorLevelLink.FIELD_Description, HELPER_Description.getFromRS(dummyDescription, r, "factor_hdr_desc"));
factor_hdrPSet.setAttrib(FactorLevelLink.FIELD_ClassCode, HELPER_ClassCode.getFromRS(dummyClassCode, r, "class_code")); factor_hdrPSet.setAttrib(FactorLevelLink.FIELD_ClassCode, HELPER_ClassCode.getFromRS(dummyClassCode, r, "class_code"));
factor_hdrPSet.setAttrib(FactorLevelLink.FIELD_Notes, HELPER_Notes.getFromRS(dummyNotes, r, "factor_hdr_notes")); factor_hdrPSet.setAttrib(FactorLevelLink.FIELD_Notes, HELPER_Notes.getFromRS(dummyNotes, r, "factor_hdr_notes"));
factor_hdrPSet.setAttrib(FactorLevelLink.FIELD_LeftAnnot, HELPER_LeftAnnot.getFromRS(dummyLeftAnnot, r, "left_annot")); factor_hdrPSet.setAttrib(FactorLevelLink.FIELD_LeftAnnot, HELPER_LeftAnnot.getFromRS(dummyLeftAnnot, r, "left_annot"));
...@@ -493,10 +488,10 @@ public class FactorLevelLinkPersistenceMgr extends ObjectPersistenceMgr ...@@ -493,10 +488,10 @@ public class FactorLevelLinkPersistenceMgr extends ObjectPersistenceMgr
{ {
executeStatement (sqlMgr, executeStatement (sqlMgr,
"INSERT INTO {PREFIX}factor_hdr " + "INSERT INTO {PREFIX}factor_hdr " +
" (factor_hdr_desc, class_code, factor_hdr_notes, left_annot, right_annot, z_score_wght, z_score_wght_2, level_number, factor_number, object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " + " (class_code, factor_hdr_notes, left_annot, right_annot, z_score_wght, z_score_wght_2, level_number, factor_number, object_id, object_LAST_UPDATED_DATE, object_CREATED_DATE) " +
"VALUES " + "VALUES " +
" (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ", " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")", " (?, ?, ?, ?, ?, ?, ?, ?, ?, " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ", " + sqlMgr.getPortabilityServices ().getTimestampExpression () + ")",
CollectionUtils.listEntry (HELPER_Description.getForSQL(dummyDescription, factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_Description))).listEntry (HELPER_ClassCode.getForSQL(dummyClassCode, factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_ClassCode))).listEntry (HELPER_Notes.getForSQL(dummyNotes, factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_Notes))).listEntry (HELPER_LeftAnnot.getForSQL(dummyLeftAnnot, factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_LeftAnnot))).listEntry (HELPER_RightAnnot.getForSQL(dummyRightAnnot, factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_RightAnnot))).listEntry (HELPER_ZScoreWeight.getForSQL(dummyZScoreWeight, factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_ZScoreWeight))).listEntry (HELPER_ZScoreWeight2.getForSQL(dummyZScoreWeight2, factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_ZScoreWeight2))) .listEntry (SQLManager.CheckNull((Long)(factor_hdrPSet.getAttrib (FactorLevelLink.SINGLEREFERENCE_Level)))).listEntry (SQLManager.CheckNull((Long)(factor_hdrPSet.getAttrib (FactorLevelLink.SINGLEREFERENCE_Factor)))) .listEntry (objectID.longID ()).toList().toArray()); CollectionUtils.listEntry (HELPER_ClassCode.getForSQL(dummyClassCode, factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_ClassCode))).listEntry (HELPER_Notes.getForSQL(dummyNotes, factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_Notes))).listEntry (HELPER_LeftAnnot.getForSQL(dummyLeftAnnot, factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_LeftAnnot))).listEntry (HELPER_RightAnnot.getForSQL(dummyRightAnnot, factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_RightAnnot))).listEntry (HELPER_ZScoreWeight.getForSQL(dummyZScoreWeight, factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_ZScoreWeight))).listEntry (HELPER_ZScoreWeight2.getForSQL(dummyZScoreWeight2, factor_hdrPSet.getAttrib (FactorLevelLink.FIELD_ZScoreWeight2))) .listEntry (SQLManager.CheckNull((Long)(factor_hdrPSet.getAttrib (FactorLevelLink.SINGLEREFERENCE_Level)))).listEntry (SQLManager.CheckNull((Long)(factor_hdrPSet.getAttrib (FactorLevelLink.SINGLEREFERENCE_Factor)))) .listEntry (objectID.longID ()).toList().toArray());
factor_hdrPSet.setStatus (PersistentSetStatus.PROCESSED); factor_hdrPSet.setStatus (PersistentSetStatus.PROCESSED);
} }
......
cmsWebApp/webroot/extensions/performa/CustomServlets_PERFORMA.xml → cmsWebApp/webroot/extensions/performa/CustomServlets_performa.xml
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<NODE name="testAnalysis_jsp" factory="Participant"> <NODE name="testAnalysis_jsp" factory="Participant">
<INHERITS factory="Named" nodename="CoreORMAdmin"/> <INHERITS factory="Named" nodename="CoreORMAdmin"/>
<FORM name="*.importCSV" factory="Participant" class="performa.form.ImportCSVFP"/> <FORM name="*.testAnalysis" factory="Participant" class="performa.form.TestAnalysisFP"/>
</NODE> </NODE>
</OBJECTS> </OBJECTS>
\ No newline at end of file
cmsWebApp/webroot/extensions/performa/GeneralConfig_PERFORMA.xml → cmsWebApp/webroot/extensions/performa/GeneralConfig_performa.xml
...@@ -2,11 +2,12 @@ ...@@ -2,11 +2,12 @@
<OBJECTS name=""> <OBJECTS name="">
<NODE name="UI_Factories::PERFORMA"> <NODE name="UI_Factories::Performa">
<NODE name="PERFORMA" factory="Participant" class="oneit.servlets.jsp.ui.DefaultUICustomiser"> <NODE name="Performa" factory="Participant" class="oneit.servlets.jsp.ui.DefaultUICustomiser">
<TOPMENU name="MENU.TEST_ANALYSIS" desc="Test Analysis" sortOrder="100" factory="Participant" class="oneit.servlets.jsp.ui.DefaultUICustomiser$Element" link="/extensions/performa/testAnalysis.jsp"/> <TOPMENU name="MENU.TEST_ANALYSIS" desc="Test Analysis" sortOrder="100" factory="Participant" class="oneit.servlets.jsp.ui.DefaultUICustomiser$Element"
link="/extensions/performa/testAnalysis.jsp"/>
</NODE> </NODE>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment