diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt index 75a738ef..a8ed17f5 100644 --- a/ayanova/devdocs/todo.txt +++ b/ayanova/devdocs/todo.txt @@ -906,7 +906,6 @@ BUILD 8.0.0-beta.0.14 CHANGES OF NOTE now ensures non ops api routes are disabled will return validation error, so user can do nothing until server open again then continue working non ops users can not login during ops only state. Ops users can do ops things during ops state but no business object stuff even if they ahve the role as that's controlled in each api route individually -- Changed Material date picker to show adjacent months days - work order item parts, removed serials from the table so it only displays in the edit form as during documentation realized it's eating up huge screen real estate - Work order item labor, removed the service details from the Table so it only displays in the edit form as it's eating up a large amount of UI space unnecessarily. - Work order item travel, removed the service details from the Table so it only displays in the edit form as it's eating up a large amount of UI space unnecessarily. diff --git a/ayanova/src/components/date-control.vue b/ayanova/src/components/date-control.vue index e97c13b4..23ed8b6f 100644 --- a/ayanova/src/components/date-control.vue +++ b/ayanova/src/components/date-control.vue @@ -20,7 +20,6 @@ {{ diff --git a/ayanova/src/components/date-time-control.vue b/ayanova/src/components/date-time-control.vue index 4d8851ec..f3b9a8d3 100644 --- a/ayanova/src/components/date-time-control.vue +++ b/ayanova/src/components/date-time-control.vue @@ -21,7 +21,6 @@ {{ diff --git a/ayanova/src/components/pm-items.vue b/ayanova/src/components/pm-items.vue index 4520e6a3..80d5d695 100644 --- a/ayanova/src/components/pm-items.vue +++ b/ayanova/src/components/pm-items.vue @@ -915,13 +915,13 @@ export default { }, canAddOutsideService: function() { return ( - this.form().showMe(this, "WorkOrderItemOutsideServiceList") && + this.form().showMe(this, "OutsideServiceList") && !this.value.userIsRestrictedType ); }, showOutsideServices: function() { return ( - this.form().showMe(this, "WorkOrderItemOutsideServiceList") && + this.form().showMe(this, "OutsideServiceList") && this.value.items[this.activeItemIndex].outsideServices.length > 0 && !this.value.userIsRestrictedType ); diff --git a/ayanova/src/components/quote-items.vue b/ayanova/src/components/quote-items.vue index 11f45a9f..17273d0f 100644 --- a/ayanova/src/components/quote-items.vue +++ b/ayanova/src/components/quote-items.vue @@ -913,13 +913,13 @@ export default { }, canAddOutsideService: function() { return ( - this.form().showMe(this, "WorkOrderItemOutsideServiceList") && + this.form().showMe(this, "OutsideServiceList") && !this.value.userIsRestrictedType ); }, showOutsideServices: function() { return ( - this.form().showMe(this, "WorkOrderItemOutsideServiceList") && + this.form().showMe(this, "OutsideServiceList") && this.value.items[this.activeItemIndex].outsideServices.length > 0 && !this.value.userIsRestrictedType ); diff --git a/ayanova/src/components/work-order-item-parts.vue b/ayanova/src/components/work-order-item-parts.vue index 4caecd77..a25ee653 100644 --- a/ayanova/src/components/work-order-item-parts.vue +++ b/ayanova/src/components/work-order-item-parts.vue @@ -588,7 +588,7 @@ export default { value: "quantity" }); -//todo: property indicatingh if this woitem has *any* suggested quantities and removed it if not + //todo: property indicatingh if this woitem has *any* suggested quantities and removed it if not if (this.form().showMe(this, "WorkOrderItemPartSuggestedQuantity")) { headers.push({ text: this.$ay.t("WorkOrderItemPartSuggestedQuantity"), @@ -621,8 +621,7 @@ export default { }); } - -//not sure about this one, removed it for now + //not sure about this one, removed it for now // if (this.form().showMe(this, "PurchaseOrderItemSerialNumbers")) { // headers.push({ // text: this.$ay.t("PurchaseOrderItemSerialNumbers"), diff --git a/ayanova/src/components/work-order-items.vue b/ayanova/src/components/work-order-items.vue index 4dcdbe4f..d5c676b8 100644 --- a/ayanova/src/components/work-order-items.vue +++ b/ayanova/src/components/work-order-items.vue @@ -1023,13 +1023,13 @@ export default { }, canAddOutsideService: function() { return ( - this.form().showMe(this, "WorkOrderItemOutsideServiceList") && + this.form().showMe(this, "OutsideServiceList") && !this.value.userIsRestrictedType ); }, showOutsideServices: function() { return ( - this.form().showMe(this, "WorkOrderItemOutsideServiceList") && + this.form().showMe(this, "OutsideServiceList") && this.value.items[this.activeItemIndex].outsideServices.length > 0 && !this.value.userIsRestrictedType );