openchs-models 1.31.42 → 1.31.43

package/dist/EntityMetaData.js

@@ -33,8 +33,6 @@ var _EncounterType = _interopRequireDefault(require("./EncounterType"));
 
 var _Encounter = _interopRequireDefault(require("./Encounter"));
 
-var _ProgramOutcome = _interopRequireDefault(require("./ProgramOutcome"));
-
 var _Form = _interopRequireDefault(require("./application/Form"));
 
 var _FormElementGroup = _interopRequireDefault(require("./application/FormElementGroup"));
@@ -248,9 +246,6 @@ const program = refDataNameTranslated(_Program.default, {
   res: "operationalProgram",
   syncWeight: 3
 });
-const programOutcome = refDataNameTranslated(_ProgramOutcome.default, {
-  syncWeight: 3
-});
 const gender = refDataNameTranslated(_Gender.default, {
   syncWeight: 1
 });
@@ -630,7 +625,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, 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, programOutcome, gender, groupRole, 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, encounter, identifierAssignment, programEncounter, programEnrolment, individual, extension, userInfo, ruleFailureTelemetry, syncTelemetry];
+    return [groupDashboard, approvalStatus, dashboardSectionCardMapping, dashboardSection, dashboardFilter, dashboard, reportCard, 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, 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, encounter, identifierAssignment, programEncounter, programEnrolment, individual, extension, userInfo, ruleFailureTelemetry, syncTelemetry];
   }
 
   static entitiesLoadedFromServer() {

package/dist/ProgramEncounter.js

@@ -17,8 +17,6 @@ var _lodash = _interopRequireDefault(require("lodash"));
 
 var _ValidationResult = _interopRequireDefault(require("./application/ValidationResult"));
 
-var _Point = _interopRequireDefault(require("./geo/Point"));
-
 var _EntityApprovalStatus = _interopRequireDefault(require("./EntityApprovalStatus"));
 
 var _SchemaNames = _interopRequireDefault(require("./SchemaNames"));

package/dist/ProgramEnrolment.js

@@ -11,8 +11,6 @@ var _ResourceUtil = _interopRequireDefault(require("./utility/ResourceUtil"));
 
 var _Program = _interopRequireDefault(require("./Program"));
 
-var _ProgramOutcome = _interopRequireDefault(require("./ProgramOutcome"));
-
 var _ProgramEncounter = _interopRequireDefault(require("./ProgramEncounter"));
 
 var _BaseEntity = _interopRequireDefault(require("./BaseEntity"));
@@ -98,14 +96,6 @@ class ProgramEnrolment extends _BaseEntity.default {
     this.that.programExitObservations = this.fromEntityList(x);
   }
 
-  get programOutcome() {
-    return this.toEntity("programOutcome", _ProgramOutcome.default);
-  }
-
-  set programOutcome(x) {
-    this.that.programOutcome = this.fromObject(x);
-  }
-
   get encounters() {
     return this.toEntityList("encounters", _ProgramEncounter.default);
   }
@@ -217,7 +207,6 @@ class ProgramEnrolment extends _BaseEntity.default {
     resource["programUUID"] = this.program.uuid;
     resource.enrolmentDateTime = _General.default.isoFormat(this.enrolmentDateTime);
     resource.programExitDateTime = _General.default.isoFormat(this.programExitDateTime);
-    resource["programOutcomeUUID"] = _lodash.default.isNil(this.programOutcome) ? null : this.programOutcome.uuid;
     resource["individualUUID"] = this.individual.uuid;
     if (!_lodash.default.isNil(this.checklist)) resource["checklistUUID"] = this.checklist.uuid;
     resource["observations"] = [];
@@ -242,20 +231,12 @@ class ProgramEnrolment extends _BaseEntity.default {
 
   static fromResource(resource, entityService) {
     const program = entityService.findByKey("uuid", _ResourceUtil.default.getUUIDFor(resource, "programUUID"), _Program.default.schema.name);
-
-    const programOutcomeUUID = _ResourceUtil.default.getUUIDFor(resource, "programOutcomeUUID");
-
     const individual = entityService.findByKey("uuid", _ResourceUtil.default.getUUIDFor(resource, "individualUUID"), _Individual.default.schema.name);
 
     const programEnrolment = _General.default.assignFields(resource, new ProgramEnrolment(), ["uuid", "voided"], ["enrolmentDateTime", "programExitDateTime"], ["observations", "programExitObservations"], entityService);
 
     programEnrolment.program = program;
     programEnrolment.individual = individual;
-
-    if (!_lodash.default.isNil(programOutcomeUUID)) {
-      programEnrolment.programOutcome = entityService.findByKey("uuid", programOutcomeUUID, _ProgramOutcome.default.schema.name);
-    }
-
     if (!_lodash.default.isNil(resource.enrolmentLocation)) programEnrolment.enrolmentLocation = _Point.default.fromResource(resource.enrolmentLocation);
     if (!_lodash.default.isNil(resource.exitLocation)) programEnrolment.exitLocation = _Point.default.fromResource(resource.exitLocation);
     (0, _AuditUtil.mapAuditFields)(programEnrolment, resource);
@@ -290,7 +271,6 @@ class ProgramEnrolment extends _BaseEntity.default {
     programEnrolment.program = _lodash.default.isNil(this.program) ? null : this.program.clone();
     programEnrolment.enrolmentDateTime = this.enrolmentDateTime;
     programEnrolment.programExitDateTime = this.programExitDateTime;
-    programEnrolment.programOutcome = _lodash.default.isNil(this.programOutcome) ? null : this.programOutcome.clone();
     programEnrolment.individual = this.individual;
     programEnrolment.observations = _ObservationsHolder.default.clone(this.observations);
     programEnrolment.programExitObservations = _ObservationsHolder.default.clone(this.programExitObservations);
@@ -654,10 +634,6 @@ class ProgramEnrolment extends _BaseEntity.default {
       observations: this.observations,
       programExitDateTime: this.programExitDateTime,
       programExitObservations: this.programExitObservations,
-      programOutcome: {
-        type: "ProgramOutcome",
-        optional: true
-      },
       encounters: this.encounters,
       checklists: this.checklists,
       individualUUID: this.individual.uuid,
@@ -691,10 +667,6 @@ _defineProperty(ProgramEnrolment, "schema", {
       type: "list",
       objectType: "EmbeddedObservation"
     },
-    programOutcome: {
-      type: "ProgramOutcome",
-      optional: true
-    },
     encounters: {
       type: "list",
       objectType: _SchemaNames.default.ProgramEncounter

package/dist/Schema.js

@@ -38,8 +38,6 @@ var _Encounter = _interopRequireDefault(require("./Encounter"));
 
 var _EncounterType = _interopRequireDefault(require("./EncounterType"));
 
-var _ProgramOutcome = _interopRequireDefault(require("./ProgramOutcome"));
-
 var _FormElement = _interopRequireDefault(require("./application/FormElement"));
 
 var _FormElementGroup = _interopRequireDefault(require("./application/FormElementGroup"));
@@ -198,7 +196,7 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const entities = [_DashboardFilter.default, _LocaleMapping.default, _Settings.default, _ConceptAnswer.default, _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, _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, _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, _SubjectProgramEligibility.default, _MenuItem.default, _UserSubjectAssignment.default];
+const entities = [_DashboardFilter.default, _LocaleMapping.default, _Settings.default, _ConceptAnswer.default, _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, _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, _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, _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, _SubjectProgramEligibility.default, _MenuItem.default, _UserSubjectAssignment.default];
 
 function migrateObjectTypeFieldToEmbedded(newDB, oldDB, schemaName, field, creatorFn) {
   console.log(`schema: ${schemaName}, field: ${field}`);

package/dist/error/SyncError.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 
 //https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error
-function SyncError(code, message, fileName, lineNumber) {
-  let instance = new Error(message, fileName, lineNumber);
+function SyncError(code, message) {
+  let instance = new Error(message);
   instance.errorCode = code;
   instance.errorText = message;
 

package/dist/index.js

@@ -297,12 +297,6 @@ Object.defineProperty(exports, "Program", {
     return _Program.default;
   }
 });
-Object.defineProperty(exports, "ProgramOutcome", {
-  enumerable: true,
-  get: function () {
-    return _ProgramOutcome.default;
-  }
-});
 Object.defineProperty(exports, "ReferenceEntity", {
   enumerable: true,
   get: function () {
@@ -902,8 +896,6 @@ var _ProgramEnrolment = _interopRequireDefault(require("./ProgramEnrolment"));
 
 var _Program = _interopRequireDefault(require("./Program"));
 
-var _ProgramOutcome = _interopRequireDefault(require("./ProgramOutcome"));
-
 var _ReferenceEntity = _interopRequireDefault(require("./ReferenceEntity"));
 
 var _RuleDependency = _interopRequireDefault(require("./RuleDependency"));

package/package.json

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

package/dist/ProgramOutcome.js

@@ -1,39 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _ReferenceEntity = _interopRequireDefault(require("./ReferenceEntity"));
-
-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 ProgramOutcome extends _ReferenceEntity.default {
-  constructor(that = null) {
-    super(that);
-  }
-
-  get name() {
-    return this.that.name;
-  }
-
-  set name(x) {
-    this.that.name = x;
-  }
-
-}
-
-_defineProperty(ProgramOutcome, "schema", {
-  name: "ProgramOutcome",
-  primaryKey: "uuid",
-  properties: {
-    uuid: "string",
-    name: "string"
-  }
-});
-
-var _default = ProgramOutcome;
-exports.default = _default;