peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-19 21:06:06 +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-09 11:54:26 +01:00
parent 3edb765c41 323aebc68d
commit 7bd92ae5d5
50 changed files with 152 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/edit-event/edit-event.page.html
+2 -2
View File
@@ -122,7 +122,7 @@
displayFormat="D MMM YYYY H:mm"
minuteValues="0,15,30,45"
monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
min="2021"
min="{{minDate}}"
max="2025"
>
</ion-datetime>
@@ -143,7 +143,7 @@
displayFormat="D MMM YYYY H:mm"
minuteValues="0,15,30,45"
monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
min="2021"
min="{{minDate}}"
max="2025"
>
</ion-datetime>
src/app/pages/agenda/edit-event/edit-event.page.ts
+1
View File
@@ -95,6 +95,7 @@ export class EditEventPage implements OnInit {
}
this.getAttachments(this.postEvent.EventId);
}
ngOnInit() {
src/app/pages/agenda/new-event/new-event.page.html
+9 -9
View File
@@ -1,7 +1,7 @@
<ion-header class="ion-no-border">
<ion-toolbar class="header-toolbar">
<div class="main-header">
<div class="title-content">
<div class="title-content width-100">
<div class="middle">
<ion-label class="title">Novo Evento</ion-label>
</div>
@@ -19,7 +19,7 @@
</div>
<div *ngIf="Form && validateFrom" >
<!-- <div *ngIf="Form && validateFrom" >
<div *ngIf="Form.get('Subject').invalid " class="input-errror-message">
<div *ngIf="Form.get('Subject').errors?.required">
Campo obrigatório.
@@ -28,7 +28,7 @@
O campo deve ter pelo menos 4 caracteres.
</div>
</div>
</div>
</div> -->
<div class="container-div">
<div class="ion-item-class-2">
@@ -46,7 +46,7 @@
</div>
<div *ngIf="Form && validateFrom" >
<!-- <div *ngIf="Form && validateFrom" >
<div *ngIf="Form.get('Location').invalid " class="input-errror-message">
<div *ngIf="Form.get('Location').errors?.required">
Campo obrigatório.
@@ -55,7 +55,7 @@
O campo deve ter pelo menos 4 caracteres.
</div>
</div>
</div>
</div> -->
<div class="container-div">
<div class="ion-item-class-2">
@@ -75,13 +75,13 @@
</div>
</div>
<div *ngIf="Form && validateFrom" >
<!-- <div *ngIf="Form && validateFrom" >
<div *ngIf="Form.get('CalendarName').invalid " class="input-errror-message">
<div *ngIf="Form.get('CalendarName').errors?.required">
Campo obrigatório.
</div>
</div>
</div>
</div> -->
<div class="container-div">
<div class="ion-item-class-2">
@@ -102,14 +102,14 @@
</div>
</div>
<div *ngIf="Form && validateFrom" >
<!-- <div *ngIf="Form && validateFrom" >
<div *ngIf="Form.get('Categories').invalid " class="input-errror-message">
{{ postEvent.Categories[0] }}
<div *ngIf="Form.get('Categories').errors?.required">
Campo obrigatório.
</div>
</div>
</div>
</div> -->
<div class="container-div">
<div class="ion-item-class-2">
src/app/pages/agenda/new-event/new-event.page.ts
+4
View File
@@ -78,6 +78,10 @@ export class NewEventPage implements OnInit {
this.selectedSegment = this.navParams.get('segment');
this.selectedDate = this.navParams.get('eventSelectedDate');
this.postEvent.StartDate = new Date()
this.postEvent.EndDate = (new Date(new Date().getTime() + 15 * 60000))
}
ngOnInit() {
src/app/pages/agenda/view-event/view-event.page.html
+1 -1
View File
@@ -6,7 +6,7 @@
<div class="main-content d-flex height-100">
<div class="content d-flex flex-column width-100">
<div class="main-header d-flex">
<div class="title-content d-flex justify-between width-100">
<div class="title-content d-flex justify-between width-100">
<div class="left">
<button class="btn-no-color d-flex align-center" (click)="goBack()">
<ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>