@ironcode/vas-lib 1.13.0 → 1.15.0

package/{fesm2022 → fesm2020}/ironcode-vas-lib.mjs

@@ -21,15 +21,6 @@ var VasControlConfigDirection;
  * BaseEntityModel
  */
 class VasBaseModel {
-    id;
-    created;
-    serverCreated;
-    createdBy;
-    modified;
-    serverModified;
-    modifiedBy;
-    createdByName;
-    modifiedByName;
     constructor(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, createdByName, modifiedByName) {
         this.id = id;
         this.created = created;
@@ -59,16 +50,6 @@ class VasBaseModel {
 }
 
 class VasAccountObjectModel extends VasBaseModel {
-    id;
-    created;
-    serverCreated;
-    createdBy;
-    modified;
-    serverModified;
-    modifiedBy;
-    createdByName;
-    modifiedByName;
-    account;
     constructor(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, createdByName, modifiedByName, account) {
         super(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, createdByName, modifiedByName);
         this.id = id;
@@ -99,17 +80,6 @@ var VasAccountIndexingMode;
 })(VasAccountIndexingMode || (VasAccountIndexingMode = {}));
 
 class VasRestrictedAccountObjectModel extends VasAccountObjectModel {
-    id;
-    created;
-    serverCreated;
-    createdBy;
-    modified;
-    serverModified;
-    modifiedBy;
-    createdByName;
-    modifiedByName;
-    account;
-    accessGroup;
     constructor(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, createdByName, modifiedByName, account, accessGroup) {
         super(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, createdByName, modifiedByName, account);
         this.id = id;
@@ -133,33 +103,6 @@ class VasRestrictedAccountObjectModel extends VasAccountObjectModel {
 }
 
 class VasBranchModel extends VasRestrictedAccountObjectModel {
-    id;
-    created;
-    serverCreated;
-    createdBy;
-    modified;
-    serverModified;
-    modifiedBy;
-    createdByName;
-    modifiedByName;
-    account;
-    accessGroup;
-    branchType;
-    storeCode;
-    address;
-    city;
-    postcode;
-    email;
-    locationManager;
-    areaManager;
-    regionalDirector;
-    salesManager;
-    cluster;
-    hourWeekdays;
-    hourSaturday;
-    hourSunday;
-    exceptions;
-    active;
     constructor(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, createdByName, modifiedByName, account, accessGroup, branchType, storeCode, address, city, postcode, email, locationManager, areaManager, regionalDirector, salesManager, cluster, hourWeekdays, hourSaturday, hourSunday, exceptions, active) {
         super(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, createdByName, modifiedByName, account, accessGroup);
         this.id = id;
@@ -249,30 +192,6 @@ const only = (obj, omitKey) => {
 };
 
 class VasContactModel extends VasRestrictedAccountObjectModel {
-    id;
-    created;
-    serverCreated;
-    createdBy;
-    modified;
-    serverModified;
-    modifiedBy;
-    createdByName;
-    modifiedByName;
-    account;
-    accessGroup;
-    contactType;
-    name;
-    email;
-    mobile;
-    phone;
-    address;
-    address2;
-    address3;
-    billingCode;
-    business;
-    fax;
-    vatNumber;
-    website;
     constructor(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, createdByName, modifiedByName, account, accessGroup, contactType, name, email, mobile, phone, address, address2, address3, billingCode, business, fax, vatNumber, website) {
         super(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, createdByName, modifiedByName, account, accessGroup);
         this.id = id;
@@ -375,16 +294,6 @@ class VasContactModel extends VasRestrictedAccountObjectModel {
  * VasControlTypeModel
  */
 class VasControlTypeModel extends VasBaseModel {
-    id;
-    created;
-    serverCreated;
-    createdBy;
-    modified;
-    serverModified;
-    modifiedBy;
-    createdByName;
-    modifiedByName;
-    name;
     constructor(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, createdByName, modifiedByName, name) {
         super(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, createdByName, modifiedByName);
         this.id = id;
@@ -436,30 +345,6 @@ class VasControlTypeModel extends VasBaseModel {
  * ControlModel
  */
 class VasControlModel extends VasRestrictedAccountObjectModel {
-    id;
-    created;
-    serverCreated;
-    createdBy;
-    modified;
-    serverModified;
-    modifiedBy;
-    createdByName;
-    modifiedByName;
-    account;
-    accessGroup;
-    controlType;
-    group;
-    validators;
-    name;
-    title;
-    linkable;
-    sequence;
-    description;
-    defaultValue;
-    config;
-    descriptionImage;
-    portalEnabled;
-    controlTypeId = '';
     constructor(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, createdByName, modifiedByName, account, accessGroup, controlType, group, validators, name, title, linkable, sequence, description, defaultValue, config, descriptionImage, portalEnabled) {
         super(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, createdByName, modifiedByName, account, accessGroup);
         this.id = id;
@@ -485,6 +370,7 @@ class VasControlModel extends VasRestrictedAccountObjectModel {
         this.config = config;
         this.descriptionImage = descriptionImage;
         this.portalEnabled = portalEnabled;
+        this.controlTypeId = '';
         if (typeof controlType === 'string') {
             this.controlTypeId = controlType;
         }
@@ -646,17 +532,6 @@ class VasControlModel extends VasRestrictedAccountObjectModel {
  * VasJobDataModel
  */
 class VasJobDataModel extends VasAccountObjectModel {
-    id;
-    created;
-    serverCreated;
-    createdBy;
-    modified;
-    serverModified;
-    modifiedBy;
-    createdByName;
-    modifiedByName;
-    account;
-    job;
     constructor(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, createdByName, modifiedByName, account, job) {
         super(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, createdByName, modifiedByName, account);
         this.id = id;
@@ -704,24 +579,6 @@ const prepareFieldApiValue = (value) => {
  * VasFieldModel
  */
 class VasFieldModel extends VasJobDataModel {
-    id;
-    created;
-    serverCreated;
-    createdBy;
-    modified;
-    serverModified;
-    modifiedBy;
-    createdByName;
-    modifiedByName;
-    account;
-    job;
-    control;
-    fieldJobPointers;
-    value;
-    version;
-    controlName;
-    controlTitle;
-    controlTypeName;
     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;
@@ -814,27 +671,6 @@ function isFileDto(object) {
  * VasFileDto
  */
 class VasFileModel extends VasJobDataModel {
-    id;
-    created;
-    serverCreated;
-    createdBy;
-    modified;
-    serverModified;
-    modifiedBy;
-    createdByName;
-    modifiedByName;
-    account;
-    job;
-    name;
-    fileSize;
-    mimeType;
-    sequence;
-    config;
-    url;
-    controlPath;
-    message;
-    status;
-    uri;
     constructor(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, createdByName, modifiedByName, account, job, name, fileSize, mimeType, sequence, config, url, controlPath, message, status, uri) {
         super(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, createdByName, modifiedByName, account, job);
         this.id = id;
@@ -965,20 +801,6 @@ class VasFileModel extends VasJobDataModel {
 }
 
 class VasUserModel extends VasBaseModel {
-    id;
-    created;
-    serverCreated;
-    createdBy;
-    modified;
-    serverModified;
-    modifiedBy;
-    createdByName;
-    modifiedByName;
-    email;
-    name;
-    username;
-    memberships;
-    instructionProviders;
     constructor(id, created = '', serverCreated = '', createdBy = '', modified = '', serverModified = '', modifiedBy = '', createdByName, modifiedByName, email, name, username, memberships, instructionProviders) {
         super(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, createdByName, modifiedByName);
         this.id = id;
@@ -1020,25 +842,6 @@ class VasUserModel extends VasBaseModel {
 }
 
 class VasFireUserModel extends VasUserModel {
-    id;
-    created;
-    serverCreated;
-    createdBy;
-    modified;
-    serverModified;
-    modifiedBy;
-    createdByName;
-    modifiedByName;
-    email;
-    name;
-    username;
-    memberships;
-    instructionProviders;
-    accounts;
-    tokens;
-    topics;
-    language;
-    displayName;
     constructor(id, created = '', serverCreated = '', createdBy = '', modified = '', serverModified = '', modifiedBy = '', createdByName, modifiedByName, email, name, username, memberships, instructionProviders, accounts, tokens, topics, language, displayName) {
         super(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, createdByName, modifiedByName, email, name, username, memberships, instructionProviders);
         this.id = id;
@@ -1139,8 +942,6 @@ class VasFireUserModel extends VasUserModel {
 }
 
 class VasFormConfigModel {
-    emailRecipients;
-    actions;
     constructor(emailRecipients, actions) {
         this.emailRecipients = emailRecipients;
         this.actions = actions;
@@ -1175,27 +976,6 @@ class VasFormConfigModel {
  * GroupModel
  */
 class VasGroupModel extends VasRestrictedAccountObjectModel {
-    id;
-    created;
-    serverCreated;
-    createdBy;
-    modified;
-    serverModified;
-    modifiedBy;
-    createdByName;
-    modifiedByName;
-    account;
-    accessGroup;
-    name;
-    title;
-    description;
-    sequence;
-    includeInSummary;
-    forms;
-    visibilityControl;
-    visibleIfEquals;
-    controls;
-    scoreWeight;
     constructor(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, createdByName, modifiedByName, account, accessGroup, name, title, description, sequence, includeInSummary, forms, visibilityControl, visibleIfEquals, controls, scoreWeight) {
         super(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, createdByName, modifiedByName, account, accessGroup);
         this.id = id;
@@ -1301,27 +1081,6 @@ class VasGroupModel extends VasRestrictedAccountObjectModel {
  * VasFormModel
  */
 class VasFormModel extends VasRestrictedAccountObjectModel {
-    id;
-    created;
-    serverCreated;
-    createdBy;
-    modified;
-    serverModified;
-    modifiedBy;
-    createdByName;
-    modifiedByName;
-    account;
-    accessGroup;
-    jobType;
-    title;
-    description;
-    groups;
-    dynamicDescriptor;
-    indexName;
-    pipelineName;
-    config;
-    geoLocationEnabled;
-    filesEnabled;
     constructor(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, createdByName, modifiedByName, account, accessGroup, jobType, title, description, groups, dynamicDescriptor, indexName, pipelineName, config, geoLocationEnabled, filesEnabled) {
         super(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, createdByName, modifiedByName, account, accessGroup);
         this.id = id;
@@ -1532,20 +1291,6 @@ class VasFormModel extends VasRestrictedAccountObjectModel {
  * VasInstructionJobFieldModel
  */
 class VasInstructionJobFieldModel extends VasBaseModel {
-    id;
-    created;
-    serverCreated;
-    createdBy;
-    modified;
-    serverModified;
-    modifiedBy;
-    createdByName;
-    modifiedByName;
-    value;
-    name;
-    title;
-    sequence;
-    controlType;
     constructor(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, createdByName, modifiedByName, value, name, title, sequence, controlType) {
         super(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, createdByName, modifiedByName);
         this.id = id;
@@ -1593,19 +1338,6 @@ class VasInstructionJobFieldModel extends VasBaseModel {
  * VasNoteModel
  */
 class VasNoteModel extends VasJobDataModel {
-    id;
-    created;
-    serverCreated;
-    createdBy;
-    modified;
-    serverModified;
-    modifiedBy;
-    createdByName;
-    modifiedByName;
-    account;
-    job;
-    content;
-    sensitive;
     constructor(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, createdByName, modifiedByName, account, job, content, sensitive) {
         super(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, createdByName, modifiedByName, account, job);
         this.id = id;
@@ -1669,26 +1401,6 @@ class VasNoteModel extends VasJobDataModel {
 }
 
 class VasReportModel extends VasJobDataModel {
-    id;
-    created;
-    serverCreated;
-    createdBy;
-    modified;
-    serverModified;
-    modifiedBy;
-    createdByName;
-    modifiedByName;
-    account;
-    job;
-    reportLayout;
-    title;
-    sendEmail;
-    message;
-    attempted;
-    completed;
-    succeeded;
-    attempts;
-    notificationId;
     constructor(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, createdByName, modifiedByName, account, job, reportLayout, title, sendEmail, message, attempted, completed, succeeded, attempts, notificationId) {
         super(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, createdByName, modifiedByName, account, job);
         this.id = id;
@@ -1762,21 +1474,6 @@ class VasReportModel extends VasJobDataModel {
  * VasNoteModel
  */
 class VasInstructionJobModel extends VasBaseModel {
-    id;
-    created;
-    serverCreated;
-    createdBy;
-    modified;
-    serverModified;
-    modifiedBy;
-    createdByName;
-    modifiedByName;
-    reference;
-    jobStatus;
-    notes;
-    fields;
-    files;
-    reports;
     /**
      * @param id id
      * @param created created
@@ -1853,21 +1550,6 @@ class VasInstructionJobModel extends VasBaseModel {
  * VasInstructionProviderModel
  */
 class VasInstructionProviderModel extends VasAccountObjectModel {
-    id;
-    created;
-    serverCreated;
-    createdBy;
-    modified;
-    serverModified;
-    modifiedBy;
-    createdByName;
-    modifiedByName;
-    account;
-    form;
-    title;
-    secret;
-    portalEnabled;
-    portalVisible;
     constructor(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, createdByName, modifiedByName, account, form, title, secret, portalEnabled, portalVisible) {
         super(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, createdByName, modifiedByName, account);
         this.id = id;
@@ -1932,18 +1614,6 @@ class VasInstructionProviderModel extends VasAccountObjectModel {
  * VasNoteModel
  */
 class VasInstructionModel extends VasAccountObjectModel {
-    id;
-    created;
-    serverCreated;
-    createdBy;
-    modified;
-    serverModified;
-    modifiedBy;
-    createdByName;
-    modifiedByName;
-    account;
-    job;
-    instructionProvider;
     constructor(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, createdByName, modifiedByName, account, job, instructionProvider) {
         super(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, createdByName, modifiedByName, account);
         this.id = id;
@@ -1998,25 +1668,6 @@ var VasInvitationTypeEnum;
     VasInvitationTypeEnum["TYPE_P2C_MOBILE"] = "p2c-mobile";
 })(VasInvitationTypeEnum || (VasInvitationTypeEnum = {}));
 class VasInvitationModel extends VasAccountObjectModel {
-    id;
-    created;
-    serverCreated;
-    createdBy;
-    modified;
-    serverModified;
-    modifiedBy;
-    createdByName;
-    modifiedByName;
-    account;
-    secret;
-    type;
-    accessGroups;
-    contactTypes;
-    jobStatuses;
-    jobTypes;
-    lookupTypes;
-    taskTypes;
-    instructionProviders;
     constructor(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, createdByName, modifiedByName, account, secret, type, accessGroups, contactTypes, jobStatuses, jobTypes, lookupTypes, taskTypes, instructionProviders) {
         super(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, createdByName, modifiedByName, account);
         this.id = id;
@@ -2118,14 +1769,6 @@ const isJobSetValueStep = (step) => {
 };
 
 class VasJobCopyModel {
-    accessGroup;
-    jobType;
-    jobStatus;
-    jobDate;
-    assigneeId;
-    fields;
-    files;
-    reports;
     constructor(accessGroup, jobType, jobStatus, jobDate, assigneeId, fields, files, reports) {
         this.accessGroup = accessGroup;
         this.jobType = jobType;
@@ -2165,28 +1808,6 @@ class VasJobCopyModel {
 }
 
 class VasJobEmailModel extends VasJobDataModel {
-    id;
-    created;
-    serverCreated;
-    createdBy;
-    modified;
-    serverModified;
-    modifiedBy;
-    createdByName;
-    modifiedByName;
-    account;
-    job;
-    body;
-    cc;
-    files;
-    message;
-    recipients;
-    replyTo;
-    reports;
-    sender;
-    sentTime;
-    subject;
-    succeeded;
     constructor(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, createdByName, modifiedByName, account, job, body, cc, files, message, recipients, replyTo, reports, sender, sentTime, subject, succeeded) {
         super(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, createdByName, modifiedByName, account, job);
         this.id = id;
@@ -2353,37 +1974,7 @@ const isArrayString = (value) => {
  * JobModel
  */
 class VasJobModel extends VasRestrictedAccountObjectModel {
-    id;
-    created;
-    serverCreated;
-    createdBy;
-    modified;
-    serverModified;
-    modifiedBy;
-    createdByName;
-    modifiedByName;
-    account;
-    accessGroup;
-    reference;
-    jobDate;
-    jobStatus;
-    jobType;
-    assigneeId;
-    formId;
-    timeZoneOffset;
-    pendingFields;
-    childModified;
-    version;
-    createdByDisplayName;
-    modifiedByDisplayName;
-    geoLocation;
-    files;
-    fields;
-    jobEmails;
-    notes;
-    reports;
-    tasks;
-    constructor(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, createdByName, modifiedByName, account, accessGroup, reference, jobDate, jobStatus, jobType, assigneeId, formId, timeZoneOffset, pendingFields, childModified, version, createdByDisplayName, modifiedByDisplayName, geoLocation, files, fields, jobEmails, notes, reports, tasks) {
+    constructor(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, createdByName, modifiedByName, account, accessGroup, reference, jobDate, jobStatus, jobType, assigneeId, formId, timeZoneOffset, pendingFields, childModified, version, createdByDisplayName, modifiedByDisplayName, geoLocation, files, fields, jobEmails, notes, reports, tasks, instruction) {
         super(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, createdByName, modifiedByName, account, accessGroup);
         this.id = id;
         this.created = created;
@@ -2415,6 +2006,7 @@ class VasJobModel extends VasRestrictedAccountObjectModel {
         this.notes = notes;
         this.reports = reports;
         this.tasks = tasks;
+        this.instruction = instruction;
     }
     /**
      * Returns this with the dynamic interface
@@ -2443,10 +2035,10 @@ class VasJobModel extends VasRestrictedAccountObjectModel {
      * @return {VasJobModel}
      */
     static empty() {
-        return new VasJobModel('', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', moment().utcOffset(), 0, '', 0, '', '', getEmptyGeoLocation(), [], [], [], [], [], []);
+        return new VasJobModel('', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', moment().utcOffset(), 0, '', 0, '', '', getEmptyGeoLocation(), [], [], [], [], [], [], null);
     }
     static fromDto(dto) {
-        const model = new VasJobModel(dto.id || '', dto.created || '', dto.serverCreated || '', dto.createdBy || '', dto.modified || '', dto.serverModified || '', dto.modifiedBy || '', dto.createdByName || '', dto.modifiedByName || '', dto.account || '', dto.accessGroup || '', dto.reference || '', dto.jobDate || '', dto.jobStatus || '', dto.jobType || '', dto.assigneeId || '', dto.formId || dto.lastForm || '', dto.timeZoneOffset || moment().utcOffset(), dto.pendingFields || 0, dto.childModified || '', dto.version || 0, dto.createdByDisplayName || '', dto.modifiedByDisplayName || '', dto.geoLocation || getEmptyGeoLocation(), dto.files || [], dto.fields || [], dto.jobEmails || [], dto.notes || [], dto.reports || [], dto.tasks || []);
+        const model = new VasJobModel(dto.id || '', dto.created || '', dto.serverCreated || '', dto.createdBy || '', dto.modified || '', dto.serverModified || '', dto.modifiedBy || '', dto.createdByName || '', dto.modifiedByName || '', dto.account || '', dto.accessGroup || '', dto.reference || '', dto.jobDate || '', dto.jobStatus || '', dto.jobType || '', dto.assigneeId || '', dto.formId || dto.lastForm || '', dto.timeZoneOffset || moment().utcOffset(), dto.pendingFields || 0, dto.childModified || '', dto.version || 0, dto.createdByDisplayName || '', dto.modifiedByDisplayName || '', dto.geoLocation || getEmptyGeoLocation(), dto.files || [], dto.fields || [], dto.jobEmails || [], dto.notes || [], dto.reports || [], dto.tasks || [], dto.instruction || null);
         const emptyKeys = model.staticProperties;
         Object
             .keys(dto)
@@ -2461,7 +2053,7 @@ class VasJobModel extends VasRestrictedAccountObjectModel {
      *
      */
     static fromRelational(dto, form) {
-        const model = new VasJobModel(dto.id || '', dto.created || '', dto.serverCreated || '', dto.createdBy || '', dto.modified || '', dto.serverModified || '', dto.modifiedBy || '', dto.createdByName || '', dto.modifiedByName || '', dto.account || '', dto.accessGroup || '', dto.reference || '', dto.jobDate || '', dto.jobStatus || '', dto.jobType || '', dto.assigneeId || '', dto.formId || '', dto.timeZoneOffset || moment().utcOffset(), dto.pendingFields || 0, dto.childModified || '', dto.version || 0, dto.createdByDisplayName || '', dto.modifiedByDisplayName || '', dto.geoLocation || getEmptyGeoLocation(), dto.files || [], dto.fields || [], dto.jobEmails || [], dto.notes || [], dto.reports || [], dto.tasks || []);
+        const model = new VasJobModel(dto.id || '', dto.created || '', dto.serverCreated || '', dto.createdBy || '', dto.modified || '', dto.serverModified || '', dto.modifiedBy || '', dto.createdByName || '', dto.modifiedByName || '', dto.account || '', dto.accessGroup || '', dto.reference || '', dto.jobDate || '', dto.jobStatus || '', dto.jobType || '', dto.assigneeId || '', dto.formId || '', dto.timeZoneOffset || moment().utcOffset(), dto.pendingFields || 0, dto.childModified || '', dto.version || 0, dto.createdByDisplayName || '', dto.modifiedByDisplayName || '', dto.geoLocation || getEmptyGeoLocation(), dto.files || [], dto.fields || [], dto.jobEmails || [], dto.notes || [], dto.reports || [], dto.tasks || [], dto.instruction || null);
         form.groups
             .forEach(group => {
             group.controls
@@ -2494,7 +2086,7 @@ class VasJobModel extends VasRestrictedAccountObjectModel {
      * Will return an object whose keys are the names of all fields in the job.
      * 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
+     * return a value for every control even if no value was set, because it uses
      * the form to drive the logic. Note also this method will return values for
      * any Fields in the fields array.
      * @return {Record<string, VasFieldDtoValue>}
@@ -2754,6 +2346,7 @@ class VasJobModel extends VasRestrictedAccountObjectModel {
                 notes: this.notes,
                 reports: this.reports,
                 tasks: this.tasks,
+                instruction: this.instruction
             };
         }
         const dto = {};
@@ -2900,21 +2493,6 @@ class VasJobModel extends VasRestrictedAccountObjectModel {
  * VasLookupModel
  */
 class VasLookupModel extends VasRestrictedAccountObjectModel {
-    id;
-    created;
-    serverCreated;
-    createdBy;
-    modified;
-    serverModified;
-    modifiedBy;
-    createdByName;
-    modifiedByName;
-    account;
-    accessGroup;
-    content;
-    lookupType;
-    sequence;
-    title;
     constructor(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, createdByName, modifiedByName, account, accessGroup, content, lookupType, sequence, title) {
         super(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, createdByName, modifiedByName, account, accessGroup);
         this.id = id;
@@ -2988,24 +2566,6 @@ class VasLookupModel extends VasRestrictedAccountObjectModel {
  * VasMembershipModel
  */
 class VasMembershipModel extends VasAccountObjectModel {
-    id;
-    created;
-    serverCreated;
-    createdBy;
-    modified;
-    serverModified;
-    modifiedBy;
-    createdByName;
-    modifiedByName;
-    account;
-    user;
-    admin;
-    lookupTypes;
-    contactTypes;
-    accessGroups;
-    jobStatuses;
-    jobTypes;
-    taskTypes;
     constructor(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, createdByName, modifiedByName, account, user, admin, lookupTypes, contactTypes, accessGroups, jobStatuses, jobTypes, taskTypes) {
         super(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, createdByName, modifiedByName, account);
         this.id = id;
@@ -3063,21 +2623,6 @@ class VasMembershipModel extends VasAccountObjectModel {
 }
 
 class VasReportLayoutModel extends VasRestrictedAccountObjectModel {
-    id;
-    created;
-    serverCreated;
-    createdBy;
-    modified;
-    serverModified;
-    modifiedBy;
-    createdByName;
-    modifiedByName;
-    account;
-    accessGroup;
-    jobType;
-    title;
-    description;
-    entryPoint;
     constructor(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, createdByName, modifiedByName, account, accessGroup, jobType, title, description, entryPoint) {
         super(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, createdByName, modifiedByName, account, accessGroup);
         this.id = id;
@@ -3099,21 +2644,6 @@ class VasReportLayoutModel extends VasRestrictedAccountObjectModel {
 }
 
 class VasReportRequestModel extends VasAccountObjectModel {
-    id;
-    created;
-    serverCreated;
-    createdBy;
-    modified;
-    serverModified;
-    modifiedBy;
-    createdByName;
-    modifiedByName;
-    account;
-    error;
-    jobId;
-    title;
-    url;
-    reportId;
     constructor(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, createdByName, modifiedByName, account, error, jobId, title, url, reportId) {
         super(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, createdByName, modifiedByName, account);
         this.id = id;
@@ -3160,23 +2690,6 @@ class VasReportRequestModel extends VasAccountObjectModel {
  * VasTaskModel
  */
 class VasTaskModel extends VasJobDataModel {
-    id;
-    created;
-    serverCreated;
-    createdBy;
-    modified;
-    serverModified;
-    modifiedBy;
-    createdByName;
-    modifiedByName;
-    account;
-    job;
-    assignee;
-    done;
-    dueDate;
-    taskType;
-    title;
-    jobReference;
     constructor(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, createdByName, modifiedByName, account, job, assignee, done, dueDate, taskType, title, jobReference) {
         super(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, createdByName, modifiedByName, account, job);
         this.id = id;
@@ -3252,21 +2765,6 @@ class VasTaskModel extends VasJobDataModel {
 }
 
 class VasVehicleModel extends VasAccountObjectModel {
-    id;
-    created;
-    serverCreated;
-    createdBy;
-    modified;
-    serverModified;
-    modifiedBy;
-    createdByName;
-    modifiedByName;
-    account;
-    registration;
-    make;
-    model;
-    archived;
-    description;
     constructor(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, createdByName, modifiedByName, account, registration, make, model, archived, description) {
         super(id, created, serverCreated, createdBy, modified, serverModified, modifiedBy, createdByName, modifiedByName, account);
         this.id = id;