Assessment Logging

scope_shared/scope/schemas/documents/activity-log.json

@@ -1,91 +1,104 @@
 {
-	"$schema": "https://json-schema.org/draft/2020-12/schema",
-	"$id": "https://uwscope.org/schemas/documents/activity-log",
-	"title": "IActivityLog",
-	"description": "IActivityLog Type",
-	"type": "object",
-	"properties": {
-		"_id": {
-			"type": "string"
-		},
-		"_type": {
-			"const": "activityLog"
-		},
-		"_set_id": {
-			"type": "string"
-		},
-		"_rev": {
-			"type": "number"
-		},
-		"activityLogId": {
-			"type": "string"
-		},
-		"scheduledActivityId": {
-			"type": "string"
-		},
-		"activityName": {
-			"type": "string"
-		},
-		"recordedDateTime": {
-			"$ref": "/schemas/documents/utils/log#/properties/recordedDateTime"
-		},
-		"comment": {
-			"$ref": "/schemas/documents/utils/log#/properties/comment"
-		},
-		"completed": {
-			"type": "boolean"
-		},
-		"success": {
-			"$ref": "/schemas/utils/enums#/properties/activitySuccessType"
-		},
-		"alternative": {
-			"type": "string"
-		},
-		"pleasure": {
-			"type": "number"
-		},
-		"accomplishment": {
-			"type": "number"
-		}
-	},
-	"additionalProperties": false,
-	"required": ["_type", "scheduledActivityId", "activityName", "recordedDateTime"],
-	"allOf": [
-		{
-			"$ref": "#/$defs/no-success-disallows-accomplishment"
-		},
-		{
-			"$ref": "#/$defs/no-success-disallows-pleasure"
-		}
-	],
-	"$defs": {
-		"no-success-disallows-accomplishment": {
-			"anyOf": [
-				{
-					"not": { "$ref": "#/$defs/no-success" }
-				},
-				{
-					"not": { "required": ["accomplishment"] }
-				}
-			]
-		},
-		"no-success-disallows-pleasure": {
-			"anyOf": [
-				{
-					"not": { "$ref": "#/$defs/no-success" }
-				},
-				{
-					"not": { "required": ["pleasure"] }
-				}
-			]
-		},
-		"no-success": {
-			"properties": {
-				"success": {
-					"const": "No"
-				}
-			},
-			"required": ["success"]
-		}
-	}
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
+    "$id": "https://uwscope.org/schemas/documents/activity-log",
+    "title": "IActivityLog",
+    "description": "IActivityLog Type",
+    "$comment": [
+        "---------------------------------------",
+        "Added Entire Activity Json",
+        "---------------------------------------",
+        {
+            "activityId": {
+                "type": "string"
+            },
+            "activityName": {
+                "type": "string"
+            }
+        }
+    ],
+    "type": "object",
+    "properties": {
+        "_id": {
+            "type": "string"
+        },
+        "_type": {
+            "const": "activityLog"
+        },
+        "_set_id": {
+            "type": "string"
+        },
+        "_rev": {
+            "type": "number"
+        },
+        "activityLogId": {
+            "type": "string"
+        },
+        "scheduledActivityId": {
+            "type": "string"
+        },
+        "activity": {
+            "$ref": "/schemas/documents/activity"
+        },
+        "recordedDateTime": {
+            "$ref": "/schemas/documents/utils/log#/properties/recordedDateTime"
+        },
+        "comment": {
+            "$ref": "/schemas/documents/utils/log#/properties/comment"
+        },
+        "completed": {
+            "type": "boolean"
+        },
+        "success": {
+            "$ref": "/schemas/utils/enums#/properties/activitySuccessType"
+        },
+        "alternative": {
+            "type": "string"
+        },
+        "pleasure": {
+            "type": "number"
+        },
+        "accomplishment": {
+            "type": "number"
+        }
+    },
+    "additionalProperties": false,
+    "required": ["_type", "scheduledActivityId", "activity", "recordedDateTime"],
+    "allOf": [
+        {
+            "$ref": "#/$defs/no-success-disallows-accomplishment"
+        },
+        {
+            "$ref": "#/$defs/no-success-disallows-pleasure"
+        }
+    ],
+    "$defs": {
+        "no-success-disallows-accomplishment": {
+            "anyOf": [
+                {
+                    "not": { "$ref": "#/$defs/no-success" }
+                },
+                {
+                    "not": { "required": ["accomplishment"] }
+                }
+            ]
+        },
+        "no-success-disallows-pleasure": {
+            "anyOf": [
+                {
+                    "not": { "$ref": "#/$defs/no-success" }
+                },
+                {
+                    "not": { "required": ["pleasure"] }
+                }
+            ]
+        },
+        "no-success": {
+            "properties": {
+                "success": {
+                    "const": "No"
+                }
+            },
+            "required": ["success"]
+        }
+    }
 }

scope_shared/scope/schemas/documents/assessment-log.json

