@ironcode/vas-lib 1.6.2 → 1.7.0

package/fesm2020/ironcode-vas-lib.mjs

@@ -637,7 +637,7 @@ class VasJobDataModel extends VasAccountObjectModel {
  * VasFieldModel
  */
 class VasFieldModel extends VasJobDataModel {
-    constructor(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, createdByName, modifiedByName, account, job, control, fieldJobPointers, value, version) {
+    constructor(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, createdByName, modifiedByName, account, job, control, fieldJobPointers, value, version, controlName, controlTitle, controlTypeName) {
         super(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, createdByName, modifiedByName, account, job);
         this.id = id;
         this.created = created;
@@ -654,13 +654,16 @@ class VasFieldModel extends VasJobDataModel {
         this.fieldJobPointers = fieldJobPointers;
         this.value = value;
         this.version = version;
+        this.controlName = controlName;
+        this.controlTitle = controlTitle;
+        this.controlTypeName = controlTypeName;
     }
     /**
      * @param {VasFieldDto} fieldDto
      * @return {VasFieldModel}
      */
     static fromDto(fieldDto) {
-        return new VasFieldModel(fieldDto.id || '', fieldDto.created || '', fieldDto.serverCreated || '', fieldDto.createdBy || '', fieldDto.modified || '', fieldDto.serverModified || '', fieldDto.modifiedBy || '', fieldDto.createdByName || '', fieldDto.modifiedByName || '', fieldDto.account || '', fieldDto.job || '', fieldDto.control || '', fieldDto.fieldJobPointers || [], fieldDto.value || '', fieldDto.version || 0);
+        return new VasFieldModel(fieldDto.id || '', fieldDto.created || '', fieldDto.serverCreated || '', fieldDto.createdBy || '', fieldDto.modified || '', fieldDto.serverModified || '', fieldDto.modifiedBy || '', fieldDto.createdByName || '', fieldDto.modifiedByName || '', fieldDto.account || '', fieldDto.job || '', fieldDto.control || '', fieldDto.fieldJobPointers || [], fieldDto.value || '', fieldDto.version || 0, fieldDto.controlName || '', fieldDto.controlTitle || '', fieldDto.controlTypeName || '');
     }
     /**
      * @return {VasFieldDto}
@@ -682,6 +685,9 @@ class VasFieldModel extends VasJobDataModel {
             fieldJobPointers: this.fieldJobPointers,
             value: this.value,
             version: this.version,
+            controlName: this.controlName,
+            controlTitle: this.controlTitle,
+            controlTypeName: this.controlTypeName,
         };
     }
     /**
@@ -1879,7 +1885,8 @@ class VasJobModel extends VasRestrictedAccountObjectModel {
      * This method is similar to `getFields` except that this method will only
      * return values where a value was set, as opposed to `getFields` which will
      * return a value for every control even if not value was set, because it uses
-     * the form to drive the logic
+     * the form to drive the logic. Note also this method will return values for
+     * any Fields in the fields array.
      * @return {Record<string, VasFieldDtoValue>}
      */
     getFields2() {
@@ -1892,6 +1899,7 @@ class VasJobModel extends VasRestrictedAccountObjectModel {
                 fields[controlName] = this.getValueByPath([groupName, controlName]);
             });
         }, {});
+        this.fields.forEach(field => fields[field.controlName] = field.value);
         return fields;
     }
     /**