openchs-models 1.33.51 → 1.33.53

package/dist/AttendanceType.js

@@ -15,11 +15,11 @@ function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 const CONFIG_KEYS = {
-  SESSION_OUTCOME_REASON_CONCEPT_UUID: "session_outcome_reason_concept_uuid",
-  ABSENCE_REASON_CONCEPT_UUID: "absence_reason_concept_uuid",
-  FOLLOW_UP_ENCOUNTER_TYPE_UUID: "follow_up_encounter_type_uuid",
-  SHARE_RULE: "share_rule",
-  AUTO_SHARE_ON_SAVE: "auto_share_on_save"
+  SESSION_OUTCOME_REASON_CONCEPT: "sessionOutcomeReasonConcept",
+  ABSENCE_REASON_CONCEPT: "absenceReasonConcept",
+  FOLLOW_UP_ENCOUNTER_TYPE: "followUpEncounterType",
+  SHARE_RULE: "shareRule",
+  AUTO_SHARE_ON_SAVE: "autoShareOnSave"
 };
 class AttendanceType extends _BaseEntity.default {
   constructor(that = null) {
@@ -85,13 +85,13 @@ class AttendanceType extends _BaseEntity.default {
     this.config = JSON.stringify(obj || {});
   }
   getSessionOutcomeReasonConceptUUID() {
-    return this.getConfig()[CONFIG_KEYS.SESSION_OUTCOME_REASON_CONCEPT_UUID] || null;
+    return this.getConfig()[CONFIG_KEYS.SESSION_OUTCOME_REASON_CONCEPT] || null;
   }
   getAbsenceReasonConceptUUID() {
-    return this.getConfig()[CONFIG_KEYS.ABSENCE_REASON_CONCEPT_UUID] || null;
+    return this.getConfig()[CONFIG_KEYS.ABSENCE_REASON_CONCEPT] || null;
   }
   getFollowUpEncounterTypeUUID() {
-    return this.getConfig()[CONFIG_KEYS.FOLLOW_UP_ENCOUNTER_TYPE_UUID] || null;
+    return this.getConfig()[CONFIG_KEYS.FOLLOW_UP_ENCOUNTER_TYPE] || null;
   }
   getShareRule() {
     return this.getConfig()[CONFIG_KEYS.SHARE_RULE] || null;

package/dist/Session.js

@@ -107,9 +107,13 @@ class Session extends _BaseEntity.default {
 
   // Caller iterates the returned records and persists them in the same realm.write.
   // rosterByStudentUUID: { [studentUUID]: { status: 'Present'|'Absent', reasonConceptUUID?: string } }
-  markHeld(rosterByStudentUUID) {
+  // reasonConceptUUID: optional session-level reason. Required by the server for
+  // Mark-Anyway-Held (Held on weekly_off/public_holiday); ignored on a working day.
+  // Default null preserves prior semantics (e.g. re-mark-Held after DidntHappen
+  // clears the previously-stored reason).
+  markHeld(rosterByStudentUUID, reasonConceptUUID = null) {
     this.status = Session.status.HELD;
-    this.reasonConceptUUID = null;
+    this.reasonConceptUUID = reasonConceptUUID || null;
     this.markedAt = new Date();
     const records = [];
     _lodash.default.forOwn(rosterByStudentUUID || {}, (entry, studentUUID) => {

package/package.json

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