diff --git a/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.html b/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.html index 971ed12f6..af5ce3919 100644 --- a/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.html +++ b/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.html @@ -12,13 +12,9 @@ - - - - - - - - - +
+ + +
+
diff --git a/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.scss b/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.scss index 0188510aa..005553fac 100644 --- a/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.scss +++ b/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.scss @@ -20,23 +20,7 @@ ion-content{ } .buttons{ - width: 100%; - margin: 0 auto; - padding: 5px 0 5px 0; + display: flex; + justify-content: space-between; + padding: 15px 0 15px 0; } - - .button-reject { - width: 130px; - height: 44px; - --color: #d30a0a; - border-radius: 22.5px; - --background: #ffe0e0; - margin: 0 12px 0 0px; - } - .button-approve { - width: 130px; - height: 44px; - border-radius: 22.5px; - --background: #42b9fe; - margin: 0 0px 0 12px; - } \ No newline at end of file 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 a3159dcc1..e9677c103 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 @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import { Router } from '@angular/router'; +import { ActivatedRoute, NavigationExtras, Router } from '@angular/router'; import { AnimationController, ModalController, NavParams } from '@ionic/angular'; import { AddParticipantsCcModalPage } from '../add-participants-cc-modal/add-participants-cc-modal.page'; import { AddParticipantsModalPage } from '../add-participants-modal/add-participants-modal.page'; @@ -57,6 +57,7 @@ export class BookMeetingModalPage implements OnInit { authService: AuthService, private animationController: AnimationController, private toastService: ToastService, + private activatedRoute: ActivatedRoute, ) { this.taskParticipants = []; this.loggeduser = authService.ValidatedUser; @@ -98,6 +99,19 @@ export class BookMeetingModalPage implements OnInit { cancelTask(){ this.modalController.dismiss(null); } + 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); + } + } async saveTask(){ // issue12323423 @@ -140,9 +154,11 @@ export class BookMeetingModalPage implements OnInit { await this.calendarService.postExpedientEvent(this.task.DocId, this.postData, "pr",this.task.SerialNumber, this.task.FsId).toPromise() break; } - + + this.modalController.dismiss(); this.distartExpedientModal(); - this.toastService.successMessage('Reunião criada') + this.toastService.successMessage('Reunião criada'); + } catch (error) { this.toastService.badRequest('Reunião não criada') } 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 81eb25ab9..17068ef18 100644 --- a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts +++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts @@ -60,6 +60,7 @@ export class OptsExpedientePage implements OnInit { } async openBookMeetingModal() { + this.close(); let classs; if( window.innerWidth <= 800){ classs = 'book-meeting-modal modal modal-desktop' @@ -77,6 +78,7 @@ export class OptsExpedientePage implements OnInit { await modal.present(); modal.onDidDismiss(); } + async openExpedientActionsModal(taskAction: any, task: any) { //this.modalController.dismiss(); let classs; diff --git a/src/theme/variables.scss b/src/theme/variables.scss index a9d800520..127cba229 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -467,18 +467,19 @@ $app-theme: mat-light-theme(( overflow: auto; --background: #fff; } -.btn-ok{ - width: 170px !important; + +.btn-ok-no-width{ height: 45px !important; - margin: 0 auto !important; + margin: 0 auto; padding:0 !important; border-radius: 22.5px; background-color: #42b9fe; color: #ffffff !important; } -.btn-ok-no-width{ +.btn-ok{ + width: 170px !important; height: 45px !important; - margin: 0 auto; + margin: 0 auto !important; padding:0 !important; border-radius: 22.5px; background-color: #42b9fe; @@ -504,6 +505,35 @@ $app-theme: mat-light-theme(( color: #061b52 !important; margin: 0 auto !important; } +.btn-ok-medium{ + width: 130px !important; + height: 45px !important; + margin: 0 auto !important; + padding:0 !important; + border-radius: 22.5px; + background-color: #42b9fe; + color: #ffffff !important; +} +.btn-delete-medium{ + display: block; + width: 130px !important; + height: 45px !important; + margin: 0 auto !important; + padding:0 !important; + border-radius: 22.5px; + background-color: #ffe0e0; + color: #d30a0a !important; +} +.btn-cancel-medium{ + display: block; + width: 130px !important; + height: 45px !important; + padding:0 !important; + border-radius: 22.5px; + background-color: #e0e9ee; + color: #061b52 !important; + margin: 0 auto !important; +} .btn-no-color{ background-color: #fff; }