openchs-models 1.31.60 → 1.31.61

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -33,8 +33,6 @@ var _EncounterType = _interopRequireDefault(require("./EncounterType"));
33
33
 
34
34
  var _Encounter = _interopRequireDefault(require("./Encounter"));
35
35
 
36
- var _ProgramOutcome = _interopRequireDefault(require("./ProgramOutcome"));
37
-
38
36
  var _Form = _interopRequireDefault(require("./application/Form"));
39
37
 
40
38
  var _FormElementGroup = _interopRequireDefault(require("./application/FormElementGroup"));
@@ -248,9 +246,6 @@ const program = refDataNameTranslated(_Program.default, {
248
246
  res: "operationalProgram",
249
247
  syncWeight: 3
250
248
  });
251
- const programOutcome = refDataNameTranslated(_ProgramOutcome.default, {
252
- syncWeight: 3
253
- });
254
249
  const gender = refDataNameTranslated(_Gender.default, {
255
250
  syncWeight: 1
256
251
  });
@@ -630,7 +625,7 @@ class EntityMetaData {
630
625
 
631
626
  //order is important. last entity in each (tx and ref) with be executed first. parent should be synced before the child.
632
627
  static model() {
633
- 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];
628
+ 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];
634
629
  }
635
630
 
636
631
  static entitiesLoadedFromServer() {
@@ -32,6 +32,14 @@ class GroupDashboard extends _BaseEntity.default {
32
32
  this.that.primaryDashboard = x;
33
33
  }
34
34
 
35
+ get secondaryDashboard() {
36
+ return this.that.secondaryDashboard;
37
+ }
38
+
39
+ set secondaryDashboard(x) {
40
+ this.that.secondaryDashboard = x;
41
+ }
42
+
35
43
  get group() {
36
44
  return this.toEntity("group", _Groups.default);
37
45
  }
@@ -49,7 +57,7 @@ class GroupDashboard extends _BaseEntity.default {
49
57
  }
50
58
 
51
59
  static fromResource(resource, entityService) {
52
- const groupDashboard = _General.default.assignFields(resource, new GroupDashboard(), ["uuid", "primaryDashboard", "voided"]);
60
+ const groupDashboard = _General.default.assignFields(resource, new GroupDashboard(), ["uuid", "primaryDashboard", "secondaryDashboard", "voided"]);
53
61
 
54
62
  groupDashboard.group = entityService.findByKey("uuid", _ResourceUtil.default.getUUIDFor(resource, "groupUUID"), _Groups.default.schema.name);
55
63
  groupDashboard.dashboard = entityService.findByKey("uuid", _ResourceUtil.default.getUUIDFor(resource, "dashboardUUID"), _Dashboard.default.schema.name);
@@ -67,6 +75,10 @@ _defineProperty(GroupDashboard, "schema", {
67
75
  type: "bool",
68
76
  default: false
69
77
  },
78
+ secondaryDashboard: {
79
+ type: "bool",
80
+ default: false
81
+ },
70
82
  group: {
71
83
  type: "Groups",
72
84
  optional: true
@@ -891,6 +891,18 @@ class Individual extends _BaseEntity.default {
891
891
  return _lodash.default.filter(this.getEncounters(true), encounter => !encounter.encounterDateTime && _lodash.default.isNil(encounter.cancelDateTime));
892
892
  }
893
893
 
894
+ everScheduledEncounters() {
895
+ return _lodash.default.filter(this.getEncounters(true), encounter => !_lodash.default.isNil(encounter.earliestVisitDateTime) && _lodash.default.isNil(encounter.cancelDateTime));
896
+ }
897
+
898
+ scheduledEncountersOfType(encounterTypeName) {
899
+ return this.scheduledEncounters().filter(scheduledEncounter => scheduledEncounter.encounterType.name === encounterTypeName);
900
+ }
901
+
902
+ everScheduledEncountersOfType(encounterTypeName) {
903
+ return this.everScheduledEncounters().filter(scheduledEncounter => scheduledEncounter.encounterType.name === encounterTypeName);
904
+ }
905
+
894
906
  findObservationInLastEncounter(conceptNameOrUuid, currentEncounter) {
895
907
  const lastEncounter = this.findLastEncounterOfType(currentEncounter, _lodash.default.get(currentEncounter, 'encounterType'));
896
908
  return lastEncounter ? lastEncounter.findObservation(conceptNameOrUuid) : null;
@@ -11,8 +11,6 @@ var _ResourceUtil = _interopRequireDefault(require("./utility/ResourceUtil"));
11
11
 
12
12
  var _Program = _interopRequireDefault(require("./Program"));
13
13
 
14
- var _ProgramOutcome = _interopRequireDefault(require("./ProgramOutcome"));
15
-
16
14
  var _ProgramEncounter = _interopRequireDefault(require("./ProgramEncounter"));
17
15
 
18
16
  var _BaseEntity = _interopRequireDefault(require("./BaseEntity"));
@@ -98,14 +96,6 @@ class ProgramEnrolment extends _BaseEntity.default {
98
96
  this.that.programExitObservations = this.fromEntityList(x);
99
97
  }
100
98
 
101
- get programOutcome() {
102
- return this.toEntity("programOutcome", _ProgramOutcome.default);
103
- }
104
-
105
- set programOutcome(x) {
106
- this.that.programOutcome = this.fromObject(x);
107
- }
108
-
109
99
  get encounters() {
110
100
  return this.toEntityList("encounters", _ProgramEncounter.default);
111
101
  }
@@ -217,7 +207,6 @@ class ProgramEnrolment extends _BaseEntity.default {
217
207
  resource["programUUID"] = this.program.uuid;
218
208
  resource.enrolmentDateTime = _General.default.isoFormat(this.enrolmentDateTime);
219
209
  resource.programExitDateTime = _General.default.isoFormat(this.programExitDateTime);
220
- resource["programOutcomeUUID"] = _lodash.default.isNil(this.programOutcome) ? null : this.programOutcome.uuid;
221
210
  resource["individualUUID"] = this.individual.uuid;
222
211
  if (!_lodash.default.isNil(this.checklist)) resource["checklistUUID"] = this.checklist.uuid;
223
212
  resource["observations"] = [];
@@ -242,20 +231,12 @@ class ProgramEnrolment extends _BaseEntity.default {
242
231
 
243
232
  static fromResource(resource, entityService) {
244
233
  const program = entityService.findByKey("uuid", _ResourceUtil.default.getUUIDFor(resource, "programUUID"), _Program.default.schema.name);
245
-
246
- const programOutcomeUUID = _ResourceUtil.default.getUUIDFor(resource, "programOutcomeUUID");
247
-
248
234
  const individual = entityService.findByKey("uuid", _ResourceUtil.default.getUUIDFor(resource, "individualUUID"), _Individual.default.schema.name);
249
235
 
250
236
  const programEnrolment = _General.default.assignFields(resource, new ProgramEnrolment(), ["uuid", "voided"], ["enrolmentDateTime", "programExitDateTime"], ["observations", "programExitObservations"], entityService);
251
237
 
252
238
  programEnrolment.program = program;
253
239
  programEnrolment.individual = individual;
254
-
255
- if (!_lodash.default.isNil(programOutcomeUUID)) {
256
- programEnrolment.programOutcome = entityService.findByKey("uuid", programOutcomeUUID, _ProgramOutcome.default.schema.name);
257
- }
258
-
259
240
  if (!_lodash.default.isNil(resource.enrolmentLocation)) programEnrolment.enrolmentLocation = _Point.default.fromResource(resource.enrolmentLocation);
260
241
  if (!_lodash.default.isNil(resource.exitLocation)) programEnrolment.exitLocation = _Point.default.fromResource(resource.exitLocation);
261
242
  (0, _AuditUtil.mapAuditFields)(programEnrolment, resource);
@@ -290,7 +271,6 @@ class ProgramEnrolment extends _BaseEntity.default {
290
271
  programEnrolment.program = _lodash.default.isNil(this.program) ? null : this.program.clone();
291
272
  programEnrolment.enrolmentDateTime = this.enrolmentDateTime;
292
273
  programEnrolment.programExitDateTime = this.programExitDateTime;
293
- programEnrolment.programOutcome = _lodash.default.isNil(this.programOutcome) ? null : this.programOutcome.clone();
294
274
  programEnrolment.individual = this.individual;
295
275
  programEnrolment.observations = _ObservationsHolder.default.clone(this.observations);
296
276
  programEnrolment.programExitObservations = _ObservationsHolder.default.clone(this.programExitObservations);
@@ -654,10 +634,6 @@ class ProgramEnrolment extends _BaseEntity.default {
654
634
  observations: this.observations,
655
635
  programExitDateTime: this.programExitDateTime,
656
636
  programExitObservations: this.programExitObservations,
657
- programOutcome: {
658
- type: "ProgramOutcome",
659
- optional: true
660
- },
661
637
  encounters: this.encounters,
662
638
  checklists: this.checklists,
663
639
  individualUUID: this.individual.uuid,
@@ -695,10 +671,6 @@ _defineProperty(ProgramEnrolment, "schema", {
695
671
  type: "list",
696
672
  objectType: "Observation"
697
673
  },
698
- programOutcome: {
699
- type: "ProgramOutcome",
700
- optional: true
701
- },
702
674
  encounters: {
703
675
  type: "list",
704
676
  objectType: _SchemaNames.default.ProgramEncounter
package/dist/Schema.js CHANGED
@@ -19,8 +19,6 @@ var _Family = _interopRequireDefault(require("./Family"));
19
19
 
20
20
  var _AddressLevel = _interopRequireWildcard(require("./AddressLevel"));
21
21
 
22
- var _UserDefinedIndividualProperty = _interopRequireDefault(require("./UserDefinedIndividualProperty"));
23
-
24
22
  var _Gender = _interopRequireDefault(require("./Gender"));
25
23
 
26
24
  var _EntitySyncStatus = _interopRequireDefault(require("./EntitySyncStatus"));
@@ -37,8 +35,6 @@ var _Encounter = _interopRequireDefault(require("./Encounter"));
37
35
 
38
36
  var _EncounterType = _interopRequireDefault(require("./EncounterType"));
39
37
 
40
- var _ProgramOutcome = _interopRequireDefault(require("./ProgramOutcome"));
41
-
42
38
  var _FormElement = _interopRequireDefault(require("./application/FormElement"));
43
39
 
44
40
  var _FormElementGroup = _interopRequireDefault(require("./application/FormElementGroup"));
@@ -53,8 +49,6 @@ var _EntityQueue = _interopRequireDefault(require("./EntityQueue"));
53
49
 
54
50
  var _FormMapping = _interopRequireDefault(require("./application/FormMapping"));
55
51
 
56
- var _ConfigFile = _interopRequireDefault(require("./ConfigFile"));
57
-
58
52
  var _ChecklistItemStatus = _interopRequireDefault(require("./ChecklistItemStatus"));
59
53
 
60
54
  var _ChecklistItemDetail = _interopRequireDefault(require("./ChecklistItemDetail"));
@@ -197,7 +191,7 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
197
191
 
198
192
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
199
193
 
200
- 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];
194
+ const entities = [_DashboardFilter.default, _LocaleMapping.default, _Settings.default, _ConceptAnswer.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, _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];
201
195
 
202
196
  function migrateObjectTypeFieldToEmbedded(newDB, oldDB, schemaName, field, creatorFn) {
203
197
  console.log(`schema: ${schemaName}, field: ${field}`);
@@ -287,7 +281,7 @@ function createRealmConfig() {
287
281
  return doCompact;
288
282
  },
289
283
  //order is important, should be arranged according to the dependency
290
- schemaVersion: 186,
284
+ schemaVersion: 188,
291
285
  onMigration: function (oldDB, newDB) {
292
286
  console.log("[AvniModels.Schema]", `Running migration with old schema version: ${oldDB.schemaVersion} and new schema version: ${newDB.schemaVersion}`);
293
287
  if (oldDB.schemaVersion === VersionWithEmbeddedMigrationProblem) throw new Error(`Update from schema version ${VersionWithEmbeddedMigrationProblem} is not allowed. Please uninstall and install app.`);
@@ -295,7 +289,7 @@ function createRealmConfig() {
295
289
  if (oldDB.schemaVersion < 10) {
296
290
  const oldObjects = oldDB.objects("DecisionConfig");
297
291
  oldObjects.forEach(decisionConfig => {
298
- newDB.create(_ConfigFile.default.schema.name, _ConfigFile.default.create(decisionConfig.fileName, decisionConfig.decisionCode), true);
292
+ newDB.create(ConfigFile.schema.name, ConfigFile.create(decisionConfig.fileName, decisionConfig.decisionCode), true);
299
293
  });
300
294
  }
301
295
 
@@ -903,6 +897,12 @@ function createRealmConfig() {
903
897
 
904
898
  if (oldDB.schemaVersion < VersionWithEmbeddedMigrationProblem) {// removed migration code. keeping the version number in case this number is required for any checks later
905
899
  }
900
+
901
+ if (oldDB.schemaVersion < 186) {// newDB.deleteModel("UserDefinedIndividualProperty");
902
+ // newDB.deleteModel("ConfigFile");
903
+ // newDB.deleteModel("Decision");
904
+ // newDB.deleteModel("ProgramOutcome");
905
+ }
906
906
  }
907
907
  };
908
908
  }
@@ -178,6 +178,14 @@ class SubjectType extends _ReferenceEntity.default {
178
178
  this.that.directlyAssignable = x;
179
179
  }
180
180
 
181
+ get settings() {
182
+ return this.that.settings;
183
+ }
184
+
185
+ set settings(x) {
186
+ this.that.settings = x;
187
+ }
188
+
181
189
  static create(name, group = false, household = false, type) {
182
190
  let subjectType = new SubjectType();
183
191
  subjectType.uuid = _General.default.randomUUID();
@@ -212,6 +220,7 @@ class SubjectType extends _ReferenceEntity.default {
212
220
  subjectType.syncRegistrationConcept1 = _ResourceUtil.default.getUUIDFor(operationalSubjectType, 'syncRegistrationConcept1');
213
221
  subjectType.syncRegistrationConcept2 = _ResourceUtil.default.getUUIDFor(operationalSubjectType, 'syncRegistrationConcept2');
214
222
  subjectType.nameHelpText = _ResourceUtil.default.getUUIDFor(operationalSubjectType, 'nameHelpText');
223
+ subjectType.settings = !_lodash.default.isNil(operationalSubjectType.settings) ? JSON.stringify(operationalSubjectType.settings) : '{}';
215
224
  return subjectType;
216
225
  }
217
226
 
@@ -239,6 +248,7 @@ class SubjectType extends _ReferenceEntity.default {
239
248
  cloned.syncRegistrationConcept1 = this.syncRegistrationConcept1;
240
249
  cloned.syncRegistrationConcept2 = this.syncRegistrationConcept2;
241
250
  cloned.nameHelpText = this.nameHelpText;
251
+ cloned.settings = this.settings;
242
252
  return cloned;
243
253
  }
244
254
 
@@ -266,6 +276,14 @@ class SubjectType extends _ReferenceEntity.default {
266
276
  return !_lodash.default.isNil(this.iconFileS3Key);
267
277
  }
268
278
 
279
+ getSettings() {
280
+ return JSON.parse(this.settings);
281
+ }
282
+
283
+ getSetting(settingName) {
284
+ return this.getSettings()[settingName];
285
+ }
286
+
269
287
  }
270
288
 
271
289
  _defineProperty(SubjectType, "schema", {
@@ -346,6 +364,10 @@ _defineProperty(SubjectType, "schema", {
346
364
  nameHelpText: {
347
365
  type: "string",
348
366
  optional: true
367
+ },
368
+ settings: {
369
+ type: "string",
370
+ default: '{}'
349
371
  }
350
372
  }
351
373
  });
@@ -357,5 +379,10 @@ _defineProperty(SubjectType, "types", {
357
379
  Household: 'Household'
358
380
  });
359
381
 
382
+ _defineProperty(SubjectType, "settingKeys", {
383
+ displayRegistrationDetails: 'displayRegistrationDetails',
384
+ displayPlannedEncounters: 'displayPlannedEncounters'
385
+ });
386
+
360
387
  var _default = SubjectType;
361
388
  exports.default = _default;
@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", {
6
6
  exports.default = void 0;
7
7
 
8
8
  //https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error
9
- function SyncError(code, message, fileName, lineNumber) {
10
- let instance = new Error(message, fileName, lineNumber);
9
+ function SyncError(code, message) {
10
+ let instance = new Error(message);
11
11
  instance.errorCode = code;
12
12
  instance.errorText = message;
13
13
 
package/dist/index.js CHANGED
@@ -75,18 +75,6 @@ Object.defineProperty(exports, "ConceptAnswer", {
75
75
  return _ConceptAnswer.default;
76
76
  }
77
77
  });
78
- Object.defineProperty(exports, "ConfigFile", {
79
- enumerable: true,
80
- get: function () {
81
- return _ConfigFile.default;
82
- }
83
- });
84
- Object.defineProperty(exports, "Decision", {
85
- enumerable: true,
86
- get: function () {
87
- return _Decision.default;
88
- }
89
- });
90
78
  Object.defineProperty(exports, "Duration", {
91
79
  enumerable: true,
92
80
  get: function () {
@@ -297,12 +285,6 @@ Object.defineProperty(exports, "Program", {
297
285
  return _Program.default;
298
286
  }
299
287
  });
300
- Object.defineProperty(exports, "ProgramOutcome", {
301
- enumerable: true,
302
- get: function () {
303
- return _ProgramOutcome.default;
304
- }
305
- });
306
288
  Object.defineProperty(exports, "ReferenceEntity", {
307
289
  enumerable: true,
308
290
  get: function () {
@@ -357,12 +339,6 @@ Object.defineProperty(exports, "StringKeyNumericValue", {
357
339
  return _StringKeyNumericValue.default;
358
340
  }
359
341
  });
360
- Object.defineProperty(exports, "UserDefinedIndividualProperty", {
361
- enumerable: true,
362
- get: function () {
363
- return _UserDefinedIndividualProperty.default;
364
- }
365
- });
366
342
  Object.defineProperty(exports, "UserInfo", {
367
343
  enumerable: true,
368
344
  get: function () {
@@ -830,10 +806,6 @@ var _Concept = _interopRequireDefault(require("./Concept"));
830
806
 
831
807
  var _ConceptAnswer = _interopRequireDefault(require("./ConceptAnswer"));
832
808
 
833
- var _ConfigFile = _interopRequireDefault(require("./ConfigFile"));
834
-
835
- var _Decision = _interopRequireDefault(require("./Decision"));
836
-
837
809
  var _Duration = _interopRequireDefault(require("./Duration"));
838
810
 
839
811
  var _Encounter = _interopRequireDefault(require("./Encounter"));
@@ -902,8 +874,6 @@ var _ProgramEnrolment = _interopRequireDefault(require("./ProgramEnrolment"));
902
874
 
903
875
  var _Program = _interopRequireDefault(require("./Program"));
904
876
 
905
- var _ProgramOutcome = _interopRequireDefault(require("./ProgramOutcome"));
906
-
907
877
  var _ReferenceEntity = _interopRequireDefault(require("./ReferenceEntity"));
908
878
 
909
879
  var _RuleDependency = _interopRequireDefault(require("./RuleDependency"));
@@ -922,8 +892,6 @@ var _StaticFormElementGroup = _interopRequireDefault(require("./application/Stat
922
892
 
923
893
  var _StringKeyNumericValue = _interopRequireDefault(require("./application/StringKeyNumericValue"));
924
894
 
925
- var _UserDefinedIndividualProperty = _interopRequireDefault(require("./UserDefinedIndividualProperty"));
926
-
927
895
  var _UserInfo = _interopRequireDefault(require("./UserInfo"));
928
896
 
929
897
  var _ValidationResult = _interopRequireDefault(require("./application/ValidationResult"));
@@ -48,7 +48,7 @@ class PrimitiveValue {
48
48
 
49
49
  _valueFromString() {
50
50
  // https://stackoverflow.com/a/1711405/766175
51
- if (this.datatype === _Concept.default.dataType.Numeric && !isNaN(this.value) && !isNaN(parseInt(this.value))) {
51
+ if (this.datatype === _Concept.default.dataType.Numeric && !(isNaN(this.value) && isNaN(parseInt(this.value)) && isNaN(_lodash.default.toNumber(this.value)))) {
52
52
  // && !/\.$|\.0+$|\.*0$/.test(this.value)) {
53
53
  return _lodash.default.toNumber(this.value);
54
54
  } else if (this.datatype === _Concept.default.dataType.DateTime) {
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "openchs-models",
3
3
  "description": "OpenCHS data model to be used by front end clients",
4
- "version": "1.31.60",
4
+ "version": "1.31.61",
5
5
  "private": false,
6
6
  "repository": {
7
7
  "type": "git",
@@ -1,58 +0,0 @@
1
- "use strict";
2
-
3
- Object.defineProperty(exports, "__esModule", {
4
- value: true
5
- });
6
- exports.default = void 0;
7
-
8
- var _PersistedObject = _interopRequireDefault(require("./PersistedObject"));
9
-
10
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
11
-
12
- 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; }
13
-
14
- class ConfigFile extends _PersistedObject.default {
15
- constructor(that = null) {
16
- super(that);
17
- }
18
-
19
- get fileName() {
20
- return this.that.fileName;
21
- }
22
-
23
- set fileName(x) {
24
- this.that.fileName = x;
25
- }
26
-
27
- get contents() {
28
- return this.that.contents;
29
- }
30
-
31
- set contents(x) {
32
- this.that.contents = x;
33
- }
34
-
35
- static create(fileName, contents) {
36
- const configFile = new ConfigFile();
37
- configFile.fileName = fileName.toLowerCase();
38
- configFile.contents = contents;
39
- return configFile;
40
- }
41
-
42
- toString() {
43
- return this.fileName;
44
- }
45
-
46
- }
47
-
48
- _defineProperty(ConfigFile, "schema", {
49
- name: "ConfigFile",
50
- primaryKey: "fileName",
51
- properties: {
52
- fileName: "string",
53
- contents: "string"
54
- }
55
- });
56
-
57
- var _default = ConfigFile;
58
- exports.default = _default;
package/dist/Decision.js DELETED
@@ -1,63 +0,0 @@
1
- "use strict";
2
-
3
- Object.defineProperty(exports, "__esModule", {
4
- value: true
5
- });
6
- exports.default = void 0;
7
-
8
- var _PersistedObject = _interopRequireDefault(require("./PersistedObject"));
9
-
10
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
11
-
12
- 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; }
13
-
14
- class Decision extends _PersistedObject.default {
15
- constructor(that = null) {
16
- super(that);
17
- }
18
-
19
- get name() {
20
- return this.that.name;
21
- }
22
-
23
- set name(x) {
24
- this.that.name = x;
25
- }
26
-
27
- get value() {
28
- return this.that.value;
29
- }
30
-
31
- set value(x) {
32
- this.that.value = x;
33
- }
34
-
35
- get code() {
36
- return this.that.code;
37
- }
38
-
39
- set code(x) {
40
- this.that.code = x;
41
- }
42
-
43
- static newInstance(name, code, value) {
44
- return {
45
- name: name,
46
- code: code,
47
- value: value
48
- };
49
- }
50
-
51
- }
52
-
53
- _defineProperty(Decision, "schema", {
54
- name: "Decision",
55
- properties: {
56
- name: "string",
57
- code: "string",
58
- value: "string"
59
- }
60
- });
61
-
62
- var _default = Decision;
63
- exports.default = _default;
@@ -1,39 +0,0 @@
1
- "use strict";
2
-
3
- Object.defineProperty(exports, "__esModule", {
4
- value: true
5
- });
6
- exports.default = void 0;
7
-
8
- var _ReferenceEntity = _interopRequireDefault(require("./ReferenceEntity"));
9
-
10
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
11
-
12
- 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; }
13
-
14
- class ProgramOutcome extends _ReferenceEntity.default {
15
- constructor(that = null) {
16
- super(that);
17
- }
18
-
19
- get name() {
20
- return this.that.name;
21
- }
22
-
23
- set name(x) {
24
- this.that.name = x;
25
- }
26
-
27
- }
28
-
29
- _defineProperty(ProgramOutcome, "schema", {
30
- name: "ProgramOutcome",
31
- primaryKey: "uuid",
32
- properties: {
33
- uuid: "string",
34
- name: "string"
35
- }
36
- });
37
-
38
- var _default = ProgramOutcome;
39
- exports.default = _default;
@@ -1,58 +0,0 @@
1
- "use strict";
2
-
3
- Object.defineProperty(exports, "__esModule", {
4
- value: true
5
- });
6
- exports.default = void 0;
7
-
8
- var _PersistedObject = _interopRequireDefault(require("./PersistedObject"));
9
-
10
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
11
-
12
- 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; }
13
-
14
- class UserDefinedIndividualProperty extends _PersistedObject.default {
15
- constructor(that = null) {
16
- super(that);
17
- }
18
-
19
- get name() {
20
- return this.that.name;
21
- }
22
-
23
- set name(x) {
24
- this.that.name = x;
25
- }
26
-
27
- get value() {
28
- return this.that.value;
29
- }
30
-
31
- set value(x) {
32
- this.that.value = x;
33
- }
34
-
35
- get unit() {
36
- return this.that.unit;
37
- }
38
-
39
- set unit(x) {
40
- this.that.unit = x;
41
- }
42
-
43
- }
44
-
45
- _defineProperty(UserDefinedIndividualProperty, "schema", {
46
- name: "UserDefinedIndividualProperty",
47
- properties: {
48
- name: "string",
49
- value: "string",
50
- unit: {
51
- type: "string",
52
- optional: true
53
- }
54
- }
55
- });
56
-
57
- var _default = UserDefinedIndividualProperty;
58
- exports.default = _default;