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/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html
+3 -3
View File
@@ -102,11 +102,11 @@
<ion-datetime
class="d-block d-md-none"
placeholder="Início"
[(ngModel)]="dateControlEnd"
[(ngModel)]="eventProcess.workflowInstanceDataFields.StartDate"
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="2018"
min="{{minDate}}"
max="2025"
>
</ion-datetime>
@@ -144,7 +144,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="2018"
min="{{minDate}}"
max="2025"
>
</ion-datetime>
src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts
+4 -3
View File
@@ -37,7 +37,8 @@ export class EditEventToApprovePage implements OnInit {
public showSeconds = false;
public touchUi = false;
public enableMeridian = false;
public minDate: any;
public minDate = new Date().toISOString().slice(0,10)
public endMinDate = new Date(new Date().getTime() + 15 * 60000);
public maxDate: any;
public stepHour = 1;
public stepMinute = 5;
@@ -219,8 +220,8 @@ export class EditEventToApprovePage implements OnInit {
// IsRecurring: new FormControl(this.postEvent.IsRecurring, [
// Validators.required
// ]),
participantes: new FormControl(this.taskParticipantsCc.concat(this.taskParticipants), [
// Validators.required
participantes: new FormControl(this.taskParticipants, [
Validators.required
]),
})
src/app/shared/agenda/edit-event/edit-event.page.ts
+4 -3
View File
@@ -38,7 +38,8 @@ export class EditEventPage implements OnInit {
public showSeconds = false;
public touchUi = false;
public enableMeridian = false;
public minDate: any;
public minDate = new Date().toISOString().slice(0,10)
public endMinDate = new Date(new Date().getTime() + 15 * 60000);
public maxDate: any;
public stepHour = 1;
public stepMinute = 5;
@@ -179,8 +180,8 @@ export class EditEventPage implements OnInit {
IsRecurring: new FormControl(this.postEvent.IsRecurring, [
Validators.required
]),
participantes: new FormControl(this.taskParticipantsCc.concat(this.taskParticipants), [
// Validators.required
participantes: new FormControl(this.taskParticipants, [
Validators.required
]),
})
src/app/shared/agenda/new-event/new-event.page.ts
+10 -4
View File
@@ -60,7 +60,7 @@ export class NewEventPage implements OnInit {
public showSeconds = false;
public touchUi = false;
public enableMeridian = false;
public minDate = new Date();
public minDate = new Date().toISOString().slice(0,10)
public endMinDate = new Date(new Date().getTime() + 15 * 60000);
public stepHour = 1;
public stepMinute = 5;
@@ -251,8 +251,8 @@ export class NewEventPage implements OnInit {
IsRecurring: new FormControl(this.postEvent.IsRecurring, [
Validators.required
]),
participantes: new FormControl(this.taskParticipantsCc.concat(this.taskParticipants), [
// Validators.required
participantes: new FormControl(this.taskParticipants, [
Validators.required
]),
})
@@ -482,6 +482,11 @@ export class NewEventPage implements OnInit {
}
}
/**
*
* @description o pipeline já esta a funcionar tuda vez que nos fazer push na branch master e test o pipeline executa os teste, mas agora os teste temos que melhora para testar a app em tudos os pontos
* o pipeline já está a funcionar toda vez que nos fazer um push na branch master ou teste o pipeline executa os testes, mas agora os testes temos que melhorar para testar a app em todos os pontos
*/
restoreTemporaryData(): boolean {
@@ -505,4 +510,5 @@ export class NewEventPage implements OnInit {
window['temp.path:/home/agenda/new-event.component.ts'] = {}
}
}
}