diff --git a/ayanova/src/components/dash-base.vue b/ayanova/src/components/dash-base.vue
index 1c4f16db..f8daf207 100644
--- a/ayanova/src/components/dash-base.vue
+++ b/ayanova/src/components/dash-base.vue
@@ -134,7 +134,7 @@
- settings
+ default slot for settings
diff --git a/ayanova/src/components/dash-labor-hours-personal.vue b/ayanova/src/components/dash-labor-hours-personal.vue
index 48048477..86833b9c 100644
--- a/ayanova/src/components/dash-labor-hours-personal.vue
+++ b/ayanova/src/components/dash-labor-hours-personal.vue
@@ -40,6 +40,7 @@
>
+
- settings: {{ settings }}
- localsettings: {{ localSettings }}
+
+
+
+
+ {{ settings }}
@@ -101,18 +113,10 @@ export default {
return {
obj: {},
context: false,
- localSettings: {},
selectLists: {
- dateFilterOperators: [],
dateFilterTokens: [],
- stringFilterOperators: [],
- integerFilterOperators: [],
- boolFilterOperators: [],
- decimalFilterOperators: [],
tagFilterOperators: [],
- roleFilterOperators: [],
- enumFilterOperators: [],
- intervalFilterOperators: []
+ units: []
}
};
},
@@ -176,7 +180,7 @@ export default {
//
//
async function initWidget(vm) {
- console.log("INitializing widget dash-labotr-hours-personal");
+ //console.log("INitializing widget dash-labotr-hours-personal");
await fetchTranslatedText();
populateSelectionLists(vm);
}
@@ -188,24 +192,14 @@ async function initWidget(vm) {
async function fetchTranslatedText() {
await window.$gz.translation.cacheTranslations([
"Filter",
- "GridFilterDialogAndRadioText",
- "GridFilterDialogOrRadioText",
"GridRowFilterDropDownBlanksItem",
"GridRowFilterDropDownNonBlanksItem",
"GridRowFilterDropDownEquals",
- "GridRowFilterDropDownGreaterThan",
- "GridRowFilterDropDownGreaterThanOrEqualTo",
- "GridRowFilterDropDownLessThan",
- "GridRowFilterDropDownLessThanOrEqualTo",
"GridRowFilterDropDownNotEquals",
"GridRowFilterDropDownDoesNotContain",
"GridRowFilterDropDownContains",
- "GridRowFilterDropDownStartsWith",
- "GridRowFilterDropDownEndsWith",
- "SelectItem",
"DateRangeYesterday",
"DateRangeToday",
- "DateRangeTomorrow",
"DateRangeLastWeek",
"DateRangeThisWeek",
"DateRangeNextWeek",
@@ -214,7 +208,6 @@ async function fetchTranslatedText() {
"DateRangeNextMonth",
"DateRange14DayWindow",
"DateRangePast",
- "DateRangeFuture",
"DateRangeLastYear",
"DateRangeThisYear",
"DateRangeInTheLastThreeMonths",
@@ -240,18 +233,11 @@ async function fetchTranslatedText() {
"DateRangePreviousYearThisMonth",
"DateRangePreviousYearLastMonth",
"DateRangePreviousYearNextMonth",
- "True",
- "False"
+ "TimeSpanDays",
+ "TimeSpanMonths"
]);
}
-/*
- "TimeSpanDays": "days",
- "TimeSpanHours": "hours",
- "TimeSpanMinutes": "minutes",
- "TimeSpanMonths": "months",
-*/
-
/////////////////////////////////
//
//
@@ -324,5 +310,15 @@ function populateSelectionLists(vm) {
{ name: vm.$ay.t("GridRowFilterDropDownContains"), id: "-%-" }
]
);
+
+ vm.selectLists.units.push(
+ ...[
+ { name: vm.$ay.t("TimeSpanDays"), id: "day" },
+ {
+ name: vm.$ay.t("TimeSpanMonths"),
+ id: "month"
+ }
+ ]
+ );
}