+
diff --git a/src/app/pages/agenda/view-event/view-event.page.scss b/src/app/pages/agenda/view-event/view-event.page.scss
index 78ef0dad7..700d61a96 100644
--- a/src/app/pages/agenda/view-event/view-event.page.scss
+++ b/src/app/pages/agenda/view-event/view-event.page.scss
@@ -43,9 +43,7 @@ ion-menu{
overflow: auto;
}
.div-icon{
- width: 92px;
float: right;
- overflow: auto;
padding: 1px;
}
.div-icon .edit{
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 ed7ce6f2e..5187c36a2 100644
--- a/src/app/pages/agenda/view-event/view-event.page.ts
+++ b/src/app/pages/agenda/view-event/view-event.page.ts
@@ -10,6 +10,7 @@ import { EditEventPage } from '../edit-event/edit-event.page';
import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
import { ProcessesService } from 'src/app/services/processes.service';
import { ExpedientTaskModalPage } from '../../gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page';
+import { BookMeetingModalPage } from '../../gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
@Component({
selector: 'app-view-event',
@@ -37,6 +38,8 @@ export class ViewEventPage implements OnInit {
months = ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"];
days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"];
+ dicIndex = 0;
+
constructor(
private modalController: ModalController,
private navParams: NavParams,
@@ -53,6 +56,7 @@ export class ViewEventPage implements OnInit {
this.eventBody = { BodyType : "1", Text : ""};
this.loadedEvent.Body = this.eventBody;
this.eventId = this.navParams.get('eventId');
+
}
ngOnInit() {
@@ -181,7 +185,43 @@ export class ViewEventPage implements OnInit {
}
- async openExpedientActionsModal(taskAction: any, task: any) {
+
+
+ async openBookMeetingModal() {
+
+ const doc = this.loadedAttachments[ this.dicIndex];
+
+ let task = {
+ 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 openExpedientActionsModal(taskAction: any) {
//this.modalController.dismiss();
let classs;
if( window.innerWidth <= 800){
@@ -189,6 +229,21 @@ export class ViewEventPage implements OnInit {
} else {
classs = 'modal modal-desktop showAsideOptions'
}
+
+ const doc = this.loadedAttachments[ this.dicIndex];
+
+ let 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: {
diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts
index 0bc385d2d..59d328151 100644
--- a/src/app/pages/events/events.page.ts
+++ b/src/app/pages/events/events.page.ts
@@ -264,7 +264,7 @@ export class EventsPage implements OnInit {
async viewEventDetail(eventId:any) {
let classs;
if( window.innerWidth <= 800){
- classs = 'modal'
+ classs = 'modal modal-desktop'
} else {
classs = 'modal modal-desktop showAsideOptions'
}
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html
index a51a0fec8..82683e678 100644
--- a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html
+++ b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html
@@ -1,11 +1,11 @@
-