DFPL-2303: c110a Design Changes to Risk and Harm & Factors Affecting Parenting Sections

ccd-definition/AuthorisationCaseEvent/CareSupervision/AuthorisationCaseEvent.json

@@ -487,7 +487,7 @@
           "[SOLICITORA]",
           "[CHILDSOLICITORA]"
         ],
-        "CRUD": "CR"
+        "CRUD": "R"
       },
       {
         "UserRoles": [

ccd-definition/CaseEvent/CareSupervision/DEPRECATED.json

@@ -383,5 +383,20 @@
     "ShowEventNotes": "N",
     "Publish": "Y",
     "EndButtonLabel": "Send reminder"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "ID": "enterParentingFactors",
+    "Name": "Factors affecting parenting",
+    "Description": "Entering the factors affecting parenting",
+    "DisplayOrder": 10,
+    "PreConditionState(s)": "Open;RETURNED",
+    "PostConditionState": "*",
+    "SecurityClassification": "Public",
+    "ShowSummary": "Y",
+    "ShowEventNotes": "N",
+    "EndButtonLabel": "Save and continue",
+    "CallBackURLSubmittedEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/callback/update-task-list/submitted"
   }
 ]

ccd-definition/CaseEvent/CareSupervision/MultiState.json

@@ -384,22 +384,6 @@
     "CallBackURLSubmittedEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/callback/update-task-list/submitted",
     "EventEnablingCondition": "otherOrderType!=\"YES\" AND secureAccommodationOrderType!=\"YES\" AND refuseContactWithChildOrderType!=\"YES\" AND contactWithChildInCareOrderType!=\"YES\""
   },
-  {
-    "LiveFrom": "01/01/2017",
-    "CaseTypeID": "CARE_SUPERVISION_EPO",
-    "ID": "enterParentingFactors",
-    "Name": "Factors affecting parenting",
-    "Description": "Entering the factors affecting parenting",
-    "DisplayOrder": 10,
-    "PreConditionState(s)": "Open;RETURNED",
-    "PostConditionState": "*",
-    "SecurityClassification": "Public",
-    "ShowSummary": "Y",
-    "ShowEventNotes": "N",
-    "EndButtonLabel": "Save and continue",
-    "CallBackURLSubmittedEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/callback/update-task-list/submitted",
-    "EventEnablingCondition": "otherOrderType!=\"YES\" AND secureAccommodationOrderType!=\"YES\" AND refuseContactWithChildOrderType!=\"YES\" AND contactWithChildInCareOrderType!=\"YES\""
-  },
   {
     "LiveFrom": "01/01/2017",
     "CaseTypeID": "CARE_SUPERVISION_EPO",

ccd-definition/CaseEventToComplexTypes/RiskAndHarm/enterRiskHarm.json

@@ -0,0 +1,32 @@
+[
+  {
+    "LiveFrom": "01/01/2017",
+    "ID": "RiskAndHarm",
+    "CaseEventID": "enterRiskHarm",
+    "CaseFieldID": "risks",
+    "ListElementCode": "whatKindOfRiskAndHarmToChildren",
+    "EventElementLabel": "What kind of harm is the child at risk of?",
+    "FieldDisplayOrder": 1,
+    "DisplayContext": "MANDATORY"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "ID": "RiskAndHarm",
+    "CaseEventID": "enterRiskHarm",
+    "CaseFieldID": "risks",
+    "ListElementCode": "factorsAffectingParenting",
+    "EventElementLabel": "Is there anything affecting any respondent's ability to parent?",
+    "FieldDisplayOrder": 2,
+    "DisplayContext": "MANDATORY"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "ID": "RiskAndHarm",
+    "CaseEventID": "enterRiskHarm",
+    "CaseFieldID": "risks",
+    "ListElementCode": "anythingElseAffectingParenting",
+    "EventElementLabel": "Tell us what else is affecting their ability to parent",
+    "FieldDisplayOrder": 3,
+    "DisplayContext": "MANDATORY"
+  }
+]

ccd-definition/CaseEventToFields/CareSupervision/enterRiskHarm.json

@@ -5,7 +5,7 @@
     "CaseEventID": "enterRiskHarm",
     "CaseFieldID": "risks",
     "PageFieldDisplayOrder": 1,
-    "DisplayContext": "OPTIONAL",
+    "DisplayContext": "MANDATORY",
     "PageID": 1,
     "PageDisplayOrder": 1,
     "PageColumnNumber": 1,

ccd-definition/CaseField/CareSupervision/DEPRECATED.json

@@ -845,5 +845,14 @@
     "Label": "Further evidence documents for hearings",
     "SecurityClassification": "Public",
     "Searchable": "N"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "CaseTypeID": "CARE_SUPERVISION_EPO",
+    "ID": "factorsAffectingParentingLink",
+    "FieldType": "Label",
+    "Label": "[Make changes to factors affecting parenting](/case/${[JURISDICTION]}/${[CASE_TYPE]}/${[CASE_REFERENCE]}/trigger/enterParentingFactors)",
+    "SecurityClassification": "Public",
+    "Searchable": "N"
   }
 ]

