Minor changes

cmsWebApp/sql/FactorLevelLink.xml

@@ -8,7 +8,6 @@
 			<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_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="factor_hdr_notes" type="CLOB" nullable="true"/>
 			<column name="left_annot" type="String" nullable="true" length="60"/>

cmsWebApp/sql/ms/FactorLevelLink.sql

@@ -8,7 +8,6 @@ CREATE TABLE factor_hdr (
     object_last_updated_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,
     factor_hdr_notes text NULL,
     left_annot varchar(60) NULL,

cmsWebApp/sql/oracle/FactorLevelLink.sql

@@ -9,7 +9,6 @@ CREATE TABLE factor_hdr (
     object_last_updated_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,
     factor_hdr_notes clob NULL,
     left_annot varchar2(60) NULL,

cmsWebApp/sql/postgres/FactorLevelLink.sql

@@ -9,7 +9,6 @@ CREATE TABLE factor_hdr (
     object_last_updated_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,
     factor_hdr_notes text 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;
  *
  * @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
     public SuccessfulResult processForm(ORMProcessState process, SubmissionDetails submission, Map params) throws BusinessException, StorageException
@@ -52,7 +52,7 @@ public class ImportCSVFP extends ORMProcessFormProcessor
     private static ExcelExporter.ExportAppender getExportAppender(BinaryContent file) throws IOException
     {
         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("header.horizontal-alignment", "center");

cmsWebApp/src/performa/orm/FactorLevelLink.xml

@@ -6,13 +6,12 @@
                 
         <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="Notes"            type="String"   dbcol="factor_hdr_notes"/>
             <ATTRIB name="LeftAnnot"        type="String"   dbcol="left_annot"  length="60"/>
             <ATTRIB name="RightAnnot"       type="String"   dbcol="right_annot" length="60"/>
-            <ATTRIB name="ZScoreWeight"     type="Double"   dbcol="z_score_wght"/>
-            <ATTRIB name="ZScoreWeight2"    type="Double"   dbcol="z_score_wght_2"/>
+            <ATTRIB name="ZScoreWeight"     type="Double"   dbcol="z_score_wght"    />
+            <ATTRIB name="ZScoreWeight2"    type="Double"   dbcol="z_score_wght_2"  />
 
             <SINGLEREFERENCE    name="Level"    type="Level"    dbcol="level_number"    backreferenceName="Factors" />
             <SINGLEREFERENCE    name="Factor"   type="Factor"   dbcol="factor_number"   backreferenceName="Levels" />

cmsWebApp/webroot/extensions/performa/CustomServlets_PERFORMA.xml → cmsWebApp/webroot/extensions/performa/CustomServlets_performa.xml

@@ -4,7 +4,7 @@
     
     <NODE name="testAnalysis_jsp" factory="Participant">
         <INHERITS factory="Named"   nodename="CoreORMAdmin"/>
-        <FORM   name="*.importCSV"  factory="Participant"   class="performa.form.ImportCSVFP"/>
+        <FORM   name="*.testAnalysis"   factory="Participant"   class="performa.form.TestAnalysisFP"/>
     </NODE>
     
 </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 @@
 
 <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>