peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 20:47:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

reorder list

Browse Source
This commit is contained in:
Peter Maquiran
2023-03-20 10:43:46 +01:00
parent 71add2165b
commit d4c4749067
3 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/gabinete-digital.page.ts
+11 -7
View File
@@ -398,10 +398,12 @@ export class GabineteDigitalPage implements OnInit {
} }
sortArrayISODate(myArray: any) { sortArrayISODate(myArray: any): any[] {
return myArray.sort(function (a, b) { // return myArray.sort(function (a, b) {
return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0); // return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0);
}); // });
return myArray.sort((a,b) => Date.parse(b.CreateDate || b.taskStartDate) - Date.parse(a.CreateDate || a.taskStartDate))
} }
setFormatDate(start: any, end: any, allday: boolean) { setFormatDate(start: any, end: any, allday: boolean) {
@@ -600,9 +602,11 @@ export class GabineteDigitalPage implements OnInit {
} }
updateAllProcess = () => { updateAllProcess = () => {
this.AllProcess = this.expedientegbstore.list.concat(this.pedidosstore.listparecer).concat(this.pedidosstore.listdeferimento)
.concat(this.despachoprstore.list).concat(this.eventoaprovacaostore.contactList).concat(this.despachoStore.list) this.AllProcess = this.sortArrayISODate(this.despachoprstore.list.concat(this.deplomasStore.diplomasAssinadoList as any).concat(this.deplomasStore.diplomasParaAssinarList as any).concat(this.deplomasStore.DiplomaGerarList as any)
.concat(this.deplomasStore.diplomasParaAssinarList).concat(this.deplomasStore.diplomasAssinadoList).concat(this.deplomasStore.DiplomaGerarList).concat(this.pendentesstore.list) .concat(this.eventoaprovacaostore.contactList as any).concat(this.expedientegbstore.list as any).concat(this.despachoStore.list as any).concat(this.pedidosstore.listparecer as any).concat(this.pedidosstore.listdeferimento as any)
.concat(this.pendentesstore.list as any)).reverse()
// try{ // try{
// this.workerList.postMessage([ // this.workerList.postMessage([
src/app/shared/gabinete-digital/all-processes/all-processes.page.ts
+10 -7
View File
@@ -82,19 +82,22 @@ export class AllProcessesPage implements OnInit {
} }
updateAllProcess = () => { updateAllProcess = () => {
this.AllProcess = this.expedientegbstore.list.concat(this.pedidosstore.listparecer).concat(this.pedidosstore.listdeferimento)
.concat(this.despachoprstore.list).concat(this.eventoaprovacaostore.contactList).concat(this.despachoStore.list) this.AllProcess = this.sortArrayISODate(this.despachoprstore.list.concat(this.deplomasStore.diplomasAssinadoList as any).concat(this.deplomasStore.diplomasParaAssinarList as any).concat(this.deplomasStore.DiplomaGerarList as any)
.concat(this.deplomasStore.diplomasParaAssinarList).concat(this.deplomasStore.diplomasAssinadoList).concat(this.deplomasStore.DiplomaGerarList).concat(this.pendentesstore.list) .concat(this.eventoaprovacaostore.contactList as any).concat(this.expedientegbstore.list as any).concat(this.despachoStore.list as any).concat(this.pedidosstore.listparecer as any).concat(this.pedidosstore.listdeferimento as any)
.concat(this.pendentesstore.list as any)).reverse()
} }
get getAllProcessCount() { get getAllProcessCount() {
return this.AllProcess.length return this.AllProcess.length
} }
sortArrayISODate(myArray: any) { sortArrayISODate(myArray: any): any[] {
return myArray.sort(function (a, b) { // return myArray.sort(function (a, b) {
return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0); // return (a.CreateDate || a.taskStartDate < b.CreateDate || b.taskStartDate) ? -1 : ((a.CreateDate || a.taskStartDate > b.CreateDate || b.taskStartDate) ? 1 : 0);
}); // });
return myArray.sort((a,b) => Date.parse(b.CreateDate || b.taskStartDate) - Date.parse(a.CreateDate || a.taskStartDate))
} }
setFormatDate(start: any, end: any, allday: boolean) { setFormatDate(start: any, end: any, allday: boolean) {
version/git-version.ts
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = { export let versionData = {
"shortSHA": "000d4d1d5", "shortSHA": "71add2165",
"SHA": "000d4d1d5b3fd12116599c2087bba85560741b23", "SHA": "71add2165ba7a4af448e084901f56fd8d6669338",
"branch": "no_bug_movemente", "branch": "no_bug_movemente",
"lastCommitAuthor": "'Peter Maquiran'", "lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Thu Mar 16 13:52:47 2023 +0100'", "lastCommitTime": "'Mon Mar 20 08:58:45 2023 +0100'",
"lastCommitMessage": "save changes", "lastCommitMessage": "sayings",
"lastCommitNumber": "4880", "lastCommitNumber": "4881",
"change": "", "change": "",
"changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.html\n\tmodified: src/app/shared/popover/opts-expediente/opts-expediente.page.html\n\tmodified: src/environments/suport/doneIt.ts\n\tmodified: src/environments/suport/oapr.ts", "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.ts",
"changeAuthor": "peter.maquiran" "changeAuthor": "peter.maquiran"
} }