diff --git a/src/app/models/beast-orm.ts b/src/app/models/beast-orm.ts index ae03945ea..d32fab0e7 100644 --- a/src/app/models/beast-orm.ts +++ b/src/app/models/beast-orm.ts @@ -1,7 +1,5 @@ import { models } from 'beast-orm' -/* import { models } from 'src/plugin/src' */ import { environment } from 'src/environments/environment' -// import { DispatchDomain } from 'src/app/domain/process/DispatchDomain' const { ArrayField, JsonField} = models.indexedDB.fields export class MessageModel extends models.Model { @@ -76,38 +74,4 @@ models.register({ type: 'indexedDB', version: 14, models: [PublicationModel, ActionModel] -}) - -// gabinete - -// export class DispatchModal extends models.Model{ -// SerialNumber = models.CharField() -// TaskStartDate = models.CharField() -// Subject = models.CharField() -// Folio = models.CharField() -// Senders = models.CharField() -// CreateDate = models.CharField() -// DocumentsQty = models.IntegerField() -// WorkflowName = models.CharField() -// activityInstanceName = models.CharField() -// Status = models.CharField() -// Deadline = models.CharField() -// TaskStatus = models.CharField() -// TaskReceiveDate = models.CharField() - -// // Busses logic -// arquivar = DispatchDomain.arquivar -// executado = DispatchDomain.executado -// reexecutar = DispatchDomain.reexecutar -// sendToPending = DispatchDomain.sendToPending -// requestAppear = DispatchDomain.requestAppear -// createTaskDispatch = DispatchDomain.createTaskDispatch -// setUpMeeting = DispatchDomain.setUpMeeting -// } - -// models.register({ -// databaseName: 'cabinet'+environment.version.lastCommitNumber + environment.id, -// type: 'indexedDB', -// version: 14, -// models: [DispatchModal] -// }) +}) \ No newline at end of file diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html index 43f5a0866..17cbfd6f8 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html +++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html @@ -98,7 +98,7 @@
- + 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 9a7902888..7f51b582c 100644 --- a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts +++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts @@ -20,6 +20,7 @@ import { RouteService } from 'src/app/services/route.service'; import { SessionStore } from 'src/app/store/session.service'; import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'; import { environment } from 'src/environments/environment'; +import { TaskService } from 'src/app/services/task.service'; @Component({ selector: 'app-opts-expediente', @@ -52,7 +53,8 @@ export class OptsExpedientePage implements OnInit { private RouteService: RouteService, private expedienteService: ExpedienteService, public ThemeService: ThemeService, - private httpErrorHanlde: HttpErrorHandle + private httpErrorHanlde: HttpErrorHandle, + public TaskService: TaskService ) { } @@ -203,6 +205,7 @@ export class OptsExpedientePage implements OnInit { try { await this.processes.CompleteTask(body).toPromise() + this.TaskService.loadExpedientes() this.close(); this.toastService._successMessage() } catch(error) { @@ -220,6 +223,7 @@ export class OptsExpedientePage implements OnInit { sendExpedienteToPending() { this.close(); this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{ + this.TaskService.loadExpedientes() this.goBack(); },(error)=>{ if(error.status == 0) { @@ -248,6 +252,7 @@ export class OptsExpedientePage implements OnInit { try { await this.processes.CompleteTask(body).toPromise(); + this.TaskService.loadExpedientes() this.close(); this.httpErrorHanlde.httpsSucessMessagge('Avaliação Superiror') } catch(error) { @@ -305,6 +310,7 @@ export class OptsExpedientePage implements OnInit { const loader = this.toastService.loading() try { await this.processes.CompleteTask(body).toPromise(); + this.TaskService.loadExpedientes() this.goBack(); } catch (error) { if(error.status == 0) { @@ -344,6 +350,7 @@ export class OptsExpedientePage implements OnInit { try { await this.expedienteService.discard({SerialNumber: this.task.SerialNumber}).toPromise() + this.TaskService.loadExpedientes() this.toastService._successMessage('Processo descartado'); this.goBack(); } catch (error) { @@ -370,6 +377,7 @@ export class OptsExpedientePage implements OnInit { try { await this.processes.CompleteTask(body).toPromise(); this.toastService._successMessage('Processo descartado'); + this.TaskService.loadExpedientes() this.goBack(); } catch (error) { if(error.status == 0) { @@ -389,6 +397,7 @@ export class OptsExpedientePage implements OnInit { try { await this.processes.UpdateTaskStatus(this.task.FolderId).toPromise(); + this.TaskService.loadExpedientes() this.toastService._successMessage(); this.goBack(); } catch (error) { diff --git a/version/git-version.ts b/version/git-version.ts index 1b3d52f32..8e1ff7987 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "923a141ff", - "SHA": "923a141ffab6f4b1d3c0a1687b2e41ac7dd04a3b", + "shortSHA": "0ec1341cd", + "SHA": "0ec1341cd6f01ace6e3332c609278d4faee2f440", "branch": "feature/gabinete-search", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Sat Jun 10 21:14:50 2023 +0100'", - "lastCommitMessage": "remove", - "lastCommitNumber": "4968", + "lastCommitTime": "'Sat Jun 10 21:18:46 2023 +0100'", + "lastCommitMessage": "commit", + "lastCommitNumber": "4969", "change": "", - "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: .gitignore\n\tmodified: version/git-version.ts", + "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\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", "changeAuthor": "peter.maquiran" } \ No newline at end of file