diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts
index 65ddf319d..993d7de56 100644
--- a/src/app/pages/agenda/agenda.page.ts
+++ b/src/app/pages/agenda/agenda.page.ts
@@ -367,8 +367,6 @@ export class AgendaPage implements OnInit {
}
-
-
}, timeout);
}
diff --git a/src/app/pages/agenda/view-event/task-options/task-options.component.html b/src/app/pages/agenda/view-event/task-options/task-options.component.html
index b49d08b03..78d6d3599 100644
--- a/src/app/pages/agenda/view-event/task-options/task-options.component.html
+++ b/src/app/pages/agenda/view-event/task-options/task-options.component.html
@@ -1,3 +1,17 @@
-
- task-options works!
-
+
+
+
+
+
+
diff --git a/src/app/pages/agenda/view-event/task-options/task-options.component.scss b/src/app/pages/agenda/view-event/task-options/task-options.component.scss
index e69de29bb..2c7a0cc7f 100644
--- a/src/app/pages/agenda/view-event/task-options/task-options.component.scss
+++ b/src/app/pages/agenda/view-event/task-options/task-options.component.scss
@@ -0,0 +1,51 @@
+.container{
+ --padding-top:20px !important;
+ --padding-bottom:20px !important;
+ --padding-start:20px !important;
+ --padding-end:20px !important;
+}
+.arrow-right{
+ display: none;
+ margin-bottom: 20px;
+ .arrow-right-icon{
+ width: 37px;
+ float: right;
+ font-size: 35px;
+ overflow: hidden;
+ }
+}
+.buttons{
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-around;
+}
+.solid {
+ display: none;
+ width: 90%;
+ border-top: 1px solid #bbb;
+ margin: 0 auto !important;
+ }
+ .btn-ok, .btn-cancel{
+ //width: 50% !important;
+ margin-bottom: 5px !important;
+ margin-top: 5px !important;
+}
+@media only screen and (min-width: 1024px) {
+ .arrow-right{
+ display: flex;
+ justify-content: flex-end;
+ }
+ .btn-cancel{
+ display: none;
+ width: 100% !important;
+ margin-bottom: 10px !important;
+ }
+ .btn-delete, .btn-ok{
+ width: 100% !important;
+ margin-bottom: 10px !important;
+ margin-top: 10px !important;
+ }
+ /* .solid{
+ display: block;
+ } */
+}
\ No newline at end of file
diff --git a/src/app/pages/agenda/view-event/view-event.page.html b/src/app/pages/agenda/view-event/view-event.page.html
index f59e148b5..f97672017 100644
--- a/src/app/pages/agenda/view-event/view-event.page.html
+++ b/src/app/pages/agenda/view-event/view-event.page.html
@@ -1,4 +1,4 @@
-
+
-
+ -->
@@ -106,9 +102,9 @@
{{ attach.CreateDate | date: 'dd-MM-yy' }}
-
+
-
+
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 7382cda94..c92f115bc 100644
--- a/src/app/pages/agenda/view-event/view-event.page.ts
+++ b/src/app/pages/agenda/view-event/view-event.page.ts
@@ -12,6 +12,7 @@ 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';
import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page';
+import { TaskOptionsComponent } from './task-options/task-options.component';
@Component({
selector: 'app-view-event',
@@ -186,52 +187,89 @@ export class ViewEventPage implements OnInit {
});
}
- async openBookMeetingModal() {
+ // async openBookMeetingModal() {
- const doc = this.loadedAttachments[ this.dicIndex];
+ // 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 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();
- }
+ // 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){
- classs = 'modal modal-desktop'
- } else {
- classs = 'modal modal-desktop showAsideOptions'
- }
+ // async openExpedientActionsModal(taskAction: any) {
+ // //this.modalController.dismiss();
+ // let classs;
+ // if( window.innerWidth <= 800){
+ // classs = 'modal modal-desktop'
+ // } 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: {
+ // 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 openTaskOptions() {
const doc = this.loadedAttachments[ this.dicIndex];
- let task = {
+ let customTask = {
serialNumber: doc.SourceId,
taskStartDate: doc.CreateDate,
isEvent: true,
@@ -243,27 +281,21 @@ export class ViewEventPage implements OnInit {
},
}
- const modal = await this.modalController.create({
- component: ExpedientTaskModalPage,
+ const popover = await this.popoverController.create({
+ component: OptsExpedientePage,
+ cssClass: 'exp-options',
componentProps: {
- taskAction: taskAction,
- task: task,
- profile: this.profile,
+ fulltask: customTask,
+ task: customTask
},
- cssClass: classs,
- });
- await modal.present();
- modal.onDidDismiss().then(res=>{
- console.log(res['data']);
- if(res['data']=='openDiscart'){
- console.log('open discart');
-
- // this.distartExpedientModal();
-
- }
-
+ translucent: true
});
+ return await popover.present();
}
+ docIndex(index: number){
+ this.dicIndex = index
+ }
+
}
diff --git a/src/app/shared/agenda/view-event/view-event.page.html b/src/app/shared/agenda/view-event/view-event.page.html
index 047226798..fac60bff3 100644
--- a/src/app/shared/agenda/view-event/view-event.page.html
+++ b/src/app/shared/agenda/view-event/view-event.page.html
@@ -1,4 +1,4 @@
-
+
-
+ -->