From bec45d13c8ca500204861e2654535c3e06de878f Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Tue, 13 Jul 2021 20:08:04 +0000 Subject: [PATCH] --- ayanova/devdocs/todo.txt | 10 +++------- ayanova/src/components/work-order-item-labors.vue | 5 ++++- ayanova/src/components/work-order-item-loans.vue | 2 +- ayanova/src/components/work-order-item-travels.vue | 5 ++++- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt index 1a9013fd..0b3c61b9 100644 --- a/ayanova/devdocs/todo.txt +++ b/ayanova/devdocs/todo.txt @@ -423,14 +423,10 @@ CURRENTLY DOING: Subcontractor / tech limited modifications -- Remove all costs from workorder for parts unless have inventory-limited, inventory, bizadminfull or Accounting roles - not sent over wire / populated - not shown as fields in UI of workorder anywhere - +- Do not send work order items that don't have restricted user scheduled in them and also some other subitems as per below +- At server have biz rules that prevent changes to fields / objects that are restricted as per below +- At client have code to set restricted user restricted fields to read-only or hide as necessary per below - Remove sections from work order for low rights users as per below - -- go over initialize.js and for low rights roles restrict as per below - - Test login as each low rights type and confirm works as planned below diff --git a/ayanova/src/components/work-order-item-labors.vue b/ayanova/src/components/work-order-item-labors.vue index b706cb47..cf2ba0bb 100644 --- a/ayanova/src/components/work-order-item-labors.vue +++ b/ayanova/src/components/work-order-item-labors.vue @@ -780,7 +780,10 @@ export default { }); } - if (this.form().showMe(this, "LaborCostViz")) { + if ( + this.form().showMe(this, "LaborCostViz") && + this.value.hasTravelAndLaborRateCosts + ) { headers.push({ text: this.$ay.t("Cost"), align: "right", diff --git a/ayanova/src/components/work-order-item-loans.vue b/ayanova/src/components/work-order-item-loans.vue index 8ffab129..e47b04f0 100644 --- a/ayanova/src/components/work-order-item-loans.vue +++ b/ayanova/src/components/work-order-item-loans.vue @@ -654,7 +654,7 @@ export default { }); } - if (this.form().showMe(this, "LoanCost")) { + if (this.form().showMe(this, "LoanCost") && this.value.hasLoanItemCosts) { headers.push({ text: this.$ay.t("Cost"), align: "right", diff --git a/ayanova/src/components/work-order-item-travels.vue b/ayanova/src/components/work-order-item-travels.vue index 60e85400..98ab454c 100644 --- a/ayanova/src/components/work-order-item-travels.vue +++ b/ayanova/src/components/work-order-item-travels.vue @@ -758,7 +758,10 @@ export default { }); } - if (this.form().showMe(this, "TravelCostViz")) { + if ( + this.form().showMe(this, "TravelCostViz") && + this.value.hasTravelAndLaborRateCosts + ) { headers.push({ text: this.$ay.t("Cost"), align: "right",