bibbox · ChristianMUG · Dec 2, 2019 · Dec 2, 2019 · Dec 2, 2019 · Dec 2, 2019
diff --git a/README.md b/README.md
@@ -43,7 +43,6 @@ Features
  * Highly configurable user interface
  * Mobile and tablet apps
 
-
 Online Resources
 ----------------
 Website: http://www.openspecimen.org

diff --git a/WEB-INF/applicationContext.xml b/WEB-INF/applicationContext.xml
diff --git a/WEB-INF/resources/com/krishagni/catissueplus/core/administrative/schema/activity-log.xml b/WEB-INF/resources/com/krishagni/catissueplus/core/administrative/schema/activity-log.xml
@@ -0,0 +1,49 @@
+#macro(getMessage $code)$messageSource.getMessage($code, null, $locale)#end
+
+<object-schema>
+  <name>containerActivityLog</name>
+  <record>
+    <name>com.krishagni.catissueplus.core.administrative.events.ContainerActivityLogDetail</name>
+
+    <field>
+      <caption>#getMessage("storage_container_name")</caption>
+      <attribute>containerName</attribute>
+    </field>
+
+    <field>
+      <caption>#getMessage("cont_activity_name")</caption>
+      <attribute>scheduledActivityName</attribute>
+    </field>
+
+    <field>
+      <caption>#getMessage("cont_activity_task")</caption>
+      <attribute>taskName</attribute>
+    </field>
+
+    <record>
+      <caption>#getMessage("cont_activity_performed_by")</caption>
+      <attribute>performedBy</attribute>
+
+      <field>
+        <caption>#getMessage("cont_activity_user_email")</caption>
+        <attribute>emailAddress</attribute>
+      </field>
+    </record>
+
+    <field>
+      <caption>#getMessage("cont_activity_date")</caption>
+      <attribute>activityDate</attribute>
+      <type>date</type>
+    </field>
+
+    <field>
+      <caption>#getMessage("cont_activity_time_taken")</caption>
+      <attribute>timeTaken</attribute>
+    </field>
+
+    <field>
+      <caption>#getMessage("cont_activity_comments")</caption>
+      <attribute>comments</attribute>
+    </field>
+  </record>
+</object-schema>
diff --git a/...resources/com/krishagni/catissueplus/core/administrative/schema/distribution-protocol.xml b/...resources/com/krishagni/catissueplus/core/administrative/schema/distribution-protocol.xml
@@ -30,6 +30,11 @@
       <attribute>defReceivingSiteName</attribute>
     </field>
 
+    <field>
+      <caption>#getMessage("dp_activity_status")</caption>
+      <attribute>activityStatus</attribute>
+    </field>
+
     <record>
       <attribute>principalInvestigator</attribute>
       <caption>#getMessage("dp_pi")</caption>
@@ -57,13 +62,13 @@
     </field>
 
     <field>
-      <type>date</type>
+      <type>dateOnly</type>
       <caption>#getMessage("dp_start_date")</caption>
       <attribute>startDate</attribute>
     </field>
 
     <field>
-      <type>date</type>
+      <type>dateOnly</type>
       <caption>#getMessage("dp_end_date")</caption>
       <attribute>endDate</attribute>
     </field>

diff --git a/WEB-INF/resources/com/krishagni/catissueplus/core/administrative/schema/dp-requirement.xml b/WEB-INF/resources/com/krishagni/catissueplus/core/administrative/schema/dp-requirement.xml
@@ -58,6 +58,11 @@
       <attribute>comments</attribute>
     </field>
 
+    <field>
+      <caption>#getMessage("dp_req_activity_status")</caption>
+      <attribute>activityStatus</attribute>
+    </field>
+
     <record type="customFields" entityType="DpRequirementExtension">
       <attribute>extensionDetail</attribute>
     </record>

diff --git a/WEB-INF/resources/com/krishagni/catissueplus/core/administrative/schema/institute.xml b/WEB-INF/resources/com/krishagni/catissueplus/core/administrative/schema/institute.xml
@@ -15,6 +15,10 @@
       <attribute>name</attribute>
     </field>
 
+    <field>
+      <caption>#getMessage("institute_activity_status")</caption>
+      <attribute>activityStatus</attribute>
+    </field>
   </record>
 </object-schema>
 
diff --git a/WEB-INF/resources/com/krishagni/catissueplus/core/administrative/schema/return-specimen.xml b/WEB-INF/resources/com/krishagni/catissueplus/core/administrative/schema/return-specimen.xml
@@ -58,7 +58,7 @@
     <field>
       <attribute>time</attribute>
       <caption>#getMessage("return_date")</caption>
