Merge pull request #607 from bharathravi-in/cbrelease-4.8.16

Cbrelease 4.8.16
sunbird-cb · Aug 5, 2024 · 7b17c68 · 7b17c68
2 parents f945d9d + 6a17633
commit 7b17c68
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/.../src/lib/routes/home/routes/designation/components/designations/designations.component.ts b/.../src/lib/routes/home/routes/designation/components/designations/designations.component.ts
@@ -135,7 +135,7 @@ export class DesignationsComponent implements OnInit {
       } else {
         setTimeout(() => {
           this.getOrgReadData()
-        }, 10000)
+        },         10000)
       }
       // console.log('orgFramework Details', res)
     })
@@ -202,7 +202,16 @@ export class DesignationsComponent implements OnInit {
       this.filteredDesignationsList = this.designationsList
         .filter((designation: any) => designation.name.toLowerCase().includes(key.toLowerCase()))
     } else {
-      this.filteredDesignationsList = this.designationsList
+      const filteredData: any = this.designationsList.sort((a: any, b: any) => {
+        const timestampA = a.additionalProperties && a.additionalProperties.timeStamp ?
+          new Date(Number(a.additionalProperties.timeStamp)).getTime() : 0
+        const timestampB = b.additionalProperties && b.additionalProperties.timeStamp ?
+          new Date(Number(b.additionalProperties.timeStamp)).getTime() : 0
+
+        return timestampB - timestampA
+
+      })
+      this.filteredDesignationsList = filteredData
     }
   }
 

diff --git a/...tes/home/routes/designation/components/import-designation/import-designation.component.ts b/...tes/home/routes/designation/components/import-designation/import-designation.component.ts
@@ -272,7 +272,7 @@ export class ImportDesignationComponent implements OnInit, OnDestroy {
         if (response) {
           setTimeout(() => {
             this.dialogRef.close()
-          },         2000)
+          },         10000)
         }
       },
       error: (error: HttpErrorResponse) => {