diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt index 08ff45cb..63c6424e 100644 --- a/ayanova/devdocs/todo.txt +++ b/ayanova/devdocs/todo.txt @@ -307,7 +307,6 @@ todo: many biz objects are not using new PUT methodology CURRENTLY DOING: -todo: start/stop date biz rules precedence on form at back todo: workorder item expense next collection (easing into it) @@ -335,6 +334,9 @@ OVERALL ##################################################################### =================== WORKORDER TODO / ON HOLD ======================== + +todo: make sure all rules are mirrored at both ends (like date precedence etc) + TODO: Test address / units select alternate when have units working TODO: Sequence field sb hidden by default, most won't want it I'm guessing really need to pin down some default form customization for wo diff --git a/ayanova/src/components/work-order-item-expenses.vue b/ayanova/src/components/work-order-item-expenses.vue new file mode 100644 index 00000000..834d78eb --- /dev/null +++ b/ayanova/src/components/work-order-item-expenses.vue @@ -0,0 +1,518 @@ + + diff --git a/ayanova/src/components/work-order-item-scheduled-users.vue b/ayanova/src/components/work-order-item-scheduled-users.vue index 73c06338..142e9d78 100644 --- a/ayanova/src/components/work-order-item-scheduled-users.vue +++ b/ayanova/src/components/work-order-item-scheduled-users.vue @@ -120,6 +120,13 @@ `Items[${activeWoItemIndex}].scheduledUsers[${activeItemIndex}].stopDate` " data-cy="stopDate" + :rules="[ + form().datePrecedence( + this, + `Items[${activeWoItemIndex}].scheduledUsers[${activeItemIndex}].startDate`, + `Items[${activeWoItemIndex}].scheduledUsers[${activeItemIndex}].stopDate` + ) + ]" :error-messages=" form().serverErrors( this, diff --git a/ayanova/src/components/work-order-items.vue b/ayanova/src/components/work-order-items.vue index c43edc86..f9ccc679 100644 --- a/ayanova/src/components/work-order-items.vue +++ b/ayanova/src/components/work-order-items.vue @@ -361,6 +361,19 @@ @change="$emit('change')" /> + + + @@ -370,10 +383,12 @@ /* XXXeslint-disable */ //////////////////////////////////////////////////////////////////////////////////////////////////////////// import GzWoItemScheduledUsers from "../components/work-order-item-scheduled-users.vue"; +import GzWoItemExpenses from "../components/work-order-item-expenses.vue"; export default { components: { - GzWoItemScheduledUsers + GzWoItemScheduledUsers, + GzWoItemExpenses }, created() { this.setDefaultView();