openchs-models 1.33.55 → 1.33.57

package/dist/AttendanceRecord.js

@@ -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;
   }
@@ -86,6 +92,7 @@ class AttendanceRecord extends _BaseEntity.default {
     record.status = resource.status;
     record.reasonConceptUUID = resource.reasonConceptUUID || null;
     record.followUpEncounterUUID = resource.followUpEncounterUUID || null;
+    record.needsFollowUp = !!resource.needsFollowUp;
     record.voided = !!resource.voided;
     (0, _AuditUtil.mapAuditFields)(record, resource);
     return record;
@@ -94,6 +101,7 @@ class AttendanceRecord extends _BaseEntity.default {
     const resource = _lodash.default.pick(this, ["uuid", "sessionUUID", "subjectUUID", "status", "voided"]);
     resource.reasonConceptUUID = this.reasonConceptUUID || null;
     resource.followUpEncounterUUID = this.followUpEncounterUUID || null;
+    resource.needsFollowUp = !!this.needsFollowUp;
     return resource;
   }
 }
@@ -113,6 +121,10 @@ _defineProperty(AttendanceRecord, "schema", {
       type: "string",
       optional: true
     },
+    needsFollowUp: {
+      type: "bool",
+      default: false
+    },
     voided: {
       type: "bool",
       default: false

package/dist/ReportCard.js

@@ -15,6 +15,7 @@ var _EncounterType = _interopRequireDefault(require("./EncounterType"));
 var _Duration = _interopRequireDefault(require("./Duration"));
 var _NestedReportCardResult = _interopRequireDefault(require("./reports/NestedReportCardResult"));
 var _CustomCardConfig = _interopRequireDefault(require("./CustomCardConfig"));
+var _AttendanceType = _interopRequireDefault(require("./AttendanceType"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
@@ -151,6 +152,9 @@ class ReportCard extends _BaseEntity.default {
       if (resource.actionDetail.encounterTypeUUID) {
         reportCard.actionDetailEncounterType = entityService.findByUUID(resource.actionDetail.encounterTypeUUID, _EncounterType.default.schema.name);
       }
+      if (resource.actionDetail.attendanceTypeUUID) {
+        reportCard.actionDetailAttendanceType = entityService.findByUUID(resource.actionDetail.attendanceTypeUUID, _AttendanceType.default.schema.name);
+      }
       reportCard.actionDetailVisitType = resource.actionDetail.visitType || null;
     }
     reportCard.customCardConfig = entityService.findByUUID(_ResourceUtil.default.getUUIDFor(resource, "customCardConfigUUID"), _CustomCardConfig.default.schema.name);
@@ -217,6 +221,12 @@ class ReportCard extends _BaseEntity.default {
   set actionDetailVisitType(x) {
     this.that.actionDetailVisitType = x;
   }
+  get actionDetailAttendanceType() {
+    return this.toEntity("actionDetailAttendanceType", _AttendanceType.default);
+  }
+  set actionDetailAttendanceType(x) {
+    this.that.actionDetailAttendanceType = this.fromObject(x);
+  }
   get onActionCompletion() {
     return this.that.onActionCompletion;
   }
@@ -226,6 +236,9 @@ class ReportCard extends _BaseEntity.default {
   isActionDoVisit() {
     return this.action === ReportCard.actionTypes.DoVisit;
   }
+  isActionMarkAttendance() {
+    return this.action === ReportCard.actionTypes.MarkAttendance;
+  }
   isScheduledVisitType() {
     return this.actionDetailVisitType === ReportCard.visitTypes.Scheduled;
   }
@@ -252,7 +265,8 @@ _defineProperty(ReportCard, "cardTypes", {
 });
 _defineProperty(ReportCard, "actionTypes", {
   ViewSubjectProfile: "ViewSubjectProfile",
-  DoVisit: "DoVisit"
+  DoVisit: "DoVisit",
+  MarkAttendance: "MarkAttendance"
 });
 _defineProperty(ReportCard, "visitTypes", {
   Scheduled: "Scheduled",
@@ -336,6 +350,11 @@ _defineProperty(ReportCard, "schema", {
       type: "string",
       optional: true
     },
+    actionDetailAttendanceType: {
+      type: "object",
+      objectType: "AttendanceType",
+      optional: true
+    },
     onActionCompletion: {
       type: "string",
       optional: true

package/dist/Schema.js

@@ -186,7 +186,7 @@ function createRealmConfig() {
       return doCompact;
     },
     //order is important, should be arranged according to the dependency
-    schemaVersion: 212,
+    schemaVersion: 214,
     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.`);
@@ -823,6 +823,19 @@ function createRealmConfig() {
         // (bool default false). Realm backfills the new boolean and the new
         // schemas have no pre-existing rows.
       }
+      if (oldDB.schemaVersion < 213) {
+        // Additive: ReportCard.actionDetailAttendanceType (optional ref to
+        // 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);
+        });
+      }
     }
   };
 }

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.55",
+    "version": "1.33.57",
     "private": false,
     "repository": {
         "type": "git",