tango-app-ui-analyse-zone 3.7.1-beta.13 → 3.7.1-beta.14

package/fesm2022/tango-app-ui-analyse-zone.mjs

@@ -2863,10 +2863,10 @@ class StoreHeatmapComponent {
     changeTab(tabName) {
         this.selectedTab = tabName;
         this.zoneName = tabName;
+        this.type = 'daily';
         this.getOverallStoreHeatmapDates();
         this.getTrajectoryAnalysis();
         this.getTrajectoryRateAnalysis();
-        this.getAnalaysisSummary();
         this.changeDetector.detectChanges();
     }
     getAvailableZoneNames() {
@@ -2937,6 +2937,7 @@ class StoreHeatmapComponent {
         this.Zonev2Service.getOverallStoreConcentrationData(requestData).pipe(takeUntil(this.destroy$)).subscribe((response) => {
             this.heatmapLoading = false;
             if (response?.code === 200 && response?.status === "success") {
+                this.formatDateInput(this.selectedDate);
                 // this.overallStoreData = response.data.overallStoreConcentrationDatas;
                 this.overallStoreconcentrationData = response.data.overallStoreConcentrationDatas;
                 this.heatmapNoData = false;
@@ -2954,7 +2955,6 @@ class StoreHeatmapComponent {
                 this.cardDataLoading = false;
                 this.cardNoData = true;
             }
-            // this.getAnalaysisSummary()
         }, error => {
             this.overallStoreconcentrationData = [];
             // this.zoneConcentrationData = []
@@ -2967,70 +2967,51 @@ class StoreHeatmapComponent {
         this.customArrow = false;
         this.heatmapLoading = true;
         this.heatmapNoData = true;
-        // this.cardDataLoading = true;
         const requestData = {
             fromDate: this.headerData.date.startDate,
             toDate: this.headerData.date.endDate,
-            storeId: this.headerData.stores.filter((store) => store.checked).map((store) => store.storeId),
+            storeId: this.headerData.stores.filter((s) => s.checked).map((s) => s.storeId),
             clientId: this.headerData.client,
             zoneName: this.zoneName,
-            dateType: this.type
+            dateType: this.type,
         };
-        this.Zonev2Service.getOverallStoreHeatmapDates(requestData).pipe(takeUntil(this.destroy$)).subscribe((response) => {
-            if (response && response.data) {
-                this.overallStoreConcentrationDates = response.data.overallStoreConcentrationDates;
-                this.selectedDate = this.overallStoreConcentrationDates[0].zoneDate;
-                // if(['weekly','monthly'].includes(this.type)) {
-                //   let lastDigit = this.overallStoreConcentrationDates[this.overallStoreConcentrationDates.length -1].zoneDate;
-                //   let lastSplit = lastDigit.split('-')[1];
-                //   lastSplit = lastSplit +' '+ this.dayjs().format('YYYY');
-                //   if(this.dayjs(lastSplit,'MMM DD YYYY').format('YYYY-MM-DD') > this.dayjs(this.headerData.date.endDate).format('YYYY-MM-DD'))
-                //     this.overallStoreConcentrationDates.splice(this.overallStoreConcentrationDates.length-1,1);
-                //   }
-                if (response?.code === 200 && response?.status === "success" && response.data.overallStoreConcentrationDates.length) {
-                    if (this.type === 'daily') {
-                        if (response.data.overallStoreConcentrationDates.length > 7) {
-                            this.customArrow = true;
-                        }
-                    }
-                    else if (this.type === 'weekly') {
-                        if (response.data.overallStoreConcentrationDates.length > 5) {
-                            this.customArrow = true;
-                        }
-                    }
-                    else {
-                    }
+        this.Zonev2Service.getOverallStoreHeatmapDates(requestData)
+            .pipe(takeUntil(this.destroy$))
+            .subscribe({
+            next: (response) => {
+                const data = response?.data?.overallStoreConcentrationDates || [];
+                this.overallStoreConcentrationDates = data;
+                this.heatmapLoading = false;
+                if (response?.code === 200 && response?.status === 'success' && data.length) {
+                    this.selectedDate = data[0].zoneDate;
+                    // Show arrows based on count
+                    this.customArrow =
+                        (this.type === 'daily' && data.length > 7) ||
+                            (this.type === 'weekly' && data.length > 5);
+                    // ✅ Load dependent data
                     this.getOverallStoreConcentrationData();
-                    //   this.heatmapLoading = false;
-                    // this.heatmapNoData = false;
+                    this.getAnalaysisSummary();
                 }
                 else {
-                    this.heatmapLoading = false;
                     this.heatmapNoData = true;
-                    // this.cardNoData = true;
-                    // this.cardDataLoading = false;
                 }
-            }
-            else {
+            },
+            error: () => {
                 this.heatmapLoading = false;
                 this.heatmapNoData = true;
-            }
-        }, error => {
-            this.heatmapLoading = false;
-            this.heatmapNoData = true;
-            // console.error('API call failed', error);
+            },
         });
     }
     onDateChange(date) {
         if (this.selectedDate !== date) {
             this.selectedDate = date;
             this.getOverallStoreConcentrationData();
+            this.getAnalaysisSummary();
         }
     }
     selectPlan(selectedType) {
         this.type = selectedType;
-        this.getOverallStoreHeatmapDates();
-        // this.getOverallStoreConcentrationData();
+        this.getOverallStoreHeatmapDates(); // auto handles everything
     }
     onZoneClick(zoneName) {
         this.zoneName = zoneName;
@@ -3100,38 +3081,57 @@ class StoreHeatmapComponent {
             series.appear(1000, 100);
         }, 100);
     }
+    // --- Utility: format date string (single or range)
+    formatDateInput(dateStr) {
+        if (!dateStr) {
+            return { fromDate: this.headerData.date.startDate, toDate: this.headerData.date.endDate };
+        }
+        const formatLocalDate = (d) => {
+            const date = new Date(d);
+            const y = date.getFullYear();
+            const m = String(date.getMonth() + 1).padStart(2, '0');
+            const day = String(date.getDate()).padStart(2, '0');
+            return `${y}-${m}-${day}`;
+        };
+        const parts = dateStr.split(' - ').map(p => p.trim());
+        const from = formatLocalDate(parts[0]);
+        const to = formatLocalDate(parts[1] || parts[0]);
+        return { fromDate: from, toDate: to };
+    }
     getAnalaysisSummary() {
-        this.cardDataLoading = true;
-        this.cardNoData = false;
+        const { fromDate, toDate } = this.formatDateInput(this.selectedDate);
         const requestData = {
-            fromDate: this.headerData.date.startDate,
-            toDate: this.headerData.date.endDate,
-            storeId: this.headerData.stores.filter((store) => store.checked).map((store) => store.storeId),
-            // storeId: ["204"],
+            fromDate,
+            toDate,
+            storeId: this.headerData.stores.filter((s) => s.checked).map((s) => s.storeId),
             clientId: this.headerData.client,
             zoneName: this.zoneName,
         };
-        this.Zonev2Service.getAnalaysisSummary(requestData).pipe(takeUntil(this.destroy$)).subscribe((response) => {
-            if (response && response.data && response.data.zoneConcentrationData && response.data.zoneConcentrationData.length > 0) {
-                this.overallStoreData = response.data.zoneConcentrationData[0]; // Get the first zone data
-                this.ageAnalysis = this.overallStoreData.ageAnalysis || [];
-                this.genderAnalysis = this.overallStoreData.genderAnalysis || [];
-                setTimeout(() => {
-                    this.genderchart();
-                }, 200);
+        this.cardDataLoading = true;
+        this.cardNoData = false;
+        this.Zonev2Service.getAnalaysisSummary(requestData)
+            .pipe(takeUntil(this.destroy$))
+            .subscribe({
+            next: (response) => {
+                const zoneData = response?.data?.zoneConcentrationData || [];
+                if (zoneData.length) {
+                    this.overallStoreData = zoneData[0];
+                    this.ageAnalysis = this.overallStoreData.ageAnalysis || [];
+                    this.genderAnalysis = this.overallStoreData.genderAnalysis || [];
+                    setTimeout(() => this.genderchart(), 200);
+                    this.cardNoData = false;
+                }
+                else {
+                    this.overallStoreData = [];
+                    this.cardNoData = true;
+                }
                 this.cardDataLoading = false;
-                this.cardNoData = false;
-            }
-            else {
-                // this.cardData = []
+            },
+            error: () => {
                 this.overallStoreData = [];
                 this.cardDataLoading = false;
                 this.cardNoData = true;
-            }
-        }, error => {
-            // this.cardData = []
-            this.overallStoreData = [];
-            this.changeDetector.detectChanges();
+            },
         });
     }
     getAgeArray() {