openchs-models 1.25.4 → 1.26.0

package/dist/EntityMetaData.js

@@ -143,6 +143,8 @@ var _SubjectProgramEligibility = _interopRequireDefault(require("./program/Subje
 
 var _MenuItem = _interopRequireDefault(require("./application/MenuItem"));
 
+var _UserSubjectAssignment = _interopRequireDefault(require("./assignment/UserSubjectAssignment"));
+
 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; }
@@ -496,11 +498,14 @@ const subjectProgramEligibility = txData(_SubjectProgramEligibility.default, {
   privilegeEntity: _Privilege.default.privilegeEntityType.subject,
   privilegeName: _Privilege.default.privilegeName.viewSubject
 });
+const userSubjectAssignment = txData(_UserSubjectAssignment.default, {
+  syncWeight: 0
+});
 
 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, menuItem, locationHierarchy, video, checklistItemDetail, checklistDetail, rule, ruleDependency, individualRelationshipType, individualRelationGenderMapping, individualRelation, programConfig, 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, taskUnAssigment, task, subjectProgramEligibility, 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, menuItem, locationHierarchy, video, checklistItemDetail, checklistDetail, rule, ruleDependency, individualRelationshipType, individualRelationGenderMapping, individualRelation, programConfig, 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, individualRelationship, checklistItem, checklist, encounter, identifierAssignment, programEncounter, programEnrolment, individual, extension, userInfo, syncTelemetry, ruleFailureTelemetry];
   }
 
   static entitiesLoadedFromServer() {

package/dist/Schema.js

@@ -179,6 +179,8 @@ var _SubjectProgramEligibility = _interopRequireDefault(require("./program/Subje
 
 var _MenuItem = _interopRequireDefault(require("./application/MenuItem"));
 
+var _UserSubjectAssignment = _interopRequireDefault(require("./assignment/UserSubjectAssignment"));
+
 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; }
@@ -187,8 +189,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, _ResetSync.default, _Documentation.default, _DocumentationItem.default, _TaskType.default, _TaskStatus.default, _Task.default, _TaskUnAssignment.default, _DraftEncounter.default, _SubjectProgramEligibility.default, _MenuItem.default],
-  schemaVersion: 165,
+  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, _Documentation.default, _DocumentationItem.default, _TaskType.default, _TaskStatus.default, _Task.default, _TaskUnAssignment.default, _DraftEncounter.default, _SubjectProgramEligibility.default, _MenuItem.default, _UserSubjectAssignment.default],
+  schemaVersion: 166,
   migration: function (oldDB, newDB) {
     if (oldDB.schemaVersion < 10) {
       const oldObjects = oldDB.objects("DecisionConfig");

package/dist/SubjectType.js

@@ -35,6 +35,8 @@ class SubjectType extends _ReferenceEntity.default {
 
     _defineProperty(this, "allowMiddleName", void 0);
 
+    _defineProperty(this, "directlyAssignable", void 0);
+
     _defineProperty(this, "validFirstNameFormat", void 0);
 
     _defineProperty(this, "validMiddleNameFormat", void 0);
@@ -68,6 +70,7 @@ class SubjectType extends _ReferenceEntity.default {
     subjectType.programEligibilityCheckRule = operationalSubjectType.programEligibilityCheckRule;
     subjectType.uniqueName = operationalSubjectType.uniqueName;
     subjectType.allowMiddleName = operationalSubjectType.allowMiddleName;
+    subjectType.directlyAssignable = operationalSubjectType.directlyAssignable;
     subjectType.allowProfilePicture = operationalSubjectType.allowProfilePicture;
     subjectType.validFirstNameFormat = _Format.default.fromResource(operationalSubjectType["validFirstNameFormat"]);
     subjectType.validMiddleNameFormat = _Format.default.fromResource(operationalSubjectType["validMiddleNameFormat"]);
@@ -92,6 +95,7 @@ class SubjectType extends _ReferenceEntity.default {
     cloned.programEligibilityCheckRule = this.programEligibilityCheckRule;
     cloned.allowEmptyLocation = this.allowEmptyLocation;
     cloned.allowMiddleName = this.allowMiddleName;
+    cloned.directlyAssignable = this.directlyAssignable;
     cloned.allowProfilePicture = this.allowProfilePicture;
     cloned.uniqueName = this.uniqueName;
     cloned.validFirstNameFormat = this.validFirstNameFormat;
@@ -197,6 +201,10 @@ _defineProperty(SubjectType, "schema", {
       type: 'bool',
       default: false
     },
+    directlyAssignable: {
+      type: 'bool',
+      default: false
+    },
     nameHelpText: {
       type: "string",
       optional: true

package/dist/application/Form.js

@@ -60,7 +60,7 @@ class Form {
       subjectType
     }) => {
       const outOfSyncDrafts = entityService.findAll(_DraftSubject.default.schema.name).filtered(`subjectType = $0`, subjectType);
-      entityService.deleteAll(outOfSyncDrafts);
+      entityService.clearDataIn(outOfSyncDrafts);
     });
   }
 

package/dist/application/MenuItem.js

@@ -13,6 +13,8 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 class MenuItem {
   constructor() {
+    _defineProperty(this, "id", void 0);
+
     _defineProperty(this, "uuid", void 0);
 
     _defineProperty(this, "displayKey", void 0);
@@ -29,7 +31,14 @@ class MenuItem {
   }
 
   static fromResource(resource, entityService) {
-    return _General.default.assignFields(resource, new MenuItem(), ['uuid', 'displayKey', 'type', 'icon', "voided", "group", "linkFunction"]);
+    return this.assignFields(resource, new MenuItem());
+  }
+
+  static assignFields(source, menuItem) {
+    const assigned = _General.default.assignFields(source, menuItem, ['uuid', 'displayKey', 'type', 'icon', "voided", "group", "linkFunction"]);
+
+    if (source.id) menuItem.id = source.id;
+    return assigned;
   }
 
   static fromDb(obj) {
@@ -52,6 +61,10 @@ class MenuItem {
     return [this.HyperlinkTypeName];
   }
 
+  clone() {
+    return MenuItem.assignFields(this, new MenuItem());
+  }
+
 }
 
 _defineProperty(MenuItem, "FunctionalityGroupName", "Functionality");

package/dist/assignment/UserSubjectAssignment.js

@@ -0,0 +1,44 @@
+"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 UserSubjectAssignment extends _BaseEntity.default {
+  constructor(...args) {
+    super(...args);
+
+    _defineProperty(this, "uuid", void 0);
+
+    _defineProperty(this, "subjectUUID", void 0);
+  }
+
+  static fromResource(resource) {
+    const userSubjectAssignment = new UserSubjectAssignment();
+    userSubjectAssignment.uuid = resource.uuid;
+    userSubjectAssignment.subjectUUID = _ResourceUtil.default.getUUIDFor(resource, 'subjectUUID');
+    return userSubjectAssignment;
+  }
+
+}
+
+_defineProperty(UserSubjectAssignment, "schema", {
+  name: 'UserSubjectAssignment',
+  primaryKey: 'uuid',
+  properties: {
+    uuid: 'string',
+    subjectUUID: 'string'
+  }
+});
+
+var _default = UserSubjectAssignment;
+exports.default = _default;

package/dist/index.js

@@ -717,6 +717,12 @@ Object.defineProperty(exports, "SubjectProgramEligibility", {
     return _SubjectProgramEligibility.default;
   }
 });
+Object.defineProperty(exports, "UserSubjectAssignment", {
+  enumerable: true,
+  get: function () {
+    return _UserSubjectAssignment.default;
+  }
+});
 
 var _AbstractEncounter = _interopRequireDefault(require("./AbstractEncounter"));
 
@@ -954,6 +960,8 @@ var _DraftEncounter = _interopRequireDefault(require("./draft/DraftEncounter"));
 
 var _SubjectProgramEligibility = _interopRequireDefault(require("./program/SubjectProgramEligibility"));
 
+var _UserSubjectAssignment = _interopRequireDefault(require("./assignment/UserSubjectAssignment"));
+
 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/package.json

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