This commit is contained in:
tiago.kayaya
2021-04-08 10:07:14 +01:00
parent 4bb1e8add8
commit 57c830ed88
5 changed files with 34 additions and 13 deletions
+13
View File
@@ -48,6 +48,15 @@ const routes: Routes = [
}, },
] ]
}, },
{
path: 'attendees-modal',
children: [
{
path:'',
loadChildren: ()=> import('../shared/event/attendee-modal/attendee-modal.module').then(m => m.AttendeeModalPageModule)
},
]
},
{ {
path: 'login', path: 'login',
children: [ children: [
@@ -103,6 +112,10 @@ const routes: Routes = [
{ {
path:'events/:eventId/:caller', path:'events/:eventId/:caller',
loadChildren: ()=> import('../pages/events/event-detail/event-detail.module').then(m => m.EventDetailPageModule), loadChildren: ()=> import('../pages/events/event-detail/event-detail.module').then(m => m.EventDetailPageModule),
},
{
path:'expediente-task-modal',
loadChildren: ()=> import('../pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.module').then(m => m.ExpedientTaskModalPageModule),
} }
] ]
}, },
-1
View File
@@ -389,7 +389,6 @@
<app-attendee-modal <app-attendee-modal
class="d-flex flex-column height-100" class="d-flex flex-column height-100"
*ngIf="mobileComponent.showAttendees" *ngIf="mobileComponent.showAttendees"
[eventAttendees]="contacts"
(closeComponent)="GoBackEditOrAdd()" (closeComponent)="GoBackEditOrAdd()"
(setContact)="setContact($event)" (setContact)="setContact($event)"
[adding]="adding" [adding]="adding"
@@ -8,6 +8,7 @@ import { ExpedientTaskModalPageRoutingModule } from './expedient-task-modal-rout
import { ExpedientTaskModalPage } from './expedient-task-modal.page'; import { ExpedientTaskModalPage } from './expedient-task-modal.page';
import { AttendeeModalPage } from 'src/app/shared/event/attendee-modal/attendee-modal.page'; import { AttendeeModalPage } from 'src/app/shared/event/attendee-modal/attendee-modal.page';
import { EmptyContainerPage } from 'src/app/shared/empty-container/empty-container.page';
@NgModule({ @NgModule({
imports: [ imports: [
@@ -18,7 +19,10 @@ import { AttendeeModalPage } from 'src/app/shared/event/attendee-modal/attendee-
], ],
declarations: [ declarations: [
ExpedientTaskModalPage, ExpedientTaskModalPage,
AttendeeModalPage AttendeeModalPage,
] EmptyContainerPage,
],
entryComponents: [
EmptyContainerPage,]
}) })
export class ExpedientTaskModalPageModule {} export class ExpedientTaskModalPageModule {}
@@ -62,7 +62,7 @@
</ion-item> </ion-item>
</div> </div>
<div class="add-people"> <div class="add-people">
<ion-icon (click)="addParticipants()" slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon> <ion-icon (click)="addParticipants(); showAttendees='true'" slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
</div> </div>
</div> </div>
</div> </div>
@@ -83,7 +83,7 @@
</ion-item> </ion-item>
</div> </div>
<div class="add-people"> <div class="add-people">
<ion-icon (click)="addParticipantsCc()" slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon> <ion-icon (click)="addParticipantsCc(); showAttendees='true'" slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
</div> </div>
</div> </div>
</div> </div>
@@ -115,9 +115,15 @@
</div> </div>
</div> </div>
<app-empty-container
[texto]="emptyTextDescription"
*ngIf="!showAttendees"
class=" aside-right d-flex height-100 flex-column">
</app-empty-container>
<app-attendee-modal <app-attendee-modal
*ngIf="showAttendees"
class="aside-right d-flex flex-column height-100" class="aside-right d-flex flex-column height-100"
[eventAttendees]="contacts"
[adding]="adding" [adding]="adding"
[taskParticipants]="taskParticipants" [taskParticipants]="taskParticipants"
[taskParticipantsCc]="taskParticipantsCc" [taskParticipantsCc]="taskParticipantsCc"
@@ -127,6 +133,8 @@
(setContact)="setContact($event)" (setContact)="setContact($event)"
></app-attendee-modal> ></app-attendee-modal>
</div> </div>
</ion-content> </ion-content>
<ion-footer> <ion-footer>
@@ -49,6 +49,9 @@ export class ExpedientTaskModalPage implements OnInit {
adding: "intervenient" | "CC" = "intervenient"; adding: "intervenient" | "CC" = "intervenient";
profile: string; profile: string;
emptyTextDescription = "Sem intervenientes selecionados";
showEmptyContainer = true;
constructor( constructor(
private modalController: ModalController, private modalController: ModalController,
private router:Router, private router:Router,
@@ -125,9 +128,6 @@ export class ExpedientTaskModalPage implements OnInit {
} }
console.log(this.postData); console.log(this.postData);
this.processes.postDespatcho(this.postData); this.processes.postDespatcho(this.postData);
//this.distartExpedientModal();
this.modalController.dismiss('openDiscart');
break; break;
case '1': case '1':
this.postData = { this.postData = {
@@ -140,8 +140,6 @@ export class ExpedientTaskModalPage implements OnInit {
DispatchFolder: this.dispatchFolder, DispatchFolder: this.dispatchFolder,
} }
this.processes.postParecer(this.postData); this.processes.postParecer(this.postData);
//this.distartExpedientModal();
this.modalController.dismiss();
break; break;
case '2': case '2':
this.postData = { this.postData = {
@@ -154,10 +152,9 @@ export class ExpedientTaskModalPage implements OnInit {
DispatchFolder: this.dispatchFolder, DispatchFolder: this.dispatchFolder,
} }
this.processes.postDeferimento(this.postData); this.processes.postDeferimento(this.postData);
//this.distartExpedientModal();
this.close();
break; break;
} }
this.modalController.dismiss('openDiscart');
/* this.distartExpedientModal(); /* this.distartExpedientModal();
this.close(); */ this.close(); */