ccd-definition/CaseField/CareSupervision/eventLinks.json

@@ -35,15 +35,6 @@
     "SecurityClassification": "Public",
     "Searchable": "N"
   },
-  {
-    "LiveFrom": "01/01/2017",
-    "CaseTypeID": "CARE_SUPERVISION_EPO",
-    "ID": "factorsAffectingParentingLink",
-    "FieldType": "Label",
-    "Label": "[Make changes to factors affecting parenting](/case/${[JURISDICTION]}/${[CASE_TYPE]}/${[CASE_REFERENCE]}/trigger/enterParentingFactors)",
-    "SecurityClassification": "Public",
-    "Searchable": "N"
-  },
   {
     "LiveFrom": "01/01/2017",
     "CaseTypeID": "CARE_SUPERVISION_EPO",

ccd-definition/CaseTypeTab/CareSupervision/1_ViewApplication.json

@@ -83,7 +83,7 @@
     "TabLabel": "View application",
     "TabDisplayOrder": 1,
     "CaseFieldID": "groundsForTheApplicationHeadingLabel",
-    "FieldShowCondition": "grounds!=\"\" OR groundsForEPO!=\"\" OR groundsForSecureAccommodationOrder!=\"\" OR risks!=\"\" OR factorsParenting!=\"\" OR proceeding!=\"\" OR internationalElement!=\"\"",
+    "FieldShowCondition": "grounds!=\"\" OR groundsForEPO!=\"\" OR groundsForSecureAccommodationOrder!=\"\" OR risks!=\"\" OR proceeding!=\"\" OR internationalElement!=\"\"",
     "TabFieldDisplayOrder": 8
   },
   {
@@ -247,17 +247,6 @@
     "CaseFieldID": "factorsParenting",
     "TabFieldDisplayOrder": 18
   },
