From 9283dd425178ee4ef03c35553b1cf776a6db6174 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Thu, 27 May 2021 16:53:00 +0000 Subject: [PATCH] --- .../src/components/work-order-item-labors.vue | 5 +- .../src/components/work-order-item-loans.vue | 5 +- .../src/components/work-order-item-parts.vue | 5 +- .../components/work-order-item-travels.vue | 5 +- .../src/components/work-order-item-units.vue | 110 ++++++++---------- ayanova/src/views/svc-workorder.vue | 1 + 6 files changed, 63 insertions(+), 68 deletions(-) diff --git a/ayanova/src/components/work-order-item-labors.vue b/ayanova/src/components/work-order-item-labors.vue index 6ceea8d9..1369a8fa 100644 --- a/ayanova/src/components/work-order-item-labors.vue +++ b/ayanova/src/components/work-order-item-labors.vue @@ -784,7 +784,10 @@ export default { this.pvm.languageName, this.pvm.currencyName ), - serviceDetails: window.$gz.util.truncateString(x.serviceDetails, 50) + serviceDetails: window.$gz.util.truncateString( + x.serviceDetails, + this.pvm.maxTableNotesLength + ) }; }); }, diff --git a/ayanova/src/components/work-order-item-loans.vue b/ayanova/src/components/work-order-item-loans.vue index 06ed9336..0229dd5b 100644 --- a/ayanova/src/components/work-order-item-loans.vue +++ b/ayanova/src/components/work-order-item-loans.vue @@ -765,7 +765,10 @@ export default { this.pvm.languageName, this.pvm.hour12 ), - notes: window.$gz.util.truncateString(x.notes, 50), + notes: window.$gz.util.truncateString( + x.notes, + this.pvm.maxTableNotesLength + ), cost: window.$gz.locale.currencyLocalized( x.cost, diff --git a/ayanova/src/components/work-order-item-parts.vue b/ayanova/src/components/work-order-item-parts.vue index 68b43e81..ff4d2739 100644 --- a/ayanova/src/components/work-order-item-parts.vue +++ b/ayanova/src/components/work-order-item-parts.vue @@ -627,7 +627,10 @@ export default { ), upcViz: x.upcViz, description: x.description, - serials: window.$gz.util.truncateString(x.serials, 50), + serials: window.$gz.util.truncateString( + x.serials, + this.pvm.maxTableNotesLength + ), unitOfMeasureViz: x.unitOfMeasureViz, cost: window.$gz.locale.currencyLocalized( x.cost, diff --git a/ayanova/src/components/work-order-item-travels.vue b/ayanova/src/components/work-order-item-travels.vue index a8b98d40..1e835361 100644 --- a/ayanova/src/components/work-order-item-travels.vue +++ b/ayanova/src/components/work-order-item-travels.vue @@ -786,7 +786,10 @@ export default { this.pvm.languageName, this.pvm.currencyName ), - travelDetails: window.$gz.util.truncateString(x.travelDetails, 50) + travelDetails: window.$gz.util.truncateString( + x.travelDetails, + this.pvm.maxTableNotesLength + ) }; }); }, diff --git a/ayanova/src/components/work-order-item-units.vue b/ayanova/src/components/work-order-item-units.vue index fdeeb5dd..7ad9ba78 100644 --- a/ayanova/src/components/work-order-item-units.vue +++ b/ayanova/src/components/work-order-item-units.vue @@ -263,26 +263,45 @@ /* XXXeslint-disable */ //////////////////////////////////////////////////////////////////////////////////////////////////////////// /* - l.Add(new FormField { TKey = "WorkOrderItemUnitEstimatedQuantity", FieldKey = "WorkOrderItemUnitEstimatedQuantity", TKeySection = "WorkOrderItemUnit" }); - l.Add(new FormField { TKey = "WorkOrderItemUnitServiceRateID", FieldKey = "WorkOrderItemUnitServiceRateID", TKeySection = "WorkOrderItemUnit" }); - l.Add(new FormField { TKey = "WorkOrderItemUnitStartDate", FieldKey = "WorkOrderItemUnitStartDate", TKeySection = "WorkOrderItemUnit" }); - l.Add(new FormField { TKey = "WorkOrderItemUnitStopDate", FieldKey = "WorkOrderItemUnitStopDate", TKeySection = "WorkOrderItemUnit" }); - l.Add(new FormField { TKey = "WorkOrderItemUnitUserID", FieldKey = "WorkOrderItemUnitUserID", TKeySection = "WorkOrderItemUnit" }); +l.Add(new FormField { TKey = "WorkOrderItemUnitNotes", FieldKey = "WorkOrderItemUnitNotes", TKeySection = "WorkOrderItemUnit" }); +l.Add(new FormField { TKey = "Unit", FieldKey = "WorkOrderItemUnit", TKeySection = "WorkOrderItemUnit" }); +l.Add(new FormField { TKey = "Tags", FieldKey = "WorkOrderItemUnitTags", TKeySection = "WorkOrderItemUnit" }); +l.Add(new FormField { TKey = "Wiki", FieldKey = "WorkOrderItemUnitWiki", TKeySection = "WorkOrderItemUnit" }); +l.Add(new FormField { TKey = "Attachments", FieldKey = "WorkOrderItemUnitAttachments", TKeySection = "WorkOrderItemUnit" }); +l.Add(new FormField { TKey = "WorkOrderItemUnitCustom1", FieldKey = "WorkOrderItemUnitCustom1", IsCustomField = true, TKeySection = "WorkOrderItemUnit" }); +l.Add(new FormField { TKey = "WorkOrderItemUnitCustom2", FieldKey = "WorkOrderItemUnitCustom2", IsCustomField = true, TKeySection = "WorkOrderItemUnit" }); +l.Add(new FormField { TKey = "WorkOrderItemUnitCustom3", FieldKey = "WorkOrderItemUnitCustom3", IsCustomField = true, TKeySection = "WorkOrderItemUnit" }); +l.Add(new FormField { TKey = "WorkOrderItemUnitCustom4", FieldKey = "WorkOrderItemUnitCustom4", IsCustomField = true, TKeySection = "WorkOrderItemUnit" }); +l.Add(new FormField { TKey = "WorkOrderItemUnitCustom5", FieldKey = "WorkOrderItemUnitCustom5", IsCustomField = true, TKeySection = "WorkOrderItemUnit" }); +l.Add(new FormField { TKey = "WorkOrderItemUnitCustom6", FieldKey = "WorkOrderItemUnitCustom6", IsCustomField = true, TKeySection = "WorkOrderItemUnit" }); +l.Add(new FormField { TKey = "WorkOrderItemUnitCustom7", FieldKey = "WorkOrderItemUnitCustom7", IsCustomField = true, TKeySection = "WorkOrderItemUnit" }); +l.Add(new FormField { TKey = "WorkOrderItemUnitCustom8", FieldKey = "WorkOrderItemUnitCustom8", IsCustomField = true, TKeySection = "WorkOrderItemUnit" }); +l.Add(new FormField { TKey = "WorkOrderItemUnitCustom9", FieldKey = "WorkOrderItemUnitCustom9", IsCustomField = true, TKeySection = "WorkOrderItemUnit" }); +l.Add(new FormField { TKey = "WorkOrderItemUnitCustom10", FieldKey = "WorkOrderItemUnitCustom10", IsCustomField = true, TKeySection = "WorkOrderItemUnit" }); +l.Add(new FormField { TKey = "WorkOrderItemUnitCustom11", FieldKey = "WorkOrderItemUnitCustom11", IsCustomField = true, TKeySection = "WorkOrderItemUnit" }); +l.Add(new FormField { TKey = "WorkOrderItemUnitCustom12", FieldKey = "WorkOrderItemUnitCustom12", IsCustomField = true, TKeySection = "WorkOrderItemUnit" }); +l.Add(new FormField { TKey = "WorkOrderItemUnitCustom13", FieldKey = "WorkOrderItemUnitCustom13", IsCustomField = true, TKeySection = "WorkOrderItemUnit" }); +l.Add(new FormField { TKey = "WorkOrderItemUnitCustom14", FieldKey = "WorkOrderItemUnitCustom14", IsCustomField = true, TKeySection = "WorkOrderItemUnit" }); +l.Add(new FormField { TKey = "WorkOrderItemUnitCustom15", FieldKey = "WorkOrderItemUnitCustom15", IsCustomField = true, TKeySection = "WorkOrderItemUnit" }); +l.Add(new FormField { TKey = "WorkOrderItemUnitCustom16", FieldKey = "WorkOrderItemUnitCustom16", IsCustomField = true, TKeySection = "WorkOrderItemUnit" }); - - public long? UserId { get; set; } - public decimal EstimatedQuantity { get; set; } - public DateTime? StartDate { get; set; } - public DateTime? StopDate { get; set; } - public long? ServiceRateId { get; set; } +{ +"0": { +"id": 39, +"concurrency": 8129666, +"notes": "Saepe quos omnis fugiat aliquam amet animi sit dolorum voluptatibus.", +"wiki": null, +"customFields": null, +"tags": [], +"unitId": 2, +"unitViz": "86876317", +"isDirty": false, +"workOrderItemId": 20 +} +} - - "WorkOrderItemUnitServiceRateID": "Suggested rate", - "WorkOrderItemUnitStartDate": "Start Date Time", - "WorkOrderItemUnitStopDate": "Stop Date Time", - "WorkOrderItemUnitUserID": "User", */ export default { created() { @@ -434,43 +453,19 @@ export default { */ let headers = []; - if (this.form().showMe(this, "WorkOrderItemUnitStartDate")) { + if (this.form().showMe(this, "WorkOrderItemUnit")) { headers.push({ - text: this.$ay.t("WorkOrderItemUnitStartDate"), - align: "right", - value: "startDate" - }); - } - - if (this.form().showMe(this, "WorkOrderItemUnitStopDate")) { - headers.push({ - text: this.$ay.t("WorkOrderItemUnitStopDate"), - align: "right", - value: "stopDate" - }); - } - - if (this.form().showMe(this, "WorkOrderItemUnitEstimatedQuantity")) { - headers.push({ - text: this.$ay.t("WorkOrderItemUnitEstimatedQuantity"), - align: "right", - value: "estimatedQuantity" - }); - } - - if (this.form().showMe(this, "WorkOrderItemUnitUserID")) { - headers.push({ - text: this.$ay.t("WorkOrderItemUnitUserID"), + text: this.$ay.t("WorkOrderItemUnit"), align: "left", - value: "userViz" + value: "unitViz" }); } - if (this.form().showMe(this, "WorkOrderItemUnitServiceRateID")) { + if (this.form().showMe(this, "WorkOrderItemUnitNotes")) { headers.push({ - text: this.$ay.t("WorkOrderItemUnitServiceRateID"), + text: this.$ay.t("WorkOrderItemUnitNotes"), align: "left", - value: "serviceRateViz" + value: "notes" }); } @@ -481,24 +476,11 @@ export default { return { index: i, id: x.id, - startDate: window.$gz.locale.utcDateToShortDateAndTimeLocalized( - x.startDate, - this.pvm.timeZoneName, - this.pvm.languageName, - this.pvm.hour12 - ), - stopDate: window.$gz.locale.utcDateToShortDateAndTimeLocalized( - x.stopDate, - this.pvm.timeZoneName, - this.pvm.languageName, - this.pvm.hour12 - ), - estimatedQuantity: window.$gz.locale.decimalLocalized( - x.estimatedQuantity, - this.pvm.languageName - ), - userViz: x.userViz, - serviceRateViz: x.serviceRateViz + unitViz: x.unitViz, + notes: window.$gz.util.truncateString( + x.notes, + this.pvm.maxTableNotesLength + ) }; }); }, diff --git a/ayanova/src/views/svc-workorder.vue b/ayanova/src/views/svc-workorder.vue index 9dd3e2cd..3eb1c7f3 100644 --- a/ayanova/src/views/svc-workorder.vue +++ b/ayanova/src/views/svc-workorder.vue @@ -259,6 +259,7 @@ export default { delete: true } }, + maxTableNotesLength: 50, //value to cut off notes in tables saveResult: { fatal: false, //fatal error, further save is pointless, bail early and report errors: null //contains error objects from save