openchs-models 1.33.54 → 1.33.55

package/dist/ReportCard.js

@@ -15,7 +15,6 @@ 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 + ""; }
@@ -152,9 +151,6 @@ 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);
@@ -221,12 +217,6 @@ 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;
   }
@@ -236,9 +226,6 @@ 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;
   }
@@ -265,8 +252,7 @@ _defineProperty(ReportCard, "cardTypes", {
 });
 _defineProperty(ReportCard, "actionTypes", {
   ViewSubjectProfile: "ViewSubjectProfile",
-  DoVisit: "DoVisit",
-  MarkAttendance: "MarkAttendance"
+  DoVisit: "DoVisit"
 });
 _defineProperty(ReportCard, "visitTypes", {
   Scheduled: "Scheduled",
@@ -350,11 +336,6 @@ _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: 213,
+    schemaVersion: 212,
     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,11 +823,6 @@ 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.
-      }
     }
   };
 }

package/dist/Session.js

@@ -163,13 +163,19 @@ class Session extends _BaseEntity.default {
     const followUpEncounterTypeUUID = attendanceType.getFollowUpEncounterTypeUUID();
     if (!followUpEncounterTypeUUID) return [];
     if (!encounterType) return [];
-    const startOfToday = (0, _moment.default)().startOf("day").toDate();
-    const maxVisit = (0, _moment.default)().startOf("day").add(2, "days").toDate();
+    const base = (0, _moment.default)(this.scheduledDate).startOf("day");
+    const earliestVisit = base.clone().toDate();
+    const maxVisit = base.clone().add(2, "days").toDate();
     const created = [];
     _lodash.default.forEach(attendanceRecords || [], record => {
       if (!record) return;
       if (record.status !== _AttendanceRecord.default.status.ABSENT) return;
       if (!_lodash.default.isNil(record.reasonConceptUUID)) 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").
+      if (record.followUpEncounterUUID) return;
       const student = studentLookup ? studentLookup(record.subjectUUID) : null;
       if (!student) return;
       let encounter;
@@ -180,7 +186,7 @@ class Session extends _BaseEntity.default {
         encounter.uuid = _General.default.randomUUID();
         encounter.encounterType = encounterType;
         encounter.programEnrolment = enrolment;
-        encounter.earliestVisitDateTime = startOfToday;
+        encounter.earliestVisitDateTime = earliestVisit;
         encounter.maxVisitDateTime = maxVisit;
         encounter.observations = [];
         encounter.cancelObservations = [];
@@ -190,7 +196,7 @@ class Session extends _BaseEntity.default {
         encounter.uuid = _General.default.randomUUID();
         encounter.encounterType = encounterType;
         encounter.individual = student;
-        encounter.earliestVisitDateTime = startOfToday;
+        encounter.earliestVisitDateTime = earliestVisit;
         encounter.maxVisitDateTime = maxVisit;
         encounter.observations = [];
         encounter.cancelObservations = [];

package/package.json

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