Project collections

grails-app/controllers/au/org/ala/ecodata/ActivityController.groovy

@@ -164,7 +164,7 @@ class ActivityController {
  * an error, but no results will be returned. (this is an effect of mongo allowing
  * a dynamic schema)
  *
- * @return a list of the projects that match the supplied criteria
+ * @return a list of the activities that match the supplied criteria
  */
  @RequireApiKey
  def search() {

grails-app/services/au/org/ala/ecodata/ProjectService.groovy

@@ -58,7 +58,7 @@ class ProjectService {
  def dbo = prj.getProperty("dbo")
  def mapOfProperties = dbo.toMap()
  if (levelOfDetail == BRIEF) {
- return [projectId: prj.projectId, name: prj.name, description:prj.description, plannedStartDate:prj.plannedStartDate, plannedEndDate:prj.plannedEndDate, associatedProgram:prj.associatedProgram, associatedSubProgram:prj.associatedSubProgram]
+ return [projectId: prj.projectId, name: prj.name, grantId:prj.grantId, externalId:prj.externalId, funding:prj.funding, description:prj.description, status:prj.status, plannedStartDate:prj.plannedStartDate, plannedEndDate:prj.plannedEndDate, associatedProgram:prj.associatedProgram, associatedSubProgram:prj.associatedSubProgram]
  }
  def id = mapOfProperties["_id"].toString()
  mapOfProperties["id"] = id

models/communityActivityDetails/dataModel.json

@@ -108,10 +108,6 @@
  "name": "groupsSupported",
  "validate": "min[0]"
  },
- {
- "dataType": "number",
- "name": "numberOfEvents"
- },
  {
  "dataType": "text",
  "name": "eventNotes"

models/gaQuarterlyProjectReport/dataModel.json

@@ -1,47 +1,6 @@
 {
  "modelName": "Three Monthly Report",
  "dataModel": [
- {
- "dataType": "text",
- "description": "The 3 month period for which this report applies.",
- "name": "reportQuarter",
- "constraints": [
- "Q1 - 1 July - 30 September",
- "Q2 - 1 October - 31 December",
- "Q3 - 1 January - 31 March",
- "Q4 - 1 April - 30 June"
- ],
- "validate": "required"
- },
- {
- "dataType": "text",
- "description": "The year for which this report applies.",
- "name": "reportYear",
- "constraints": [
- "2014",
- "2015"
- ],
- "validate": "required"
- },
- {
- "dataType": "text",
- "description": ".",
- "name": "projectStatus",
- "constraints": [
- "Not started",
- "Commenced",
- "Progressing - behind schedule",
- "Progressing - on schedule",
- "Progressing - ahead of schedule",
- "Completed"
- ],
- "validate": "required"
- },
- {
- "dataType": "date",
- "description": ".",
- "name": "projectStatusReason"
- },
  {
  "dataType": "list",
  "name": "training",
@@ -80,8 +39,9 @@
  {
  "dataType": "number",
  "description": ".",
+ "primaryResult": "true",
  "name": "participantWithdrawals",
- "validate": "required"
+ "validate": "required,min[0]"
  },
  {
  "dataType": "text",
@@ -97,8 +57,9 @@
  {
  "dataType": "number",
  "description": ".",
+ "primaryResult": "true",
  "name": "participantExits",
- "validate": "required"
+ "validate": "required,min[0]"
  },
  {
  "dataType": "text",
@@ -114,8 +75,9 @@
  {
  "dataType": "number",
  "description": "The number of participants who commenced or made a commitment to undertake non-accredited training.",
+ "primaryResult": "true",
  "name": "participantTrainingNaNumber",
- "validate": "required"
+ "validate": "required,min[0]"
  },
  {
  "dataType": "text",
@@ -131,8 +93,9 @@
  {
  "dataType": "number",
  "description": "The number of participants who did commenced, but did not complete training.",
+ "primaryResult": "true",
  "name": "participantTrainingNcNumber",
- "validate": "required"
+ "validate": "required,min[0]"
  },
  {
  "dataType": "text",
@@ -168,46 +131,55 @@
  "columns": [
  {
  "dataType": "number",
+ "primaryResult": "true",
  "name": "no17Years",
- "validate": "required,min[0]"
+ "validate": "required, min[0]"
  },
  {
  "dataType": "number",
+ "primaryResult": "true",
  "name": "no18Years",
- "validate": "required,min[0]"
+ "validate": "required, min[0]"
  },
  {
  "dataType": "number",
+ "primaryResult": "true",
  "name": "no19Years",
- "validate": "required,min[0]"
+ "validate": "required, min[0]"
  },
  {
  "dataType": "number",
+ "primaryResult": "true",
  "name": "no20Years",
- "validate": "required,min[0]"
+ "validate": "required, min[0]"
  },
  {
  "dataType": "number",
+ "primaryResult": "true",
  "name": "no21Years",
- "validate": "required,min[0]"
+ "validate": "required, min[0]"
  },
  {
  "dataType": "number",
+ "primaryResult": "true",
  "name": "no22Years",
- "validate": "required,min[0]"
+ "validate": "required, min[0]"
  },
  {
  "dataType": "number",
+ "primaryResult": "true",
  "name": "no23Years",
- "validate": "required,min[0]"
+ "validate": "required, min[0]"
  },
  {
  "dataType": "number",
+ "primaryResult": "true",
  "name": "no24Years",
- "validate": "required,min[0]"
+ "validate": "required, min[0]"
  },
  {
  "dataType": "number",
+ "primaryResult": "true",
  "name": "totalParticipants",
  "computed": {
  "operation": "sum",
@@ -222,7 +194,7 @@
  "no24Years"
  ]
  },
- "validate": "required,min[0]"
+ "validate": "min[0]"
  }
  ]
  },
@@ -293,48 +265,30 @@
  ]
  },
  {
- "dataType": "checkbox",
+ "dataType": "text",
  "description": "Indicate whether this injury or illness was notifiable.",
- "name": "incidentNotifiable"
+ "name": "incidentNotifiable",
+ "constraints": [
+ "Yes",
+ "No"
+ ]
  },
  {
  "dataType": "text",
  "description": "Provide a brief description of the injury or illness.",
  "name": "incidentDescription"
  }
  ]
+ },
+ {
+ "dataType": "number",
+ "description": "We are interested in knowing how long it takes you to complete your reporting requirements. When submitting your reports to the Green Army Team, please tell us the time (minutes) you have taken to complete this report.",
+ "primaryResult": "true",
+ "name": "reportingTimeTaken",
+ "validate": "required, min[0]"
  }
  ],
  "viewModel": [
- {
- "items": [
- {
- "source": "reportQuarter",
- "computed": null,
- "preLabel": "Report period:",
- "type": "selectOne"
- },
- {
- "source": "reportYear",
- "computed": null,
- "preLabel": "Year:",
- "type": "selectOne"
- },
- {
- "source": "projectStatus",
- "computed": null,
- "preLabel": "How is the project tracking?:",
- "type": "selectOne"
- },
- {
- "source": "projectStatusReason",
- "computed": null,
- "preLabel": "Reason project is behind schedule or that MERIT has not been updated:",
- "type": "textarea"
- }
- ],
- "type": "row"
- },
  {
  "items": [{
  "source": "<h4>List of Training Activities<\/h4>",
@@ -559,7 +513,7 @@
  },
  {
  "items": [{
- "source": "Please provide information on the age range of all participants that commenced on the Project during this reporting period.",
+ "source": "Please provide information on the age range of all participants that commenced on the Project during this reporting period. The total number must agree with the sum of the monthly totals for this three month period for Participants commencing.",
  "computed": null,
  "type": "literal"
  }],
@@ -620,9 +574,23 @@
  },
  {
  "title": "Total Participants",
- "readOnly": "true",
  "source": "totalParticipants",
+ "primaryResult": "true",
  "width": "10%",
+ "computed": {
+ "operation": "sum",
+ "dependents": [
+ "no17Years",
+ "no18Years",
+ "no19Years",
+ "no20Years",
+ "no21Years",
+ "no22Years",
+ "no23Years",
+ "no24Years"
+ ]
+ },
+ "noEdit": "true",
  "type": "number"
  }
  ],
@@ -666,7 +634,7 @@
  "title": "Was the incident notifiable?",
  "source": "incidentNotifiable",
  "width": "10%",
- "type": "checkbox"
+ "type": "selectOne"
  },
  {
  "title": "Description of incident and resulting injury/illness and remedial action/s taken to address incident <br><i>(including any insurance claim by the Participant, and/or to decrease the likelihood of re-occurrence where required)<\/i>",
@@ -678,6 +646,15 @@
  "userAddedRows": true,
  "class": "output-section",
  "type": "table"
+ },
+ {
+ "items": [{
+ "source": "reportingTimeTaken",
+ "computed": null,
+ "preLabel": "Time taken to complete this report (minutes):",
+ "type": "number"
+ }],
+ "type": "row"
  }
  ]
 }