Merge branch 'feature/calendar' into developer

This commit is contained in:
tiago.kayaya
2021-03-30 09:19:38 +01:00
2 changed files with 5 additions and 5 deletions
@@ -2,14 +2,14 @@
<ion-toolbar class="px-10"> <ion-toolbar class="px-10">
<ion-title class="pa-0">Adicionar intervenientes</ion-title> <ion-title class="pa-0">Adicionar intervenientes</ion-title>
</ion-toolbar> </ion-toolbar>
<ion-searchbar class="attendee-search-bar" (ionChange)="onChange($event)" placeholder="Pesquisar"></ion-searchbar><!-- [(ngModel)]="searchCountryString" --> <ion-searchbar class="attendee-search-bar" (ionChange)="onChange($event)" placeholder="Insira email para adicionar destinatário"></ion-searchbar><!-- [(ngModel)]="searchCountryString" -->
<ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar> <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
</ion-header> </ion-header>
<ion-content class="height-100 "> <ion-content class="height-100 ">
<ion-item-group class="d-flex flex-column height-100"> <ion-item-group class="d-flex flex-column height-100">
<ion-list class="flex-grow-1 overflow-y-auto height-100" > <ion-list lines="none" class="flex-grow-1 overflow-y-auto height-100" >
<ion-item-sliding class="px-20"> <ion-item-sliding class="px-20">
<div *ngFor="let attendee of contacts;"> <div *ngFor="let attendee of contacts;">
<ion-item (click)="selectContact(attendee)" *ngIf="checkbox(attendee)" > <ion-item (click)="selectContact(attendee)" *ngIf="checkbox(attendee)" >
@@ -26,7 +26,8 @@
</ion-item-sliding> </ion-item-sliding>
</ion-list> </ion-list>
<hr/> <hr/>
<ion-list lines="none" *ngIf="selectedContact.length >= 1" class="flex-grow-1 overflow-y-auto height-100" style="border-top:1px solid #ebebeb"> <div class="px-20 font-15 pt-20" style="border-top:1px solid #ebebeb" *ngIf="selectedContact.length >= 1">Destinatário</div>
<ion-list lines="none" *ngIf="selectedContact.length >= 1" class="flex-grow-1 overflow-y-auto height-100 pb-0" >
<ion-item-sliding class="px-20"> <ion-item-sliding class="px-20">
<ion-item *ngFor="let attendee of selectedContact;" class="d-flex"> <ion-item *ngFor="let attendee of selectedContact;" class="d-flex">
<div class="pr-10"> <div class="pr-10">
@@ -32,7 +32,6 @@ export class AttendeeModalPage implements OnInit {
// set data to agenda component // set data to agenda component
this.setContact.emit(this.selectedContact); this.setContact.emit(this.selectedContact);
// got back
this.GoBackEditOrAdd.emit(); this.GoBackEditOrAdd.emit();
} }
@@ -75,7 +74,7 @@ export class AttendeeModalPage implements OnInit {
async selectContact(itm: EventPerson){ async selectContact(itm: EventPerson){
const index = 0; const index = 0;
const findIndex = this.selectedContact.find((contact, index)=>{ const findIndex = this.selectedContact.find((contact, index)=>{
if(contact.Name == itm.Name && contact.EmailAddress == itm.EmailAddress){ if(contact.Name == itm.Name && contact.EmailAddress == itm.EmailAddress){
index = index; index = index;