This commit is contained in:
2021-05-27 16:53:00 +00:00
parent adda3a6471
commit 9283dd4251
6 changed files with 63 additions and 68 deletions

View File

@@ -784,7 +784,10 @@ export default {
this.pvm.languageName, this.pvm.languageName,
this.pvm.currencyName this.pvm.currencyName
), ),
serviceDetails: window.$gz.util.truncateString(x.serviceDetails, 50) serviceDetails: window.$gz.util.truncateString(
x.serviceDetails,
this.pvm.maxTableNotesLength
)
}; };
}); });
}, },

View File

@@ -765,7 +765,10 @@ export default {
this.pvm.languageName, this.pvm.languageName,
this.pvm.hour12 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( cost: window.$gz.locale.currencyLocalized(
x.cost, x.cost,

View File

@@ -627,7 +627,10 @@ export default {
), ),
upcViz: x.upcViz, upcViz: x.upcViz,
description: x.description, description: x.description,
serials: window.$gz.util.truncateString(x.serials, 50), serials: window.$gz.util.truncateString(
x.serials,
this.pvm.maxTableNotesLength
),
unitOfMeasureViz: x.unitOfMeasureViz, unitOfMeasureViz: x.unitOfMeasureViz,
cost: window.$gz.locale.currencyLocalized( cost: window.$gz.locale.currencyLocalized(
x.cost, x.cost,

View File

@@ -786,7 +786,10 @@ export default {
this.pvm.languageName, this.pvm.languageName,
this.pvm.currencyName this.pvm.currencyName
), ),
travelDetails: window.$gz.util.truncateString(x.travelDetails, 50) travelDetails: window.$gz.util.truncateString(
x.travelDetails,
this.pvm.maxTableNotesLength
)
}; };
}); });
}, },

View File

@@ -263,26 +263,45 @@
/* XXXeslint-disable */ /* XXXeslint-disable */
//////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////
/* /*
l.Add(new FormField { TKey = "WorkOrderItemUnitEstimatedQuantity", FieldKey = "WorkOrderItemUnitEstimatedQuantity", TKeySection = "WorkOrderItemUnit" }); l.Add(new FormField { TKey = "WorkOrderItemUnitNotes", FieldKey = "WorkOrderItemUnitNotes", TKeySection = "WorkOrderItemUnit" });
l.Add(new FormField { TKey = "WorkOrderItemUnitServiceRateID", FieldKey = "WorkOrderItemUnitServiceRateID", TKeySection = "WorkOrderItemUnit" }); l.Add(new FormField { TKey = "Unit", FieldKey = "WorkOrderItemUnit", TKeySection = "WorkOrderItemUnit" });
l.Add(new FormField { TKey = "WorkOrderItemUnitStartDate", FieldKey = "WorkOrderItemUnitStartDate", TKeySection = "WorkOrderItemUnit" }); l.Add(new FormField { TKey = "Tags", FieldKey = "WorkOrderItemUnitTags", TKeySection = "WorkOrderItemUnit" });
l.Add(new FormField { TKey = "WorkOrderItemUnitStopDate", FieldKey = "WorkOrderItemUnitStopDate", TKeySection = "WorkOrderItemUnit" }); l.Add(new FormField { TKey = "Wiki", FieldKey = "WorkOrderItemUnitWiki", TKeySection = "WorkOrderItemUnit" });
l.Add(new FormField { TKey = "WorkOrderItemUnitUserID", FieldKey = "WorkOrderItemUnitUserID", 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; } "0": {
public decimal EstimatedQuantity { get; set; } "id": 39,
public DateTime? StartDate { get; set; } "concurrency": 8129666,
public DateTime? StopDate { get; set; } "notes": "Saepe quos omnis fugiat aliquam amet animi sit dolorum voluptatibus.",
public long? ServiceRateId { get; set; } "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 { export default {
created() { created() {
@@ -434,43 +453,19 @@ export default {
*/ */
let headers = []; let headers = [];
if (this.form().showMe(this, "WorkOrderItemUnitStartDate")) { if (this.form().showMe(this, "WorkOrderItemUnit")) {
headers.push({ headers.push({
text: this.$ay.t("WorkOrderItemUnitStartDate"), text: this.$ay.t("WorkOrderItemUnit"),
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"),
align: "left", align: "left",
value: "userViz" value: "unitViz"
}); });
} }
if (this.form().showMe(this, "WorkOrderItemUnitServiceRateID")) { if (this.form().showMe(this, "WorkOrderItemUnitNotes")) {
headers.push({ headers.push({
text: this.$ay.t("WorkOrderItemUnitServiceRateID"), text: this.$ay.t("WorkOrderItemUnitNotes"),
align: "left", align: "left",
value: "serviceRateViz" value: "notes"
}); });
} }
@@ -481,24 +476,11 @@ export default {
return { return {
index: i, index: i,
id: x.id, id: x.id,
startDate: window.$gz.locale.utcDateToShortDateAndTimeLocalized( unitViz: x.unitViz,
x.startDate, notes: window.$gz.util.truncateString(
this.pvm.timeZoneName, x.notes,
this.pvm.languageName, this.pvm.maxTableNotesLength
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
}; };
}); });
}, },

View File

@@ -259,6 +259,7 @@ export default {
delete: true delete: true
} }
}, },
maxTableNotesLength: 50, //value to cut off notes in tables
saveResult: { saveResult: {
fatal: false, //fatal error, further save is pointless, bail early and report fatal: false, //fatal error, further save is pointless, bail early and report
errors: null //contains error objects from save errors: null //contains error objects from save