Fixe duplicated attendess

This commit is contained in:
Peter Maquiran
2021-04-08 13:53:49 +01:00
9 changed files with 82 additions and 76 deletions
@@ -8,6 +8,7 @@ import { ExpedientTaskModalPageRoutingModule } from './expedient-task-modal-rout
import { ExpedientTaskModalPage } from './expedient-task-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({
imports: [
@@ -18,7 +19,10 @@ import { AttendeeModalPage } from 'src/app/shared/event/attendee-modal/attendee-
],
declarations: [
ExpedientTaskModalPage,
AttendeeModalPage
]
AttendeeModalPage,
EmptyContainerPage,
],
entryComponents: [
EmptyContainerPage,]
})
export class ExpedientTaskModalPageModule {}
@@ -62,7 +62,7 @@
</ion-item>
</div>
<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>
@@ -83,7 +83,7 @@
</ion-item>
</div>
<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>
@@ -115,16 +115,25 @@
</div>
</div>
<app-attendee-modal
class="aside-right d-flex flex-column height-100"
[adding]="adding"
[taskParticipants]="taskParticipants"
[taskParticipantsCc]="taskParticipantsCc"
(closeComponent)="closeComponent()"
(setIntervenient)="setIntervenient($event)"
(setIntervenientCC)="setIntervenientCC($event)"
(setContact)="setContact($event)"
></app-attendee-modal>
<div class="aside-right flex-column height-100">
<app-empty-container
[texto]="emptyTextDescription"
*ngIf="!showAttendees"
class="d-flex height-100 flex-column">
</app-empty-container>
<app-attendee-modal
*ngIf="showAttendees"
class="d-flex flex-column height-100"
[adding]="adding"
[taskParticipants]="taskParticipants"
[taskParticipantsCc]="taskParticipantsCc"
(closeComponent)="closeComponent()"
(setIntervenient)="setIntervenient($event)"
(setIntervenientCC)="setIntervenientCC($event)"
(setContact)="setContact($event)"
></app-attendee-modal>
</div>
</div>
</ion-content>
@@ -120,4 +120,9 @@
justify-content: space-between;
padding: 20px;
overflow: auto;
}
@media only screen and (min-width: 1024px){
.aside-content{
display: block;
}
}
@@ -49,6 +49,9 @@ export class ExpedientTaskModalPage implements OnInit {
adding: "intervenient" | "CC" = "intervenient";
profile: string;
emptyTextDescription = "Sem intervenientes selecionados";
showEmptyContainer = true;
constructor(
private modalController: ModalController,
private router:Router,
@@ -122,10 +125,7 @@ export class ExpedientTaskModalPage implements OnInit {
DispatchFolder: this.dispatchFolder,
}
console.log(this.postData);
/* this.processes.postDespatcho(this.postData); */
//this.distartExpedientModal();
this.modalController.dismiss('openDiscart');
this.processes.postDespatcho(this.postData);
break;
case '1':
this.postData = {
@@ -137,9 +137,7 @@ export class ExpedientTaskModalPage implements OnInit {
UsersSelected: this.participants,
DispatchFolder: this.dispatchFolder,
}
/* this.processes.postParecer(this.postData); */
//this.distartExpedientModal();
this.modalController.dismiss();
this.processes.postParecer(this.postData);
break;
case '2':
this.postData = {
@@ -152,9 +150,11 @@ export class ExpedientTaskModalPage implements OnInit {
DispatchFolder: this.dispatchFolder,
}
this.processes.postDeferimento(this.postData);
this.close();
break;
}
this.modalController.dismiss('openDiscart');
/* this.distartExpedientModal();
this.close(); */
}
getAttachments(){