openchs-models 1.31.90 → 1.31.92

package/dist/MediaQueue.js

@@ -9,6 +9,8 @@ var _General = _interopRequireDefault(require("./utility/General"));
 
 var _BaseEntity = _interopRequireDefault(require("./BaseEntity"));
 
+var _lodash = _interopRequireDefault(require("lodash"));
+
 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; }
@@ -67,7 +69,7 @@ class MediaQueue extends _BaseEntity.default {
   }
 
   static create(entityUUID, entityName, fileName, type, entityTargetField, conceptUUID, uuid = _General.default.randomUUID()) {
-    var mediaQueue = new MediaQueue();
+    const mediaQueue = new MediaQueue();
     mediaQueue.entityUUID = entityUUID;
     mediaQueue.uuid = uuid;
     mediaQueue.entityName = entityName;
@@ -90,6 +92,18 @@ class MediaQueue extends _BaseEntity.default {
     return mediaQueueItem;
   }
 
+  getDisplayText() {
+    // generate safe to string
+    let str = "";
+    if (!_lodash.default.isNil(this.entityName)) str += "EntityName: " + this.entityName + ", ";
+    if (!_lodash.default.isNil(this.entityUUID)) str += "EntityUUID: " + this.entityUUID + ", ";
+    if (!_lodash.default.isNil(this.entityTargetField)) str += "EntityTargetField: " + this.entityTargetField + ", ";
+    if (!_lodash.default.isNil(this.fileName)) str += "FileName: " + this.fileName + ", ";
+    if (!_lodash.default.isNil(this.type)) str += "Type: " + this.type + ", ";
+    if (!_lodash.default.isNil(this.conceptUUID)) str += "ConceptUUID: " + this.conceptUUID;
+    return str;
+  }
+
 }
 
 _defineProperty(MediaQueue, "schema", {

package/dist/application/FormElementGroup.js

@@ -226,7 +226,11 @@ class FormElementGroup extends _BaseEntity.default {
   }
 
   nonVoidedFormElements() {
-    return _lodash.default.filter(this.formElements, formElement => !formElement.voided);
+    return _lodash.default.filter(this.formElements, formElement => {
+      let parentFormElement;
+      if (!_lodash.default.isNil(formElement.groupUuid)) parentFormElement = _lodash.default.find(this.formElements, fe => fe.uuid === formElement.groupUuid);
+      return !formElement.voided && (_lodash.default.isNil(parentFormElement) || !parentFormElement.voided);
+    });
   }
 
   getFormElements() {

package/package.json

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