Merge branch 'developer' of bitbucket.org:equilibriumito/gabinete-digital into developer

This commit is contained in:
Peter Maquiran
2021-07-12 16:06:02 +01:00
8 changed files with 256 additions and 145 deletions
@@ -158,7 +158,7 @@
<ion-icon slot="start" src="assets/images/icons-refresh.svg"></ion-icon>
</div>
<div class="ion-input-class" [class.input-error]="Form?.get('Categories')?.invalid && validateFrom ">
<ion-select placeholder="Selecione a repetição*"
<ion-select placeholder="Selecione a repetição*"
[(ngModel)]="selectedRecurringType"
(ngModelChange)="onSelectedRecurringChanged($event)"
interface="action-sheet"
@@ -86,7 +86,6 @@ export class EditEventPage implements OnInit {
this.taskParticipantsCc.push(e);
}
})
}
if(this.postEvent.IsRecurring == false) {
@@ -101,8 +100,6 @@ export class EditEventPage implements OnInit {
}
ngOnInit() {
this.selectedRecurringType = this.postEvent.EventRecurrence.Type;
window.onresize = (event) => {
// if not mobile remove all component
if( window.innerWidth >= 1024) {
@@ -114,6 +111,9 @@ export class EditEventPage implements OnInit {
}
this.getRecurrenceTypes();
setTimeout(() => {
this.selectedRecurringType = this.postEvent.EventRecurrence.Type.toString();
}, 500);
}
@@ -133,7 +133,7 @@ export class EditEventPage implements OnInit {
});
}
onSelectedRecurringChanged(ev:any){
onSelectedRecurringChanged(ev?:any){
console.log(ev);
if(ev.length > 1){
console.log(ev.filter(data => data != '-1'));