@softwear/latestcollectioncore 1.0.103 → 1.0.105

package/dist/articleStatus.d.ts

@@ -17,6 +17,7 @@ declare function getTimeGrouper(groupers: string[]): TimeGranularityE | undefine
 declare function runQuery(timeframe: HrTimeframeI, rawAggregations: RaGI, beginStock: boolean, transactions: TransactionI[], selectedGroupsValues: string[], skus: SkuI[], warehouses: any[], customers: any[], subtotalsForOuterGrouper: boolean, computedFilter: string, parentGroupTotals: boolean): RaGI;
 declare const _default: {
     getDateRangeFromPicker: (inputDates: string[]) => HrTimeframeI;
+    getDateRangeFromDatePair: (inputDates: string[]) => HrTimeframeI;
     getTimeGrouper: typeof getTimeGrouper;
     filtrexOptions: {
         extraFunctions: {

package/dist/articleStatus.js

@@ -231,21 +231,21 @@ function whichShardsToProcess(dateRange, granularity) {
     };
     const result = [];
     if (granularity == 'year')
-        for (let year = dateRange.fromYear; year <= dateRange.toYear; year++)
+        for (let year = dateRange.utcFromYear; year <= dateRange.utcToYear; year++)
             result.push(year);
     else
-        for (let year = dateRange.fromYear; year <= dateRange.toYear; year++) {
-            if (year == dateRange.fromYear && year < dateRange.toYear)
-                for (let month = dateRange.fromMonth; month <= 12; month++)
+        for (let year = dateRange.utcFromYear; year <= dateRange.utcToYear; year++) {
+            if (year == dateRange.utcFromYear && year < dateRange.utcToYear)
+                for (let month = dateRange.utcFromMonth; month <= 12; month++)
                     result.push('' + year + '' + padl(month));
-            if (year == dateRange.fromYear && year == dateRange.toYear)
-                for (let month = dateRange.fromMonth; month <= dateRange.toMonth; month++)
+            if (year == dateRange.utcFromYear && year == dateRange.utcToYear)
+                for (let month = dateRange.utcFromMonth; month <= dateRange.utcToMonth; month++)
                     result.push('' + year + '' + padl(month));
-            if (year != dateRange.fromYear && year != dateRange.toYear)
+            if (year != dateRange.utcFromYear && year != dateRange.utcToYear)
                 for (let month = 1; month <= 12; month++)
                     result.push('' + year + '' + padl(month));
-            if (year != dateRange.fromYear && year == dateRange.toYear)
-                for (let month = 1; month <= dateRange.toMonth; month++)
+            if (year != dateRange.utcFromYear && year == dateRange.utcToYear)
+                for (let month = 1; month <= dateRange.utcToMonth; month++)
                     result.push('' + year + '' + padl(month));
         }
     return result;
@@ -335,12 +335,19 @@ function runQuery(timeframe, rawAggregations, beginStock, transactions, selected
     }
     return rawAggregations;
 }
+/**
+ * @param inputDates array of two YYYY-MM-DD strings
+ */
 const getDateRangeFromPicker = function (inputDates) {
     if (!Array.isArray(inputDates))
         return {
             beginTimeStamp: 0,
             endTimeStamp: 0,
             timeFrame: 0,
+            utcFromYear: 0,
+            utcToYear: 0,
+            utcFromMonth: 0,
+            utcToMonth: 0,
             fromYear: 0,
             toYear: 0,
             fromMonth: 0,
@@ -365,6 +372,62 @@ const getDateRangeFromPicker = function (inputDates) {
         beginTimeStamp,
         endTimeStamp,
         timeFrame,
+        utcFromYear: fromDate.getUTCFullYear(),
+        utcToYear: toDate.getUTCFullYear(),
+        utcFromMonth: fromDate.getUTCMonth(),
+        utcToMonth: toDate.getUTCMonth(),
+        fromYear: parseInt((0, date_fns_1.format)(fromDate, 'yyyy')),
+        toYear: toDate.getUTCFullYear(),
+        fromMonth: parseInt((0, date_fns_1.format)(fromDate, 'MM')),
+        toMonth: parseInt((0, date_fns_1.format)(toDate, 'MM')),
+        hrYear: (0, date_fns_1.format)(fromDate, 'yyyy'),
+        hrQuarter: (0, date_fns_1.format)(fromDate, 'yyyy-QQQ'),
+        hrMonth: (0, date_fns_1.format)(fromDate, 'yyyy-MM'),
+        hrWeek: (0, date_fns_1.format)(fromDate, 'RRRR-II'),
+        hrDay: (0, date_fns_1.format)(fromDate, 'yyyy-MM-dd'),
+    };
+};
+/**
+ * @param inputDates array of two ISO Date strings
+ */
+const getDateRangeFromDatePair = function (inputDates) {
+    if (!Array.isArray(inputDates))
+        return {
+            beginTimeStamp: 0,
+            endTimeStamp: 0,
+            timeFrame: 0,
+            utcFromYear: 0,
+            utcToYear: 0,
+            utcFromMonth: 0,
+            utcToMonth: 0,
+            fromYear: 0,
+            toYear: 0,
+            fromMonth: 0,
+            toMonth: 0,
+            hrYear: '',
+            hrQuarter: '',
+            hrMonth: '',
+            hrWeek: '',
+            hrDay: '',
+        };
+    const dates = inputDates.slice();
+    dates.sort((a, b) => {
+        return ('' + a).localeCompare(b);
+    });
+    const fromDate = new Date(Date.parse(dates[0]));
+    fromDate.setSeconds(fromDate.getSeconds());
+    const toDate = new Date(Date.parse(dates[1]));
+    const beginTimeStamp = fromDate.getTime();
+    const endTimeStamp = toDate.getTime();
+    const timeFrame = endTimeStamp - beginTimeStamp;
+    return {
+        beginTimeStamp,
+        endTimeStamp,
+        timeFrame,
+        utcFromYear: fromDate.getUTCFullYear(),
+        utcToYear: toDate.getUTCFullYear(),
+        utcFromMonth: fromDate.getUTCMonth(),
+        utcToMonth: toDate.getUTCMonth(),
         fromYear: parseInt((0, date_fns_1.format)(fromDate, 'yyyy')),
         toYear: parseInt((0, date_fns_1.format)(toDate, 'yyyy')),
         fromMonth: parseInt((0, date_fns_1.format)(fromDate, 'MM')),
@@ -378,6 +441,7 @@ const getDateRangeFromPicker = function (inputDates) {
 };
 exports.default = {
     getDateRangeFromPicker,
+    getDateRangeFromDatePair,
     getTimeGrouper,
     filtrexOptions,
     postAgg,

package/dist/types.d.ts

@@ -304,6 +304,10 @@ interface HrTimeframeI {
     beginTimeStamp: number;
     endTimeStamp: number;
     timeFrame: number;
+    utcFromYear: number;
+    utcToYear: number;
+    utcFromMonth: number;
+    utcToMonth: number;
     fromYear: number;
     toYear: number;
     fromMonth: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@softwear/latestcollectioncore",
-  "version": "1.0.103",
+  "version": "1.0.105",
   "description": "Core functions for LatestCollections applications",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/articleStatus.ts

@@ -304,14 +304,14 @@ function whichShardsToProcess(dateRange: any, granularity: 'year' | 'month'): an
     return '0' + s
   }
   const result = [] as any[]
-  if (granularity == 'year') for (let year = dateRange.fromYear; year <= dateRange.toYear; year++) result.push(year)
+  if (granularity == 'year') for (let year = dateRange.utcFromYear; year <= dateRange.utcToYear; year++) result.push(year)
   else
-    for (let year = dateRange.fromYear; year <= dateRange.toYear; year++) {
-      if (year == dateRange.fromYear && year < dateRange.toYear) for (let month = dateRange.fromMonth; month <= 12; month++) result.push('' + year + '' + padl(month))
-      if (year == dateRange.fromYear && year == dateRange.toYear)
-        for (let month = dateRange.fromMonth; month <= dateRange.toMonth; month++) result.push('' + year + '' + padl(month))
-      if (year != dateRange.fromYear && year != dateRange.toYear) for (let month = 1; month <= 12; month++) result.push('' + year + '' + padl(month))
-      if (year != dateRange.fromYear && year == dateRange.toYear) for (let month = 1; month <= dateRange.toMonth; month++) result.push('' + year + '' + padl(month))
+    for (let year = dateRange.utcFromYear; year <= dateRange.utcToYear; year++) {
+      if (year == dateRange.utcFromYear && year < dateRange.utcToYear) for (let month = dateRange.utcFromMonth; month <= 12; month++) result.push('' + year + '' + padl(month))
+      if (year == dateRange.utcFromYear && year == dateRange.utcToYear)
+        for (let month = dateRange.utcFromMonth; month <= dateRange.utcToMonth; month++) result.push('' + year + '' + padl(month))
+      if (year != dateRange.utcFromYear && year != dateRange.utcToYear) for (let month = 1; month <= 12; month++) result.push('' + year + '' + padl(month))
+      if (year != dateRange.utcFromYear && year == dateRange.utcToYear) for (let month = 1; month <= dateRange.utcToMonth; month++) result.push('' + year + '' + padl(month))
     }
   return result
 }
@@ -405,12 +405,19 @@ function runQuery(
   return rawAggregations
 }
 
+/**
+ * @param inputDates array of two YYYY-MM-DD strings
+ */
 const getDateRangeFromPicker = function (inputDates: string[]): HrTimeframeI {
   if (!Array.isArray(inputDates))
     return {
       beginTimeStamp: 0,
       endTimeStamp: 0,
       timeFrame: 0,
+      utcFromYear: 0,
+      utcToYear: 0,
+      utcFromMonth: 0,
+      utcToMonth: 0,
       fromYear: 0,
       toYear: 0,
       fromMonth: 0,
@@ -436,6 +443,64 @@ const getDateRangeFromPicker = function (inputDates: string[]): HrTimeframeI {
     beginTimeStamp,
     endTimeStamp,
     timeFrame,
+    utcFromYear: fromDate.getUTCFullYear(),
+    utcToYear: toDate.getUTCFullYear(),
+    utcFromMonth: fromDate.getUTCMonth(),
+    utcToMonth: toDate.getUTCMonth(),
+    fromYear: parseInt(format(fromDate, 'yyyy')),
+    toYear: toDate.getUTCFullYear(),
+    fromMonth: parseInt(format(fromDate, 'MM')),
+    toMonth: parseInt(format(toDate, 'MM')),
+    hrYear: format(fromDate, 'yyyy'),
+    hrQuarter: format(fromDate, 'yyyy-QQQ'),
+    hrMonth: format(fromDate, 'yyyy-MM'),
+    hrWeek: format(fromDate, 'RRRR-II'),
+    hrDay: format(fromDate, 'yyyy-MM-dd'),
+  }
+}
+
+/**
+ * @param inputDates array of two ISO Date strings
+ */
+const getDateRangeFromDatePair = function (inputDates: string[]): HrTimeframeI {
+  if (!Array.isArray(inputDates))
+    return {
+      beginTimeStamp: 0,
+      endTimeStamp: 0,
+      timeFrame: 0,
+      utcFromYear: 0,
+      utcToYear: 0,
+      utcFromMonth: 0,
+      utcToMonth: 0,
+      fromYear: 0,
+      toYear: 0,
+      fromMonth: 0,
+      toMonth: 0,
+      hrYear: '',
+      hrQuarter: '',
+      hrMonth: '',
+      hrWeek: '',
+      hrDay: '',
+    }
+  const dates = inputDates.slice()
+  dates.sort((a, b) => {
+    return ('' + a).localeCompare(b)
+  })
+  const fromDate = new Date(Date.parse(dates[0]))
+  fromDate.setSeconds(fromDate.getSeconds())
+
+  const toDate = new Date(Date.parse(dates[1]))
+  const beginTimeStamp = fromDate.getTime()
+  const endTimeStamp = toDate.getTime()
+  const timeFrame = endTimeStamp - beginTimeStamp
+  return {
+    beginTimeStamp,
+    endTimeStamp,
+    timeFrame,
+    utcFromYear: fromDate.getUTCFullYear(),
+    utcToYear: toDate.getUTCFullYear(),
+    utcFromMonth: fromDate.getUTCMonth(),
+    utcToMonth: toDate.getUTCMonth(),
     fromYear: parseInt(format(fromDate, 'yyyy')),
     toYear: parseInt(format(toDate, 'yyyy')),
     fromMonth: parseInt(format(fromDate, 'MM')),
@@ -450,6 +515,7 @@ const getDateRangeFromPicker = function (inputDates: string[]): HrTimeframeI {
 
 export default {
   getDateRangeFromPicker,
+  getDateRangeFromDatePair,
   getTimeGrouper,
   filtrexOptions,
   postAgg,

package/src/types.ts

@@ -323,6 +323,10 @@ interface HrTimeframeI {
   beginTimeStamp: number
   endTimeStamp: number
   timeFrame: number
+  utcFromYear: number
+  utcToYear: number
+  utcFromMonth: number
+  utcToMonth: number
   fromYear: number
   toYear: number
   fromMonth: number

package/test/articleStatus.spec.js

@@ -242,5 +242,33 @@ describe('#articleStatus', () => {
       expect(JSON.stringify(result[2].vector[articleStatus.VALUE_AVG_STOCK])).to.equal('90.00000031709791')
       expect(JSON.stringify(result[2].vector[articleStatus.MARGIN])).to.equal('50')
     })
+    describe('#getDateRangeFromPicker', () => {
+      const dateRange = articleStatus.getDateRangeFromPicker(['2024-01-01', '2024-12-31'])
+      expect(dateRange.beginTimeStamp).to.equal(1704063600000)
+      expect(dateRange.fromYear).to.equal(2024)
+      expect(dateRange.fromMonth).to.equal(1)
+      expect(dateRange.toYear).to.equal(2024)
+      expect(dateRange.toMonth).to.equal(12)
+      expect(dateRange.hrYear).to.equal('2024')
+      expect(dateRange.hrQuarter).to.equal('2024-Q1')
+      expect(dateRange.hrMonth).to.equal('2024-01')
+      expect(dateRange.hrWeek).to.equal('2024-01')
+      expect(dateRange.hrDay).to.equal('2024-01-01')
+      expect(dateRange.timeFrame).to.equal(366 * 24 * 3600 * 1000)
+    })
+    describe('#getDateRangeFromDatePair', () => {
+      const dateRange = articleStatus.getDateRangeFromDatePair(['2023-12-31T23:00:00.000Z', '2024-12-31T23:00:00.000Z'])
+      expect(dateRange.beginTimeStamp).to.equal(1704063600000)
+      expect(dateRange.fromYear).to.equal(2024)
+      expect(dateRange.fromMonth).to.equal(1)
+      expect(dateRange.toYear).to.equal(2025)
+      expect(dateRange.hrQuarter).to.equal('2024-Q1')
+      expect(dateRange.toMonth).to.equal(1)
+      expect(dateRange.hrYear).to.equal('2024')
+      expect(dateRange.hrMonth).to.equal('2024-01')
+      expect(dateRange.hrWeek).to.equal('2024-01')
+      expect(dateRange.hrDay).to.equal('2024-01-01')
+      expect(dateRange.timeFrame).to.equal(366 * 24 * 3600 * 1000)
+    })
   })
 })