@dhis2/analytics 24.5.0-alpha.1 → 24.6.0

package/build/es/components/PeriodDimension/utils/fixedPeriods.js

@@ -1,4 +1,3 @@
-import { generateFixedPeriods, getNowInCalendar } from '@dhis2/multi-calendar-dates';
 import i18n from '../../../locales/index.js';
 import { DAILY, WEEKLY, WEEKLYWED, WEEKLYTHU, WEEKLYSAT, WEEKLYSUN, BIWEEKLY, MONTHLY, BIMONTHLY, QUARTERLY, SIXMONTHLY, SIXMONTHLYAPR, YEARLY, FYNOV, FYOCT, FYJUL, FYAPR } from './index.js';
 const PERIOD_TYPE_REGEX = {
@@ -39,176 +38,452 @@ const PERIOD_TYPE_REGEX = {
 
 };
 
-const getPeriods = _ref => {
-  let {
-    periodType,
-    config,
-    fnFilter,
-    calendar
-  } = _ref;
-  const offset = parseInt(config.offset, 10);
-  const isFilter = config.filterFuturePeriods;
-  const isReverse = periodType.match(/^FY|YEARLY/) ? true : config.reversePeriods;
-  const now = getNowInCalendar(calendar);
-  const year = (now.eraYear || now.year) + offset;
-  const params = {
-    periodType,
-    year,
-    calendar,
-    locale: 'en',
-    startingDay: config.startDay
-  };
-  let periods = generateFixedPeriods(params);
-  periods = isFilter ? fnFilter(periods) : periods;
-  periods = !isReverse ? periods : periods.reverse();
-  return periods;
+const getMonthName = key => {
+  const monthNames = [i18n.t('January'), i18n.t('February'), i18n.t('March'), i18n.t('April'), i18n.t('May'), i18n.t('June'), i18n.t('July'), i18n.t('August'), i18n.t('September'), i18n.t('October'), i18n.t('November'), i18n.t('December')];
+  return monthNames[key];
 };
 
-const getDailyPeriodType = (fnFilter, calendar) => {
+const getDailyPeriodType = (formatYyyyMmDd, fnFilter) => {
   return config => {
-    return getPeriods({
-      periodType: 'DAILY',
-      config,
-      fnFilter,
-      calendar
-    });
+    let periods = [];
+    const offset = parseInt(config.offset, 10);
+    const isFilter = config.filterFuturePeriods;
+    const isReverse = config.reversePeriods;
+    const year = new Date(Date.now()).getFullYear() + offset;
+    const date = new Date("01 Jan ".concat(year));
+
+    while (date.getFullYear() === year) {
+      const period = {};
+      period.startDate = formatYyyyMmDd(date);
+      period.endDate = period.startDate;
+      period.name = period.startDate;
+      period.iso = period.startDate.replace(/-/g, '');
+      period.id = period.iso;
+      periods.push(period);
+      date.setDate(date.getDate() + 1);
+    }
+
+    periods = isFilter ? fnFilter(periods) : periods;
+    periods = isReverse ? periods.reverse() : periods;
+    return periods;
   };
 };
 
-const getWeeklyPeriodType = (weekObj, fnFilter, calendar) => {
+const getWeeklyPeriodType = (formatYyyyMmDd, weekObj, fnFilter) => {
+  // Calculate the first date of an EPI year base on ISO standard  ( first week always contains 4th Jan )
+  const getEpiWeekStartDay = (year, startDayOfWeek) => {
+    const jan4 = new Date(year, 0, 4);
+    const jan4DayOfWeek = jan4.getDay();
+    const startDate = jan4;
+    const dayDiff = jan4DayOfWeek - startDayOfWeek;
+
+    if (dayDiff > 0) {
+      startDate.setDate(jan4.getDate() - dayDiff);
+    } else if (dayDiff < 0) {
+      startDate.setDate(jan4.getDate() - dayDiff);
+      startDate.setDate(startDate.getDate() - 7);
+    }
+
+    return startDate;
+  };
+
   return config => {
-    return getPeriods({
-      periodType: 'WEEKLY',
-      config: { ...config,
-        startDay: weekObj.startDay
-      },
-      fnFilter,
-      calendar
-    });
+    let periods = [];
+    const offset = parseInt(config.offset, 10);
+    const isFilter = config.filterFuturePeriods;
+    const isReverse = config.reversePeriods;
+    const year = new Date(Date.now()).getFullYear() + offset;
+    const date = getEpiWeekStartDay(year, weekObj.startDay);
+    let week = 1;
+
+    while (date.getFullYear() <= year) {
+      const period = {};
+      period.startDate = formatYyyyMmDd(date);
+      period.iso = "".concat(year).concat(weekObj.shortName, "W").concat(week);
+      period.id = period.iso;
+      date.setDate(date.getDate() + 6);
+      period.endDate = formatYyyyMmDd(date);
+      const weekNumber = week;
+      period.name = "".concat(i18n.t('Week {{weekNumber}}', {
+        weekNumber
+      }), " - ").concat(period.startDate, " - ").concat(period.endDate); // if end date is Jan 4th or later, week belongs to next year
+
+      if (date.getFullYear() > year && date.getDate() >= 4) {
+        break;
+      }
+
+      periods.push(period);
+      date.setDate(date.getDate() + 1);
+      week += 1;
+    }
+
+    periods = isFilter ? fnFilter(periods) : periods;
+    periods = isReverse ? periods.reverse() : periods;
+    return periods;
   };
 };
 
-const getBiWeeklyPeriodType = (fnFilter, calendar) => {
+const getBiWeeklyPeriodType = (formatYyyyMmDd, fnFilter) => {
   return config => {
-    return getPeriods({
-      periodType: 'BIWEEKLY',
-      config,
-      fnFilter,
-      calendar
-    });
+    let periods = [];
+    const offset = parseInt(config.offset, 10);
+    const isFilter = config.filterFuturePeriods;
+    const isReverse = config.reversePeriods;
+    const year = new Date(Date.now()).getFullYear() + offset;
+    const date = new Date("01 Jan ".concat(year));
+    const day = date.getDay();
+    let biWeek = 1;
+
+    if (day <= 4) {
+      date.setDate(date.getDate() - (day - 1));
+    } else {
+      date.setDate(date.getDate() + (8 - day));
+    }
+
+    while (date.getFullYear() <= year) {
+      const period = {};
+      period.iso = "".concat(year, "BiW").concat(biWeek);
+      period.id = period.iso;
+      period.startDate = formatYyyyMmDd(date);
+      date.setDate(date.getDate() + 13);
+      period.endDate = formatYyyyMmDd(date);
+      const biWeekNumber = biWeek;
+      period.name = "".concat(i18n.t('Bi-Week {{biWeekNumber}}', {
+        biWeekNumber
+      }), " - ").concat(period.startDate, " - ").concat(period.endDate); // if end date is Jan 4th or later, biweek belongs to next year
+
+      if (date.getFullYear() > year && date.getDate() >= 4) {
+        break;
+      }
+
+      periods.push(period);
+      date.setDate(date.getDate() + 1);
+      biWeek += 1;
+    }
+
+    periods = isFilter ? fnFilter(periods) : periods;
+    periods = isReverse ? periods.reverse() : periods;
+    return periods;
   };
 };
 
-const getMonthlyPeriodType = (fnFilter, calendar) => {
+const getMonthlyPeriodType = (formatYyyyMmDd, fnFilter) => {
+  const formatIso = date => {
+    const y = date.getFullYear();
+    let m = String(date.getMonth() + 1);
+    m = m.length < 2 ? "0".concat(m) : m;
+    return y + m;
+  };
+
   return config => {
-    return getPeriods({
-      periodType: 'MONTHLY',
-      config,
-      fnFilter,
-      calendar
-    });
+    let periods = [];
+    const offset = parseInt(config.offset, 10);
+    const isFilter = config.filterFuturePeriods;
+    const isReverse = config.reversePeriods;
+    const year = new Date(Date.now()).getFullYear() + offset;
+    const date = new Date("31 Dec ".concat(year));
+
+    while (date.getFullYear() === year) {
+      const period = {};
+      period.endDate = formatYyyyMmDd(date);
+      date.setDate(1);
+      period.startDate = formatYyyyMmDd(date);
+      const monthName = getMonthName(date.getMonth());
+      period.name = "".concat(monthName, " ").concat(year);
+      period.iso = formatIso(date);
+      period.id = period.iso;
+      periods.push(period);
+      date.setDate(0);
+    }
+
+    periods = isFilter ? fnFilter(periods) : periods;
+    periods = isReverse ? periods : periods.reverse(); // Months are collected backwards. If isReverse is true, then do nothing. Else reverse to correct order and return.
+
+    return periods;
   };
 };
 
-const getBiMonthlyPeriodType = (fnFilter, calendar) => {
+const getBiMonthlyPeriodType = (formatYyyyMmDd, fnFilter) => {
   return config => {
-    return getPeriods({
-      periodType: 'BIMONTHLY',
-      config,
-      fnFilter,
-      calendar
-    });
+    let periods = [];
+    const offset = parseInt(config.offset, 10);
+    const isFilter = config.filterFuturePeriods;
+    const isReverse = config.reversePeriods;
+    const year = new Date(Date.now()).getFullYear() + offset;
+    const date = new Date("31 Dec ".concat(year));
+    let index = 6;
+
+    while (date.getFullYear() === year) {
+      const period = {};
+      period.endDate = formatYyyyMmDd(date);
+      date.setDate(0);
+      date.setDate(1);
+      period.startDate = formatYyyyMmDd(date);
+      const monthStart = getMonthName(date.getMonth());
+      const monthEnd = getMonthName(date.getMonth() + 1);
+      const fullYear = date.getFullYear();
+      period.name = "".concat(monthStart, " - ").concat(monthEnd, " ").concat(fullYear);
+      period.iso = "".concat(year, "0").concat(index, "B");
+      period.id = period.iso;
+      periods.push(period);
+      date.setDate(0);
+      index--;
+    }
+
+    periods = isFilter ? fnFilter(periods) : periods;
+    periods = isReverse ? periods : periods.reverse(); // Bi-months are collected backwards. If isReverse is true, then do nothing. Else reverse to correct order and return.
+
+    return periods;
   };
 };
 
-const getQuarterlyPeriodType = (fnFilter, calendar) => {
+const getQuarterlyPeriodType = (formatYyyyMmDd, fnFilter) => {
   return config => {
-    return getPeriods({
-      periodType: 'QUARTERLY',
-      config,
-      fnFilter,
-      calendar
-    });
+    let periods = [];
+    const offset = parseInt(config.offset, 10);
+    const isFilter = config.filterFuturePeriods;
+    const isReverse = config.reversePeriods;
+    const year = new Date(Date.now()).getFullYear() + offset;
+    const date = new Date("31 Dec ".concat(year));
+    let quarter = 4;
+
+    while (date.getFullYear() === year) {
+      const period = {};
+      period.endDate = formatYyyyMmDd(date);
+      date.setDate(0);
+      date.setDate(0);
+      date.setDate(1);
+      period.startDate = formatYyyyMmDd(date);
+      const monthStart = getMonthName(date.getMonth());
+      const monthEnd = getMonthName(date.getMonth() + 2);
+      const fullYear = date.getFullYear();
+      period.name = "".concat(monthStart, " - ").concat(monthEnd, " ").concat(fullYear);
+      period.iso = "".concat(year, "Q").concat(quarter);
+      period.id = period.iso;
+      periods.push(period);
+      date.setDate(0);
+      quarter -= 1;
+    }
+
+    periods = isFilter ? fnFilter(periods) : periods;
+    periods = isReverse ? periods : periods.reverse(); // Quarters are collected backwards. If isReverse is true, then do nothing. Else reverse to correct order and return.
+
+    return periods;
   };
 };
 
-const getSixMonthlyPeriodType = (fnFilter, calendar) => {
+const getSixMonthlyPeriodType = fnFilter => {
   return config => {
-    return getPeriods({
-      periodType: 'SIXMONTHLY',
-      config,
-      fnFilter,
-      calendar
-    });
+    let periods = [];
+    const offset = parseInt(config.offset, 10);
+    const isFilter = config.filterFuturePeriods;
+    const isReverse = config.reversePeriods;
+    const year = new Date(Date.now()).getFullYear() + offset;
+    let period = {};
+    period.startDate = "".concat(year, "-01-01");
+    period.endDate = "".concat(year, "-06-30");
+    period.name = "".concat(getMonthName(0), " - ").concat(getMonthName(5), " ").concat(year);
+    period.iso = "".concat(year, "S1");
+    period.id = period.iso;
+    periods.push(period);
+    period = {};
+    period.startDate = "".concat(year, "-07-01");
+    period.endDate = "".concat(year, "-12-31");
+    period.name = "".concat(getMonthName(6), " - ").concat(getMonthName(11), " ").concat(year);
+    period.iso = "".concat(year, "S2");
+    period.id = period.iso;
+    periods.push(period);
+    periods = isFilter ? fnFilter(periods) : periods;
+    periods = isReverse ? periods.reverse() : periods;
+    return periods;
   };
 };
 
-const getSixMonthlyAprilPeriodType = (fnFilter, calendar) => {
+const getSixMonthlyAprilPeriodType = fnFilter => {
   return config => {
-    return getPeriods({
-      periodType: 'SIXMONTHLYAPR',
-      config,
-      fnFilter,
-      calendar
-    });
+    let periods = [];
+    const offset = parseInt(config.offset, 10);
+    const isFilter = config.filterFuturePeriods;
+    const isReverse = config.reversePeriods;
+    const year = new Date(Date.now()).getFullYear() + offset;
+    let period = {};
+    period.startDate = "".concat(year, "-04-01");
+    period.endDate = "".concat(year, "-09-30");
+    period.name = "".concat(getMonthName(3), " - ").concat(getMonthName(8), " ").concat(year);
+    period.iso = "".concat(year, "AprilS1");
+    period.id = period.iso;
+    periods.push(period);
+    period = {};
+    period.startDate = "".concat(year, "-10-01");
+    period.endDate = "".concat(year + 1, "-03-31");
+    period.name = "".concat(getMonthName(9), " ").concat(year, " - ").concat(getMonthName(2), " ").concat(year + 1);
+    period.iso = "".concat(year, "AprilS2");
+    period.id = period.iso;
+    periods.push(period);
+    periods = isFilter ? fnFilter(periods) : periods;
+    periods = isReverse ? periods.reverse() : periods;
+    return periods;
   };
 };
 
-const getYearlyPeriodType = (fnFilter, calendar) => {
+const getYearlyPeriodType = (formatYyyyMmDd, fnFilter) => {
   return config => {
-    return getPeriods({
-      periodType: 'YEARLY',
-      config,
-      fnFilter,
-      calendar
-    });
+    let periods = [];
+    const offset = parseInt(config.offset, 10);
+    const isFilter = config.filterFuturePeriods;
+    const isReverse = config.reversePeriods;
+    const year = new Date(Date.now()).getFullYear() + offset;
+    const date = new Date("31 Dec ".concat(year));
+
+    while (year - date.getFullYear() < 10) {
+      const period = {};
+      period.endDate = formatYyyyMmDd(date);
+      date.setMonth(0, 1);
+      period.startDate = formatYyyyMmDd(date);
+      const dateString = date.getFullYear().toString();
+      period.name = dateString;
+      period.iso = date.getFullYear().toString();
+      period.id = period.iso.toString();
+      periods.push(period);
+      date.setDate(0);
+    }
+
+    periods = isFilter ? fnFilter(periods) : periods;
+    periods = isReverse ? periods : periods.reverse(); // Years are collected backwards. If isReverse is true, then do nothing. Else reverse to correct order and return.
+
+    return periods;
   };
 };
 
-const getFinancialOctoberPeriodType = (fnFilter, calendar) => {
+const getFinancialOctoberPeriodType = (formatYyyyMmDd, fnFilter) => {
   return config => {
-    return getPeriods({
-      periodType: 'FYOCT',
-      config,
-      fnFilter,
-      calendar
-    });
+    let periods = [];
+    const offset = parseInt(config.offset, 10);
+    const isFilter = config.filterFuturePeriods;
+    const isReverse = config.reversePeriods;
+    const year = new Date(Date.now()).getFullYear() + offset;
+    const date = new Date("30 Sep ".concat(year + 1));
+
+    for (let i = 0; i < 10; i++) {
+      const period = {};
+      period.endDate = formatYyyyMmDd(date);
+      date.setYear(date.getFullYear() - 1);
+      date.setDate(date.getDate() + 1);
+      period.startDate = formatYyyyMmDd(date);
+      const yearStart = date.getFullYear();
+      const yearEnd = date.getFullYear() + 1;
+      period.name = "".concat(getMonthName(9), " ").concat(yearStart, " - ").concat(getMonthName(8), " ").concat(yearEnd);
+      period.id = "".concat(date.getFullYear(), "Oct");
+      periods.push(period);
+      date.setDate(date.getDate() - 1);
+    }
+
+    periods = isFilter ? fnFilter(periods) : periods;
+    periods = isReverse ? periods : periods.reverse(); // FinancialOctober periods are collected backwards. If isReverse is true, then do nothing. Else reverse to correct order and return.
+
+    return periods;
   };
 };
 
-const getFinancialNovemberPeriodType = (fnFilter, calendar) => {
+const getFinancialNovemberPeriodType = (formatYyyyMmDd, fnFilter) => {
   return config => {
-    return getPeriods({
-      periodType: 'FYNOV',
-      config,
-      fnFilter,
-      calendar
-    });
+    let periods = [];
+    const offset = parseInt(config.offset, 10);
+    const isFilter = config.filterFuturePeriods;
+    const isReverse = config.reversePeriods;
+    const year = new Date(Date.now()).getFullYear() + offset;
+    const date = new Date("31 Oct ".concat(year + 1));
+
+    for (let i = 0; i < 10; i++) {
+      const period = {};
+      period.endDate = formatYyyyMmDd(date);
+      date.setYear(date.getFullYear() - 1);
+      date.setDate(date.getDate() + 1);
+      period.startDate = formatYyyyMmDd(date);
+      const yearStart = date.getFullYear();
+      const yearEnd = date.getFullYear() + 1;
+      period.name = "".concat(getMonthName(10), " ").concat(yearStart, " - ").concat(getMonthName(9), " ").concat(yearEnd);
+      period.id = "".concat(date.getFullYear(), "Nov");
+      periods.push(period);
+      date.setDate(date.getDate() - 1);
+    }
+
+    periods = isFilter ? fnFilter(periods) : periods;
+    periods = isReverse ? periods : periods.reverse(); // FinancialNovember periods are collected backwards. If isReverse is true, then do nothing. Else reverse to correct order and return.
+
+    return periods;
   };
 };
 
-const getFinancialJulyPeriodType = (fnFilter, calendar) => {
+const getFinancialJulyPeriodType = (formatYyyyMmDd, fnFilter) => {
   return config => {
-    return getPeriods({
-      periodType: 'FYJUL',
-      config,
-      fnFilter,
-      calendar
-    });
+    let periods = [];
+    const offset = parseInt(config.offset, 10);
+    const isFilter = config.filterFuturePeriods;
+    const isReverse = config.reversePeriods;
+    const year = new Date(Date.now()).getFullYear() + offset;
+    const date = new Date("30 Jun ".concat(year + 1));
+
+    for (let i = 0; i < 10; i++) {
+      const period = {};
+      period.endDate = formatYyyyMmDd(date);
+      date.setYear(date.getFullYear() - 1);
+      date.setDate(date.getDate() + 1);
+      period.startDate = formatYyyyMmDd(date);
+      const yearStart = date.getFullYear();
+      const yearEnd = date.getFullYear() + 1;
+      period.name = "".concat(getMonthName(6), " ").concat(yearStart, " - ").concat(getMonthName(5), " ").concat(yearEnd);
+      period.id = "".concat(date.getFullYear(), "July");
+      periods.push(period);
+      date.setDate(date.getDate() - 1);
+    }
+
+    periods = isFilter ? fnFilter(periods) : periods;
+    periods = isReverse ? periods : periods.reverse(); // FinancialJuly periods are collected backwards. If isReverse is true, then do nothing. Else reverse to correct order and return.
+
+    return periods;
   };
 };
 
-const getFinancialAprilPeriodType = (fnFilter, calendar) => {
+const getFinancialAprilPeriodType = (formatYyyyMmDd, fnFilter) => {
   return config => {
-    return getPeriods({
-      periodType: 'FYAPR',
-      config,
-      fnFilter,
-      calendar
-    });
+    let periods = [];
+    const offset = parseInt(config.offset, 10);
+    const isFilter = config.filterFuturePeriods;
+    const isReverse = config.reversePeriods;
+    const year = new Date(Date.now()).getFullYear() + offset;
+    const date = new Date("31 Mar ".concat(year + 1));
+
+    for (let i = 0; i < 10; i++) {
+      const period = {};
+      period.endDate = formatYyyyMmDd(date);
+      date.setYear(date.getFullYear() - 1);
+      date.setDate(date.getDate() + 1);
+      period.startDate = formatYyyyMmDd(date);
+      const yearStart = date.getFullYear();
+      const yearEnd = date.getFullYear() + 1;
+      period.name = "".concat(getMonthName(3), " ").concat(yearStart, " - ").concat(getMonthName(2), " ").concat(yearEnd);
+      period.id = "".concat(date.getFullYear(), "April");
+      periods.push(period);
+      date.setDate(date.getDate() - 1);
+    }
+
+    periods = isFilter ? fnFilter(periods) : periods;
+    periods = isReverse ? periods : periods.reverse(); // FinancialApril periods are collected backwards. If isReverse is true, then do nothing. Else reverse to correct order and return.
+
+    return periods;
   };
 };
 
+const formatYyyyMmDd = date => {
+  const y = date.getFullYear();
+  let m = String(date.getMonth() + 1);
+  let d = String(date.getDate());
+  m = m.length < 2 ? "0".concat(m) : m;
+  d = d.length < 2 ? "0".concat(d) : d;
+  return "".concat(y, "-").concat(m, "-").concat(d);
+};
+
 const filterFuturePeriods = periods => {
   const array = [];
   const now = new Date(Date.now());
@@ -222,93 +497,92 @@ const filterFuturePeriods = periods => {
   return array;
 };
 
-const getOptions = function () {
-  let calendar = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'gregory';
-  return [{
-    id: DAILY,
-    getPeriods: getDailyPeriodType(filterFuturePeriods, calendar),
-    name: i18n.t('Daily')
-  }, {
-    id: WEEKLY,
-    getPeriods: getWeeklyPeriodType({
-      startDay: 1
-    }, filterFuturePeriods, calendar),
-    name: i18n.t('Weekly')
-  }, {
-    id: WEEKLYWED,
-    getPeriods: getWeeklyPeriodType({
-      startDay: 3
-    }, filterFuturePeriods, calendar),
-    name: i18n.t('Weekly (Start Wednesday)')
-  }, {
-    id: WEEKLYTHU,
-    getPeriods: getWeeklyPeriodType({
-      startDay: 4
-    }, filterFuturePeriods, calendar),
-    name: i18n.t('Weekly (Start Thursday)')
-  }, {
-    id: WEEKLYSAT,
-    getPeriods: getWeeklyPeriodType({
-      startDay: 6
-    }, filterFuturePeriods, calendar),
-    name: i18n.t('Weekly (Start Saturday)')
-  }, {
-    id: WEEKLYSUN,
-    getPeriods: getWeeklyPeriodType({
-      startDay: 7
-    }, filterFuturePeriods, calendar),
-    name: i18n.t('Weekly (Start Sunday)')
-  }, {
-    id: BIWEEKLY,
-    getPeriods: getBiWeeklyPeriodType(filterFuturePeriods, calendar),
-    name: i18n.t('Bi-weekly')
-  }, {
-    id: MONTHLY,
-    getPeriods: getMonthlyPeriodType(filterFuturePeriods, calendar),
-    name: i18n.t('Monthly')
-  }, {
-    id: BIMONTHLY,
-    getPeriods: getBiMonthlyPeriodType(filterFuturePeriods, calendar),
-    name: i18n.t('Bi-monthly')
-  }, {
-    id: QUARTERLY,
-    getPeriods: getQuarterlyPeriodType(filterFuturePeriods, calendar),
-    name: i18n.t('Quarterly')
-  }, {
-    id: SIXMONTHLY,
-    getPeriods: getSixMonthlyPeriodType(filterFuturePeriods, calendar),
-    name: i18n.t('Six-monthly')
-  }, {
-    id: SIXMONTHLYAPR,
-    getPeriods: getSixMonthlyAprilPeriodType(filterFuturePeriods, calendar),
-    name: i18n.t('Six-monthly April')
-  }, {
-    id: YEARLY,
-    getPeriods: getYearlyPeriodType(filterFuturePeriods, calendar),
-    name: i18n.t('Yearly')
-  }, {
-    id: FYNOV,
-    getPeriods: getFinancialNovemberPeriodType(filterFuturePeriods, calendar),
-    name: i18n.t('Financial year (Start November)')
-  }, {
-    id: FYOCT,
-    getPeriods: getFinancialOctoberPeriodType(filterFuturePeriods, calendar),
-    name: i18n.t('Financial year (Start October)')
-  }, {
-    id: FYJUL,
-    getPeriods: getFinancialJulyPeriodType(filterFuturePeriods, calendar),
-    name: i18n.t('Financial year (Start July)')
-  }, {
-    id: FYAPR,
-    getPeriods: getFinancialAprilPeriodType(filterFuturePeriods, calendar),
-    name: i18n.t('Financial year (Start April)')
-  }];
-};
+const getOptions = () => [{
+  id: DAILY,
+  getPeriods: getDailyPeriodType(formatYyyyMmDd, filterFuturePeriods),
+  name: i18n.t('Daily')
+}, {
+  id: WEEKLY,
+  getPeriods: getWeeklyPeriodType(formatYyyyMmDd, {
+    shortName: '',
+    startDay: 1
+  }, filterFuturePeriods),
+  name: i18n.t('Weekly')
+}, {
+  id: WEEKLYWED,
+  getPeriods: getWeeklyPeriodType(formatYyyyMmDd, {
+    shortName: 'Wed',
+    startDay: 3
+  }, filterFuturePeriods),
+  name: i18n.t('Weekly (Start Wednesday)')
+}, {
+  id: WEEKLYTHU,
+  getPeriods: getWeeklyPeriodType(formatYyyyMmDd, {
+    shortName: 'Thu',
+    startDay: 4
+  }, filterFuturePeriods),
+  name: i18n.t('Weekly (Start Thursday)')
+}, {
+  id: WEEKLYSAT,
+  getPeriods: getWeeklyPeriodType(formatYyyyMmDd, {
+    shortName: 'Sat',
+    startDay: 6
+  }, filterFuturePeriods),
+  name: i18n.t('Weekly (Start Saturday)')
+}, {
+  id: WEEKLYSUN,
+  getPeriods: getWeeklyPeriodType(formatYyyyMmDd, {
+    shortName: 'Sun',
+    startDay: 7
+  }, filterFuturePeriods),
+  name: i18n.t('Weekly (Start Sunday)')
+}, {
+  id: BIWEEKLY,
+  getPeriods: getBiWeeklyPeriodType(formatYyyyMmDd, filterFuturePeriods),
+  name: i18n.t('Bi-weekly')
+}, {
+  id: MONTHLY,
+  getPeriods: getMonthlyPeriodType(formatYyyyMmDd, filterFuturePeriods),
+  name: i18n.t('Monthly')
+}, {
+  id: BIMONTHLY,
+  getPeriods: getBiMonthlyPeriodType(formatYyyyMmDd, filterFuturePeriods),
+  name: i18n.t('Bi-monthly')
+}, {
+  id: QUARTERLY,
+  getPeriods: getQuarterlyPeriodType(formatYyyyMmDd, filterFuturePeriods),
+  name: i18n.t('Quarterly')
+}, {
+  id: SIXMONTHLY,
+  getPeriods: getSixMonthlyPeriodType(filterFuturePeriods),
+  name: i18n.t('Six-monthly')
+}, {
+  id: SIXMONTHLYAPR,
+  getPeriods: getSixMonthlyAprilPeriodType(filterFuturePeriods),
+  name: i18n.t('Six-monthly April')
+}, {
+  id: YEARLY,
+  getPeriods: getYearlyPeriodType(formatYyyyMmDd, filterFuturePeriods),
+  name: i18n.t('Yearly')
+}, {
+  id: FYNOV,
+  getPeriods: getFinancialNovemberPeriodType(formatYyyyMmDd, filterFuturePeriods),
+  name: i18n.t('Financial year (Start November)')
+}, {
+  id: FYOCT,
+  getPeriods: getFinancialOctoberPeriodType(formatYyyyMmDd, filterFuturePeriods),
+  name: i18n.t('Financial year (Start October)')
+}, {
+  id: FYJUL,
+  getPeriods: getFinancialJulyPeriodType(formatYyyyMmDd, filterFuturePeriods),
+  name: i18n.t('Financial year (Start July)')
+}, {
+  id: FYAPR,
+  getPeriods: getFinancialAprilPeriodType(formatYyyyMmDd, filterFuturePeriods),
+  name: i18n.t('Financial year (Start April)')
+}];
 
-export const getFixedPeriodsOptionsById = function (id) {
-  let calendar = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'gregory';
-  return getOptions(calendar).find(option => option.id === id);
-};
+export const getFixedPeriodsOptionsById = id => getOptions().find(option => option.id === id);
 export const getFixedPeriodsOptions = () => getOptions();
 export const getYearOffsetFromNow = yearStr => parseInt(yearStr) - new Date(Date.now()).getFullYear();
 export const parsePeriodCode = (code, allowedTypes) => {