Intervenientes
Com conhecimento
-0">Com conhecimento
+{{c.Name}}
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts index 5faaedb2a..5b7551515 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts +++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts @@ -5,7 +5,7 @@ import { EventsService } from 'src/app/services/events.service'; import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; import { DailyWorkTask } from '../../../../models/dailyworktask.model'; import { ActivatedRoute, NavigationExtras, Router } from '@angular/router'; -import { formatDate } from '@angular/common'; + import { Event } from '../../../../models/event.model'; import { AnimationController, MenuController, ModalController, PopoverController } from '@ionic/angular'; import { AlertService } from 'src/app/services/alert.service'; @@ -17,9 +17,6 @@ import { BookMeetingModalPage } from '../../expediente/book-meeting-modal/book-m import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page'; import { DelegarPage } from 'src/app/modals/delegar/delegar.page'; import { AddNotePage } from 'src/app/modals/add-note/add-note.page'; -import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page'; -import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page'; -import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page'; import { DespachosPrOptionsPage } from 'src/app/shared/popover/despachos-pr-options/despachos-pr-options.page'; import { ToastService } from 'src/app/services/toast.service'; import { Location } from '@angular/common' @@ -128,7 +125,10 @@ export class DespachoPrPage implements OnInit { this.cc = users.filter(user=>{ return user.Type == 'CC'; }) || [] - console.log(users); + + if(!this.cc) { + this.cc = [] + } }); this.getDocumentDetails(this.task.FolderId, '361'); diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.ts b/src/app/pages/gabinete-digital/event-list/event-list.page.ts index 92c7d023d..bccca72e0 100644 --- a/src/app/pages/gabinete-digital/event-list/event-list.page.ts +++ b/src/app/pages/gabinete-digital/event-list/event-list.page.ts @@ -4,8 +4,9 @@ import { EventPerson } from 'src/app/models/eventperson.model'; import { ProcessesService } from 'src/app/services/processes.service'; import { ModalController } from '@ionic/angular'; import { ApproveEventModalPage } from './approve-event-modal/approve-event-modal.page'; -import { NavigationEnd, NavigationStart, Router } from '@angular/router'; +import { NavigationStart, Router } from '@angular/router'; import { EventoAprovacaoStore } from 'src/app/store/eventoaprovacao-store.service'; +import { Location } from '@angular/common'; @Component({ selector: 'app-event-list', @@ -32,7 +33,8 @@ export class EventListPage implements OnInit { constructor( private processes:ProcessesService, private modalController: ModalController, - private router: Router + private router: Router, + private location: Location ) { } ngOnInit() { @@ -138,12 +140,14 @@ export class EventListPage implements OnInit { this.modalController.dismiss(null); } goBack() { - if(this.router.url == '/home/agenda/event-list') { - this.router.navigate(['/home/agenda']); - } - else if(this.router.url == '/home/gabinete-digital/event-list'){ - this.router.navigate(['/home/gabinete-digital']); - } + // if(this.router.url == '/home/agenda/event-list') { + // this.router.navigate(['/home/agenda']); + // } + // else if(this.router.url == '/home/gabinete-digital/event-list'){ + // this.router.navigate(['/home/gabinete-digital']); + // } + + this.location.back() } 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 5face2565..eb9687cf1 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 @@ -158,7 +158,7 @@ export class ExpedientePrPage implements OnInit { "CreateDate":taskDate, "DocumentURL": res.workflowInstanceDataFields.ViewerRequest, "Remetente": res.workflowInstanceDataFields.Sender, - "Note": res.workflowInstanceDataFields.Note, + "Note": res.workflowInstanceDataFields.TaskMessage || res.workflowInstanceDataFields.Note, "FolderId": res.workflowInstanceDataFields.FolderID, "FsId": res.workflowInstanceDataFields.FsId, "DocId": res.workflowInstanceDataFields.DocId || res.workflowInstanceDataFields.DocID, diff --git a/src/app/shared/header/header.page.ts b/src/app/shared/header/header.page.ts index 774a89644..66dedaef5 100644 --- a/src/app/shared/header/header.page.ts +++ b/src/app/shared/header/header.page.ts @@ -59,12 +59,12 @@ export class HeaderPage implements OnInit { - if(window.location.pathname == '/home/agenda') { + if(window.location.pathname.startsWith('/home/agenda')) { type = "Agenda" - } else if (window.location.pathname =='/home/gabinete-digital') { + } else if (window.location.pathname.startsWith('/home/gabinete-digital')) { type = "AccoesPresidenciais & ArquivoDespachoElect" - } else if (window.location.pathname == '/home/publications') { + } else if (window.location.pathname.startsWith('/home/publications')) { type = "AccoesPresidenciais" } diff --git a/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts b/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts index 46825812e..4c648efb4 100644 --- a/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts +++ b/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts @@ -8,14 +8,10 @@ import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discar import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page'; import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page'; import { SearchPage } from 'src/app/pages/search/search.page'; -import { AlertService } from 'src/app/services/alert.service'; import { AttachmentsService } from 'src/app/services/attachments.service'; import { AuthService } from 'src/app/services/auth.service'; -import { EventsService } from 'src/app/services/events.service'; import { ProcessesService } from 'src/app/services/processes.service'; import { ToastService } from 'src/app/services/toast.service'; -import { BadRequestPage } from '../bad-request/bad-request.page'; -import { SuccessMessagePage } from '../success-message/success-message.page'; @Component({ selector: 'app-opts-expediente-pr', @@ -68,7 +64,7 @@ export class OptsExpedientePrPage implements OnInit { ngOnInit() { } - close(){ + close() { if( window.innerWidth <= 1024){ this.popoverController.dismiss(); } @@ -121,7 +117,7 @@ export class OptsExpedientePrPage implements OnInit { }); } - async approve(note:string, documents:any){ + async approve(note:string, documents:any) { this.popoverController.dismiss(); let body = { "serialNumber": this.task.SerialNumber, @@ -160,7 +156,7 @@ export class OptsExpedientePrPage implements OnInit { modal.onDidDismiss().then( async (res)=>{ console.log(res['data']); - if(body == 'descartar'){ + if(body == 'descartar') { if(res['data']== 'Yes'){ let otherbody = { "serialNumber": this.task.SerialNumber, @@ -188,17 +184,17 @@ export class OptsExpedientePrPage implements OnInit { //Do nothing } } - else{ - if(res['data']== 'Yes'){ + else { + if(res['data']== 'Yes') { const loader = this.toastService.loading() try { await this.processes.CompleteTask(body).toPromise(); - this.toastService.successMessage('Processo descartado'); + // this.toastService.successMessage('Processo descartado'); this.goBack(); } catch (error) { this.toastService.badRequest('Processo não descartado'); - } finally { + } finally { loader.remove() } this.goBack(); @@ -222,7 +218,7 @@ export class OptsExpedientePrPage implements OnInit { } - async sendToReview(note:string, documents:any){ + async sendToReview(note:string, documents:any) { let body = { "serialNumber": this.task.SerialNumber, "action": "Retificar", @@ -276,14 +272,25 @@ export class OptsExpedientePrPage implements OnInit { cssClass: classs, }); await modal.present(); - modal.onDidDismiss().then(res=>{ + modal.onDidDismiss().then( async (res)=>{ console.log(res['data']); let body = res['data']; // alert('close '+ res['data']) if(res['data']){ console.log('open discart'); - this.distartExpedientModal(body); + const loader = this.toastService.loading() + + try { + await this.processes.CompleteTask(body).toPromise(); + // this.toastService.successMessage('Processo descartado'); + this.goBack(); + } catch (error) { + this.toastService.badRequest('Processo não descartado'); + } finally { + loader.remove() + } + this.goBack(); } else{ diff --git a/src/app/shared/popover/searched-document-options/searched-document-options-routing.module.ts b/src/app/shared/popover/searched-document-options/searched-document-options-routing.module.ts new file mode 100644 index 000000000..63193d5ce --- /dev/null +++ b/src/app/shared/popover/searched-document-options/searched-document-options-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { SearchedDocumentOptionsPage } from './searched-document-options.page'; + +const routes: Routes = [ + { + path: '', + component: SearchedDocumentOptionsPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class SearchedDocumentOptionsPageRoutingModule {} diff --git a/src/app/shared/popover/searched-document-options/searched-document-options.module.ts b/src/app/shared/popover/searched-document-options/searched-document-options.module.ts new file mode 100644 index 000000000..14020955a --- /dev/null +++ b/src/app/shared/popover/searched-document-options/searched-document-options.module.ts @@ -0,0 +1,20 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; + +import { IonicModule } from '@ionic/angular'; + +import { SearchedDocumentOptionsPageRoutingModule } from './searched-document-options-routing.module'; + +import { SearchedDocumentOptionsPage } from './searched-document-options.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + SearchedDocumentOptionsPageRoutingModule + ], + declarations: [SearchedDocumentOptionsPage] +}) +export class SearchedDocumentOptionsPageModule {} diff --git a/src/app/shared/popover/searched-document-options/searched-document-options.page.html b/src/app/shared/popover/searched-document-options/searched-document-options.page.html new file mode 100644 index 000000000..ba93eae54 --- /dev/null +++ b/src/app/shared/popover/searched-document-options/searched-document-options.page.html @@ -0,0 +1,10 @@ +