-  {
-    "LiveFrom": "01/01/2017",
-    "CaseTypeID": "CARE_SUPERVISION_EPO",
-    "Channel": "CaseWorker",
-    "TabID": "ViewApplicationTab",
-    "TabLabel": "View application",
-    "TabDisplayOrder": 1,
-    "CaseFieldID": "factorsAffectingParentingLink",
-    "FieldShowCondition": "factorsParenting!=\"\"",
-    "TabFieldDisplayOrder": 19
-  },
   {
     "LiveFrom": "01/01/2017",
     "CaseTypeID": "CARE_SUPERVISION_EPO",

ccd-definition/ComplexTypes/CareSupervision/DEPRECATED.json

@@ -314,5 +314,90 @@
     "ElementLabel": "Give reason",
     "FieldShowCondition": "whichCountriesInvolved=\"DO_NOT_SHOW\"",
     "SecurityClassification": "Public"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "ID": "RiskAndHarm",
+    "ListElementCode": "evidenceQuestion",
+    "FieldType": "Label",
+    "ElementLabel": "## Is there evidence of any of the following?",
+    "FieldShowCondition": "whatKindOfRiskAndHarmToChildren=\"DO_NOT_SHOW\"",
+    "SecurityClassification": "Public"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "ID": "RiskAndHarm",
+    "ListElementCode": "physicalHarm",
+    "FieldType": "YesOrNo",
+    "ElementLabel": "Physical harm including non-accidental injury",
+    "FieldShowCondition": "whatKindOfRiskAndHarmToChildren=\"DO_NOT_SHOW\"",
+    "SecurityClassification": "Public"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "ID": "RiskAndHarm",
+    "ListElementCode": "physicalHarmOccurrences",
+    "FieldType": "MultiSelectList",
+    "FieldTypeParameter": "PastOrFutureHarmSelect",
+    "ElementLabel": "Select all that apply",
+    "FieldShowCondition": "whatKindOfRiskAndHarmToChildren=\"DO_NOT_SHOW\"",
+    "SecurityClassification": "Public"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "ID": "RiskAndHarm",
+    "ListElementCode": "emotionalHarm",
+    "FieldType": "YesOrNo",
+    "ElementLabel": "Emotional harm",
+    "FieldShowCondition": "whatKindOfRiskAndHarmToChildren=\"DO_NOT_SHOW\"",
+    "SecurityClassification": "Public"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "ID": "RiskAndHarm",
+    "ListElementCode": "emotionalHarmOccurrences",
+    "FieldType": "MultiSelectList",
+    "FieldTypeParameter": "PastOrFutureHarmSelect",
+    "ElementLabel": "Select all that apply",
+    "FieldShowCondition": "whatKindOfRiskAndHarmToChildren=\"DO_NOT_SHOW\"",
+    "SecurityClassification": "Public"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "ID": "RiskAndHarm",
+    "ListElementCode": "sexualAbuse",
+    "FieldType": "YesOrNo",
+    "ElementLabel": "Sexual abuse",
+    "FieldShowCondition": "whatKindOfRiskAndHarmToChildren=\"DO_NOT_SHOW\"",
+    "SecurityClassification": "Public"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "ID": "RiskAndHarm",
+    "ListElementCode": "sexualAbuseOccurrences",
+    "FieldType": "MultiSelectList",
+    "FieldTypeParameter": "PastOrFutureHarmSelect",
+    "ElementLabel": "Select all that apply",
+    "FieldShowCondition": "whatKindOfRiskAndHarmToChildren=\"DO_NOT_SHOW\"",
+    "SecurityClassification": "Public"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "ID": "RiskAndHarm",
+    "ListElementCode": "neglect",
+    "FieldType": "YesOrNo",
+    "ElementLabel": "Neglect",
+    "FieldShowCondition": "whatKindOfRiskAndHarmToChildren=\"DO_NOT_SHOW\"",
+    "SecurityClassification": "Public"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "ID": "RiskAndHarm",
+    "ListElementCode": "neglectOccurrences",
+    "FieldType": "MultiSelectList",
+    "FieldTypeParameter": "PastOrFutureHarmSelect",
+    "ElementLabel": "Select all that apply",
+    "FieldShowCondition": "whatKindOfRiskAndHarmToChildren=\"DO_NOT_SHOW\"",
+    "SecurityClassification": "Public"
   }
 ]

ccd-definition/ComplexTypes/CareSupervision/RiskAndHarm.json

