@annalib/anna-core 1.2.2 → 1.2.3

package/fesm2020/annalib-anna-core-src-lib-anna-generic-table-lib.mjs

@@ -837,7 +837,7 @@ class AnnaNonEditableGenericTableComponent {
         this.setTooltipRadioNames();
     }
     ngAfterViewChecked() {
-        if (this.gtGeneralConfig.component.includes("ORDER_LISTING")) {
+        if (this.gtGeneralConfig.component.includes("ORDER_LISTING") || this.gtGeneralConfig.component == "DRRLISTING") {
             this.setMarginLeftForFilterIcon();
         }
     }
@@ -861,9 +861,9 @@ class AnnaNonEditableGenericTableComponent {
             if (this.tableData && this.tableData.length == 0) {
                 this.tableData = Array(2).fill(0);
                 this.marginTop = (-this.gtDimension.rowHeight - (this.gtDimension.rowHeight / 2)) + 'px';
-                if (this.gtGeneralConfig.component.includes("ORDER_LISTING")) {
-                    this.marginTop = "-124px";
-                }
+                // if(this.gtGeneralConfig.component.includes("ORDER_LISTING")){
+                //   this.marginTop = "-124px";
+                // }
                 this.showNoDataToDisplay = true;
             }
             else {
@@ -1228,9 +1228,18 @@ class AnnaNonEditableGenericTableComponent {
         let selectedFilterSet = new Set(this.annaFilterService.appliedFiltersArray);
         let isSortPresent = (this.annaSortService.columnSortState.size > 0 && this.annaSortService.columnSortState.get(this.annaFilterService.selectedRadio) != "DEFAULT");
         this.disableColumnClearAllBtn = selectedFilterSet.has(this.annaFilterService.selectedRadio) || isSortPresent ? false : true;
-        if (this.sameTooltipClicked && this.annaFilterService.calendarSet.has(this.annaFilterService.selectedRadio) && this.calendarSelection) {
-            this.selectedMinDate = this.calendarSelection.fromDate;
-            this.selectedMaxDate = this.calendarSelection.toDate;
+        if (this.sameTooltipClicked && this.annaFilterService.calendarSet.has(this.annaFilterService.selectedRadio)) {
+            if (this.calendarSelection.fromDate && this.calendarSelection.toDate) {
+                this.selectedMinDate = this.calendarSelection.fromDate;
+                this.selectedMaxDate = this.calendarSelection.toDate;
+            }
+            else {
+                this.selectedMinDate = cloneDeep(this.selectedMinDate);
+                this.selectedMaxDate = cloneDeep(this.selectedMaxDate);
+                console.log("inside else");
+                console.log(this.selectedMinDate);
+                console.log(this.selectedMaxDate);
+            }
         }
         if (radioButtonData.isFilterRequired && !this.sameTooltipClicked) {
             this.disableSliderApplyButton = false;