From 8d4c77ae7a7a2cb6d9f27f44991c6aecf3d61be5 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Tue, 1 Jun 2021 22:22:00 +0000 Subject: [PATCH] --- ayanova/devdocs/todo.txt | 5 +-- ayanova/src/views/adm-global-settings.vue | 49 ++++++++++++++++++++--- 2 files changed, 44 insertions(+), 10 deletions(-) diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt index 5aa620b2..a0bd4cb4 100644 --- a/ayanova/devdocs/todo.txt +++ b/ayanova/devdocs/todo.txt @@ -402,16 +402,13 @@ todo: DEFAULT TIME SPAN / AUTO SET workorderitemlabor / scheduled user update quantity when dates change or update stop date when quantity changes to match no consideration for global default, once it's made that shit doesn't apply NEW + First - update global settings, add schedule/labor default minutes and separately Travel default minutes No auto date set on new, just leave empty (ONLY IF GLOBAL DEFAULT QTY) enter start date when stop date is null then it will add global default to start and set stop and qty (ONLY IF GLOBAL DEFAULT QTY) enter stop date when start date is null then it will back calc and set start and qty based on global default If no global default then it acts like existing and updates qty or stop date when qty changes (if there are dates to go on) -todo: workorderitemscheduled user new record if not today date chosen for start should default stop to global time (not sure about this feature from v7 seems impractical) - - - todo: seeder stock data / translations: loanunit "Units" have extraneous "rate" in them, i.e. "Hourly rate", sb just "Hourly" diff --git a/ayanova/src/views/adm-global-settings.vue b/ayanova/src/views/adm-global-settings.vue index 747e44db..2c44461f 100644 --- a/ayanova/src/views/adm-global-settings.vue +++ b/ayanova/src/views/adm-global-settings.vue @@ -82,12 +82,45 @@ @input="fieldValueChanged('workOrderCompleteByAge')" > - - - {{ $ay.t("ContractDefaultAdjustments") }} + + + + + + + + {{ $ay.t("UserInterfaceSettings") }} + @@ -200,7 +233,9 @@ export default { taxPartPurchaseId: null, taxPartSaleId: null, taxRateSaleId: null, - workOrderCompleteByAge: "00:00:00" + workOrderCompleteByAge: "00:00:00", + workOrderTravelDefaultMinutes: 0, + workLaborScheduleDefaultMinutes: 0 }, formState: { ready: false, @@ -421,7 +456,9 @@ async function fetchTranslatedText(vm) { "GlobalTaxPartSaleID", "GlobalTaxRateSaleID", "GlobalNextSeeds", - "GlobalWorkOrderCompleteByAge" + "GlobalWorkOrderCompleteByAge", + "GlobalLaborSchedUserDfltTimeSpan", + "GlobalTravelDfltTimeSpan" ]); }