openchs-models 1.33.56 → 1.33.58

package/dist/AttendanceRecord.js

@@ -36,11 +36,11 @@ class AttendanceRecord extends _BaseEntity.default {
   set status(x) {
     this.that.status = x;
   }
-  get reasonConceptUUID() {
-    return this.that.reasonConceptUUID;
+  get reasonConceptUUIDs() {
+    return this.that.reasonConceptUUIDs || [];
   }
-  set reasonConceptUUID(x) {
-    this.that.reasonConceptUUID = x;
+  set reasonConceptUUIDs(x) {
+    this.that.reasonConceptUUIDs = x || [];
   }
   get followUpEncounterUUID() {
     return this.that.followUpEncounterUUID;
@@ -48,6 +48,12 @@ class AttendanceRecord extends _BaseEntity.default {
   set followUpEncounterUUID(x) {
     this.that.followUpEncounterUUID = x;
   }
+  get needsFollowUp() {
+    return this.that.needsFollowUp;
+  }
+  set needsFollowUp(x) {
+    this.that.needsFollowUp = x;
+  }
   get createdBy() {
     return this.that.createdBy;
   }
@@ -84,16 +90,18 @@ class AttendanceRecord extends _BaseEntity.default {
     record.sessionUUID = resource.sessionUUID;
     record.subjectUUID = resource.subjectUUID;
     record.status = resource.status;
-    record.reasonConceptUUID = resource.reasonConceptUUID || null;
+    record.reasonConceptUUIDs = Array.isArray(resource.reasonConceptUUIDs) ? resource.reasonConceptUUIDs : resource.reasonConceptUUID ? [resource.reasonConceptUUID] : [];
     record.followUpEncounterUUID = resource.followUpEncounterUUID || null;
+    record.needsFollowUp = !!resource.needsFollowUp;
     record.voided = !!resource.voided;
     (0, _AuditUtil.mapAuditFields)(record, resource);
     return record;
   }
   get toResource() {
     const resource = _lodash.default.pick(this, ["uuid", "sessionUUID", "subjectUUID", "status", "voided"]);
-    resource.reasonConceptUUID = this.reasonConceptUUID || null;
+    resource.reasonConceptUUIDs = this.reasonConceptUUIDs || [];
     resource.followUpEncounterUUID = this.followUpEncounterUUID || null;
+    resource.needsFollowUp = !!this.needsFollowUp;
     return resource;
   }
 }
@@ -105,14 +113,18 @@ _defineProperty(AttendanceRecord, "schema", {
     sessionUUID: "string",
     subjectUUID: "string",
     status: "string",
-    reasonConceptUUID: {
-      type: "string",
-      optional: true
+    reasonConceptUUIDs: {
+      type: "string[]",
+      default: []
     },
     followUpEncounterUUID: {
       type: "string",
       optional: true
     },
+    needsFollowUp: {
+      type: "bool",
+      default: false
+    },
     voided: {
       type: "bool",
       default: false

package/dist/Schema.js

@@ -186,7 +186,7 @@ function createRealmConfig() {
       return doCompact;
     },
     //order is important, should be arranged according to the dependency
-    schemaVersion: 213,
+    schemaVersion: 215,
     onMigration: function (oldDB, newDB) {
       console.log("[AvniModels.Schema]", `Running migration with old schema version: ${oldDB.schemaVersion} and new schema version: ${newDB.schemaVersion}`);
       if (oldDB.schemaVersion === VersionWithEmbeddedMigrationProblem) throw new Error(`Update from schema version ${VersionWithEmbeddedMigrationProblem} is not allowed. Please uninstall and install app.`);
@@ -828,6 +828,24 @@ function createRealmConfig() {
         // AttendanceType) for the new MarkAttendance action. Existing rows
         // remain null.
       }
+      if (oldDB.schemaVersion < 214) {
+        // Backfill AttendanceRecord.needsFollowUp from existing follow-up
+        // linkage so historical follow-ups survive the first re-save under
+        // the new flag-based rule.
+        _lodash.default.forEach(newDB.objects(_SchemaNames.default.AttendanceRecord), rec => {
+          rec.needsFollowUp = !_lodash.default.isNil(rec.followUpEncounterUUID);
+        });
+      }
+      if (oldDB.schemaVersion < 215) {
+        // reasonConceptUUID (single, optional) -> reasonConceptUUIDs (string[]).
+        // A set reason becomes a one-element array; null becomes [].
+        const oldRecords = oldDB.objects(_SchemaNames.default.AttendanceRecord);
+        const newRecords = newDB.objects(_SchemaNames.default.AttendanceRecord);
+        for (let i = 0; i < oldRecords.length; i++) {
+          const reason = oldRecords[i].reasonConceptUUID;
+          newRecords[i].reasonConceptUUIDs = _lodash.default.isNil(reason) ? [] : [reason];
+        }
+      }
     }
   };
 }

package/dist/Session.js

@@ -170,11 +170,11 @@ class Session extends _BaseEntity.default {
     _lodash.default.forEach(attendanceRecords || [], record => {
       if (!record) return;
       if (record.status !== _AttendanceRecord.default.status.ABSENT) return;
-      if (!_lodash.default.isNil(record.reasonConceptUUID)) return;
+      if (!record.needsFollowUp) return;
       // Re-mark path: an existing AttendanceRecord may already point at a
       // previously-created follow-up encounter. Don't create a second one —
       // leave the link in place; voidStaleFollowUps handles the inverse case
-      // (student transitioned out of "absent-no-reason").
+      // (needsFollowUp cleared while still Absent).
       if (record.followUpEncounterUUID) return;
       const student = studentLookup ? studentLookup(record.subjectUUID) : null;
       if (!student) return;
@@ -221,7 +221,7 @@ class Session extends _BaseEntity.default {
     _lodash.default.forOwn(prevByStudent, (prev, studentUUID) => {
       if (!prev || !prev.followUpEncounterUUID) return;
       const next = newByStudent[studentUUID];
-      const stillNeedsFollowUp = next && next.status === _AttendanceRecord.default.status.ABSENT && _lodash.default.isNil(next.reasonConceptUUID);
+      const stillNeedsFollowUp = next && next.status === _AttendanceRecord.default.status.ABSENT && next.needsFollowUp;
       if (stillNeedsFollowUp) return;
       const encounter = encounterLookup ? encounterLookup(prev.followUpEncounterUUID) : null;
       if (!encounter) return;

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "openchs-models",
     "description": "OpenCHS data model to be used by front end clients",
-    "version": "1.33.56",
+    "version": "1.33.58",
     "private": false,
     "repository": {
         "type": "git",