-      <type>date</type>
+      <type>datetime</type>
     </field>
 
     <field>

diff --git a/WEB-INF/resources/com/krishagni/catissueplus/core/administrative/schema/site.xml b/WEB-INF/resources/com/krishagni/catissueplus/core/administrative/schema/site.xml
@@ -46,6 +46,11 @@
       </field>
     </record>
 
+    <field>
+      <caption>#getMessage("site_activity_status")</caption>
+      <attribute>activityStatus</attribute>
+    </field>
+
     <record type="customFields" entityType="SiteExtension">
       <attribute>extensionDetail</attribute>
     </record>

diff --git a/WEB-INF/resources/com/krishagni/catissueplus/core/administrative/schema/user-roles.xml b/WEB-INF/resources/com/krishagni/catissueplus/core/administrative/schema/user-roles.xml
@@ -7,7 +7,7 @@
 
     <field>
       <caption>#getMessage("user_roles_identifier")</caption>
-      <attribute>id</attribute>
+      <attribute>subjectId</attribute>
     </field>
 
     <field>

diff --git a/WEB-INF/resources/com/krishagni/catissueplus/core/administrative/schema/user.xml b/WEB-INF/resources/com/krishagni/catissueplus/core/administrative/schema/user.xml
@@ -64,5 +64,11 @@
       <caption>#getMessage("user_activity_status")</caption>
       <attribute>activityStatus</attribute>
     </field>
+
+    <field>
+      <type>boolean</type>
+      <caption>#getMessage("user_dnd")</caption>
+      <attribute>dnd</attribute>
+    </field>
   </record>
 </object-schema>
