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 'develop_bitOut' of https://bitbucket.org/equilibriumito/gabinete-digital-fo into develop_bitOut

Browse Source
This commit is contained in:
Eudes Inácio
2022-12-19 12:04:32 +01:00
parent 79f343ca49 c96ad9de0a
commit 6e2053bf76
36 changed files with 307 additions and 134 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
+2 -2
View File
@@ -210,7 +210,7 @@
</div>
</div>
<div class="container-div width-100">
<!-- <div class="container-div width-100">
<div class="ion-item-class-2">
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-refresh.svg"></ion-icon>
@@ -239,7 +239,7 @@
</div>
</div>
</div>
</div> -->
<div *ngIf="eventProcess.workflowInstanceDataFields.OccurrenceType != '-1'"
class="container-div width-100">
src/app/shared/agenda/edit-event/edit-event.page.html
+3 -3
View File
@@ -147,7 +147,7 @@
[(ngModel)]="postEvent.EndDate"
[max]="maxDate"
[disabled]="disabled"
[min]="currentDate"
[min]="postEvent.StartDate"
>
<mat-datepicker-toggle id="new-fim" matSuffix [for]="fim"></mat-datepicker-toggle>
<ngx-mat-datetime-picker #fim
@@ -162,7 +162,7 @@
</div>
</div>
<div class="container-div d-flex">
<!-- <div class="container-div d-flex">
<div class="ion-item-class-2 width-100 d-flex">
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-refresh.svg"></ion-icon>
@@ -184,7 +184,7 @@
</div>
</div>
</div>
</div> -->
<div *ngIf="postEvent.EventRecurrence.Type != '-1'" class="container-div width-100">
<div class="ion-item-class-2 d-flex">
src/app/shared/agenda/edit-event/edit-event.page.ts
+36 -3
View File
@@ -46,9 +46,9 @@ export class EditEventPage implements OnInit {
public endMinDate = new Date(new Date().getTime() + 15 * 60000).toISOString().slice(0,10)
public maxDate: any;
public stepHour = 1;
public stepMinute = 5;
public stepSecond = 5;
currentDate = new Date();
public stepMinute = 15;
public stepSecond = 15;
currentDate = this.roundTimeQuarterHour();
Form: FormGroup;
validateFrom = false
@@ -216,6 +216,39 @@ export class EditEventPage implements OnInit {
}
}
roundTimeQuarterHour() {
var timeToReturn = new Date();
// var minutes = timeToReturn.getMinutes();
var minutes = timeToReturn.getMinutes();
var hours = timeToReturn.getHours();
// console.log("MINUTOS: " +minutes);
// console.log("BEFORE MINUTES: " +(Math.round(minutes/15) * 15));
var m = (Math.round(minutes/15) * 15) % 60;
// console.log("AFTER MINUTES: " +m);
var h = minutes > 52 ? (hours === 23 ? 0 : ++hours) : hours;
if (m == 0) {
if(minutes > m){
m = m + 15;
}
timeToReturn.setHours(h);
timeToReturn.setMinutes(m);
}else{
if(minutes > m){
m = m + 15;
timeToReturn.setHours(h);
timeToReturn.setMinutes(m);
}else {
timeToReturn.setHours(h);
timeToReturn.setMinutes(m);
}
}
}
onSelectedRecurringChanged(ev:any){
this.calculetedLastOccurrence(ev);