This commit is contained in:
2020-08-05 23:40:30 +00:00
parent d38082987f
commit f01345974a
3 changed files with 297 additions and 34 deletions

View File

@@ -991,6 +991,21 @@ async function fetchTranslatedText(vm) {
"DateRangePast90Days",
"DateRangePast30Days",
"DateRangePast24Hours",
"DateRangeJanuary",
"DateRangeFebruary",
"DateRangeMarch",
"DateRangeApril",
"DateRangeMay",
"DateRangeJune",
"DateRangeJuly",
"DateRangeAugust",
"DateRangeSeptember",
"DateRangeOctober",
"DateRangeNovember",
"DateRangeDecember",
"DateRangePreviousYearThisMonth",
"DateRangePreviousYearLastMonth",
"DateRangePreviousYearNextMonth",
"True",
"False",
"Name"
@@ -1020,23 +1035,6 @@ function populateSelectionLists(vm) {
]
);
/*
"DateRangeJanuary": "January",
"DateRangeFebruary": "February",
"DateRangeMarch": "March",
"DateRangeApril": "April",
"DateRangeMay": "May",
"DateRangeJune": "June",
"DateRangeJuly": "July",
"DateRangeAugust": "August",
"DateRangeSeptember": "September",
"DateRangeOctober": "October",
"DateRangeNovember": "November",
"DateRangeDecember": "December",
"DateRangePreviousYearThisMonth":"Previous year - this month",
"DateRangePreviousYearLastMonth":"Previous year - last month",
"DateRangePreviousYearNextMonth":"Previous year - next month", */
vm.selectLists.dateFilterTokens.push(
...[
{ name: "(" + vm.$ay.t("SelectItem") + ")", id: "*select*" }, //If select then use entry in date /time picker
@@ -1063,10 +1061,34 @@ function populateSelectionLists(vm) {
id: "*last6months*"
},
{ name: vm.$ay.t("DateRangePastYear"), id: "*pastyear*" }, //last 365 days
{ name: vm.$ay.t("DateRangePast90Days"), id: "*past90days*" },
{ name: vm.$ay.t("DateRangePast30Days"), id: "*past30days*" },
{ name: vm.$ay.t("DateRangePast24Hours"), id: "*past24hours*" }
{ name: vm.$ay.t("DateRangePast24Hours"), id: "*past24hours*" },
{ name: vm.$ay.t("DateRangeJanuary"), id: "*january*" },
{ name: vm.$ay.t("DateRangeFebruary"), id: "*february*" },
{ name: vm.$ay.t("DateRangeMarch"), id: "*march*" },
{ name: vm.$ay.t("DateRangeApril"), id: "*april*" },
{ name: vm.$ay.t("DateRangeMay"), id: "*may*" },
{ name: vm.$ay.t("DateRangeJune"), id: "*june*" },
{ name: vm.$ay.t("DateRangeJuly"), id: "*july*" },
{ name: vm.$ay.t("DateRangeAugust"), id: "*august*" },
{ name: vm.$ay.t("DateRangeSeptember"), id: "*september*" },
{ name: vm.$ay.t("DateRangeOctober"), id: "*october*" },
{ name: vm.$ay.t("DateRangeNovember"), id: "*november*" },
{ name: vm.$ay.t("DateRangeDecember"), id: "*december*" },
{
name: vm.$ay.t("DateRangePreviousYearThisMonth"),
id: "*lastyearthismonth*"
},
{
name: vm.$ay.t("DateRangePreviousYearLastMonth"),
id: "*lastyearlastmonth*"
},
{
name: vm.$ay.t("DateRangePreviousYearNextMonth"),
id: "*lastyearnextmonth*"
}
]
);