From 1fee8518ce6dcf725444ab92aac7b4749d5a5fca Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Mon, 29 May 2023 15:19:13 +0100 Subject: [PATCH 1/2] add notification message --- .../despachos/despacho/despacho.page.ts | 6 +++--- .../despachos-pr-options.page.ts | 12 +++++++++--- version/git-version.ts | 12 ++++++------ 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts index 68430628c..d06f16b06 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts @@ -100,19 +100,19 @@ export class DespachoPage implements OnInit { } close() { + this.TaskService.loadDespachos(); this.modalController.dismiss(); } goBack() { + this.TaskService.loadDespachos(); this.RouteService.goBack(); - } async LoadTaskDetail(serial: string) { this.processes.GetTask(serial).subscribe((res: fullTask) => { - - this.TaskService.loadDespachos(); + this.TaskService.loadDiplomas(); this.task = { "SerialNumber": res.serialNumber, diff --git a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts index cd2ddeea0..f1f71ff08 100644 --- a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts +++ b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts @@ -12,6 +12,9 @@ import { PermissionService } from 'src/app/services/permission.service'; import { ThemeService } from 'src/app/services/theme.service' import { RouteService } from 'src/app/services/route.service'; import { environment } from 'src/environments/environment'; +import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'; +import { TaskService } from 'src/app/services/task.service' + @Component({ selector: 'app-despachos-pr-options', @@ -37,7 +40,8 @@ export class DespachosPrOptionsPage implements OnInit { private RouteService: RouteService, public p: PermissionService, public ThemeService: ThemeService, - + public TaskService: TaskService, + private httpErroHandle: HttpErrorHandle, ) { } ngOnInit() { @@ -103,7 +107,7 @@ export class DespachosPrOptionsPage implements OnInit { const loader = this.toastService.loading() this.processes.SetTaskToPending(this.serialNumber).subscribe(res=>{ - this.toastService._successMessage() + this.httpErroHandle.httpsSucessMessagge('Enviar para Pendentes') this.popoverController.dismiss('close') loader.remove() },(error)=>{ @@ -299,7 +303,7 @@ export class DespachosPrOptionsPage implements OnInit { try { await this.processes.CompleteTask(body).toPromise() - this.toastService._successMessage('') + this.httpErroHandle.httpsSucessMessagge('Concluir') this.close(); } catch (error) { if(error.status == 0) { @@ -356,6 +360,7 @@ export class DespachosPrOptionsPage implements OnInit { try { await this.processes.CompleteTask(body).toPromise() + this.httpErroHandle.httpsSucessMessagge('Executado') this.close(); this.toastService.successMessage() } catch(error) { @@ -382,6 +387,7 @@ export class DespachosPrOptionsPage implements OnInit { try { await this.processes.CompleteTask(body).toPromise() + this.httpErroHandle.httpsSucessMessagge('Reexecução') this.toastService.successMessage() this.close(); } catch (error) { diff --git a/version/git-version.ts b/version/git-version.ts index 8611faca1..21eaee5d2 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "040320a04", - "SHA": "040320a04c7afcebae5ad48b0a6e2151fb1a49cd", + "shortSHA": "1c35049a6", + "SHA": "1c35049a62599daeb5fe80ff5ff28e45eefaad4d", "branch": "feature/gabinete-search", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Mon May 29 12:16:49 2023 +0100'", - "lastCommitMessage": "push", - "lastCommitNumber": "4946", + "lastCommitTime": "'Mon May 29 13:54:05 2023 +0100'", + "lastCommitMessage": "fix", + "lastCommitNumber": "4947", "change": "", - "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/shared/shared.module.ts", + "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts\n\tmodified: src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file From a1657b1e846abdb35846a4534096dad901aea6eb Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Mon, 29 May 2023 15:29:24 +0100 Subject: [PATCH 2/2] update --- .../expediente-detail/expediente-detail.page.ts | 2 +- .../expediente-pr/expediente-pr.page.ts | 1 + version/git-version.ts | 12 ++++++------ 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts index fbf3fac50..a81dba107 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts @@ -338,8 +338,8 @@ export class ExpedienteDetailPage implements OnInit { } goBack() { + this.TaskService.loadExpedientes() this.RouteService.goBack(); - } sendExpedienteToPending() { diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts index 1428f38a6..b1764468d 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts +++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts @@ -99,6 +99,7 @@ export class ExpedientePrPage implements OnInit { } goBack() { + this.TaskService.loadExpedientes() this.RouteService.goBack(); /* if(this.task.Status == "Pending" && this.caller != 'events'){ if (window.innerWidth <= 800) { diff --git a/version/git-version.ts b/version/git-version.ts index 21eaee5d2..b79f9872a 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "1c35049a6", - "SHA": "1c35049a62599daeb5fe80ff5ff28e45eefaad4d", + "shortSHA": "1fee8518c", + "SHA": "1fee8518ce6dcf725444ab92aac7b4749d5a5fca", "branch": "feature/gabinete-search", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Mon May 29 13:54:05 2023 +0100'", - "lastCommitMessage": "fix", - "lastCommitNumber": "4947", + "lastCommitTime": "'Mon May 29 15:19:13 2023 +0100'", + "lastCommitMessage": "add notification message", + "lastCommitNumber": "4948", "change": "", - "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts\n\tmodified: src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts", + "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file