diff --git a/WEB-INF/resources/com/krishagni/catissueplus/core/biospecimen/cp-report-settings.json b/WEB-INF/resources/com/krishagni/catissueplus/core/biospecimen/cp-report-settings.json
@@ -1,5 +1,5 @@
 {
-  "dataQueryAql": "select SpecimenCollectionGroup.site.name, count(distinct Participant.id) as \"Participants\", count(distinct Specimen.id) as \"Specimens\", Specimen.type where  Specimen.collectionStatus = \"Collected\" and  Specimen.specimenPosition.containerName exists and date_range(Specimen.createdOn, last_cal_month) crosstab((1), 4, (-2,3))",
+  "dataQueryAql": "select SpecimenCollectionGroup.site, count(distinct Participant.id) as \"Participants\", count(distinct Specimen.id) as \"Specimens\", Specimen.type where  Specimen.collectionStatus = \"Collected\" and  Specimen.specimenPosition.containerName exists and date_range(Specimen.createdOn, last_cal_month) crosstab((1), 4, (-2,3))",
 
   "metricsCfg": {
     "participants": {

diff --git a/WEB-INF/resources/com/krishagni/catissueplus/core/biospecimen/schema/consent.xml b/WEB-INF/resources/com/krishagni/catissueplus/core/biospecimen/schema/consent.xml
@@ -43,6 +43,11 @@
       <caption>#getMessage("participant_consent_tier_statement")</caption>
       <attribute>statement</attribute>
     </field>
+
+    <field>
+      <caption>#getMessage("participant_consent_tier_stmt_code")</caption>
+      <attribute>code</attribute>
+    </field>
 
     <field>
       <caption>#getMessage("participant_consent_tier_response")</caption>

diff --git a/WEB-INF/resources/com/krishagni/catissueplus/core/biospecimen/schema/cp.xml b/WEB-INF/resources/com/krishagni/catissueplus/core/biospecimen/schema/cp.xml
@@ -22,6 +22,11 @@
       </field>
     </record>
 
+    <field>
+      <caption>#getMessage("cp_identifier")</caption>
+      <attribute>id</attribute>
+    </field>
+
     <field>
       <caption>#getMessage("cp_title")</caption>
       <attribute>title</attribute>
@@ -59,13 +64,13 @@
     </record>
 
     <field>
-      <type>date</type>
+      <type>dateOnly</type>
       <caption>#getMessage("cp_start_date")</caption>
       <attribute>startDate</attribute>
     </field>
 
     <field>
-      <type>date</type>
+      <type>dateOnly</type>
       <caption>#getMessage("cp_end_date")</caption>
       <attribute>endDate</attribute>
     </field>
@@ -158,5 +163,9 @@
       <caption>#getMessage("cp_activity_status")</caption>
       <attribute>activityStatus</attribute>
     </field>
+
+   <record type="customFields" entityType="CollectionProtocolExtension">
+     <attribute>extensionDetail</attribute>
+   </record>
   </record>
 </object-schema>
diff --git a/WEB-INF/resources/com/krishagni/catissueplus/core/biospecimen/schema/master-specimen.xml b/WEB-INF/resources/com/krishagni/catissueplus/core/biospecimen/schema/master-specimen.xml
@@ -141,6 +141,11 @@
       <attribute>concentration</attribute>
     </field>
 
+    <field>
+      <caption>#getMessage("specimen_freeze_thaw_cycles")</caption>
+      <attribute>freezeThawCycles</attribute>
+    </field>
+
     <field>
       <type>datetime</type>
       <caption>#getMessage("specimen_created_on")</caption>
@@ -185,6 +190,11 @@
       </field>
     </record>
 
+    <field>
+      <caption>#getMessage("specimen_collection_status")</caption>
+      <attribute>collectionStatus</attribute>
+    </field>
+
     <field>
       <caption>#getMessage("specimen_location_container")</caption>
       <attribute>container</attribute>

diff --git a/...esources/com/krishagni/catissueplus/core/biospecimen/schema/participant-static-fields.xml b/...esources/com/krishagni/catissueplus/core/biospecimen/schema/participant-static-fields.xml
@@ -14,13 +14,18 @@
 </field>
 
 <field>
-  <type>date</type>
+  <caption>#getMessage("participant_email_address")</caption>
+  <attribute>emailAddress</attribute>
+</field>
+
+<field>
+  <type>dateOnly</type>
   <caption>#getMessage("participant_dob")</caption>
   <attribute>birthDate</attribute>
 </field>
 
 <field>
-  <type>date</type>
+  <type>dateOnly</type>
   <caption>#getMessage("participant_death_date")</caption>
   <attribute>deathDate</attribute>
 </field>

diff --git a/WEB-INF/resources/com/krishagni/catissueplus/core/biospecimen/schema/specimen-aliquot.xml b/WEB-INF/resources/com/krishagni/catissueplus/core/biospecimen/schema/specimen-aliquot.xml
@@ -17,14 +17,34 @@
     </field>
 
     <field>
-      <caption>#getMessage("specimen_qty_per_aliquot")</caption>
-      <attribute>qtyPerAliquot</attribute>
+      <caption>#getMessage("specimen_labels")</caption>
+      <attribute>labels</attribute>
+    </field>
+
+    <field>
+      <caption>#getMessage("specimen_barcodes")</caption>
+      <attribute>barcodes</attribute>
     </field>
 
     <field>
       <caption>#getMessage("specimen_no_of_aliquots")</caption>
       <attribute>noOfAliquots</attribute>
-    </field>  
+    </field>
+
+    <field>
+      <caption>#getMessage("specimen_qty_per_aliquot")</caption>
+      <attribute>qtyPerAliquot</attribute>
+    </field>
+
+    <field>
+      <caption>#getMessage("specimen_class")</caption>
+      <attribute>specimenClass</attribute>
+    </field>
+
+    <field>
+      <caption>#getMessage("specimen_type")</caption>
+      <attribute>type</attribute>
+    </field>
 
     <field>
       <caption>#getMessage("specimen_concentration")</caption>

diff --git a/WEB-INF/resources/com/krishagni/catissueplus/core/biospecimen/schema/sr.xml b/WEB-INF/resources/com/krishagni/catissueplus/core/biospecimen/schema/sr.xml
@@ -6,6 +6,11 @@
   <record> 
     <name>com.krishagni.catissueplus.core.biospecimen.events.SpecimenRequirementDetail</name>
 
+    <field>
+      <caption>#getMessage("sr_identifier")</caption>
+      <attribute>id</attribute>
+    </field>
+
     <field>
       <caption>#getMessage("sr_cp_short_title")</caption>
       <attribute>cpShortTitle</attribute>
@@ -125,6 +130,11 @@
       <caption>#getMessage("sr_sort_order")</caption>
       <attribute>sortOrder</attribute>
     </field>
+
+    <field>
+      <caption>#getMessage("sr_activity_status")</caption>
+      <attribute>activityStatus</attribute>
+    </field>
 
     <record>
       <attribute>specimensPool</attribute>

diff --git a/WEB-INF/resources/com/krishagni/catissueplus/core/biospecimen/schema/visit.xml b/WEB-INF/resources/com/krishagni/catissueplus/core/biospecimen/schema/visit.xml
@@ -32,7 +32,7 @@
     </field>     
 
     <field>
-      <type>date</type>
+      <type>datetime</type>
       <caption>#getMessage("visit_date")</caption>
       <attribute>visitDate</attribute>
     </field>