@annalib/anna-core 7.3.18 → 7.3.19

package/esm2020/lib/anna-core-shared-lib/services/anna-sort.service.mjs

@@ -64,7 +64,9 @@ export class AnnaSortService {
             });
         }
         else {
-            data.sort((a, b) => {
+            let dataWithoutEmptyOrHyphenValues = data.filter(n => n[key] != "-");
+            let rowsWithHyphenOrZeroValues = data.filter(n => n[key] == "-");
+            dataWithoutEmptyOrHyphenValues.sort((a, b) => {
                 param1 = a[key];
                 param2 = b[key];
                 if (param1 !== param2) {
@@ -72,7 +74,10 @@ export class AnnaSortService {
                 }
                 return 0;
             });
+            data = isAsc ? [...rowsWithHyphenOrZeroValues, ...dataWithoutEmptyOrHyphenValues] :
+                [...dataWithoutEmptyOrHyphenValues, ...rowsWithHyphenOrZeroValues];
         }
+        console.log(data.map(n => n[key]));
         return data;
     }
     sortEnterEditLurAndCsrPage(isAsc, data, key) {
@@ -144,4 +149,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.2.7", ngImpor
                     providedIn: 'root',
                 }]
         }], ctorParameters: function () { return [{ type: i1.AnnaDateTimeFormatService }]; } });
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"anna-sort.service.js","sourceRoot":"","sources":["../../../../../../projects/anna-core/src/lib/anna-core-shared-lib/services/anna-sort.service.ts"],"names":[],"mappings":"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","sourcesContent":["// Angular import statements\r\nimport { Injectable } from '@angular/core';\r\nimport { Subject } from 'rxjs';\r\nimport { SortType } from '../models/anna-sort.model';\r\nimport { AnnaDateTimeFormatService } from './anna-date-time-format.service';\r\n\r\n// Third party import statements\r\n\r\n// User defined import statements\r\n\r\n@Injectable({\r\n  providedIn: 'root',\r\n})\r\nexport class AnnaSortService {\r\n  columnSortState: Map<string, SortType>;\r\n  noSortingAppliedData: any[];\r\n  updateSortTypeSubject: Subject<string> = new Subject();\r\n\r\n  dateSet = new Set([\r\n    'endDate',\r\n    'startDate',\r\n    'end_date',\r\n    'start_date',\r\n    'flightStartDate',\r\n    'flightEndDate',\r\n  ]);\r\n\r\n  constructor(private annaDateTimeFormatService: AnnaDateTimeFormatService) {\r\n    console.log('AnnaTableColumnSortService sevice created.');\r\n  }\r\n\r\n  sortDataForComponentOtherThanLurAndCsrPage(\r\n    isAsc: boolean,\r\n    data: any[],\r\n    key: string\r\n  ) {\r\n    let param1: string | number;\r\n    let param2: string | number;\r\n\r\n    if (this.dateSet.has(key)) {\r\n      data.sort((a, b) => {\r\n        return this.annaDateTimeFormatService.compareDate(\r\n          a[key],\r\n          b[key],\r\n          isAsc\r\n        );\r\n      });\r\n    } else if (key === 'AirDateAndTime') {\r\n      data.sort((a, b) => {\r\n        let first, second;\r\n        if (a[key] == '-') {\r\n          return 1;\r\n        }\r\n\r\n        if (b[key] == '-') {\r\n          return -1;\r\n        } else {\r\n          first =\r\n            this.annaDateTimeFormatService.formatDateAndHHMMATimeToStandardFormat(\r\n              a[key]\r\n            );\r\n          second =\r\n            this.annaDateTimeFormatService.formatDateAndHHMMATimeToStandardFormat(\r\n              b[key]\r\n            );\r\n          let compareDate = this.annaDateTimeFormatService.compareDate(\r\n            first,\r\n            second,\r\n            isAsc\r\n          );\r\n          return compareDate;\r\n        }\r\n      });\r\n    } else if (key == 'startEndTime' || key == 'TimeBand') {\r\n      data.sort((a, b) => {\r\n        if (isAsc) {\r\n          param1 = a[key][1];\r\n          param2 = b[key][1];\r\n        } else {\r\n          param1 = a[key][2];\r\n          param2 = b[key][2];\r\n        }\r\n        let val = isAsc\r\n          ? this.annaDateTimeFormatService.sortByTimeAscending(param1, param2)\r\n          : this.annaDateTimeFormatService.sortByTimeDescending(param1, param2);\r\n        return val;\r\n      });\r\n    } else {\r\n      data.sort((a, b) => {\r\n        param1 = a[key];\r\n        param2 = b[key];\r\n\r\n        if (param1 !== param2) {\r\n          return this.annaDateTimeFormatService.compare(param1, param2, isAsc);\r\n        }\r\n\r\n        return 0;\r\n      });\r\n    }\r\n\r\n    return data;\r\n  }\r\n\r\n  sortEnterEditLurAndCsrPage(isAsc: boolean, data: any[], key: any) {\r\n    let param1: string | number;\r\n    let param2: string | number;\r\n\r\n    if (key.includes('_')) {\r\n      let keys = key.split('_');\r\n      let weekNumber = keys[0];\r\n      let sortKey = keys[1];\r\n\r\n      if (keys.length > 2) {\r\n        sortKey =\r\n          keys[2] == true\r\n            ? 'BookedAurIncludingNoChargeSpots'\r\n            : 'BookedAurExcludingNoChargeSpots';\r\n      }\r\n\r\n      data.sort((a, b) => {\r\n        let aInventoryCodeWeekWiseKey = Object.keys(\r\n          a.WeekWiseInventoryCodeData\r\n        ).filter((key) => key.split('_')[1] == weekNumber);\r\n        let bInventoryCodeWeekWiseKey = Object.keys(\r\n          b.WeekWiseInventoryCodeData\r\n        ).filter((key) => key.split('_')[1] == weekNumber);\r\n\r\n        param1 = null;\r\n        param2 = null;\r\n        if (aInventoryCodeWeekWiseKey.length > 0) {\r\n          param1 =\r\n            a.WeekWiseInventoryCodeData[aInventoryCodeWeekWiseKey[0]][\r\n              sortKey\r\n            ][1];\r\n        }\r\n\r\n        if (bInventoryCodeWeekWiseKey.length > 0) {\r\n          param2 =\r\n            b.WeekWiseInventoryCodeData[bInventoryCodeWeekWiseKey[0]][\r\n              sortKey\r\n            ][1];\r\n        }\r\n\r\n        if (param1 !== param2) {\r\n          return this.annaDateTimeFormatService.compare(param1, param2, isAsc);\r\n        }\r\n\r\n        return 0;\r\n      });\r\n    } else if (key == 'TimeBand') {\r\n      data.sort((a, b) => {\r\n        if (isAsc) {\r\n          param1 = a[key][1];\r\n          param2 = b[key][1];\r\n        } else {\r\n          param1 = a[key][2];\r\n          param2 = b[key][2];\r\n        }\r\n        let val = isAsc\r\n          ? this.annaDateTimeFormatService.sortByTimeAscending(param1, param2)\r\n          : this.annaDateTimeFormatService.sortByTimeDescending(param1, param2);\r\n        return val;\r\n      });\r\n    } else {\r\n      data.sort((a, b) => {\r\n        param1 = a[key];\r\n        param2 = b[key];\r\n\r\n        if (param1 !== param2) {\r\n          return this.annaDateTimeFormatService.compare(param1, param2, isAsc);\r\n        }\r\n\r\n        return 0;\r\n      });\r\n    }\r\n\r\n    return data;\r\n  }\r\n}\r\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"anna-sort.service.js","sourceRoot":"","sources":["../../../../../../projects/anna-core/src/lib/anna-core-shared-lib/services/anna-sort.service.ts"],"names":[],"mappings":"AAAA,4BAA4B;AAC5B,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAE/B,OAAO,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAC;;;AAE5E,gCAAgC;AAEhC,iCAAiC;AAKjC,MAAM,OAAO,eAAe;IAc1B,YAAoB,yBAAoD;QAApD,8BAAyB,GAAzB,yBAAyB,CAA2B;QAXxE,0BAAqB,GAAoB,IAAI,OAAO,EAAE,CAAC;QAEvD,YAAO,GAAG,IAAI,GAAG,CAAC;YAChB,SAAS;YACT,WAAW;YACX,UAAU;YACV,YAAY;YACZ,iBAAiB;YACjB,eAAe;SAChB,CAAC,CAAC;QAGD,OAAO,CAAC,GAAG,CAAC,4CAA4C,CAAC,CAAC;IAC5D,CAAC;IAED,0CAA0C,CACxC,KAAc,EACd,IAAW,EACX,GAAW;QAEX,IAAI,MAAuB,CAAC;QAC5B,IAAI,MAAuB,CAAC;QAE5B,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YACzB,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBACjB,OAAO,IAAI,CAAC,yBAAyB,CAAC,WAAW,CAC/C,CAAC,CAAC,GAAG,CAAC,EACN,CAAC,CAAC,GAAG,CAAC,EACN,KAAK,CACN,CAAC;YACJ,CAAC,CAAC,CAAC;SACJ;aAAM,IAAI,GAAG,KAAK,gBAAgB,EAAE;YACnC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBACjB,IAAI,KAAK,EAAE,MAAM,CAAC;gBAClB,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,GAAG,EAAE;oBACjB,OAAO,CAAC,CAAC;iBACV;gBAED,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,GAAG,EAAE;oBACjB,OAAO,CAAC,CAAC,CAAC;iBACX;qBAAM;oBACL,KAAK;wBACH,IAAI,CAAC,yBAAyB,CAAC,sCAAsC,CACnE,CAAC,CAAC,GAAG,CAAC,CACP,CAAC;oBACJ,MAAM;wBACJ,IAAI,CAAC,yBAAyB,CAAC,sCAAsC,CACnE,CAAC,CAAC,GAAG,CAAC,CACP,CAAC;oBACJ,IAAI,WAAW,GAAG,IAAI,CAAC,yBAAyB,CAAC,WAAW,CAC1D,KAAK,EACL,MAAM,EACN,KAAK,CACN,CAAC;oBACF,OAAO,WAAW,CAAC;iBACpB;YACH,CAAC,CAAC,CAAC;SACJ;aAAM,IAAI,GAAG,IAAI,cAAc,IAAI,GAAG,IAAI,UAAU,EAAE;YACrD,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBACjB,IAAI,KAAK,EAAE;oBACT,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;oBACnB,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;iBACpB;qBAAM;oBACL,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;oBACnB,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;iBACpB;gBACD,IAAI,GAAG,GAAG,KAAK;oBACb,CAAC,CAAC,IAAI,CAAC,yBAAyB,CAAC,mBAAmB,CAAC,MAAM,EAAE,MAAM,CAAC;oBACpE,CAAC,CAAC,IAAI,CAAC,yBAAyB,CAAC,oBAAoB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;gBACxE,OAAO,GAAG,CAAC;YACb,CAAC,CAAC,CAAC;SACJ;aAAM;YACL,IAAI,8BAA8B,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC;YACrE,IAAI,0BAA0B,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC;YAEjE,8BAA8B,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBAC3C,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;gBAChB,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;gBAEhB,IAAI,MAAM,KAAK,MAAM,EAAE;oBACrB,OAAO,IAAI,CAAC,yBAAyB,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;iBACtE;gBAED,OAAO,CAAC,CAAC;YACX,CAAC,CAAC,CAAC;YAEH,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,0BAA0B,EAAE,GAAG,8BAA8B,CAAC,CAAC,CAAC;gBACjF,CAAC,GAAG,8BAA8B,EAAE,GAAG,0BAA0B,CAAC,CAAC;SACtE;QAED,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;QAClC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,0BAA0B,CAAC,KAAc,EAAE,IAAW,EAAE,GAAQ;QAC9D,IAAI,MAAuB,CAAC;QAC5B,IAAI,MAAuB,CAAC;QAE5B,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YACrB,IAAI,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC1B,IAAI,UAAU,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;YACzB,IAAI,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;YAEtB,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;gBACnB,OAAO;oBACL,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI;wBACb,CAAC,CAAC,iCAAiC;wBACnC,CAAC,CAAC,iCAAiC,CAAC;aACzC;YAED,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBACjB,IAAI,yBAAyB,GAAG,MAAM,CAAC,IAAI,CACzC,CAAC,CAAC,yBAAyB,CAC5B,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,UAAU,CAAC,CAAC;gBACnD,IAAI,yBAAyB,GAAG,MAAM,CAAC,IAAI,CACzC,CAAC,CAAC,yBAAyB,CAC5B,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,UAAU,CAAC,CAAC;gBAEnD,MAAM,GAAG,IAAI,CAAC;gBACd,MAAM,GAAG,IAAI,CAAC;gBACd,IAAI,yBAAyB,CAAC,MAAM,GAAG,CAAC,EAAE;oBACxC,MAAM;wBACJ,CAAC,CAAC,yBAAyB,CAAC,yBAAyB,CAAC,CAAC,CAAC,CAAC,CACzD,OAAO,CACN,CAAC,CAAC,CAAC,CAAC;iBACR;gBAED,IAAI,yBAAyB,CAAC,MAAM,GAAG,CAAC,EAAE;oBACxC,MAAM;wBACJ,CAAC,CAAC,yBAAyB,CAAC,yBAAyB,CAAC,CAAC,CAAC,CAAC,CACzD,OAAO,CACN,CAAC,CAAC,CAAC,CAAC;iBACR;gBAED,IAAI,MAAM,KAAK,MAAM,EAAE;oBACrB,OAAO,IAAI,CAAC,yBAAyB,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;iBACtE;gBAED,OAAO,CAAC,CAAC;YACX,CAAC,CAAC,CAAC;SACJ;aAAM,IAAI,GAAG,IAAI,UAAU,EAAE;YAC5B,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBACjB,IAAI,KAAK,EAAE;oBACT,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;oBACnB,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;iBACpB;qBAAM;oBACL,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;oBACnB,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;iBACpB;gBACD,IAAI,GAAG,GAAG,KAAK;oBACb,CAAC,CAAC,IAAI,CAAC,yBAAyB,CAAC,mBAAmB,CAAC,MAAM,EAAE,MAAM,CAAC;oBACpE,CAAC,CAAC,IAAI,CAAC,yBAAyB,CAAC,oBAAoB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;gBACxE,OAAO,GAAG,CAAC;YACb,CAAC,CAAC,CAAC;SACJ;aAAM;YACL,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBACjB,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;gBAChB,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;gBAEhB,IAAI,MAAM,KAAK,MAAM,EAAE;oBACrB,OAAO,IAAI,CAAC,yBAAyB,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;iBACtE;gBAED,OAAO,CAAC,CAAC;YACX,CAAC,CAAC,CAAC;SACJ;QAED,OAAO,IAAI,CAAC;IACd,CAAC;;4GA3KU,eAAe;gHAAf,eAAe,cAFd,MAAM;2FAEP,eAAe;kBAH3B,UAAU;mBAAC;oBACV,UAAU,EAAE,MAAM;iBACnB","sourcesContent":["// Angular import statements\r\nimport { Injectable } from '@angular/core';\r\nimport { Subject } from 'rxjs';\r\nimport { SortType } from '../models/anna-sort.model';\r\nimport { AnnaDateTimeFormatService } from './anna-date-time-format.service';\r\n\r\n// Third party import statements\r\n\r\n// User defined import statements\r\n\r\n@Injectable({\r\n  providedIn: 'root',\r\n})\r\nexport class AnnaSortService {\r\n  columnSortState: Map<string, SortType>;\r\n  noSortingAppliedData: any[];\r\n  updateSortTypeSubject: Subject<string> = new Subject();\r\n\r\n  dateSet = new Set([\r\n    'endDate',\r\n    'startDate',\r\n    'end_date',\r\n    'start_date',\r\n    'flightStartDate',\r\n    'flightEndDate',\r\n  ]);\r\n\r\n  constructor(private annaDateTimeFormatService: AnnaDateTimeFormatService) {\r\n    console.log('AnnaTableColumnSortService sevice created.');\r\n  }\r\n\r\n  sortDataForComponentOtherThanLurAndCsrPage(\r\n    isAsc: boolean,\r\n    data: any[],\r\n    key: string\r\n  ) {\r\n    let param1: string | number;\r\n    let param2: string | number;\r\n\r\n    if (this.dateSet.has(key)) {\r\n      data.sort((a, b) => {\r\n        return this.annaDateTimeFormatService.compareDate(\r\n          a[key],\r\n          b[key],\r\n          isAsc\r\n        );\r\n      });\r\n    } else if (key === 'AirDateAndTime') {\r\n      data.sort((a, b) => {\r\n        let first, second;\r\n        if (a[key] == '-') {\r\n          return 1;\r\n        }\r\n\r\n        if (b[key] == '-') {\r\n          return -1;\r\n        } else {\r\n          first =\r\n            this.annaDateTimeFormatService.formatDateAndHHMMATimeToStandardFormat(\r\n              a[key]\r\n            );\r\n          second =\r\n            this.annaDateTimeFormatService.formatDateAndHHMMATimeToStandardFormat(\r\n              b[key]\r\n            );\r\n          let compareDate = this.annaDateTimeFormatService.compareDate(\r\n            first,\r\n            second,\r\n            isAsc\r\n          );\r\n          return compareDate;\r\n        }\r\n      });\r\n    } else if (key == 'startEndTime' || key == 'TimeBand') {\r\n      data.sort((a, b) => {\r\n        if (isAsc) {\r\n          param1 = a[key][1];\r\n          param2 = b[key][1];\r\n        } else {\r\n          param1 = a[key][2];\r\n          param2 = b[key][2];\r\n        }\r\n        let val = isAsc\r\n          ? this.annaDateTimeFormatService.sortByTimeAscending(param1, param2)\r\n          : this.annaDateTimeFormatService.sortByTimeDescending(param1, param2);\r\n        return val;\r\n      });\r\n    } else {\r\n      let dataWithoutEmptyOrHyphenValues = data.filter(n => n[key] != \"-\");\r\n      let rowsWithHyphenOrZeroValues = data.filter(n => n[key] == \"-\");\r\n\r\n      dataWithoutEmptyOrHyphenValues.sort((a, b) => {\r\n        param1 = a[key];\r\n        param2 = b[key];\r\n\r\n        if (param1 !== param2) {\r\n          return this.annaDateTimeFormatService.compare(param1, param2, isAsc);\r\n        }\r\n\r\n        return 0;\r\n      });\r\n\r\n      data = isAsc ? [...rowsWithHyphenOrZeroValues, ...dataWithoutEmptyOrHyphenValues] :\r\n        [...dataWithoutEmptyOrHyphenValues, ...rowsWithHyphenOrZeroValues];\r\n    }\r\n\r\n    console.log(data.map(n => n[key]))\r\n    return data;\r\n  }\r\n\r\n  sortEnterEditLurAndCsrPage(isAsc: boolean, data: any[], key: any) {\r\n    let param1: string | number;\r\n    let param2: string | number;\r\n\r\n    if (key.includes('_')) {\r\n      let keys = key.split('_');\r\n      let weekNumber = keys[0];\r\n      let sortKey = keys[1];\r\n\r\n      if (keys.length > 2) {\r\n        sortKey =\r\n          keys[2] == true\r\n            ? 'BookedAurIncludingNoChargeSpots'\r\n            : 'BookedAurExcludingNoChargeSpots';\r\n      }\r\n\r\n      data.sort((a, b) => {\r\n        let aInventoryCodeWeekWiseKey = Object.keys(\r\n          a.WeekWiseInventoryCodeData\r\n        ).filter((key) => key.split('_')[1] == weekNumber);\r\n        let bInventoryCodeWeekWiseKey = Object.keys(\r\n          b.WeekWiseInventoryCodeData\r\n        ).filter((key) => key.split('_')[1] == weekNumber);\r\n\r\n        param1 = null;\r\n        param2 = null;\r\n        if (aInventoryCodeWeekWiseKey.length > 0) {\r\n          param1 =\r\n            a.WeekWiseInventoryCodeData[aInventoryCodeWeekWiseKey[0]][\r\n            sortKey\r\n            ][1];\r\n        }\r\n\r\n        if (bInventoryCodeWeekWiseKey.length > 0) {\r\n          param2 =\r\n            b.WeekWiseInventoryCodeData[bInventoryCodeWeekWiseKey[0]][\r\n            sortKey\r\n            ][1];\r\n        }\r\n\r\n        if (param1 !== param2) {\r\n          return this.annaDateTimeFormatService.compare(param1, param2, isAsc);\r\n        }\r\n\r\n        return 0;\r\n      });\r\n    } else if (key == 'TimeBand') {\r\n      data.sort((a, b) => {\r\n        if (isAsc) {\r\n          param1 = a[key][1];\r\n          param2 = b[key][1];\r\n        } else {\r\n          param1 = a[key][2];\r\n          param2 = b[key][2];\r\n        }\r\n        let val = isAsc\r\n          ? this.annaDateTimeFormatService.sortByTimeAscending(param1, param2)\r\n          : this.annaDateTimeFormatService.sortByTimeDescending(param1, param2);\r\n        return val;\r\n      });\r\n    } else {\r\n      data.sort((a, b) => {\r\n        param1 = a[key];\r\n        param2 = b[key];\r\n\r\n        if (param1 !== param2) {\r\n          return this.annaDateTimeFormatService.compare(param1, param2, isAsc);\r\n        }\r\n\r\n        return 0;\r\n      });\r\n    }\r\n\r\n    return data;\r\n  }\r\n}\r\n"]}

package/fesm2015/annalib-anna-core.mjs

@@ -1114,7 +1114,9 @@ class AnnaSortService {
             });
         }
         else {
-            data.sort((a, b) => {
+            let dataWithoutEmptyOrHyphenValues = data.filter(n => n[key] != "-");
+            let rowsWithHyphenOrZeroValues = data.filter(n => n[key] == "-");
+            dataWithoutEmptyOrHyphenValues.sort((a, b) => {
                 param1 = a[key];
                 param2 = b[key];
                 if (param1 !== param2) {
@@ -1122,7 +1124,10 @@ class AnnaSortService {
                 }
                 return 0;
             });
+            data = isAsc ? [...rowsWithHyphenOrZeroValues, ...dataWithoutEmptyOrHyphenValues] :
+                [...dataWithoutEmptyOrHyphenValues, ...rowsWithHyphenOrZeroValues];
         }
+        console.log(data.map(n => n[key]));
         return data;
     }
     sortEnterEditLurAndCsrPage(isAsc, data, key) {