@@ -2,81 +2,28 @@
   {
     "LiveFrom": "01/01/2017",
     "ID": "RiskAndHarm",
-    "ListElementCode": "evidenceQuestion",
-    "FieldType": "Label",
-    "ElementLabel": "## Is there evidence of any of the following?",
-    "SecurityClassification": "Public"
-  },
-  {
-    "LiveFrom": "01/01/2017",
-    "ID": "RiskAndHarm",
-    "ListElementCode": "physicalHarm",
-    "FieldType": "YesOrNo",
-    "ElementLabel": "Physical harm including non-accidental injury",
-    "SecurityClassification": "Public"
-  },
-  {
-    "LiveFrom": "01/01/2017",
-    "ID": "RiskAndHarm",
-    "ListElementCode": "physicalHarmOccurrences",
-    "FieldType": "MultiSelectList",
-    "FieldTypeParameter": "PastOrFutureHarmSelect",
-    "ElementLabel": "Select all that apply",
-    "FieldShowCondition": "physicalHarm=\"Yes\"",
-    "SecurityClassification": "Public"
-  },
-  {
-    "LiveFrom": "01/01/2017",
-    "ID": "RiskAndHarm",
-    "ListElementCode": "emotionalHarm",
-    "FieldType": "YesOrNo",
-    "ElementLabel": "Emotional harm",
-    "SecurityClassification": "Public"
-  },
-  {
-    "LiveFrom": "01/01/2017",
-    "ID": "RiskAndHarm",
-    "ListElementCode": "emotionalHarmOccurrences",
+    "ListElementCode": "whatKindOfRiskAndHarmToChildren",
     "FieldType": "MultiSelectList",
-    "FieldTypeParameter": "PastOrFutureHarmSelect",
-    "ElementLabel": "Select all that apply",
-    "FieldShowCondition": "emotionalHarm=\"Yes\"",
-    "SecurityClassification": "Public"
-  },
-  {
-    "LiveFrom": "01/01/2017",
-    "ID": "RiskAndHarm",
-    "ListElementCode": "sexualAbuse",
-    "FieldType": "YesOrNo",
-    "ElementLabel": "Sexual abuse",
+    "FieldTypeParameter": "RiskAndHarmToChildrenList",
+    "ElementLabel": "What kind of harm is the child at risk of?",
     "SecurityClassification": "Public"
   },
   {
     "LiveFrom": "01/01/2017",
     "ID": "RiskAndHarm",
-    "ListElementCode": "sexualAbuseOccurrences",
+    "ListElementCode": "factorsAffectingParenting",
     "FieldType": "MultiSelectList",
-    "FieldTypeParameter": "PastOrFutureHarmSelect",
-    "ElementLabel": "Select all that apply",
-    "FieldShowCondition": "sexualAbuse=\"Yes\"",
-    "SecurityClassification": "Public"
-  },
-  {
-    "LiveFrom": "01/01/2017",
-    "ID": "RiskAndHarm",
-    "ListElementCode": "neglect",
-    "FieldType": "YesOrNo",
-    "ElementLabel": "Neglect",
+    "FieldTypeParameter": "FactorsAffectingParentingList",
+    "ElementLabel": "Is there anything affecting any respondent's ability to parent?",
     "SecurityClassification": "Public"
   },
   {
     "LiveFrom": "01/01/2017",
     "ID": "RiskAndHarm",
-    "ListElementCode": "neglectOccurrences",
-    "FieldType": "MultiSelectList",
-    "FieldTypeParameter": "PastOrFutureHarmSelect",
-    "ElementLabel": "Select all that apply",
-    "FieldShowCondition": "neglect=\"Yes\"",
+    "ListElementCode": "anythingElseAffectingParenting",
+    "FieldType": "TextArea",
+    "ElementLabel": "Tell us what else is affecting their ability to parent",
+    "FieldShowCondition": "factorsAffectingParenting CONTAINS \"ANYTHING_ELSE\"",
     "SecurityClassification": "Public"
   }
 ]

ccd-definition/FixedLists/CareSupervision/FactorsAffectingParentingList.json

@@ -0,0 +1,23 @@
+[
+  {
+    "LiveFrom": "01/01/2017",
+    "ID": "FactorsAffectingParentingList",
+    "ListElementCode": "ALCOHOL_DRUG_ABUSE",
+    "ListElement": "Alcohol or drug abuse",
+    "DisplayOrder": 1
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "ID": "FactorsAffectingParentingList",
+    "ListElementCode": "DOMESTIC_ABUSE",
+    "ListElement": "Domestic abuse",
+    "DisplayOrder": 2
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "ID": "FactorsAffectingParentingList",
+    "ListElementCode": "ANYTHING_ELSE",
+    "ListElement": "Anything else",
+    "DisplayOrder": 3
+  }
+]

ccd-definition/FixedLists/CareSupervision/RiskAndHarmToChildrenList.json

@@ -0,0 +1,30 @@
+[
+  {
+    "LiveFrom": "01/01/2017",
+    "ID": "RiskAndHarmToChildrenList",
+    "ListElementCode": "PHYSICAL_HARM",
+    "ListElement": "Physical harm including non-accidental injury",
+    "DisplayOrder": 1
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "ID": "RiskAndHarmToChildrenList",
+    "ListElementCode": "EMOTIONAL_HARM",
+    "ListElement": "Emotional harm",
+    "DisplayOrder": 2
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "ID": "RiskAndHarmToChildrenList",
+    "ListElementCode": "SEXUAL_ABUSE",
+    "ListElement": "Sexual abuse",
+    "DisplayOrder": 3
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "ID": "RiskAndHarmToChildrenList",
+    "ListElementCode": "NEGLECT",
+    "ListElement": "Neglect",
+    "DisplayOrder": 4
+  }
+]