From 8eab9e67d74dcc75eee8b6989a8c44146ca2a57b Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 27 Jul 2021 10:57:50 +0100 Subject: [PATCH 1/8] Fix --- src/app/pages/agenda/agenda.page.html | 2 +- .../approve-event/approve-event.page.html | 17 ++++++++++++----- .../approve-event/approve-event.page.scss | 11 ++++++++++- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index 84d2eaabe..ff4cbef00 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -429,4 +429,4 @@ - + \ No newline at end of file diff --git a/src/app/shared/agenda/approve-event/approve-event.page.html b/src/app/shared/agenda/approve-event/approve-event.page.html index 35db219f3..4752d3ad9 100644 --- a/src/app/shared/agenda/approve-event/approve-event.page.html +++ b/src/app/shared/agenda/approve-event/approve-event.page.html @@ -22,11 +22,19 @@
+
+ +
+ +
+
@@ -114,9 +122,8 @@ -
- - - -
+
+ + +
diff --git a/src/app/shared/agenda/approve-event/approve-event.page.scss b/src/app/shared/agenda/approve-event/approve-event.page.scss index 6bbc3b95c..a0561c0c2 100644 --- a/src/app/shared/agenda/approve-event/approve-event.page.scss +++ b/src/app/shared/agenda/approve-event/approve-event.page.scss @@ -207,4 +207,13 @@ ion-menu{ width: 25%; } } */ - \ No newline at end of file + + + +.delete{ + padding: 7px; + font-size: 21px; + color:#fff; + background: #d30606; + border-radius: 20px; +} \ No newline at end of file From 4fcafe1fd96c4c4ecb4ac0913cd89e2ba2629f7b Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 27 Jul 2021 16:53:37 +0100 Subject: [PATCH 2/8] Improve --- src/app/models/CallMeeting.ts | 9 ++ src/app/services/processes.service.ts | 14 ++- .../agenda/view-event/view-event.page.ts | 117 +++++------------- .../opts-expediente/opts-expediente.page.ts | 5 +- src/app/store/to-day-event-storage.service.ts | 2 +- 5 files changed, 56 insertions(+), 91 deletions(-) create mode 100644 src/app/models/CallMeeting.ts diff --git a/src/app/models/CallMeeting.ts b/src/app/models/CallMeeting.ts new file mode 100644 index 000000000..d568b9e6f --- /dev/null +++ b/src/app/models/CallMeeting.ts @@ -0,0 +1,9 @@ +export class CallMeeting{ + Message: string; + Attachment: { + Source: number, + SourceId: string, + SourceName: string, + ApplicationId: number + } +} \ No newline at end of file diff --git a/src/app/services/processes.service.ts b/src/app/services/processes.service.ts index 0cbf7177d..0c8c1b51b 100644 --- a/src/app/services/processes.service.ts +++ b/src/app/services/processes.service.ts @@ -5,6 +5,7 @@ import { AuthService } from '../services/auth.service'; import { User } from '../models/user.model'; import { environment } from 'src/environments/environment'; import { Observable } from 'rxjs'; +import { CallMeeting } from '../models/CallMeeting'; @Injectable({ providedIn: 'root' @@ -49,6 +50,7 @@ export class ProcessesService { }; return this.http.get(`${geturl}`, options); } + SetTaskToPending(serialNumber:string): Observable{ const geturl = environment.apiURL + 'Tasks/SetTaskPending'; let params = new HttpParams(); @@ -239,7 +241,6 @@ export class ProcessesService { return this.http.post(`${geturl}`, body, options) } - GetActionsList(){ const geturl = environment.apiURL + 'presidentialActions'; let options = { @@ -249,6 +250,7 @@ export class ProcessesService { return this.http.get(`${geturl}`, options); } + GetSubjectType(){ const geturl = environment.apiURL + 'ecm/SubjectType'; let options = { @@ -272,4 +274,14 @@ export class ProcessesService { return this.http.get(`${geturl}`, options); } + CallMeeting(body: CallMeeting) { + const geturl = environment.apiURL + 'Processes/CallMeeting'; + + let options: any = { + headers: this.headers, + } + + return this.http.post(`${geturl}`,body, options); + } + } diff --git a/src/app/shared/agenda/view-event/view-event.page.ts b/src/app/shared/agenda/view-event/view-event.page.ts index 9e07f74d4..0ccdc960c 100644 --- a/src/app/shared/agenda/view-event/view-event.page.ts +++ b/src/app/shared/agenda/view-event/view-event.page.ts @@ -168,100 +168,41 @@ export class ViewEventPage implements OnInit { }); } - async openExpedientActionsModal(taskAction: any, task: any) { - let classs; - if( window.innerWidth <= 800){ - classs = 'modal modal-desktop' - } else { - classs = 'modal modal-desktop showAsideOptions' - } - - const doc = this.loadedAttachments[ this.dicIndex]; - - task = { - serialNumber: doc.SourceId, - taskStartDate: doc.CreateDate, - isEvent: true, - workflowInstanceDataFields: { - FsId: doc.ApplicationId, - FolderID: null, - DocId: doc.SourceId, - Subject: doc.SourceName - }, - } - - const modal = await this.modalController.create({ - component: ExpedientTaskModalPage, - componentProps: { - taskAction: taskAction, - task: task, - profile: this.profile, - }, - cssClass: classs, - }); - await modal.present(); - modal.onDidDismiss().then(res=>{ - console.log(res['data']); - if(res['data']=='openDiscart'){ - console.log('open discart'); - - // this.distartExpedientModal(); - - } - - }); - } - - async openBookMeetingModal(task: any) { - - const doc = this.loadedAttachments[ this.dicIndex]; - - const Customtask = { - serialNumber: doc.SourceId, - taskStartDate: doc.CreateDate, - isEvent: true, - workflowInstanceDataFields: { - FsId: doc.ApplicationId, - FolderID: null, - DocId: doc.SourceId, - Subject: doc.SourceName - }, - } - - let classs; - if( window.innerWidth <= 800){ - classs = 'book-meeting-modal modal modal-desktop' - } else { - classs = 'modal modal-desktop showAsideOptions' - } - const modal = await this.modalController.create({ - component: BookMeetingModalPage, - componentProps: { - task: task, - }, - cssClass: classs, - backdropDismiss: false - }); - await modal.present(); - modal.onDidDismiss(); - } - async openTaskOptions() { const doc = this.loadedAttachments[ this.dicIndex]; - let customTask = { - serialNumber: doc.SourceId, - taskStartDate: doc.CreateDate, - isEvent: true, - workflowInstanceDataFields: { - FsId: doc.ApplicationId, - FolderID: null, - DocId: doc.SourceId, - Subject: doc.SourceName - }, + let customTask; + + if(doc.ApplicationID == 361 || doc.ApplicationId == 361) { + customTask = { + serialNumber: doc.DispatchNumber, + taskStartDate: doc.DateDispatch, + isEvent: true, + workflowInstanceDataFields: { + FsId: doc.ApplicationID, + FolderID: null, + DocId: doc.DispatchNumber, + Subject: doc.Assunto + }, + } + } else if (doc.ApplicationID == 8 || doc.ApplicationId == 8) { + customTask = { + serialNumber: doc.DocId, + taskStartDate: doc.DocDate, + isEvent: true, + workflowInstanceDataFields: { + FsId: doc.ApplicationID || doc.ApplicationId, + FolderID: null, + DocId: doc.DocId, + Subject: doc.Assunto + } + } } + console.log(doc) + customTask.Status = '' + const popover = await this.modalController.create({ component: OptsExpedientePage, cssClass: 'model aside-modal search-submodal', 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 47bd03dd9..a7abed3f6 100644 --- a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts +++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts @@ -104,7 +104,6 @@ export class OptsExpedientePage implements OnInit { } } - sendExpedienteToPending() { this.close(); this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{ @@ -136,6 +135,10 @@ export class OptsExpedientePage implements OnInit { } async openExpedientActionsModal(taskAction: any, task: any) { + + alert('save') + console.log(taskAction, task) + this.close(); let classs; if( window.innerWidth <= 800){ diff --git a/src/app/store/to-day-event-storage.service.ts b/src/app/store/to-day-event-storage.service.ts index 299865b2d..c28c671a5 100644 --- a/src/app/store/to-day-event-storage.service.ts +++ b/src/app/store/to-day-event-storage.service.ts @@ -20,7 +20,7 @@ export class ToDayEventStorageService { this.keyName = (SHA1(this.constructor.name+ 'home/eventSource')).toString() - setTimeout(()=>{ + setTimeout(() => { let restore = localstoreService.get(this.keyName, {}) this._eventsList = restore.eventsList || [] this._count = this._eventsList.length || 0 From 81c18a14acc3001df28146c0715fde8f779b050d Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 27 Jul 2021 21:19:09 +0100 Subject: [PATCH 3/8] Add page pattern --- src/app/Rules/despacho-md.service.spec.ts | 16 ++++++ src/app/Rules/despacho-md.service.ts | 67 +++++++++++++++++++++++ 2 files changed, 83 insertions(+) create mode 100644 src/app/Rules/despacho-md.service.spec.ts create mode 100644 src/app/Rules/despacho-md.service.ts diff --git a/src/app/Rules/despacho-md.service.spec.ts b/src/app/Rules/despacho-md.service.spec.ts new file mode 100644 index 000000000..b7121436c --- /dev/null +++ b/src/app/Rules/despacho-md.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { DespachoMdService } from './despacho-md.service'; + +describe('DespachoMdService', () => { + let service: DespachoMdService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(DespachoMdService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/Rules/despacho-md.service.ts b/src/app/Rules/despacho-md.service.ts new file mode 100644 index 000000000..077986dfb --- /dev/null +++ b/src/app/Rules/despacho-md.service.ts @@ -0,0 +1,67 @@ +import { Injectable } from '@angular/core'; +import { ProcessesService } from '../services/processes.service'; + + +@Injectable({ + providedIn: 'root' +}) +export class DespachoMdService { + + /** + * @description para terminar o + * 95 - signfica + * 98 - significa + */ + ActionTypeId: 95 | 98 + + action: "Arquivo" | "Reencaminhar" + + constructor( + private processes: ProcessesService, + ) { } + + arquivar(note:string, documents:any, serialnumber) { + + let body = { + "serialNumber": serialnumber, + "action": "Arquivo", + "ActionTypeId": 95, + "dataFields": { + "ReviewUserComment": note, + }, + "AttachmentList" :documents, + } + return this.processes.CompleteTask(body) + } + + reencaminhar(note:string, documents:any, serialnumber) { + + let body = { + "serialNumber": serialnumber, + "action": "Reencaminhar", + "ActionTypeId": 98, + "dataFields": { + "ReviewUserComment": note, + }, + "AttachmentList" :documents, + } + + return this.processes.CompleteTask(body) + } + + async executado(note:string, documents:any , serialnumber) { + + let body = { + "serialNumber": serialnumber, + "action": "Conhecimento", + "ActionTypeId": 104, + "dataFields": { + "ReviewUserComment": note, + }, + "AttachmentList" :documents, + } + + return this.processes.CompleteTask(body) + } + +} From 34a16d6b176e812e0e48cde8dd4574c823581901 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 27 Jul 2021 21:21:16 +0100 Subject: [PATCH 4/8] Add page pattern --- src/app/models/CallMeeting.ts | 4 ++-- src/app/models/Excludetask.ts | 10 ++++++++++ .../despachos/despacho/despacho.page.ts | 19 ++++++------------- src/app/services/processes.service.ts | 3 ++- 4 files changed, 20 insertions(+), 16 deletions(-) create mode 100644 src/app/models/Excludetask.ts diff --git a/src/app/models/CallMeeting.ts b/src/app/models/CallMeeting.ts index d568b9e6f..00d12719c 100644 --- a/src/app/models/CallMeeting.ts +++ b/src/app/models/CallMeeting.ts @@ -1,6 +1,6 @@ -export class CallMeeting{ +export class CallMeeting { Message: string; - Attachment: { + Attachment: { Source: number, SourceId: string, SourceName: string, diff --git a/src/app/models/Excludetask.ts b/src/app/models/Excludetask.ts new file mode 100644 index 000000000..af4410828 --- /dev/null +++ b/src/app/models/Excludetask.ts @@ -0,0 +1,10 @@ +export class Excludetask{ + serialNumber: any; + action: string; + ActionTypeId: any; + dataFields: { + ReviewUserComment?: string, + Note?: any + } + AttachmentList?: any +} \ No newline at end of file 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 573c588e3..305839981 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts @@ -15,7 +15,7 @@ import { DelegarPage } from 'src/app/modals/delegar/delegar.page'; import { AddNotePage } from 'src/app/modals/add-note/add-note.page'; import { DespachosOptionsPage } from 'src/app/shared/popover/despachos-options/despachos-options.page'; import { ToastService } from 'src/app/services/toast.service'; - +import { DespachoMdService } from 'src/app/Rules/despacho-md.service' @Component({ selector: 'app-despacho', templateUrl: './despacho.page.html', @@ -50,6 +50,7 @@ export class DespachoPage implements OnInit { private router: Router, private animationController: AnimationController, private toastService: ToastService, + private despachoMdService: DespachoMdService ) { this.activatedRoute.paramMap.subscribe(params => { if(params["params"].SerialNumber) { @@ -188,21 +189,12 @@ export class DespachoPage implements OnInit { this.modalController.dismiss(); } - async executado(note:string, documents:any){ - let body = { - "serialNumber": this.serialnumber, - "action": "Conhecimento", - "ActionTypeId": 104, - "dataFields": { - "ReviewUserComment": note, - }, - "AttachmentList" :documents, - } + async executado(note:string, documents:any) { const loader = this.toastService.loading() try { - await this.processes.CompleteTask(body).toPromise() + await this.despachoMdService.executado(note, documents, this.serialnumber) this.toastService.successMessage('Processo criado') this.close(); } catch(error) { @@ -213,7 +205,7 @@ export class DespachoPage implements OnInit { } } - async arquivar(note:string, documents:any){ + async arquivar(note:string, documents:any) { let body = { "serialNumber": this.serialnumber, "action": "Arquivo", @@ -236,6 +228,7 @@ export class DespachoPage implements OnInit { loader.remove() } + } async reencaminhar(note:string, documents:any) { diff --git a/src/app/services/processes.service.ts b/src/app/services/processes.service.ts index 0c8c1b51b..b9b1d21b1 100644 --- a/src/app/services/processes.service.ts +++ b/src/app/services/processes.service.ts @@ -6,6 +6,7 @@ import { User } from '../models/user.model'; import { environment } from 'src/environments/environment'; import { Observable } from 'rxjs'; import { CallMeeting } from '../models/CallMeeting'; +import { Excludetask } from '../models/Excludetask'; @Injectable({ providedIn: 'root' @@ -156,7 +157,7 @@ export class ProcessesService { return this.http.post(`${geturl}`, body, options) } - CompleteTask(body:any){ + CompleteTask(body:Excludetask) { const geturl = environment.apiURL + 'Tasks/CompleteTask'; let options = { From 2cb96a80acf503f210ba6ff0a74f96504df8e4aa Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 27 Jul 2021 21:26:31 +0100 Subject: [PATCH 5/8] Improve --- src/app/Rules/despacho-md.service.ts | 10 ++++++++-- .../despachos/despacho/despacho.page.ts | 4 +++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/app/Rules/despacho-md.service.ts b/src/app/Rules/despacho-md.service.ts index 077986dfb..9940a63fe 100644 --- a/src/app/Rules/despacho-md.service.ts +++ b/src/app/Rules/despacho-md.service.ts @@ -49,7 +49,7 @@ export class DespachoMdService { return this.processes.CompleteTask(body) } - async executado(note:string, documents:any , serialnumber) { + executado(note:string, documents:any , serialnumber) { let body = { "serialNumber": serialnumber, @@ -63,5 +63,11 @@ export class DespachoMdService { return this.processes.CompleteTask(body) } - + + + sendExpedienteToPending(serialnumber) { + + return this.processes.SetTaskToPending(serialnumber) + } + } 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 305839981..8275ce40f 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts @@ -289,13 +289,15 @@ export class DespachoPage implements OnInit { } async sendExpedienteToPending() { - this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{ + + this.despachoMdService.sendExpedienteToPending(this.serialnumber).subscribe(res=>{ this.goBack(); this.toastService.successMessage('Processo enviado para despacho') }, error => { this.toastService.badRequest("Processo não enviado para despacho") }); + } async openAddNoteModal(actionName:string) { From 999da281e880f37afdd7ee03f9fcc69ddeae6fab Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 27 Jul 2021 22:34:47 +0100 Subject: [PATCH 6/8] Fix --- .../agenda/view-event/view-event.page.ts | 16 +++-- .../despachos/despacho/despacho.page.ts | 62 +++++++++++-------- src/app/services/navigation.service.spec.ts | 16 +++++ src/app/services/navigation.service.ts | 26 ++++++++ .../approve-event/approve-event.page.ts | 4 +- 5 files changed, 91 insertions(+), 33 deletions(-) create mode 100644 src/app/services/navigation.service.spec.ts create mode 100644 src/app/services/navigation.service.ts diff --git a/src/app/pages/agenda/view-event/view-event.page.ts b/src/app/pages/agenda/view-event/view-event.page.ts index f25b969b1..276144c67 100644 --- a/src/app/pages/agenda/view-event/view-event.page.ts +++ b/src/app/pages/agenda/view-event/view-event.page.ts @@ -15,6 +15,7 @@ import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts- import { ActivatedRoute, NavigationExtras, Router } from '@angular/router'; import { ToastService } from 'src/app/services/toast.service'; import { EliminateEventPage } from 'src/app/modals/eliminate-event/eliminate-event.page'; +import { Location } from '@angular/common' @Component({ selector: 'app-view-event', @@ -58,6 +59,7 @@ export class ViewEventPage implements OnInit { private activatedRoute: ActivatedRoute, private router: Router, private toastService: ToastService, + private location: Location ) { this.isEventEdited = false; @@ -128,13 +130,17 @@ export class ViewEventPage implements OnInit { /* this.today = new Date(res.StartDate); this.customDate = this.days[this.today.getDay()]+ ", " + this.today.getDate() +" de " + ( this.months[this.today.getMonth()]); */ loader.remove() - }, ()=>{ + }, (error)=>{ - loader.remove() - this.toastService.badRequest('Este evento já não existe na sua agenda') - this.modalController.dismiss('Eevent not Foud'); - this.router.navigate(['/home/agenda']); + if(error.status == 0) { + this.toastService.badRequest('não é possível vizualizar este event no modo offline') + } else { + this.toastService.badRequest('Este evento já não existe na sua agenda') + } + loader.remove() + this.modalController.dismiss('Eevent not Foud'); + this.location.back(); }); } 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 8275ce40f..3284e82b2 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts @@ -16,6 +16,9 @@ import { AddNotePage } from 'src/app/modals/add-note/add-note.page'; import { DespachosOptionsPage } from 'src/app/shared/popover/despachos-options/despachos-options.page'; import { ToastService } from 'src/app/services/toast.service'; import { DespachoMdService } from 'src/app/Rules/despacho-md.service' +import { NavigationService } from 'src/app/services/navigation.service'; +import { Location } from '@angular/common' + @Component({ selector: 'app-despacho', templateUrl: './despacho.page.html', @@ -50,7 +53,10 @@ export class DespachoPage implements OnInit { private router: Router, private animationController: AnimationController, private toastService: ToastService, - private despachoMdService: DespachoMdService + private despachoMdService: DespachoMdService, + private navigationService: NavigationService, + private location: Location + ) { this.activatedRoute.paramMap.subscribe(params => { if(params["params"].SerialNumber) { @@ -81,31 +87,35 @@ export class DespachoPage implements OnInit { } goBack() { - if(this.task.Status == "Pending" && this.caller == 'gabinete-digital'){ - if (window.innerWidth < 801) { - this.router.navigate(['/home/gabinete-digital/pendentes']); - } - else { - let navigationExtras: NavigationExtras = { - queryParams: { - "pendentes": true, - } - } - this.router.navigate(['/home/gabinete-digital'], navigationExtras); - } - } - else{ - if (window.innerWidth < 801) { - this.router.navigate(['/home/gabinete-digital/despachos']); - } else { - let navigationExtras: NavigationExtras = { - queryParams: { - 'despachos': true - } - } - this.router.navigate(['/home/gabinete-digital'], navigationExtras); - } - } + + //this.navigationService.back() + this.location.back(); + + // if(this.task.Status == "Pending" && this.caller == 'gabinete-digital'){ + // if (window.innerWidth < 801) { + // this.router.navigate(['/home/gabinete-digital/pendentes']); + // } + // else { + // let navigationExtras: NavigationExtras = { + // queryParams: { + // "pendentes": true, + // } + // } + // this.router.navigate(['/home/gabinete-digital'], navigationExtras); + // } + // } + // else{ + // if (window.innerWidth < 801) { + // this.router.navigate(['/home/gabinete-digital/despachos']); + // } else { + // let navigationExtras: NavigationExtras = { + // queryParams: { + // 'despachos': true + // } + // } + // this.router.navigate(['/home/gabinete-digital'], navigationExtras); + // } + // } } async LoadTaskDetail(serial: string) { diff --git a/src/app/services/navigation.service.spec.ts b/src/app/services/navigation.service.spec.ts new file mode 100644 index 000000000..3faeea3de --- /dev/null +++ b/src/app/services/navigation.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { NavigationService } from './navigation.service'; + +describe('NavigationService', () => { + let service: NavigationService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(NavigationService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/services/navigation.service.ts b/src/app/services/navigation.service.ts new file mode 100644 index 000000000..05c24f6b4 --- /dev/null +++ b/src/app/services/navigation.service.ts @@ -0,0 +1,26 @@ +import { Injectable } from '@angular/core' +import { Location } from '@angular/common' +import { Router, NavigationEnd } from '@angular/router' + +@Injectable({ providedIn: 'root' }) +export class NavigationService { + private history: string[] = [] + + constructor(private router: Router, private location: Location) { + this.router.events.subscribe((event) => { + if (event instanceof NavigationEnd) { + this.history.push(event.urlAfterRedirects) + } + }) + } + + back(): void { + this.history.pop() + if (this.history.length > 0) { + this.location.back() + } else { + this.router.navigateByUrl('/') + } + } +} + diff --git a/src/app/shared/agenda/approve-event/approve-event.page.ts b/src/app/shared/agenda/approve-event/approve-event.page.ts index 7bd01d909..1c65d4533 100644 --- a/src/app/shared/agenda/approve-event/approve-event.page.ts +++ b/src/app/shared/agenda/approve-event/approve-event.page.ts @@ -69,12 +69,12 @@ export class ApproveEventPage implements OnInit { setTimeout(()=>{ this.getTask(); this.getAttachments(); - }, 4000) + }, 6000) setTimeout(()=>{ this.getTask(); this.getAttachments(); - }, 6000) + }, 10000) } From 6da79420b4b1983eddf7242189a8e76d8e7ef5d3 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 28 Jul 2021 14:18:02 +0100 Subject: [PATCH 7/8] Improve --- src/app/Rules/despacho-md.service.ts | 2 +- src/app/models/CallMeeting.ts | 55 ++++++++++++++++--- src/app/pages/agenda/agenda.page.ts | 7 ++- .../agenda/view-event/view-event.page.ts | 18 +++--- .../expediente-detail.page.ts | 2 +- src/app/services/processes.service.ts | 2 +- .../approve-event/approve-event.page.html | 2 +- .../approve-event/approve-event.page.ts | 16 ++++-- 8 files changed, 76 insertions(+), 28 deletions(-) diff --git a/src/app/Rules/despacho-md.service.ts b/src/app/Rules/despacho-md.service.ts index 9940a63fe..ca065d75d 100644 --- a/src/app/Rules/despacho-md.service.ts +++ b/src/app/Rules/despacho-md.service.ts @@ -31,6 +31,7 @@ export class DespachoMdService { }, "AttachmentList" :documents, } + return this.processes.CompleteTask(body) } @@ -64,7 +65,6 @@ export class DespachoMdService { return this.processes.CompleteTask(body) } - sendExpedienteToPending(serialnumber) { return this.processes.SetTaskToPending(serialnumber) diff --git a/src/app/models/CallMeeting.ts b/src/app/models/CallMeeting.ts index 00d12719c..501d7350f 100644 --- a/src/app/models/CallMeeting.ts +++ b/src/app/models/CallMeeting.ts @@ -1,9 +1,50 @@ export class CallMeeting { - Message: string; - Attachment: { - Source: number, - SourceId: string, - SourceName: string, - ApplicationId: number - } + "EventProcess": { + "SerialNumber": "sample string 1", + "Body": "sample string 2", + "Location": "sample string 3", + "Subject": "sample string 4", + "StartDate": "2021-07-28T13:22:55.031857+01:00", + "EndDate": "2021-07-28T13:22:55.031857+01:00", + "ReviewUserComment": "sample string 7", + "MDName": "sample string 8", + "MDEmail": "sample string 9", + "IsAllDayEvent": true, + "Status": "sample string 11", + "EventType": "sample string 12", + "IsRecurring": true, + "ParticipantsList": [ + { + "Id": 1, + "EmailAddress": "sample string 2", + "Name": "sample string 3", + "IsRequired": true + }, + { + "Id": 1, + "EmailAddress": "sample string 2", + "Name": "sample string 3", + "IsRequired": true + } + ], + "Message": "sample string 14", + "EventRecurrence": { + "Type": 0, + "Day": 1, + "DayOfWeek": 0, + "Month": 1, + "LastOccurrence": "2021-07-28T13:22:55.031857+01:00" + }, + "Participants": "sample string 15", + "CC": "sample string 16" + } + + "Attachment": { + "Id": 1, + "ParentId": "sample string 2", + "Source": 0, + "SourceId": "sample string 3", + "SourceName": "sample string 4", + "ApplicationId": 1 + } } \ No newline at end of file diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index db9c8b17b..5e298c321 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -193,7 +193,7 @@ export class AgendaPage implements OnInit { this.updateEventListBox() - }, 1000) + }, 2000) } @@ -214,8 +214,9 @@ export class AgendaPage implements OnInit { } if ( realoadCounter != 0) { - this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate); - + setTimeout(()=>{ + this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate); + }, 1000) } realoadCounter++; } diff --git a/src/app/pages/agenda/view-event/view-event.page.ts b/src/app/pages/agenda/view-event/view-event.page.ts index 276144c67..578b6519d 100644 --- a/src/app/pages/agenda/view-event/view-event.page.ts +++ b/src/app/pages/agenda/view-event/view-event.page.ts @@ -111,14 +111,16 @@ export class ViewEventPage implements OnInit { if(this.isModal) { this.close() } else { - this.activatedRoute.paramMap.subscribe(params => { - if(params["params"].caller == 'expediente'){ - window.history.back(); - } - else{ - this.router.navigate(['/home',params["params"].caller]); - } - }); + // this.activatedRoute.paramMap.subscribe(params => { + // if(params["params"].caller == 'expediente'){ + // window.history.back(); + // } + // else{ + // this.router.navigate(['/home',params["params"].caller]); + // } + // }); + + this.location.back(); } } 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 ad6a55936..7bf5533ca 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 @@ -270,7 +270,7 @@ export class ExpedienteDetailPage implements OnInit { const loader = this.toastService.loading() try { - await this.processes.CompleteTask(otherbody).toPromise() + await this.processes.CompleteTask(otherbody) this.toastService.successMessage('Processo descartado'); this.goBack(); } catch (error) { diff --git a/src/app/services/processes.service.ts b/src/app/services/processes.service.ts index b9b1d21b1..68b44d4a2 100644 --- a/src/app/services/processes.service.ts +++ b/src/app/services/processes.service.ts @@ -252,7 +252,7 @@ export class ProcessesService { return this.http.get(`${geturl}`, options); } - GetSubjectType(){ + GetSubjectType() { const geturl = environment.apiURL + 'ecm/SubjectType'; let options = { headers: this.headers, diff --git a/src/app/shared/agenda/approve-event/approve-event.page.html b/src/app/shared/agenda/approve-event/approve-event.page.html index 4752d3ad9..79884958d 100644 --- a/src/app/shared/agenda/approve-event/approve-event.page.html +++ b/src/app/shared/agenda/approve-event/approve-event.page.html @@ -20,7 +20,7 @@
- +
diff --git a/src/app/shared/agenda/approve-event/approve-event.page.ts b/src/app/shared/agenda/approve-event/approve-event.page.ts index 1c65d4533..729788113 100644 --- a/src/app/shared/agenda/approve-event/approve-event.page.ts +++ b/src/app/shared/agenda/approve-event/approve-event.page.ts @@ -135,7 +135,6 @@ export class ApproveEventPage implements OnInit { try { await this.processes.PostTaskAction(body).toPromise() - this.router.navigate(['/home/gabinete-digital/event-list']); this.toastService.successMessage('Evento rejeitado') } catch (error) { this.toastService.badRequest('Processo não efectuado') @@ -218,12 +217,17 @@ export class ApproveEventPage implements OnInit { } goToEventsToApprove() { - let navigationExtras: NavigationExtras = { - queryParams: { + if(window.location.pathname.startsWith('/home/agenda')) { + this.close() + } else { + let navigationExtras: NavigationExtras = { + queryParams: { "eventos": true, - } - }; - this.router.navigate(['/home/gabinete-digital'], navigationExtras); + } + }; + this.router.navigate(['/home/gabinete-digital'], navigationExtras); + } + } From 554000ab4cd6211d5ab0e033ad62c9863ba1c3e6 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 28 Jul 2021 14:47:56 +0100 Subject: [PATCH 8/8] Improve --- src/app/pages/agenda/agenda.page.html | 3 +++ src/app/pages/agenda/agenda.page.ts | 17 ++++------------- .../approve-event/approve-event.page.html | 2 +- .../edit-event-to-approve.page.ts | 11 +++++++---- 4 files changed, 15 insertions(+), 18 deletions(-) diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index ff4cbef00..bde1071bf 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -409,6 +409,9 @@ (closeComponent)="approveEventDismissGoBack()" (setIntervenient)="setIntervenient($event)" (setIntervenientCC)="setIntervenientCC($event)" + + + (closeEventToApprove)="closeEventToApproveGoBack()" > { - this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate); - }, 1000) + this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate); + } realoadCounter++; } @@ -339,15 +338,7 @@ export class AgendaPage implements OnInit { let classs = []; events.forEach(element => { - - const startTimeSamp = new Date(element.startTime).toLocaleDateString() - const endTimeSamp = new Date(element.endTime).toLocaleDateString() - - const endMinutes = new Date(element.endTime).getMinutes() - const endHours = new Date(element.endTime).getHours() - const endDay: number = new Date(element.endTime).getDate() - const startDay = new Date(element.startTime).getDate() - + const profile_ = element.profile == 'md'? 'mdgpr': 'pr'; const eventtype = element.event.CalendarName; diff --git a/src/app/shared/agenda/approve-event/approve-event.page.html b/src/app/shared/agenda/approve-event/approve-event.page.html index 79884958d..4752d3ad9 100644 --- a/src/app/shared/agenda/approve-event/approve-event.page.html +++ b/src/app/shared/agenda/approve-event/approve-event.page.html @@ -20,7 +20,7 @@
- +
diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts index 156a4698d..e62ca8002 100644 --- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts +++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts @@ -109,6 +109,7 @@ export class EditEventToApprovePage implements OnInit { @Output() setIntervenient = new EventEmitter(); @Output() setIntervenientCC = new EventEmitter(); @Output() closeComponent = new EventEmitter(); + @Output() closeEventToApprove = new EventEmitter(); @Input() saveData: any; @Input() serialNumber: string @@ -210,7 +211,10 @@ export class EditEventToApprovePage implements OnInit { window['temp.path:/shared/agenda/edit-event-to-approve.ts'] = {} - this.closeComponent.emit(); + // this.closeComponent.emit(); + + this.closeEventToApprove.emit(); + /* this.setIntervenient.emit([]); this.setIntervenientCC.emit([]); this.clearContact.emit(); */ @@ -254,8 +258,6 @@ export class EditEventToApprovePage implements OnInit { } async save() { - - this.close() this.injectValidation() this.runValidation() @@ -303,8 +305,9 @@ export class EditEventToApprovePage implements OnInit { try { await this.eventsService.postEventToApproveEdit(event).toPromise() + this.close() + this.toastService.successMessage('Evento editado'); - } catch(e) { this.toastService.badRequest('Evento não editado');