diff --git a/.gitignore b/.gitignore index 79d1ea2e5..2e8147eaf 100644 --- a/.gitignore +++ b/.gitignore @@ -86,4 +86,9 @@ cypress/videos src/app/domain src/app/controller -src/app/models/beast-orm-pro.ts \ No newline at end of file +src/app/models/beast-orm-pro.ts + + +src/app/pipes/process.service.spec.ts +src/app/pipes/process.service.ts +src/app/controller/process/dispatch-controller \ No newline at end of file diff --git a/src/app/models/dailyworktask.model.ts b/src/app/models/dailyworktask.model.ts index 0760b364b..21c00621a 100644 --- a/src/app/models/dailyworktask.model.ts +++ b/src/app/models/dailyworktask.model.ts @@ -96,6 +96,7 @@ export interface fullTaskList { totalDocuments: number; deadline: string; taskStatus: string; + taskReceiveDate?: string; workflowInstanceDataFields: { Subject: string; Sender: string; diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index c74dd8ef6..9e0262497 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -428,8 +428,8 @@

Eventos para Aprovação
- {{ TaskService.eventoaprovacaostore.newList.length}} correspondências novas - {{ TaskService.eventoaprovacaostore.newList.length}} correspondência nova + {{ TaskService.eventoaprovacaostore.newList.length}} eventos novos + {{ TaskService.eventoaprovacaostore.newList.length}} evento novo

{{TaskService.eventoaprovacaostore.countAll}} diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts index 7f51b582c..27172e68e 100644 --- a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts +++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts @@ -63,7 +63,7 @@ export class OptsExpedientePage implements OnInit { } - async openNewGroupPage(){ + async openNewGroupPage() { const modal = await this.modalController.create({ @@ -225,7 +225,7 @@ export class OptsExpedientePage implements OnInit { this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{ this.TaskService.loadExpedientes() this.goBack(); - },(error)=>{ + },(error) => { if(error.status == 0) { this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') } else { diff --git a/version/git-version.ts b/version/git-version.ts index 6de090604..1ddea993b 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "afb8daf18", - "SHA": "afb8daf187ef911f4cd481e38fc8bb51bb1ef62a", + "shortSHA": "6334142ab", + "SHA": "6334142ab9027310ea080e64e7d1b0dfd6a63ac9", "branch": "feature/gabinete-search", "lastCommitAuthor": "'Eudes Inácio'", - "lastCommitTime": "'Sun Jun 11 00:07:10 2023 +0100'", - "lastCommitMessage": "changes", - "lastCommitNumber": "4986", + "lastCommitTime": "'Sun Jun 11 11:37:44 2023 +0100'", + "lastCommitMessage": "Peter bug solved", + "lastCommitNumber": "4988", "change": "", - "changeStatus": "On branch feature/gabinete-search\nYour branch and 'origin/feature/gabinete-search' have diverged,\nand have 17 and 3 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/models/beast-orm.ts\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html\n\tmodified: src/app/shared/popover/opts-expediente/opts-expediente.page.ts", + "changeStatus": "On branch feature/gabinete-search\nYour branch and 'origin/feature/gabinete-search' have diverged,\nand have 18 and 3 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: .gitignore\n\tmodified: src/app/models/dailyworktask.model.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/shared/popover/opts-expediente/opts-expediente.page.ts", "changeAuthor": "eudes.inacio" } \ No newline at end of file