diff --git a/src/app/modals/delegar/delegar.page.ts b/src/app/modals/delegar/delegar.page.ts index b4d74a350..6fab0260d 100644 --- a/src/app/modals/delegar/delegar.page.ts +++ b/src/app/modals/delegar/delegar.page.ts @@ -72,7 +72,6 @@ export class DelegarPage implements OnInit { } close() { - this.router.navigate(['/home/gabinete-digital/expediente']); this.modalController.dismiss(null); } diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index b8cdd8c20..5e980a3ac 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -20,12 +20,9 @@ import { DAYS_OF_WEEK, } from 'angular-calendar'; import { CustomDateFormatter } from './custom-date-formatter.provider'; -import { EventListPage } from '../gabinete-digital/event-list/event-list.page'; -import { ViewEventPage } from './view-event/view-event.page'; import { NewEventPage } from './new-event/new-event.page'; import { AuthService } from 'src/app/services/auth.service'; import { User } from 'src/app/models/user.model'; -import { letProto } from 'rxjs-compat/operator/let'; import { DateAdapter } from '@angular/material/core'; @Component({ 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 ee43756f9..a6584dde7 100644 --- a/src/app/pages/agenda/view-event/view-event.page.ts +++ b/src/app/pages/agenda/view-event/view-event.page.ts @@ -108,12 +108,6 @@ export class ViewEventPage implements OnInit { this.router.navigate(['/home',params["params"].caller]); } }); - - /* this.activatedRoute.queryParams.subscribe(params => { - if(params["caller"]) { - this.router.navigate(['/home',params["caller"]]); - } - }); */ } loadEvent(){ diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html index 4af7eba49..eeec4d60b 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html @@ -46,7 +46,7 @@ - + Oficial diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts index 1f1e47809..51a31a44f 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts @@ -154,17 +154,9 @@ export class BookMeetingModalPage implements OnInit { goBack() { this.modalController.dismiss(null); - let navigationExtras: NavigationExtras = { - queryParams: { - "expedientes": true, - } - } - if( window.innerWidth < 801) { - this.router.navigate(['/home/gabinete-digital/expediente']); - } else { - this.router.navigate(['/home/gabinete-digital'], navigationExtras); - } + window.history.back(); } + async saveTask(){ // issue12323423 let Attendees = this.taskParticipants.concat(this.taskParticipantsCc); 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 887f46844..b09faabf3 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 @@ -35,6 +35,7 @@ export class ExpedienteDetailPage implements OnInit { fulltask: any; eventsList: Event[]; serialnumber: string; + caller:string; serialNumber: string; profile: string; intervenientes: any; @@ -65,6 +66,9 @@ export class ExpedienteDetailPage implements OnInit { if(params["params"].SerialNumber) { this.serialnumber = params["params"].SerialNumber; } + if(params["params"].caller) { + this.caller = params["params"].caller; + } }); @@ -97,7 +101,7 @@ export class ExpedienteDetailPage implements OnInit { } goBack() { - if(this.task.Status == "Pending"){ + if(this.task.Status == "Pending" && this.caller != 'events'){ if (window.innerWidth <= 800) { this.router.navigate(['/home/gabinete-digital/pendentes']); } @@ -111,6 +115,7 @@ export class ExpedienteDetailPage implements OnInit { } } else{ + console.log('HERE'); this.activatedRoute.paramMap.subscribe(params => { switch (params["params"].caller) { case 'events': diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss index d4e0cca6a..197e3afa9 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss @@ -229,6 +229,7 @@ ion-content{ width: 35%; justify-content: flex-start !important; border-right: 1px solid #d8d8d8; + border: 1px solid red; .aside{ background:transparent; diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index a2ffad9d7..7d6a6d3a1 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -189,57 +189,6 @@ export class GabineteDigitalPage implements OnInit { this.openDiplomasPage(''); this.selectedElement='DiplomasAssinar'; } - - /* this.activatedRoute.queryParams.subscribe(params => { - switch (params) - { - case params["eventos"]: - this.openEventsToApprovePage("MDGPR"); - this.selectedElement='approval'; - break; - - case params["expedientes"]: - this.openExpedientListPage(); - this.selectedElement='Correspondence'; - this.expedientesPage.doRefresh(); - break; - - case params["pendentes"]: - this.openPendentesPage(''); - this.selectedElement='Pending'; - break; - - case params["despachos"]: - this.openDespachosPage(''); - this.selectedElement='Dispatches'; - break; - - case params["pedidos"]: - this.openPedidosPage('parecer'); - this.selectedElement='RequestsForOpinion'; - break; - - case params["expedientespr"]: - this.openEventsToApprovePage("MDGPR"); - this.selectedElement='Expediente Presidente' - break; - - case params["despachospr"]: - this.openDespachosPrPage(''); - this.selectedElement='DispatchesPr' - break; - - case params["diplomas"]: - this.openDiplomasPage('validar'); - this.selectedElement='DiplomasPorValidar'; - break; - - case params["diplomasassinar"]: - this.openDiplomasPage(''); - this.selectedElement='DiplomasAssinar'; - break; - } - }); */ } refreshExpedientes(){ diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html index 1874b81ce..00de1b496 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html @@ -11,7 +11,7 @@ -
+
{{ task.Folio}}
diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss index 87e9d322c..82eff454d 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss @@ -23,65 +23,32 @@ overflow:auto; color:#000; transform: translate3d(0, 1px, 0); - .header-top{ - width: 360px; - margin: 0px auto; - overflow: auto; - padding: 0 !important; - background: #fff; - .middle{ - padding: 0!important; - float: left; - width: 280px; - + .title-content{ display: flex; - align-items: center; - - } - .right{ - padding: 0!important; - float: right; - font-size: 25px; - color: #0782c9; - margin: 5px 0 0 0; - } - } - .header-bottom{ - width: 310px; - overflow: auto; - margin: 0 auto; + justify-content:space-between; + align-items: flex-start !important; + border-radius: 0 !important; - .header-bottom-icon{ - width: 30px; - font-size: 25px; - float: left; - padding: 2px; + .middle{ + /* width: calc(100% - 37px); */ + overflow: auto; } - .header-bottom-contacts{ - width: 275px; - font-size: 15px; - color: #797979; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - float: left; - padding: 5px; - margin: 1px; - } - } - + .title{ + width: fit-content; + height: auto; font-size: 25px; overflow: auto; float: left; + padding-left: 5px; } .div-icon{ - width: 40px; - float: right; - font-size: 35px; - overflow: auto; + width: 37px !important; + font-size: 35px !important; padding: 1px; + right: 0 !important; } + } } ion-item-group{ margin: 15px; diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts index 78ef5944b..2bb5e61b7 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts @@ -39,6 +39,7 @@ export class PedidoPage implements OnInit { fulltask: any; eventsList: Event[]; serialnumber: string; + caller: string; intervenientes: any; cc: any = []; loggeduser: User; @@ -61,6 +62,9 @@ export class PedidoPage implements OnInit { if(params["serialNumber"]) { this.serialnumber = params["serialNumber"]; } + if(params["caller"]) { + this.caller = params["caller"]; + } }); } @@ -445,7 +449,7 @@ export class PedidoPage implements OnInit { } goBack() { - if(this.task.Status == "Pending"){ + if(this.task.Status == "Pending" && this.caller == 'gabinete-digital'){ if (window.innerWidth <= 800) { this.router.navigate(['/home/gabinete-digital/pendentes']); } diff --git a/src/app/pages/publications/new-action/new-action.page.ts b/src/app/pages/publications/new-action/new-action.page.ts index 74e1a0924..eeae004ad 100644 --- a/src/app/pages/publications/new-action/new-action.page.ts +++ b/src/app/pages/publications/new-action/new-action.page.ts @@ -46,11 +46,11 @@ export class NewActionPage implements OnInit { console.log(this.folder); try { - await this.publication.CreatePublicationFolder(this.folder).toPromise() - this.toastService.successMessage("Ação presidencial criado") + await this.publication.CreatePublicationFolder(this.folder).toPromise(); + this.toastService.successMessage("Ação presidencial criado"); this.close(); } catch (error) { - this.toastService.badRequest("Ação presidencial não criado") + this.toastService.badRequest("Ação presidencial não criado"); } } diff --git a/src/app/pages/publications/new-publication/new-publication.page.ts b/src/app/pages/publications/new-publication/new-publication.page.ts index a9a1f54d8..1a2f3e9db 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.ts +++ b/src/app/pages/publications/new-publication/new-publication.page.ts @@ -78,7 +78,7 @@ export class NewPublicationPage implements OnInit { this.camera.getPicture(options).then((imageData) => { // imageData is either a base64 encoded string or a file URI - // If it's base64 (DATA_URL): + // If it's base64 (DATA_URL): let base64Image = 'data:image/jpeg;base64,' + imageData; this.capturedImage = imageData; this.capturedImageTitle = new Date().getTime() + '.jpeg'; @@ -109,7 +109,9 @@ export class NewPublicationPage implements OnInit { } async save(){ - if(this.publicationType == '3') { + console.log('SAVE'); + + if(this.publicationType == '3'){ console.log(this.navParams.get('publication')); if(this.capturedImage != '') { @@ -164,7 +166,6 @@ export class NewPublicationPage implements OnInit { } } else{ - this.publication = { DateIndex: new Date(), DocumentId:null, @@ -179,7 +180,7 @@ export class NewPublicationPage implements OnInit { /* console.log('Create'); console.log(this.publication); */ - this.publications.CreatePublication(this.folderId, this.publication); + this.publications.CreatePublication(this.folderId, this.publication).toPromise(); this.close(); @@ -207,13 +208,13 @@ export class NewPublicationPage implements OnInit { this.capturedImage = ''; } setTitle(){ - if(this.publicationType == '1'){ + if(this.publicationType == '1') { this.publicationTitle = 'Nova Publicação Rápida'; } - else if(this.publicationType == '2'){ + else if(this.publicationType == '2') { this.publicationTitle = 'Nova Publicação'; } - else if(this.publicationType == '3'){ + else if(this.publicationType == '3') { this.publicationTitle = 'Editar Publicação'; this.pub = this.navParams.get('publication'); } diff --git a/src/app/pages/publications/publications.page.html b/src/app/pages/publications/publications.page.html index 34b9e11e8..5df09a9ab 100644 --- a/src/app/pages/publications/publications.page.html +++ b/src/app/pages/publications/publications.page.html @@ -12,10 +12,10 @@
-
+
- -
+ +
Acções Presidenciais @@ -30,10 +30,10 @@
-
+ -
+
@@ -46,7 +46,7 @@

{{viagem.Detail}}

-
diff --git a/src/app/pages/publications/publications.page.scss b/src/app/pages/publications/publications.page.scss index a446b55cb..f161f91d4 100644 --- a/src/app/pages/publications/publications.page.scss +++ b/src/app/pages/publications/publications.page.scss @@ -82,16 +82,27 @@ ion-toolbar{ font-family: Roboto; background-color: #fff; overflow:auto; + .aside-left{ border-right: 1px solid #d8d8d8; + margin: 0 !important; + padding: 0 !important; + + .main-header{ + padding: 30px 20px 15px 20px !important; + } + + .aside{ + padding: 0px 20px 0 20px !important; + } } .content{ //border: 1px solid red; } } .item{ + width: 100% !important; padding: 0 0px 0 0px !important; - margin: 0px auto; border-bottom: 1px solid #ebebeb; } .item-icon{ diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts index 359f8dda9..406b8384c 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts @@ -127,23 +127,26 @@ export class EditEventToApproveComponent implements OnInit { this.isEventEdited = false; - this.getTask() - this.dateControlStart = new FormControl(moment(new Date())); this.dateControlEnd = new FormControl(moment(new Date())); } + + + ngOnInit() { + this.getTask() + console.log('HERE'); + + } + async getTask() { - console.log('this.eventProcess', this.eventProcess); const result = await this.processes.GetTask(this.serialNumber).subscribe( result =>{ this.eventProcess = result this.restoreDatepickerData() - console.log(this.eventProcess.workflowInstanceDataFields.Subject) - // description let body : any =this.eventProcess.workflowInstanceDataFields.Body.replace(/<[^>]+>/g, '') this.eventProcess.workflowInstanceDataFields.Body = body @@ -169,10 +172,6 @@ export class EditEventToApproveComponent implements OnInit { }) - } - - ngOnInit() { - } close() { diff --git a/src/app/shared/publication/new-action/new-action.page.ts b/src/app/shared/publication/new-action/new-action.page.ts index 530df12c8..703b32a77 100644 --- a/src/app/shared/publication/new-action/new-action.page.ts +++ b/src/app/shared/publication/new-action/new-action.page.ts @@ -49,20 +49,14 @@ export class NewActionPage implements OnInit { try { await this.publication.CreatePublicationFolder(this.folder).toPromise() this.close(); - this.toastService.successMessage('Publicação criado') + this.toastService.successMessage('Acção presidencial criada') } catch (error) { - this.toastService.badRequest('Publicação não criado') + this.toastService.badRequest('Não foi possivel criar a acção presidencial') } - } close(){ this.closeDesktopComponent.emit(); } - - - - - }