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

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

Browse Source
This commit is contained in:
tiago.kayaya
2021-12-13 15:39:50 +01:00
parent 25d9aefa9d e524062ed9
commit 57a781cdfe
9 changed files with 112 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/shared/agenda/new-event/new-event.page.ts
+6 -3
View File
@@ -218,7 +218,10 @@ export class NewEventPage implements OnInit {
}
runValidation() {
this.validateFrom = true
this.validateFrom = true;
if(new Date(this.postEvent.StartDate).getTime() > new Date(this.postEvent.EndDate).getTime()){
this.toastService._badRequest("A data de fim não pode ser inferior a data de início do evento")
}
}
injectValidation() {
@@ -227,7 +230,7 @@ export class NewEventPage implements OnInit {
const str: any = this.postEvent.EventRecurrence.Type.toString()
this.postEvent.EventRecurrence.Type = str
}
this.Form = new FormGroup({
Subject: new FormControl(this.postEvent.Subject, [
Validators.required,
@@ -255,8 +258,8 @@ export class NewEventPage implements OnInit {
Date: new FormControl( new Date(this.postEvent.StartDate).getTime() < new Date(this.postEvent.EndDate).getTime() ? 'ok': null,[
Validators.required
]),
})
}
src/app/shared/chat/group-messages/group-messages.page.html
+2 -2
View File
@@ -148,11 +148,11 @@
</ion-fab-button>
<!-- <ion-fab-button (click)="addFile()" color="light">
<ion-icon name="document"></ion-icon>
</ion-fab-button>
</ion-fab-button> -->
<ion-fab-button (click)="addImage()" color="light">
<ion-icon name="image"></ion-icon>
</ion-fab-button>
<ion-fab-button class="hide-desktop" (click)="takePicture()" color="light">
<!-- <ion-fab-button class="hide-desktop" (click)="takePicture()" color="light">
<ion-icon name="camera"></ion-icon>
</ion-fab-button> -->
<ion-fab-button (click)="addFileWebtrix()" color="light">
src/app/shared/chat/messages/messages.page.html
+2 -2
View File
@@ -122,11 +122,11 @@
</ion-fab-button>
<!-- <ion-fab-button hidden (click)="addFile()" color="light">
<ion-icon name="document"></ion-icon>
</ion-fab-button>
</ion-fab-button> -->
<ion-fab-button (click)="addImage()" color="light">
<ion-icon name="image"></ion-icon>
</ion-fab-button>
<ion-fab-button (click)="takePicture()" color="light">
<!-- <ion-fab-button (click)="takePicture()" color="light">
<ion-icon name="camera"></ion-icon>
</ion-fab-button> -->
<ion-fab-button (click)="addFileWebtrix()" color="light">