@licklist/design 0.44.550-dev.0 → 0.44.550-dev.2

package/dist/events/event-statistic-modal/utils/index.d.ts

@@ -4,12 +4,18 @@ export declare const TRANSLATION_KEYS: {
     total: string;
     totalPerCategory: string;
 };
-export declare const convertEventStatisticToTableData: (date: string, eventStatistic: EventStatistic) => {
+type TableDataRecord = {
     name: string;
     key: string;
     isHeader?: boolean;
     isBold?: boolean;
-    quantity: string | number;
-    total: string | number;
-}[];
+    quantity: string;
+    total: string;
+    metadata?: {
+        _productsSold: number;
+        _total: number;
+    };
+};
+export declare const convertEventStatisticToTableData: (date: string, eventStatistic: EventStatistic) => TableDataRecord[];
+export {};
 //# sourceMappingURL=index.d.ts.map

package/dist/events/event-statistic-modal/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/events/event-statistic-modal/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kEAAkE,CAAC;AAIlG,eAAO,MAAM,gBAAgB;;;;CAI5B,CAAC;AAEF,eAAO,MAAM,gCAAgC,SACrC,MAAM,kBACI,cAAc;UAUtB,MAAM;SACP,MAAM;eACA,OAAO;aACT,OAAO;cACN,MAAM,GAAG,MAAM;WAClB,MAAM,GAAG,MAAM;GAsEzB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/events/event-statistic-modal/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kEAAkE,CAAC;AAIlG,eAAO,MAAM,gBAAgB;;;;CAI5B,CAAC;AAEF,KAAK,eAAe,GAAG;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE;QACT,aAAa,EAAE,MAAM,CAAC;QACtB,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;CACH,CAAC;AAEF,eAAO,MAAM,gCAAgC,SACrC,MAAM,kBACI,cAAc,sBA4G/B,CAAC"}

package/dist/events/event-statistic-modal/utils/index.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var t=require("@licklist/core/dist/Config"),o=require("luxon"),a={shortQuantity:"shortQuantity",total:"total",totalPerCategory:"totalPerCategory"};exports.TRANSLATION_KEYS=a,exports.convertEventStatisticToTableData=function(r,e){var n,c,i=0,u=0;if(!e)return[];var l=[],y=o.DateTime.fromISO(r).toUTC().toFormat(t.DATE_FORMAT),s=null!==(c=null===(n=Object.keys(null==e?void 0:e.productCategorySummary))||void 0===n?void 0:n.filter((function(a){return o.DateTime.fromFormat(a,t.DATE_TIME_FULL_FORMAT).toFormat(t.DATE_FORMAT)===y})))&&void 0!==c?c:[];return s.map((function(t){return null==e?void 0:e.productCategorySummary[t]})).forEach((function(t){t.forEach((function(t){var o=t.totalPerCategory,r=t.productsSummary,e=void 0===r?[]:r,n=t.categoryName,c=t.eventId,y=0;i+=o||0,l.push({name:n,key:"".concat(c,".").concat(n),isBold:!0,isHeader:!0,quantity:a.shortQuantity,total:a.total}),null==e||e.forEach((function(t){var o=t.productsSold,a=t.name,r=t.totalQuantity,e=t.total;y+=o,l.push({name:a,key:"".concat(c,".").concat(n,".").concat(a),quantity:r?"".concat(o," / ").concat(r):String(o),total:String(e)})})),l.push({name:a.totalPerCategory,key:"".concat(c,".").concat(n,".").concat(a.totalPerCategory),quantity:y,total:o,isBold:!0}),u+=y}))})),l.push({name:a.total,key:"".concat(a.total,".").concat(i),quantity:u,total:i,isBold:!0}),l};
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var t=require("tslib"),a=require("@licklist/core/dist/Config"),o=require("luxon"),e={shortQuantity:"shortQuantity",total:"total",totalPerCategory:"totalPerCategory"};exports.TRANSLATION_KEYS=e,exports.convertEventStatisticToTableData=function(r,c){var n,l,i=0,u=0;if(!c)return[];var d=o.DateTime.fromISO(r).toUTC().toFormat(a.DATE_FORMAT),y=null!==(l=null===(n=Object.keys(null==c?void 0:c.productCategorySummary))||void 0===n?void 0:n.filter((function(t){return o.DateTime.fromFormat(t,a.DATE_TIME_FULL_FORMAT).toFormat(a.DATE_FORMAT)===d})))&&void 0!==l?l:[],m=new Map;return y.map((function(t){return null==c?void 0:c.productCategorySummary[t]})).flat().sort((function(t,a){return t.categoryName===a.categoryName?0:t.categoryName>a.categoryName?1:-1})).forEach((function(t){var a,o=t.totalPerCategory,r=t.productsSummary,c=void 0===r?[]:r,n=t.categoryName,l=t.eventId,d=0;i+=o||0,m.has("".concat(n))||m.set("".concat(n),{name:n,key:"".concat(l,".").concat(n),isBold:!0,isHeader:!0,quantity:e.shortQuantity,total:e.total}),null==c||c.forEach((function(t){var a,o=t.productsSold,e=t.name,r=t.totalQuantity,c=t.total;d+=o;var i=null!==(a=m.get("".concat(n,".").concat(e)))&&void 0!==a?a:{metadata:{_productsSold:0,_total:0}};m.set("".concat(n,".").concat(e),{name:e,key:"".concat(l,".").concat(n,".").concat(e),quantity:r?"".concat(i.metadata._productsSold+o," / ").concat(r):String(i.metadata._productsSold+o),total:String(i.metadata._total+c),metadata:{_productsSold:i.metadata._productsSold+o,_total:i.metadata._total+c}})}));var y=null!==(a=m.get("".concat(n,".").concat(e.totalPerCategory)))&&void 0!==a?a:{quantity:0,total:0};m.set("".concat(n,".").concat(e.totalPerCategory),{name:e.totalPerCategory,key:"".concat(l,".").concat(n,".").concat(e.totalPerCategory),quantity:String(Number(y.quantity)+d),total:String(Number(y.total)+o),isBold:!0}),u+=d})),m.set("".concat(e.total,".").concat(i),{name:e.total,key:"".concat(e.total,".").concat(i),quantity:String(u),total:String(i),isBold:!0}),t.__spreadArray([],t.__read(m.values()),!1)};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@licklist/design",
-  "version": "0.44.550-dev.0",
+  "version": "0.44.550-dev.2",
   "repository": {
     "type": "git",
     "url": "git+ssh://git@bitbucket.org/artelogicsoft/licklist_design.git"

package/src/events/event-statistic-modal/EventStatisticModal.stories.tsx

@@ -91,6 +91,57 @@ Default.args = {
           ],
         },
       ],
