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" }
     },
 
     {

ayanova/src/components/dash-labor-hours-personal.vue

@@ -54,18 +54,17 @@
             </v-card-title>
 
             <v-card-text style="height: 500px;">
-              dash-labor-hours settings go here<br />
+              <v-select
+                v-model="localSettings.dateRange"
+                :items="selectLists.dateFilterTokens"
+                item-text="name"
+                item-value="id"
+                :label="$ay.t('TimeSpanDateRange')"
+                prepend-icon="$ayiFilter"
+              ></v-select>
+
               settings: {{ settings }}<br />
               localsettings: {{ localSettings }}
-              <!-- <v-list>
-                <v-list-item
-                  v-for="item in availableItems()"
-                  :key="item.id"
-                  @click="addItem(item)"
-                >
-                  <v-list-item-title>{{ $ay.t(item.title) }}</v-list-item-title>
-                </v-list-item>
-              </v-list> -->
             </v-card-text>
 
             <v-divider></v-divider>
@@ -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: "!=" }
-    ]
-  );
 }
 </script>