openchs-models 1.17.4 → 1.18.2

package/dist/EntityMetaData.js

@@ -125,6 +125,8 @@ var _Extension = _interopRequireDefault(require("./Extension"));
 
 var _SubjectMigration = _interopRequireDefault(require("./SubjectMigration"));
 
+var _ResetSync = _interopRequireDefault(require("./ResetSync"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
@@ -280,6 +282,10 @@ const subjectMigration = txData(_SubjectMigration.default, {
   privilegeEntity: _Privilege.default.privilegeEntityType.subject,
   privilegeName: _Privilege.default.privilegeName.viewSubject
 });
+const resetSync = txData(_ResetSync.default, {
+  res: "resetSyncs",
+  syncWeight: 0
+});
 const addressLevel = refDataNameTranslated(_AddressLevel.default, {
   res: "locations",
   syncWeight: 4
@@ -443,7 +449,7 @@ const commentThread = txData(_CommentThread.default, {
 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, dashboard, reportCard, standardReportCardType, locationHierarchy, video, checklistItemDetail, checklistDetail, rule, ruleDependency, individualRelationshipType, individualRelationGenderMapping, individualRelation, programConfig, formMapping, formElement, formElementGroup, form, identifierSource, organisationConfig, platformTranslation, translation, locationMapping, addressLevel, encounterType, program, programOutcome, gender, groupRole, subjectType, conceptAnswer, concept, myGroups, groupPrivileges, groups, privilege, subjectMigration, news, videoTelemetric, groupSubject, comment, commentThread, entityApprovalStatus, individualRelationship, checklistItem, checklist, encounter, identifierAssignment, programEncounter, programEnrolment, individual, extension, userInfo, syncTelemetry, ruleFailureTelemetry];
+    return [groupDashboard, approvalStatus, dashboardSectionCardMapping, dashboardSection, dashboard, reportCard, standardReportCardType, locationHierarchy, video, checklistItemDetail, checklistDetail, rule, ruleDependency, individualRelationshipType, individualRelationGenderMapping, individualRelation, programConfig, formMapping, formElement, formElementGroup, form, identifierSource, organisationConfig, platformTranslation, translation, locationMapping, addressLevel, encounterType, program, programOutcome, gender, groupRole, subjectType, conceptAnswer, concept, myGroups, groupPrivileges, groups, privilege, resetSync, subjectMigration, news, videoTelemetric, groupSubject, comment, commentThread, entityApprovalStatus, individualRelationship, checklistItem, checklist, encounter, identifierAssignment, programEncounter, programEnrolment, individual, extension, userInfo, syncTelemetry, ruleFailureTelemetry];
   }
 
   static entitiesLoadedFromServer() {

package/dist/ObservationsHolder.js

@@ -52,6 +52,17 @@ class ObservationsHolder {
     });
   }
 
+  findQuestionGroupObservation(concept, parentFormElement, questionGroupIndex) {
+    const observations = this.findObservation(parentFormElement.concept);
+    const groupObservations = observations && observations.getValueWrapper();
+
+    if (parentFormElement.repeatable) {
+      return groupObservations && groupObservations.getGroupObservationAtIndex(questionGroupIndex).getObservation(concept);
+    }
+
+    return groupObservations && groupObservations.getObservation(concept);
+  }
+
   getObservation(concept) {
     return this.findObservation(concept);
   }
@@ -163,7 +174,7 @@ class ObservationsHolder {
         _lodash.default.forEach(childFormElements, cfe => {
           _lodash.default.range(size).forEach(questionGroupIndex => {
             const newFormElement = cfe.clone();
-            newFormElement.questionGroupIndex = _lodash.default.isEmpty(cfe.rule) ? undefined : questionGroupIndex;
+            newFormElement.questionGroupIndex = questionGroupIndex;
             formElementsIncludingRepeatableElements.push(newFormElement);
           });
         });
@@ -344,11 +355,11 @@ class ObservationsHolder {
     return observation;
   }
 
-  updateGroupQuestion(parentFormElement, childFormElement, value) {
+  updateGroupQuestion(parentFormElement, childFormElement, value, verified = false, skipVerification = false) {
     const parentConcept = parentFormElement.concept;
     const parentObservation = this.getObservation(parentConcept);
     const childObservations = _lodash.default.isEmpty(parentObservation) ? new _QuestionGroup.default() : parentObservation.getValueWrapper();
-    this.updateChildObservations(childFormElement, childObservations, value);
+    this.updateChildObservations(childFormElement, childObservations, value, verified, skipVerification);
 
     this._removeExistingObs(parentConcept);
 
@@ -357,10 +368,10 @@ class ObservationsHolder {
     }
   }
 
-  updateChildObservations(childFormElement, childObservations, value) {
+  updateChildObservations(childFormElement, childObservations, value, verified = false, skipVerification = false) {
     const childConcept = childFormElement.concept;
 
-    if (childConcept.isPrimitive() && _lodash.default.isNil(childFormElement.durationOptions)) {
+    if (childConcept.isPrimitive()) {
       childObservations.removeExistingObs(childConcept);
 
       if (!_lodash.default.isEmpty(_lodash.default.toString(value))) {
@@ -385,9 +396,29 @@ class ObservationsHolder {
         }
       }
     }
+
+    if (childFormElement.getType() === _Concept.default.dataType.Duration && !(0, _lodash.isNil)(childFormElement.durationOptions)) {
+      childObservations.removeExistingObs(childConcept);
+
+      if (!_lodash.default.isEmpty(value) && !_lodash.default.isEmpty(value.durations)) {
+        const observation = _Observation.default.create(childFormElement.concept, _CompositeDuration.default.fromObs(value));
+
+        childObservations.addObservation(observation);
+      }
+    }
+
+    if (childFormElement.getType() === _Concept.default.dataType.PhoneNumber) {
+      childObservations.removeExistingObs(childConcept);
+
+      if (!_lodash.default.isEmpty(value)) {
+        const observation = _Observation.default.create(childFormElement.concept, new _PhoneNumber.default(value, verified, skipVerification));
+
+        childObservations.addObservation(observation);
+      }
+    }
   }
 
-  updateRepeatableGroupQuestion(index, parentFormElement, childFormElement, value, action) {
+  updateRepeatableGroupQuestion(index, parentFormElement, childFormElement, value, action, verified = false, skipVerification = false) {
     const parentConcept = parentFormElement.concept;
     const observations = this.getObservation(parentConcept);
     const repeatableObservations = _lodash.default.isEmpty(observations) ? new _RepeatableQuestionGroup.default() : observations.getValueWrapper();
@@ -401,7 +432,7 @@ class ObservationsHolder {
     }
 
     const childObservations = repeatableObservations.getGroupObservationAtIndex(index);
-    this.updateChildObservations(childFormElement, childObservations, value);
+    this.updateChildObservations(childFormElement, childObservations, value, verified, skipVerification);
     repeatableObservations.updateGroupObservationsAtIndex(childObservations, index);
 
     this._removeExistingObs(parentConcept);

package/dist/PhoneNumber.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _lodash = require("lodash");
+
 class PhoneNumber {
   constructor(phoneNumber, verified = false, skipVerification = false) {
     this.phoneNumber = phoneNumber;
@@ -20,7 +22,7 @@ class PhoneNumber {
   }
 
   static fromObs(obs) {
-    return new PhoneNumber(obs.phoneNumber, obs.verified, obs.skipVerification);
+    return (0, _lodash.get)(obs, 'phoneNumber', null) ? new PhoneNumber(obs.phoneNumber, obs.verified, obs.skipVerification) : null;
   }
 
   getValue() {

package/dist/ResetSync.js

@@ -0,0 +1,75 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _BaseEntity = _interopRequireDefault(require("./BaseEntity"));
+
+var _ResourceUtil = _interopRequireDefault(require("./utility/ResourceUtil"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+class ResetSync extends _BaseEntity.default {
+  constructor(...args) {
+    super(...args);
+
+    _defineProperty(this, "uuid", void 0);
+
+    _defineProperty(this, "subjectTypeUUID", void 0);
+
+    _defineProperty(this, "hasMigrated", void 0);
+
+    _defineProperty(this, "voided", void 0);
+  }
+
+  static fromResource(resource) {
+    const resetSync = new ResetSync();
+    resetSync.uuid = resource.uuid;
+    resetSync.voided = resource.voided;
+    resetSync.subjectTypeUUID = _ResourceUtil.default.getUUIDFor(resource, 'subjectTypeUUID');
+    return resetSync;
+  }
+
+  updatedHasMigrated() {
+    const resetSync = this.clone();
+    resetSync.hasMigrated = true;
+    return resetSync;
+  }
+
+  clone() {
+    const resetSync = new ResetSync();
+    resetSync.uuid = this.uuid;
+    resetSync.subjectTypeUUID = this.subjectTypeUUID;
+    resetSync.hasMigrated = this.hasMigrated;
+    resetSync.voided = this.voided;
+    return resetSync;
+  }
+
+}
+
+_defineProperty(ResetSync, "schema", {
+  name: 'ResetSync',
+  primaryKey: 'uuid',
+  properties: {
+    uuid: 'string',
+    subjectTypeUUID: {
+      type: 'string',
+      optional: true
+    },
+    hasMigrated: {
+      type: 'bool',
+      default: false
+    },
+    voided: {
+      type: "bool",
+      default: false
+    }
+  }
+});
+
+var _default = ResetSync;
+exports.default = _default;

package/dist/Schema.js

@@ -159,6 +159,8 @@ var _Extension = _interopRequireDefault(require("./Extension"));
 
 var _SubjectMigration = _interopRequireDefault(require("./SubjectMigration"));
 
+var _ResetSync = _interopRequireDefault(require("./ResetSync"));
+
 function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -167,8 +169,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 var _default = {
   //order is important, should be arranged according to the dependency
-  schema: [_LocaleMapping.default, _Settings.default, _Concept.ConceptAnswer, _Concept.default, _EncounterType.default, _Gender.default, _UserDefinedIndividualProperty.default, _AddressLevel.LocationMapping, _AddressLevel.default, _KeyValue.default, _Form.default, _FormMapping.default, _FormElementGroup.default, _FormElement.default, _SubjectType.default, _Individual.default, _ProgramOutcome.default, _Program.default, _ProgramEnrolment.default, _Observation.default, _ProgramEncounter.default, _Encounter.default, _EntitySyncStatus.default, _EntityQueue.default, _ConfigFile.default, _Checklist.default, _ChecklistItem.default, _Format.default, _UserInfo.default, _StringKeyNumericValue.default, _VisitScheduleInterval.default, _VisitScheduleConfig.default, _ProgramConfig.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, _LocationHierarchy.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],
-  schemaVersion: 153,
+  schema: [_LocaleMapping.default, _Settings.default, _Concept.ConceptAnswer, _Concept.default, _EncounterType.default, _Gender.default, _UserDefinedIndividualProperty.default, _AddressLevel.LocationMapping, _AddressLevel.default, _KeyValue.default, _Form.default, _FormMapping.default, _FormElementGroup.default, _FormElement.default, _SubjectType.default, _Individual.default, _ProgramOutcome.default, _Program.default, _ProgramEnrolment.default, _Observation.default, _ProgramEncounter.default, _Encounter.default, _EntitySyncStatus.default, _EntityQueue.default, _ConfigFile.default, _Checklist.default, _ChecklistItem.default, _Format.default, _UserInfo.default, _StringKeyNumericValue.default, _VisitScheduleInterval.default, _VisitScheduleConfig.default, _ProgramConfig.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, _LocationHierarchy.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],
+  schemaVersion: 154,
   migration: function (oldDB, newDB) {
     if (oldDB.schemaVersion < 10) {
       var oldObjects = oldDB.objects("DecisionConfig");

package/dist/index.js

@@ -657,6 +657,12 @@ Object.defineProperty(exports, "RepeatableQuestionGroup", {
     return _RepeatableQuestionGroup.default;
   }
 });
+Object.defineProperty(exports, "ResetSync", {
+  enumerable: true,
+  get: function () {
+    return _ResetSync.default;
+  }
+});
 
 var _AbstractEncounter = _interopRequireDefault(require("./AbstractEncounter"));
 
@@ -874,6 +880,8 @@ var _QuestionGroup = _interopRequireDefault(require("./observation/QuestionGroup
 
 var _RepeatableQuestionGroup = _interopRequireDefault(require("./observation/RepeatableQuestionGroup"));
 
+var _ResetSync = _interopRequireDefault(require("./ResetSync"));
+
 function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }

package/dist/observation/QuestionGroup.js

@@ -51,7 +51,8 @@ class QuestionGroup {
       const observation = new _Observation.default();
       observation.concept = QuestionGroup.constructConceptModel(concept);
       const value = valueJSON.answer || valueJSON.value;
-      observation.valueJSON = observation.concept.getValueWrapperFor(value);
+      const valueToPass = _lodash.default.includes([_Concept.default.dataType.Duration, _Concept.default.dataType.PhoneNumber, _Concept.default.dataType.Id], concept.datatype) ? valueJSON : value;
+      observation.valueJSON = observation.concept.getValueWrapperFor(valueToPass);
       return observation;
     });
 

package/package.json

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