+      "2023-08-31 10:35:00": [
+        {
+          eventId: 1236,
+          categoryName: "ticket",
+          totalPerCategory: 1300,
+          productsSummary: [
+            {
+              id: 221,
+              name: "VIP",
+              productsSold: 13,
+              totalQuantity: 25,
+              total: 1300,
+            },
+          ],
+        },
+        {
+          eventId: 1236,
+          categoryName: "booking cat",
+          totalPerCategory: 275,
+          productsSummary: [
+            {
+              id: 222,
+              name: "Table booking",
+              productsSold: 11,
+              totalQuantity: null,
+              total: 275,
+            },
+          ],
+        },
+        {
+          eventId: 1236,
+          categoryName: "Menu",
+          totalPerCategory: 450,
+          productsSummary: [
+            {
+              id: 223,
+              name: "Wine 1 bottle",
+              productsSold: 9,
+              totalQuantity: null,
+              total: 360,
+            },
+            {
+              id: 224,
+              name: "caesar salad",
+              productsSold: 9,
+              totalQuantity: null,
+              total: 90,
+            },
+          ],
+        },
+      ],
     },
   },
 };

package/src/events/event-statistic-modal/utils/index.ts

@@ -8,6 +8,19 @@ export const TRANSLATION_KEYS = {
   totalPerCategory: "totalPerCategory",
 };
 
+type TableDataRecord = {
+  name: string;
+  key: string;
+  isHeader?: boolean;
+  isBold?: boolean;
+  quantity: string;
+  total: string;
+  metadata?: {
+    _productsSold: number;
+    _total: number;
+  };
+};
+
 export const convertEventStatisticToTableData = (
   date: string,
   eventStatistic: EventStatistic
@@ -19,15 +32,6 @@ export const convertEventStatisticToTableData = (
     return [];
   }
 
-  const tableDataArray: {
-    name: string;
-    key: string;
-    isHeader?: boolean;
-    isBold?: boolean;
-    quantity: string | number;
-    total: string | number;
-  }[] = [];
-
   const summaryFormattedDate = DateTime.fromISO(date)
     .toUTC()
     .toFormat(DATE_FORMAT);
@@ -40,16 +44,26 @@ export const convertEventStatisticToTableData = (
         ) === summaryFormattedDate
     ) ?? [];
 
