diff --git a/ayanova/src/components/dash-labor-hours-personal-bar.vue b/ayanova/src/components/dash-labor-hours-personal-bar.vue index 229b07b1..a2663784 100644 --- a/ayanova/src/components/dash-labor-hours-personal-bar.vue +++ b/ayanova/src/components/dash-labor-hours-personal-bar.vue @@ -280,17 +280,17 @@ async function fetchTranslatedText() { function populateSelectionLists(vm) { vm.selectLists.dateFilterTokens.push( ...[ - { name: vm.$ay.t("DateRangeYesterday"), id: "*yesterday*" }, - { name: vm.$ay.t("DateRangeToday"), id: "*today*" }, - { name: vm.$ay.t("DateRangeLastWeek"), id: "*lastweek*" }, - { name: vm.$ay.t("DateRangeThisWeek"), id: "*thisweek*" }, - - { name: vm.$ay.t("DateRangeLastMonth"), id: "*lastmonth*" }, + // { name: vm.$ay.t("DateRangeYesterday"), id: "*yesterday*" }, + // { name: vm.$ay.t("DateRangeToday"), id: "*today*" }, + { name: vm.$ay.t("DateRangeThisYear"), id: "*thisyear*" }, { name: vm.$ay.t("DateRangeThisMonth"), id: "*thismonth*" }, + { name: vm.$ay.t("DateRangeThisWeek"), id: "*thisweek*" }, + { name: vm.$ay.t("DateRangeLastYear"), id: "*lastyear*" }, //prior year from jan to dec + { name: vm.$ay.t("DateRangeLastMonth"), id: "*lastmonth*" }, + { name: vm.$ay.t("DateRangeLastWeek"), id: "*lastweek*" }, + //-------------------------- rando ones ------------------- { name: vm.$ay.t("DateRange14DayWindow"), id: "*14daywindow*" }, { name: vm.$ay.t("DateRangePast"), id: "*past*" }, - { name: vm.$ay.t("DateRangeLastYear"), id: "*lastyear*" }, //prior year from jan to dec - { name: vm.$ay.t("DateRangeThisYear"), id: "*thisyear*" }, { name: vm.$ay.t("DateRangeInTheLastThreeMonths"), id: "*last3months*" @@ -303,8 +303,8 @@ function populateSelectionLists(vm) { { name: vm.$ay.t("DateRangePast90Days"), id: "*past90days*" }, { name: vm.$ay.t("DateRangePast30Days"), id: "*past30days*" }, { name: vm.$ay.t("DateRangePast7Days"), id: "*past7days*" }, - { name: vm.$ay.t("DateRangePast24Hours"), id: "*past24hours*" }, - { name: vm.$ay.t("DateRangePast6Hours"), id: "*past6hours*" }, + // { name: vm.$ay.t("DateRangePast24Hours"), id: "*past24hours*" }, + // { name: vm.$ay.t("DateRangePast6Hours"), id: "*past6hours*" }, { name: vm.$ay.t("DateRangeJanuary"), id: "*january*" }, { name: vm.$ay.t("DateRangeFebruary"), id: "*february*" }, { name: vm.$ay.t("DateRangeMarch"), id: "*march*" }, @@ -346,15 +346,6 @@ function populateSelectionLists(vm) { /* - -todo: clean up line version of dash-labor-hours-personal with lessons learned from bar one - big dots to mouse on to - - -todo: add icons to dashregistry with title so can include some indication of type of chart when names are duped - or subtitle if icons too fucky - - todo: clean up the sheer number of time periods, maybe remove individual months or whatever and time frames so short they don't make sense for personal todo: give a good look over and determine if ready to make more now based on what was done already need to release so don't go too crazy, there are some new cases to take care of as well, just need to show promise and get the two most important kpi items in and leaderboard and can go from there diff --git a/ayanova/src/components/dash-labor-hours-personal-line.vue b/ayanova/src/components/dash-labor-hours-personal-line.vue index 555ead58..0b0f224a 100644 --- a/ayanova/src/components/dash-labor-hours-personal-line.vue +++ b/ayanova/src/components/dash-labor-hours-personal-line.vue @@ -287,17 +287,17 @@ async function fetchTranslatedText() { function populateSelectionLists(vm) { vm.selectLists.dateFilterTokens.push( ...[ - { name: vm.$ay.t("DateRangeYesterday"), id: "*yesterday*" }, - { name: vm.$ay.t("DateRangeToday"), id: "*today*" }, - { name: vm.$ay.t("DateRangeLastWeek"), id: "*lastweek*" }, - { name: vm.$ay.t("DateRangeThisWeek"), id: "*thisweek*" }, - - { name: vm.$ay.t("DateRangeLastMonth"), id: "*lastmonth*" }, + // { name: vm.$ay.t("DateRangeYesterday"), id: "*yesterday*" }, + // { name: vm.$ay.t("DateRangeToday"), id: "*today*" }, + { name: vm.$ay.t("DateRangeThisYear"), id: "*thisyear*" }, { name: vm.$ay.t("DateRangeThisMonth"), id: "*thismonth*" }, + { name: vm.$ay.t("DateRangeThisWeek"), id: "*thisweek*" }, + { name: vm.$ay.t("DateRangeLastYear"), id: "*lastyear*" }, //prior year from jan to dec + { name: vm.$ay.t("DateRangeLastMonth"), id: "*lastmonth*" }, + { name: vm.$ay.t("DateRangeLastWeek"), id: "*lastweek*" }, + //-------------------------- rando ones ------------------- { name: vm.$ay.t("DateRange14DayWindow"), id: "*14daywindow*" }, { name: vm.$ay.t("DateRangePast"), id: "*past*" }, - { name: vm.$ay.t("DateRangeLastYear"), id: "*lastyear*" }, //prior year from jan to dec - { name: vm.$ay.t("DateRangeThisYear"), id: "*thisyear*" }, { name: vm.$ay.t("DateRangeInTheLastThreeMonths"), id: "*last3months*" @@ -310,8 +310,8 @@ function populateSelectionLists(vm) { { name: vm.$ay.t("DateRangePast90Days"), id: "*past90days*" }, { name: vm.$ay.t("DateRangePast30Days"), id: "*past30days*" }, { name: vm.$ay.t("DateRangePast7Days"), id: "*past7days*" }, - { name: vm.$ay.t("DateRangePast24Hours"), id: "*past24hours*" }, - { name: vm.$ay.t("DateRangePast6Hours"), id: "*past6hours*" }, + // { name: vm.$ay.t("DateRangePast24Hours"), id: "*past24hours*" }, + // { name: vm.$ay.t("DateRangePast6Hours"), id: "*past6hours*" }, { name: vm.$ay.t("DateRangeJanuary"), id: "*january*" }, { name: vm.$ay.t("DateRangeFebruary"), id: "*february*" }, { name: vm.$ay.t("DateRangeMarch"), id: "*march*" },