openchs-models 1.33.69 → 1.33.71

package/.circleci/config.yml

@@ -1,5 +1,5 @@
 # Check https://circleci.com/docs/2.0/language-javascript/ for more details
-version: 2
+version: 2.1
 defaults: &defaults
   working_directory: ~/repo
   docker:
@@ -52,7 +52,6 @@ jobs:
 #          command: npm publish
 
 workflows:
-  version: 2
   test_deploy:
     jobs:
       - build
@@ -64,7 +63,3 @@ workflows:
 #              only: /^v.*/
 #            branches:
 #              ignore: /.*/
-
-notify:
-  webhooks:
-    - url: https://webhooks.gitter.im/e/0fdffde721194986f2a0

package/dist/AttendanceRecord.js

@@ -42,6 +42,12 @@ class AttendanceRecord extends _BaseEntity.default {
   set reasonConceptUUIDs(x) {
     this.that.reasonConceptUUIDs = x || [];
   }
+  get otherReasonText() {
+    return this.that.otherReasonText;
+  }
+  set otherReasonText(x) {
+    this.that.otherReasonText = x || null;
+  }
   get followUpEncounterUUID() {
     return this.that.followUpEncounterUUID;
   }
@@ -91,6 +97,7 @@ class AttendanceRecord extends _BaseEntity.default {
     record.subjectUUID = resource.subjectUUID;
     record.status = resource.status;
     record.reasonConceptUUIDs = Array.isArray(resource.reasonConceptUUIDs) ? resource.reasonConceptUUIDs : resource.reasonConceptUUID ? [resource.reasonConceptUUID] : [];
+    record.otherReasonText = resource.otherReasonText || null;
     record.followUpEncounterUUID = resource.followUpEncounterUUID || null;
     record.needsFollowUp = !!resource.needsFollowUp;
     record.voided = !!resource.voided;
@@ -100,6 +107,7 @@ class AttendanceRecord extends _BaseEntity.default {
   get toResource() {
     const resource = _lodash.default.pick(this, ["uuid", "sessionUUID", "subjectUUID", "status", "voided"]);
     resource.reasonConceptUUIDs = this.reasonConceptUUIDs || [];
+    resource.otherReasonText = this.otherReasonText || null;
     resource.followUpEncounterUUID = this.followUpEncounterUUID || null;
     resource.needsFollowUp = !!this.needsFollowUp;
     return resource;
@@ -117,6 +125,10 @@ _defineProperty(AttendanceRecord, "schema", {
       type: "list",
       objectType: "string"
     },
+    otherReasonText: {
+      type: "string",
+      optional: true
+    },
     followUpEncounterUUID: {
       type: "string",
       optional: true

package/dist/DownloadableContent.js

@@ -0,0 +1,116 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _BaseEntity = _interopRequireDefault(require("./BaseEntity"));
+var _General = _interopRequireDefault(require("./utility/General"));
+var _SchemaNames = _interopRequireDefault(require("./SchemaNames"));
+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 + ""; }
+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); }
+class DownloadableContent extends _BaseEntity.default {
+  constructor(that = null) {
+    super(that);
+  }
+  get name() {
+    return this.that.name;
+  }
+  set name(x) {
+    this.that.name = x;
+  }
+  get category() {
+    return this.that.category;
+  }
+  set category(x) {
+    this.that.category = x;
+  }
+  get contentKey() {
+    return this.that.contentKey;
+  }
+  set contentKey(x) {
+    this.that.contentKey = x;
+  }
+  get sha256() {
+    return this.that.sha256;
+  }
+  set sha256(x) {
+    this.that.sha256 = x;
+  }
+  get needsKey() {
+    return this.that.needsKey;
+  }
+  set needsKey(x) {
+    this.that.needsKey = x;
+  }
+  get payload() {
+    return this.that.payload;
+  }
+  set payload(x) {
+    this.that.payload = x;
+  }
+  get voided() {
+    return this.that.voided;
+  }
+  set voided(x) {
+    this.that.voided = x;
+  }
+  getPayload() {
+    if (!this.payload) {
+      return {};
+    }
+    try {
+      const parsed = JSON.parse(this.payload);
+      return parsed && typeof parsed === 'object' && !Array.isArray(parsed) ? parsed : {};
+    } catch (e) {
+      return {};
+    }
+  }
+  static fromResource(resource) {
+    const content = _General.default.assignFields(resource, new DownloadableContent(), ["uuid", "name", "category", "contentKey", "sha256", "voided"]);
+    // Coerce: needsKey is a non-optional Realm bool, so an undefined write would abort the sync.
+    content.needsKey = resource && resource.needsKey === true;
+    // Server sends payload as a JSON object, but tolerate an already-stringified payload too.
+    if (resource && resource.payload && typeof resource.payload === 'object') {
+      content.payload = JSON.stringify(resource.payload);
+    } else if (resource && typeof resource.payload === 'string' && resource.payload.length > 0) {
+      content.payload = resource.payload;
+    } else {
+      content.payload = null;
+    }
+    return content;
+  }
+}
+_defineProperty(DownloadableContent, "schema", {
+  name: _SchemaNames.default.DownloadableContent,
+  primaryKey: "uuid",
+  properties: {
+    uuid: "string",
+    name: "string",
+    category: "string",
+    contentKey: {
+      type: "string",
+      optional: true
+    },
+    sha256: {
+      type: "string",
+      optional: true
+    },
+    needsKey: {
+      type: "bool",
+      default: false
+    },
+    payload: {
+      type: "string",
+      optional: true
+    },
+    voided: {
+      type: "bool",
+      default: false
+    }
+  }
+});
+var _default = DownloadableContent;
+exports.default = _default;

package/dist/EntityMetaData.js

@@ -63,6 +63,7 @@ var _News = _interopRequireDefault(require("./News"));
 var _Comment = _interopRequireDefault(require("./Comment"));
 var _CommentThread = _interopRequireDefault(require("./CommentThread"));
 var _Extension = _interopRequireDefault(require("./Extension"));
+var _DownloadableContent = _interopRequireDefault(require("./DownloadableContent"));
 var _SubjectMigration = _interopRequireDefault(require("./SubjectMigration"));
 var _ResetSync = _interopRequireDefault(require("./ResetSync"));
 var _Documentation = _interopRequireDefault(require("./Documentation"));
@@ -350,6 +351,11 @@ const extension = refData(_Extension.default, {
   syncWeight: 0,
   filter: ''
 });
+const downloadableContent = refData(_DownloadableContent.default, {
+  res: "downloadableContent",
+  syncWeight: 0,
+  apiVersion: "v2"
+});
 const groupRole = refData(_GroupRole.default, {
   res: "groupRole",
   syncWeight: 0
@@ -583,7 +589,7 @@ class EntityMetaData {
   }
   //order is important. last entity in each (tx and ref) with be executed first. parent should be synced before the child.
   static model() {
-    return [groupDashboard, approvalStatus, dashboardSectionCardMapping, dashboardSection, dashboardFilter, dashboard, reportCard, customCardConfig, standardReportCardType, menuItem, locationHierarchy, video, checklistItemDetail, checklistDetail, rule, ruleDependency, individualRelationshipType, individualRelationGenderMapping, individualRelation, formMapping, formElement, formElementGroup, form, documentationItem, documentation, identifierSource, organisationConfig, platformTranslation, translation, locationMapping, addressLevel, taskStatus, taskType, encounterType, program, gender, groupRole, calendarDateMarker, calendar, attendanceType, subjectType, conceptAnswer, concept, myGroups, groupPrivileges, groups, privilege, resetSync, subjectMigration, userSubjectAssignment, task, taskUnAssigment, subjectProgramEligibility, news, videoTelemetric, groupSubject, comment, commentThread, entityApprovalStatus, subjectEntityApprovalStatus, encounterEntityApprovalStatus, programEncounterEntityApprovalStatus, programEnrolmentEntityApprovalStatus, checklistItemEntityApprovalStatus, individualRelationship, checklistItem, checklist, attendanceRecord, session, encounter, identifierAssignment, programEncounter, programEnrolment, individual, extension, userInfo, ruleFailureTelemetry, syncTelemetry];
+    return [groupDashboard, approvalStatus, dashboardSectionCardMapping, dashboardSection, dashboardFilter, dashboard, reportCard, customCardConfig, standardReportCardType, menuItem, locationHierarchy, video, checklistItemDetail, checklistDetail, rule, ruleDependency, individualRelationshipType, individualRelationGenderMapping, individualRelation, formMapping, formElement, formElementGroup, form, documentationItem, documentation, identifierSource, organisationConfig, platformTranslation, translation, locationMapping, addressLevel, taskStatus, taskType, encounterType, program, gender, groupRole, calendarDateMarker, calendar, attendanceType, subjectType, conceptAnswer, concept, myGroups, groupPrivileges, groups, privilege, resetSync, subjectMigration, userSubjectAssignment, task, taskUnAssigment, subjectProgramEligibility, news, videoTelemetric, groupSubject, comment, commentThread, entityApprovalStatus, subjectEntityApprovalStatus, encounterEntityApprovalStatus, programEncounterEntityApprovalStatus, programEnrolmentEntityApprovalStatus, checklistItemEntityApprovalStatus, individualRelationship, checklistItem, checklist, attendanceRecord, session, encounter, identifierAssignment, programEncounter, programEnrolment, individual, extension, downloadableContent, userInfo, ruleFailureTelemetry, syncTelemetry];
   }
   static entitiesLoadedFromServer() {
     return _lodash.default.differenceBy(_Schema.default.getInstance().getEntities(), [_Settings.default, _LocaleMapping.default].concat(EntityMetaData.embeddedEntities()), "schema.name");

package/dist/Schema.js

@@ -65,6 +65,7 @@ var _DashboardCache = _interopRequireDefault(require("./DashboardCache"));
 var _LocationHierarchy = _interopRequireDefault(require("./LocationHierarchy"));
 var _ReportCard = _interopRequireDefault(require("./ReportCard"));
 var _CustomCardConfig = _interopRequireDefault(require("./CustomCardConfig"));
+var _DownloadableContent = _interopRequireDefault(require("./DownloadableContent"));
 var _Dashboard = _interopRequireDefault(require("./Dashboard"));
 var _DashboardSectionCardMapping = _interopRequireDefault(require("./DashboardSectionCardMapping"));
 var _DraftSubject = _interopRequireDefault(require("./draft/DraftSubject"));
@@ -107,7 +108,7 @@ var _Session = _interopRequireDefault(require("./Session"));
 var _AttendanceRecord = _interopRequireDefault(require("./AttendanceRecord"));
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const entities = [_ReportCardResult.default, _NestedReportCardResult.default, _SubjectLocation.default, _DashboardFilter.default, _LocaleMapping.default, _Settings.default, _ConceptAnswer.default, _ConceptMedia.default, _Concept.default, _EncounterType.default, _Gender.default, _AddressLevel.LocationMapping, _AddressLevel.default, _KeyValue.default, _Form.default, _FormMapping.default, _FormElementGroup.default, _FormElement.default, _SubjectType.default, _Individual.default, _Program.default, _ProgramEnrolment.default, _Observation.default, _ProgramEncounter.default, _Encounter.default, _EntitySyncStatus.default, _EntityQueue.default, _Checklist.default, _ChecklistItem.default, _Format.default, _UserInfo.default, _StringKeyNumericValue.default, _Family.default, _IndividualRelation.default, _IndividualRelationGenderMapping.default, _IndividualRelationshipType.default, _IndividualRelationship.default, _RuleDependency.default, _Rule.default, _ChecklistItemStatus.default, _ChecklistDetail.default, _ChecklistItemDetail.default, _VideoTelemetric.default, _Video.default, _MediaQueue.default, _Point.default, _SyncTelemetry.default, _IdentifierSource.default, _IdentifierAssignment.default, _RuleFailureTelemetry.default, _BeneficiaryModePin.default, _OrganisationConfig.default, _PlatformTranslation.default, _Translation.default, _Groups.default, _MyGroups.default, _GroupPrivileges.default, _Privilege.default, _GroupRole.default, _GroupSubject.default, _DashboardCache.default, _CustomDashboardCache.default, _LocationHierarchy.default, _CustomCardConfig.default, _ReportCard.default, _Dashboard.default, _DashboardSectionCardMapping.default, _DraftSubject.default, _StandardReportCardType.default, _ApprovalStatus.default, _EntityApprovalStatus.default, _GroupDashboard.default, _DashboardSection.default, _News.default, _Comment.default, _CommentThread.default, _Extension.default, _SubjectMigration.default, _ResetSync.default, _Documentation.default, _DocumentationItem.default, _TaskType.default, _TaskStatus.default, _Task.default, _TaskUnAssignment.default, _DraftEncounter.default, _DraftEnrolment.default, _DraftProgramEncounter.default, _SubjectProgramEligibility.default, _MenuItem.default, _UserSubjectAssignment.default, _Calendar.default, _CalendarDateMarker.default, _AttendanceType.default, _Session.default, _AttendanceRecord.default];
+const entities = [_ReportCardResult.default, _NestedReportCardResult.default, _SubjectLocation.default, _DashboardFilter.default, _LocaleMapping.default, _Settings.default, _ConceptAnswer.default, _ConceptMedia.default, _Concept.default, _EncounterType.default, _Gender.default, _AddressLevel.LocationMapping, _AddressLevel.default, _KeyValue.default, _Form.default, _FormMapping.default, _FormElementGroup.default, _FormElement.default, _SubjectType.default, _Individual.default, _Program.default, _ProgramEnrolment.default, _Observation.default, _ProgramEncounter.default, _Encounter.default, _EntitySyncStatus.default, _EntityQueue.default, _Checklist.default, _ChecklistItem.default, _Format.default, _UserInfo.default, _StringKeyNumericValue.default, _Family.default, _IndividualRelation.default, _IndividualRelationGenderMapping.default, _IndividualRelationshipType.default, _IndividualRelationship.default, _RuleDependency.default, _Rule.default, _ChecklistItemStatus.default, _ChecklistDetail.default, _ChecklistItemDetail.default, _VideoTelemetric.default, _Video.default, _MediaQueue.default, _Point.default, _SyncTelemetry.default, _IdentifierSource.default, _IdentifierAssignment.default, _RuleFailureTelemetry.default, _BeneficiaryModePin.default, _OrganisationConfig.default, _PlatformTranslation.default, _Translation.default, _Groups.default, _MyGroups.default, _GroupPrivileges.default, _Privilege.default, _GroupRole.default, _GroupSubject.default, _DashboardCache.default, _CustomDashboardCache.default, _LocationHierarchy.default, _CustomCardConfig.default, _ReportCard.default, _Dashboard.default, _DashboardSectionCardMapping.default, _DraftSubject.default, _StandardReportCardType.default, _ApprovalStatus.default, _EntityApprovalStatus.default, _GroupDashboard.default, _DashboardSection.default, _News.default, _Comment.default, _CommentThread.default, _Extension.default, _DownloadableContent.default, _SubjectMigration.default, _ResetSync.default, _Documentation.default, _DocumentationItem.default, _TaskType.default, _TaskStatus.default, _Task.default, _TaskUnAssignment.default, _DraftEncounter.default, _DraftEnrolment.default, _DraftProgramEncounter.default, _SubjectProgramEligibility.default, _MenuItem.default, _UserSubjectAssignment.default, _Calendar.default, _CalendarDateMarker.default, _AttendanceType.default, _Session.default, _AttendanceRecord.default];
 function migrateObjectTypeFieldToEmbedded(newDB, oldDB, schemaName, field, creatorFn) {
   console.log(`schema: ${schemaName}, field: ${field}`);
   newDB.objects(schemaName).forEach(newDbParentEntity => {
@@ -186,7 +187,7 @@ function createRealmConfig() {
       return doCompact;
     },
     //order is important, should be arranged according to the dependency
-    schemaVersion: 216,
+    schemaVersion: 218,
     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.`);
@@ -852,6 +853,12 @@ function createRealmConfig() {
       if (oldDB.schemaVersion < 216) {
         // GroupSubject.removalReasonConceptUUID added (additive optional string). No backfill needed.
       }
+      if (oldDB.schemaVersion < 217) {
+        // DownloadableContent added (new reference-data entity). No backfill needed.
+      }
+      if (oldDB.schemaVersion < 218) {
+        // AttendanceRecord.otherReasonText added (additive optional string). No backfill needed.
+      }
     }
   };
 }

package/dist/SchemaNames.js

@@ -17,6 +17,7 @@ _defineProperty(SchemaNames, "ProgramEncounter", "ProgramEncounter");
 _defineProperty(SchemaNames, "Encounter", "Encounter");
 _defineProperty(SchemaNames, "ChecklistItem", "ChecklistItem");
 _defineProperty(SchemaNames, "Extension", "Extension");
+_defineProperty(SchemaNames, "DownloadableContent", "DownloadableContent");
 _defineProperty(SchemaNames, "Identifier", "Identifier");
 _defineProperty(SchemaNames, "Form", "Form");
 _defineProperty(SchemaNames, "Format", "EmbeddedFormat");

package/dist/Session.js

@@ -123,6 +123,7 @@ class Session extends _BaseEntity.default {
       record.subjectUUID = studentUUID;
       record.status = entry.status;
       record.reasonConceptUUIDs = entry.reasonConceptUUIDs || [];
+      record.otherReasonText = entry.otherReasonText || null;
       record.needsFollowUp = !!entry.needsFollowUp;
       record.followUpEncounterUUID = null;
       record.voided = false;

package/dist/index.js

@@ -543,6 +543,12 @@ Object.defineProperty(exports, "CustomCardConfig", {
     return _CustomCardConfig.default;
   }
 });
+Object.defineProperty(exports, "DownloadableContent", {
+  enumerable: true,
+  get: function () {
+    return _DownloadableContent.default;
+  }
+});
 Object.defineProperty(exports, "Dashboard", {
   enumerable: true,
   get: function () {
@@ -979,6 +985,7 @@ var _DashboardCache = _interopRequireDefault(require("./DashboardCache"));
 var _LocationHierarchy = _interopRequireDefault(require("./LocationHierarchy"));
 var _ReportCard = _interopRequireDefault(require("./ReportCard"));
 var _CustomCardConfig = _interopRequireDefault(require("./CustomCardConfig"));
+var _DownloadableContent = _interopRequireDefault(require("./DownloadableContent"));
 var _Dashboard = _interopRequireDefault(require("./Dashboard"));
 var _DashboardSectionCardMapping = _interopRequireDefault(require("./DashboardSectionCardMapping"));
 var _DraftSubject = _interopRequireDefault(require("./draft/DraftSubject"));

package/package.json

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