+  const summaryMap = new Map<string, TableDataRecord>();
+
   summaryDays
     .map((day) => eventStatistic?.productCategorySummary[day])
-    .forEach((summaries) => {
-      summaries.forEach(
-        ({ totalPerCategory, productsSummary = [], categoryName, eventId }) => {
-          let quantity = 0;
+    .flat()
+    .sort((prev, next) =>
+      prev.categoryName === next.categoryName
+        ? 0
+        : prev.categoryName > next.categoryName
+        ? 1
+        : -1
+    )
+    .forEach(
+      ({ totalPerCategory, productsSummary = [], categoryName, eventId }) => {
+        let quantity = 0;
 
-          totalAmount += totalPerCategory || 0;
+        totalAmount += totalPerCategory || 0;
 
-          tableDataArray.push({
+        if (!summaryMap.has(`${categoryName}`)) {
+          summaryMap.set(`${categoryName}`, {
             name: categoryName,
             key: `${eventId}.${categoryName}`,
             isBold: true,
@@ -57,42 +71,64 @@ export const convertEventStatisticToTableData = (
             quantity: TRANSLATION_KEYS.shortQuantity,
             total: TRANSLATION_KEYS.total,
           });
+        }
 
-          productsSummary?.forEach(
-            ({ productsSold, name, totalQuantity, total }) => {
-              quantity += productsSold;
-
-              tableDataArray.push({
-                name,
-                key: `${eventId}.${categoryName}.${name}`,
-                quantity: totalQuantity
-                  ? `${productsSold} / ${totalQuantity}`
-                  : String(productsSold),
-                total: String(total),
-              });
-            }
-          );
-
-          tableDataArray.push({
-            name: TRANSLATION_KEYS.totalPerCategory,
-            key: `${eventId}.${categoryName}.${TRANSLATION_KEYS.totalPerCategory}`,
-            quantity,
-            total: totalPerCategory,
-            isBold: true,
-          });
+        productsSummary?.forEach(
+          ({ productsSold, name, totalQuantity, total }) => {
+            quantity += productsSold;
 
-          totalQuantity += quantity;
-        }
-      );
-    });
+            const existingProduct = summaryMap.get(
+              `${categoryName}.${name}`
+            ) ?? {
+              metadata: {
+                _productsSold: 0,
+                _total: 0,
+              },
+            };
+
+            summaryMap.set(`${categoryName}.${name}`, {
+              name,
+              key: `${eventId}.${categoryName}.${name}`,
+              quantity: totalQuantity
+                ? `${
+                    existingProduct.metadata._productsSold + productsSold
+                  } / ${totalQuantity}`
+                : String(existingProduct.metadata._productsSold + productsSold),
+              total: String(existingProduct.metadata._total + total),
+              metadata: {
+                _productsSold:
+                  existingProduct.metadata._productsSold + productsSold,
+                _total: existingProduct.metadata._total + total,
+              },
+            });
+          }
+        );
+
+        const prevTotalPerCategory = summaryMap.get(
+          `${categoryName}.${TRANSLATION_KEYS.totalPerCategory}`
+        ) ?? {
+          quantity: 0,
+          total: 0,
+        };
+        summaryMap.set(`${categoryName}.${TRANSLATION_KEYS.totalPerCategory}`, {
+          name: TRANSLATION_KEYS.totalPerCategory,
+          key: `${eventId}.${categoryName}.${TRANSLATION_KEYS.totalPerCategory}`,
+          quantity: String(Number(prevTotalPerCategory.quantity) + quantity),
+          total: String(Number(prevTotalPerCategory.total) + totalPerCategory),
+          isBold: true,
+        });
+
+        totalQuantity += quantity;
+      }
+    );
 
-  tableDataArray.push({
+  summaryMap.set(`${TRANSLATION_KEYS.total}.${totalAmount}`, {
     name: TRANSLATION_KEYS.total,
     key: `${TRANSLATION_KEYS.total}.${totalAmount}`,
-    quantity: totalQuantity,
-    total: totalAmount,
+    quantity: String(totalQuantity),
+    total: String(totalAmount),
     isBold: true,
   });
 
-  return tableDataArray;
+  return [...summaryMap.values()];
 };