diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html
index abef052d3..a8c9d82d4 100644
--- a/src/app/pages/agenda/agenda.page.html
+++ b/src/app/pages/agenda/agenda.page.html
@@ -340,7 +340,7 @@
(cloneAllmobileComponent)="cloneAllmobileComponent()"
[eventAttendees]="contacts"
(clearContact)="clearContact()"
- (setContact)="setContact()"
+ (setContact)="setContact($event)"
>
@@ -351,7 +351,7 @@
(cloneAllmobileComponent)="cloneAllmobileComponent()"
(clearContact)="clearContact()"
(openAttendeesComponent)="openAttendeesComponent($event)"
- (setContact)="setContact()"
+ (setContact)="setContact($event)"
>
@@ -383,7 +383,7 @@
{
console.log(res);
diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.module.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.module.ts
index bbc46ea81..44ccda859 100644
--- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.module.ts
+++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.module.ts
@@ -7,6 +7,7 @@ import { IonicModule } from '@ionic/angular';
import { ExpedientTaskModalPageRoutingModule } from './expedient-task-modal-routing.module';
import { ExpedientTaskModalPage } from './expedient-task-modal.page';
+import { AttendeeModalPage } from 'src/app/shared/event/attendee-modal/attendee-modal.page';
@NgModule({
imports: [
@@ -15,6 +16,9 @@ import { ExpedientTaskModalPage } from './expedient-task-modal.page';
IonicModule,
ExpedientTaskModalPageRoutingModule
],
- declarations: [ExpedientTaskModalPage]
+ declarations: [
+ ExpedientTaskModalPage,
+ AttendeeModalPage
+ ]
})
export class ExpedientTaskModalPageModule {}
diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
index 3d2368030..7bd587cd5 100644
--- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
+++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
@@ -114,8 +114,14 @@
-
-
+
+
+
diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
index 6d2b48927..40de6e9e5 100644
--- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
@@ -40,14 +40,18 @@ export class ExpedientTaskModalPage implements OnInit {
dispatchFolder: Folder;
participants: Participant[];
+ contacts: EventPerson[] = [];
+ // trigger hide and show for attendee component
+ showAttendees= false;
+
+
constructor(
private modalController: ModalController,
private router:Router,
private processes:ProcessesService,
private attachmentsService: AttachmentsService,
private navParams: NavParams,
- private authService: AuthService,
- ) {
+ private authService: AuthService) {
this.user = environment.defaultuser +'@'+ environment.domain;
this.task = this.navParams.get('task');
this.taskType = this.navParams.get('taskAction');
@@ -70,7 +74,7 @@ export class ExpedientTaskModalPage implements OnInit {
this.postData.SubjectTypeId = '99999844';
/* Initialize 'Subject' with the title of the expedient */
this.postData.DispatchFolder.Subject = this.task.workflowInstanceFolio;
- }
+ }
ngOnInit() {
this.taskDate = new Date(this.task.taskStartDate);
@@ -78,12 +82,12 @@ export class ExpedientTaskModalPage implements OnInit {
console.log(res);
});
console.log(this.user); */
- console.log(this.task)
+ /* console.log(this.task) */
- console.log(this.task.serialNumber);
+ /* console.log(this.task.serialNumber); */
this.getAttachments();
- console.log(this.getSubjectType());
+ /* console.log(this.getSubjectType()); */
}
@@ -101,7 +105,7 @@ export class ExpedientTaskModalPage implements OnInit {
});
}
saveTask(){
- console.log(this.taskType);
+ /* console.log(this.taskType); */
switch (this.taskType)
{
@@ -229,4 +233,12 @@ export class ExpedientTaskModalPage implements OnInit {
modal.onDidDismiss();
}
+ async setContact(data:EventPerson[]){
+ this.contacts = data;
+ }
+
+ async closeComponent(){
+ this.showAttendees = false;
+ }
+
}
diff --git a/src/app/shared/event/attendee-modal/attendee-modal.page.html b/src/app/shared/event/attendee-modal/attendee-modal.page.html
index d60edd0ee..99f6943e6 100644
--- a/src/app/shared/event/attendee-modal/attendee-modal.page.html
+++ b/src/app/shared/event/attendee-modal/attendee-modal.page.html
@@ -47,7 +47,8 @@
-
+
+
diff --git a/src/app/shared/event/attendee-modal/attendee-modal.page.ts b/src/app/shared/event/attendee-modal/attendee-modal.page.ts
index 0d6b2c5e4..c5a7d8acf 100644
--- a/src/app/shared/event/attendee-modal/attendee-modal.page.ts
+++ b/src/app/shared/event/attendee-modal/attendee-modal.page.ts
@@ -22,6 +22,8 @@ export class AttendeeModalPage implements OnInit {
@Output() closeComponent = new EventEmitter();
@Output() setContact = new EventEmitter();
+ currentPath = window.location.pathname;
+
ngOnInit() {
this.fetchContacts("");
this.selectedContact = this.eventAttendees;
@@ -33,6 +35,12 @@ export class AttendeeModalPage implements OnInit {
this.closeComponent.emit();
}
+ setContactWithClose(){
+ if(this.currentPath == '/home/gabinete-digital'){
+ this.setContact.emit(this.selectedContact);
+ }
+ }
+
close(){
// this.modalCtrl.dismiss(null);
this.selectedContact = [];
@@ -66,13 +74,18 @@ export class AttendeeModalPage implements OnInit {
return false;
});
+
+ // run only in gabinete digital
+ this.setContactWithClose();
}
async selectContact(itm: EventPerson){
this.selectedContact.push(itm);
-
+
+ // run only in gabinete digital
+ this.setContactWithClose();
}
async fetchContacts(filter: string) {