@@ -1,52 +1,62 @@
 {
-	"$schema": "https://json-schema.org/draft/2020-12/schema",
-	"$id": "https://uwscope.org/schemas/documents/assessment-log",
-	"title": "IAssessmentLog",
-	"description": "IAssessmentLog Type",
-	"type": "object",
-	"$comment": "property pointValues not clear : { \"$ref\": \"\"}",
-	"properties": {
-		"_id": {
-			"type": "string"
-		},
-		"_type": {
-			"const": "assessmentLog"
-		},
-		"_set_id": {
-			"type": "string"
-		},
-		"_rev": {
-			"type": "number"
-		},
-		"assessmentLogId": {
-			"type": "string"
-		},
-		"scheduledAssessmentId": {
-			"type": "string"
-		},
-		"assessmentId": {
-			"type": "string"
-		},
-		"recordedDateTime": {
-			"$ref": "/schemas/documents/utils/log#/properties/recordedDateTime"
-		},
-		"comment": {
-			"$ref": "/schemas/documents/utils/log#/properties/comment"
-		},
-		"patientSubmitted": {
-			"type": "boolean"
-		},
-		"submittedByProviderId": {
-			"type": "string"
-		},
-		"pointValues": {
-			"type": "object",
-			"$comment": "TODO"
-		},
-		"totalScore": {
-			"type": "number"
-		}
-	},
-	"additionalProperties": false,
-	"required": ["_type", "recordedDateTime", "scheduledAssessmentId", "assessmentId", "pointValues"]
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
+    "$id": "https://uwscope.org/schemas/documents/assessment-log",
+    "title": "IAssessmentLog",
+    "description": "IAssessmentLog Type",
+    "$comment": [
+        "---------------------------------------",
+        "Added Entire Assessment Json",
+        "---------------------------------------",
+        {
+            "assessmentId": {
+                "type": "string"
+            }
+        }
+    ],
+    "type": "object",
+    "$comment": "property pointValues not clear : { \"$ref\": \"\"}",
+    "properties": {
+        "_id": {
+            "type": "string"
+        },
+        "_type": {
+            "const": "assessmentLog"
+        },
+        "_set_id": {
+            "type": "string"
+        },
+        "_rev": {
+            "type": "number"
+        },
+        "assessmentLogId": {
+            "type": "string"
+        },
+        "scheduledAssessmentId": {
+            "type": "string"
+        },
+        "assessment": {
+            "$ref": "/schemas/documents/assessment"
+        },
+        "recordedDateTime": {
+            "$ref": "/schemas/documents/utils/log#/properties/recordedDateTime"
+        },
+        "comment": {
+            "$ref": "/schemas/documents/utils/log#/properties/comment"
+        },
+        "patientSubmitted": {
+            "type": "boolean"
+        },
+        "submittedByProviderId": {
+            "type": "string"
+        },
+        "pointValues": {
+            "type": "object",
+            "$comment": "TODO"
+        },
+        "totalScore": {
+            "type": "number"
+        }
+    },
+    "additionalProperties": false,
+    "required": ["_type", "recordedDateTime", "scheduledAssessmentId", "assessment", "pointValues"]
 }

web_patient/src/components/CarePlan/CarePlanPage.tsx

@@ -98,9 +98,10 @@ export const CarePlanPage: FunctionComponent = observer(() => {
     });
 
     const handleTaskClick = action((item: IScheduledActivity) => () => {
+        const activity = patientStore.getActivityByActivityScheduleId(item.activityScheduleId);
         navigate(
             getFormPath(ParameterValues.form.activityLog, {
-                [Parameters.activityId]: item.activityId,
+                [Parameters.activityId]: activity?.activityId as string,
                 [Parameters.taskId]: item.scheduledActivityId,
             }),
         );

web_patient/src/components/Forms/ActivityLoggingForm.tsx

@@ -157,23 +157,25 @@ export const ActivityLoggingForm: FunctionComponent<IActivityLoggingFormProps> =
         return null;
     }
 
-    if (task.activityId != activityId) {
-        logError('ActivityForm', `Activity and task mismatch: activity=${activityId}, taskSource=${task.activityId}`);
-        return null;
-    }
+    // NOTE: activityId does not exist on IScheduledActivity anymore
+    // if (task.activityId != activityId) {
+    //     logError('ActivityForm', `Activity and task mismatch: activity=${activityId}, taskSource=${task.activityId}`);
+    //     return null;
+    // }
 
     const viewState = useLocalObservable<{ hasData: boolean }>(() => ({
         hasData: false,
     }));
 
     const dataState = useLocalObservable<IActivityLog>(() => ({
-        activityId,
+        //activityId,
         scheduledActivityId: task.scheduledActivityId,
         alternative: '',
         comment: '',
         pleasure: 5,
         accomplishment: 5,
-        activityName: activity.name,
+        //activityName: activity.name,
+        activity: activity,
         recordedDateTime: new Date(),
         success: '',
     }));