diff --git a/ayanova/src/api/dash-registry.js b/ayanova/src/api/dash-registry.js index 0738d951..2457a7dc 100644 --- a/ayanova/src/api/dash-registry.js +++ b/ayanova/src/api/dash-registry.js @@ -62,7 +62,7 @@ export default { type: "GzDashLaborHoursPersonal", scheduleableUserOnly: true, singleOnly: false, - settings: { endDate: window.$gz.locale.nowUTC8601String() } + settings: { customTitle: null, dateRange: "*thismonth*", unit: "day" } }, { diff --git a/ayanova/src/components/dash-labor-hours-personal.vue b/ayanova/src/components/dash-labor-hours-personal.vue index 0cecc1aa..48048477 100644 --- a/ayanova/src/components/dash-labor-hours-personal.vue +++ b/ayanova/src/components/dash-labor-hours-personal.vue @@ -54,18 +54,17 @@ - dash-labor-hours settings go here
+ + settings: {{ settings }}
localsettings: {{ localSettings }} -
@@ -246,40 +245,21 @@ async function fetchTranslatedText() { ]); } +/* + "TimeSpanDays": "days", + "TimeSpanHours": "hours", + "TimeSpanMinutes": "minutes", + "TimeSpanMonths": "months", +*/ + ///////////////////////////////// // // function populateSelectionLists(vm) { - vm.selectLists.dateFilterOperators.push( - ...[ - { name: vm.$ay.t("GridRowFilterDropDownBlanksItem"), id: "*NOVALUE*" }, - { - name: vm.$ay.t("GridRowFilterDropDownNonBlanksItem"), - id: "*HASVALUE*" - }, - { name: vm.$ay.t("GridRowFilterDropDownEquals"), id: "=" }, - { name: vm.$ay.t("GridRowFilterDropDownGreaterThan"), id: ">" }, - { - name: vm.$ay.t("GridRowFilterDropDownGreaterThanOrEqualTo"), - id: ">=" - }, - { name: vm.$ay.t("GridRowFilterDropDownLessThan"), id: "<" }, - { name: vm.$ay.t("GridRowFilterDropDownLessThanOrEqualTo"), id: "<=" }, - { name: vm.$ay.t("GridRowFilterDropDownNotEquals"), id: "!=" } - ] - ); - vm.selectLists.dateFilterTokens.push( ...[ - { name: "(" + vm.$ay.t("SelectItem") + ")", id: "*select*" }, //If select then use entry in date /time picker - { name: vm.$ay.t("GridRowFilterDropDownBlanksItem"), id: "*NOVALUE*" }, - { - name: vm.$ay.t("GridRowFilterDropDownNonBlanksItem"), - id: "*HASVALUE*" - }, { name: vm.$ay.t("DateRangeYesterday"), id: "*yesterday*" }, { name: vm.$ay.t("DateRangeToday"), id: "*today*" }, - { name: vm.$ay.t("DateRangeTomorrow"), id: "*tomorrow*" }, { name: vm.$ay.t("DateRangeLastWeek"), id: "*lastweek*" }, { name: vm.$ay.t("DateRangeThisWeek"), id: "*thisweek*" }, { name: vm.$ay.t("DateRangeNextWeek"), id: "*nextweek*" }, @@ -288,7 +268,6 @@ function populateSelectionLists(vm) { { name: vm.$ay.t("DateRangeNextMonth"), id: "*nextmonth*" }, { name: vm.$ay.t("DateRange14DayWindow"), id: "*14daywindow*" }, { name: vm.$ay.t("DateRangePast"), id: "*past*" }, - { name: vm.$ay.t("DateRangeFuture"), id: "*future*" }, { name: vm.$ay.t("DateRangeLastYear"), id: "*lastyear*" }, //prior year from jan to dec { name: vm.$ay.t("DateRangeThisYear"), id: "*thisyear*" }, { @@ -332,78 +311,6 @@ function populateSelectionLists(vm) { ] ); - vm.selectLists.stringFilterOperators.push( - ...[ - { name: vm.$ay.t("GridRowFilterDropDownBlanksItem"), id: "*NOVALUE*" }, - { - name: vm.$ay.t("GridRowFilterDropDownNonBlanksItem"), - id: "*HASVALUE*" - }, - { name: vm.$ay.t("GridRowFilterDropDownEquals"), id: "=" }, - { name: vm.$ay.t("GridRowFilterDropDownGreaterThan"), id: ">" }, - { - name: vm.$ay.t("GridRowFilterDropDownGreaterThanOrEqualTo"), - id: ">=" - }, - { name: vm.$ay.t("GridRowFilterDropDownLessThan"), id: "<" }, - { name: vm.$ay.t("GridRowFilterDropDownLessThanOrEqualTo"), id: "<=" }, - { name: vm.$ay.t("GridRowFilterDropDownNotEquals"), id: "!=" }, - { name: vm.$ay.t("GridRowFilterDropDownDoesNotContain"), id: "!-%-" }, - { name: vm.$ay.t("GridRowFilterDropDownContains"), id: "-%-" }, - { name: vm.$ay.t("GridRowFilterDropDownStartsWith"), id: "%-" }, - { name: vm.$ay.t("GridRowFilterDropDownEndsWith"), id: "-%" } - ] - ); - - vm.selectLists.integerFilterOperators.push( - ...[ - { name: vm.$ay.t("GridRowFilterDropDownBlanksItem"), id: "*NOVALUE*" }, - { - name: vm.$ay.t("GridRowFilterDropDownNonBlanksItem"), - id: "*HASVALUE*" - }, - { name: vm.$ay.t("GridRowFilterDropDownEquals"), id: "=" }, - { name: vm.$ay.t("GridRowFilterDropDownGreaterThan"), id: ">" }, - { - name: vm.$ay.t("GridRowFilterDropDownGreaterThanOrEqualTo"), - id: ">=" - }, - { name: vm.$ay.t("GridRowFilterDropDownLessThan"), id: "<" }, - { name: vm.$ay.t("GridRowFilterDropDownLessThanOrEqualTo"), id: "<=" }, - { name: vm.$ay.t("GridRowFilterDropDownNotEquals"), id: "!=" } - ] - ); - - vm.selectLists.boolFilterOperators.push( - ...[ - // { name: vm.$ay.t("GridRowFilterDropDownBlanksItem"), id: "*NOVALUE*" }, - // { - // name: vm.$ay.t("GridRowFilterDropDownNonBlanksItem"), - // id: "*HASVALUE*" - // }, - { name: vm.$ay.t("GridRowFilterDropDownEquals"), id: "=" } - //, { name: vm.$ay.t("GridRowFilterDropDownNotEquals"), id: "!=" } - ] - ); - - vm.selectLists.decimalFilterOperators.push( - ...[ - { name: vm.$ay.t("GridRowFilterDropDownBlanksItem"), id: "*NOVALUE*" }, - { - name: vm.$ay.t("GridRowFilterDropDownNonBlanksItem"), - id: "*HASVALUE*" - }, - { name: vm.$ay.t("GridRowFilterDropDownEquals"), id: "=" }, - { name: vm.$ay.t("GridRowFilterDropDownGreaterThan"), id: ">" }, - { - name: vm.$ay.t("GridRowFilterDropDownGreaterThanOrEqualTo"), - id: ">=" - }, - { name: vm.$ay.t("GridRowFilterDropDownLessThan"), id: "<" }, - { name: vm.$ay.t("GridRowFilterDropDownLessThanOrEqualTo"), id: "<=" }, - { name: vm.$ay.t("GridRowFilterDropDownNotEquals"), id: "!=" } - ] - ); vm.selectLists.tagFilterOperators.push( ...[ { name: vm.$ay.t("GridRowFilterDropDownBlanksItem"), id: "*NOVALUE*" }, @@ -417,40 +324,5 @@ function populateSelectionLists(vm) { { name: vm.$ay.t("GridRowFilterDropDownContains"), id: "-%-" } ] ); - - vm.selectLists.roleFilterOperators.push( - ...[ - { name: vm.$ay.t("GridRowFilterDropDownEquals"), id: "=" }, - { name: vm.$ay.t("GridRowFilterDropDownNotEquals"), id: "!=" }, - { name: vm.$ay.t("GridRowFilterDropDownDoesNotContain"), id: "!-%-" }, - { name: vm.$ay.t("GridRowFilterDropDownContains"), id: "-%-" } - ] - ); - - vm.selectLists.enumFilterOperators.push( - ...[ - { name: vm.$ay.t("GridRowFilterDropDownBlanksItem"), id: "*NOVALUE*" }, - { - name: vm.$ay.t("GridRowFilterDropDownNonBlanksItem"), - id: "*HASVALUE*" - }, - { name: vm.$ay.t("GridRowFilterDropDownEquals"), id: "=" }, - { name: vm.$ay.t("GridRowFilterDropDownNotEquals"), id: "!=" } - ] - ); - - vm.selectLists.intervalFilterOperators.push( - ...[ - // { name: vm.$ay.t("GridRowFilterDropDownEquals"), id: "=" }, - { name: vm.$ay.t("GridRowFilterDropDownGreaterThan"), id: ">" }, - { - name: vm.$ay.t("GridRowFilterDropDownGreaterThanOrEqualTo"), - id: ">=" - }, - { name: vm.$ay.t("GridRowFilterDropDownLessThan"), id: "<" }, - { name: vm.$ay.t("GridRowFilterDropDownLessThanOrEqualTo"), id: "<=" } - //{ name: vm.$ay.t("GridRowFilterDropDownNotEquals"), id: "!=" } - ] - ); }