peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 20:47:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
tiago.kayaya
2021-07-13 15:21:17 +01:00
parent bfcb3d0776 eb07928c60
commit e2f4de142f
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/shared/agenda/edit-event/edit-event.page.html
+2 -2
View File
@@ -214,13 +214,13 @@
</div> </div>
</div> </div>
<div *ngIf="Form && validateFrom" > <!-- <div *ngIf="Form && validateFrom" >
<div *ngIf="Form.get('participantes').invalid " class="input-errror-message"> <div *ngIf="Form.get('participantes').invalid " class="input-errror-message">
<div *ngIf="Form.get('participantes').errors?.required"> <div *ngIf="Form.get('participantes').errors?.required">
Adicionar participant. Adicionar participant.
</div> </div>
</div> </div>
</div> </div> -->
<div class=" d-flex width-100"> <div class=" d-flex width-100">
<div class="ion-item-class-2 width-100"> <div class="ion-item-class-2 width-100">
src/app/shared/agenda/edit-event/edit-event.page.ts
+3 -3
View File
@@ -102,7 +102,7 @@ export class EditEventPage implements OnInit {
public alertController: AlertController, public alertController: AlertController,
private attachmentsService: AttachmentsService, private attachmentsService: AttachmentsService,
private toastService: ToastService ) { private toastService: ToastService ) {
} }
ngOnInit() { ngOnInit() {
@@ -152,13 +152,13 @@ export class EditEventPage implements OnInit {
this.restoreDatepickerData(); this.restoreDatepickerData();
this.getRecurrenceTypes(); this.getRecurrenceTypes();
this.selectedRecurringType = this.postEvent.EventRecurrence.Type.toString(); this.selectedRecurringType = this.postEvent.EventRecurrence.Type.toString();
setTimeout(() => { setTimeout(() => {
this.selectedRecurringType = this.postEvent.EventRecurrence.Type.toString(); this.selectedRecurringType = this.postEvent.EventRecurrence.Type.toString();
console.log(this.selectedRecurringType); console.log(this.selectedRecurringType);
}, 1000); }, 1000);
} }
close() { close() {
@@ -219,7 +219,7 @@ export class EditEventPage implements OnInit {
participantes: new FormControl(this.taskParticipants, [ participantes: new FormControl(this.taskParticipants, [
Validators.required Validators.required
]), ]),
Date: new FormControl(this.dateControlStart.toLocaleString() > this.dateControlEnd.toLocaleString()? 'ok': null,[ Date: new FormControl(this.dateControlStart.value.toLocaleString() < this.dateControlEnd.value.toLocaleString()? 'ok': null,[
Validators.required Validators.required
]), ]),