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

merge with peter changes

Browse Source
This commit is contained in:
Eudes Inácio
2023-02-06 17:24:18 +01:00
parent f2e95cc8b6 18b647e702
commit f00415379b
26 changed files with 233 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/edit-event/edit-event.page.ts
+16 -27
View File
@@ -171,37 +171,26 @@ export class EditEventPage implements OnInit {
});
}
roundTimeQuarterHour() {
var timeToReturn = new Date();
// var minutes = timeToReturn.getMinutes();
var minutes = timeToReturn.getMinutes();
var hours = timeToReturn.getHours();
roundTimeQuarterHour(timeToReturn?) {
let date = timeToReturn || new Date();
const minutes = date.getMinutes();
date.setSeconds(0);
// 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;
if(minutes % 15 != 0) {
if (minutes > 45) {
date.setMinutes(60)
} else if (minutes > 30) {
date.setMinutes(45)
} else if (minutes > 15) {
date.setMinutes(30)
} else if (minutes > 1) {
date.setMinutes(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);
}
}
return date
}
onSelectedRecurringChanged(ev?:any) {
src/app/pages/agenda/new-event/new-event.page.html
+2 -2
View File
@@ -123,7 +123,7 @@
[(ngModel)]="postEvent.StartDate"
[disabled]="disabled"
>
<mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1" (click)="setStartDate()"></mat-datepicker-toggle>
<mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1" ></mat-datepicker-toggle>
<ngx-mat-datetime-picker #picker1
[showSpinners]="showSpinners"
[showSeconds]="showSeconds"
@@ -156,7 +156,7 @@
[min]="postEvent.StartDate"
>
<mat-datepicker-toggle id="new-fim" matSuffix [for]="fim" (click)="setEndDate()"></mat-datepicker-toggle>
<mat-datepicker-toggle id="new-fim" matSuffix [for]="fim" ></mat-datepicker-toggle>
<ngx-mat-datetime-picker #fim
[showSpinners]="showSpinners"
[showSeconds]="showSeconds"
src/app/pages/agenda/new-event/new-event.page.ts
+22 -30
View File
@@ -195,45 +195,37 @@ export class NewEventPage implements OnInit {
}
roundTimeQuarterHour(timeToReturn?) {
var timeToReturn = timeToReturn || new Date();
let date: any = new Date(timeToReturn) || Date();
const minutes = date.getMinutes();
date.setSeconds(0);
var minutes = timeToReturn.getMinutes();
var hours = timeToReturn.getHours();
var m = (Math.round(minutes/15) * 15) % 60;
var h = minutes > 52 ? (hours === 23 ? 0 : ++hours) : hours;
if (m == 0) {
if(minutes > m){
m = m + 15;
if(minutes % 15 != 0) {
if (minutes > 45) {
date.setMinutes(60)
} else if (minutes > 30) {
date.setMinutes(45)
} else if (minutes > 15) {
date.setMinutes(30)
} else if (minutes > 1) {
date.setMinutes(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);
}
}
// console.log("AFTER IF MINUTES: " +m);
// console.log("AFTER HOURS: " +h);
return timeToReturn;
return date
}
setStartDate(){
this.postEvent.StartDate = this.roundTimeQuarterHour();
setStartDate() {
if(!this.postEvent.StartDate) {
this.postEvent.StartDate = this.roundTimeQuarterHour();
}
}
setEndDate(){
this.postEvent.EndDate = this.postEvent.StartDate;
if(!this.postEvent.EndDate) {
this.postEvent.EndDate = this.postEvent.StartDate;
}
}
src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
+2 -2
View File
@@ -124,7 +124,7 @@
[formControl]="dateControlStart"
[disabled]="disabled"
>
<mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1" (click)="setStartDate()"></mat-datepicker-toggle>
<mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1" ></mat-datepicker-toggle>
<ngx-mat-datetime-picker #picker1
[showSpinners]="showSpinners"
[showSeconds]="showSeconds"
@@ -152,7 +152,7 @@
[disabled]="disabled"
[min] = "dateControlStart.value"
>
<mat-datepicker-toggle id="new-fim" matSuffix [for]="fim" (click)="setEndDate()"></mat-datepicker-toggle>
<mat-datepicker-toggle id="new-fim" matSuffix [for]="fim" ></mat-datepicker-toggle>
<ngx-mat-datetime-picker #fim
[showSpinners]="showSpinners"
[showSeconds]="showSeconds"
src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
+17 -28
View File
@@ -135,8 +135,8 @@ export class BookMeetingModalPage implements OnInit {
this.postData.Subject = this.task.Folio;
this.postData.CalendarName = "Oficial";
this.dateControlStart = new FormControl(moment(new Date()));
this.dateControlEnd = new FormControl(moment(new Date(new Date().getTime() + 15 * 60000)));
this.dateControlStart = new FormControl(moment(this.roundTimeQuarterHour()));
this.dateControlEnd = new FormControl(moment(new Date(this.roundTimeQuarterHour() + 15 * 60000)));
this.postData.Category = 'Reunião'
@@ -499,36 +499,25 @@ export class BookMeetingModalPage implements OnInit {
roundTimeQuarterHour(timeToReturn?) {
var timeToReturn = timeToReturn || new Date();
var minutes = timeToReturn.getMinutes();
var hours = timeToReturn.getHours();
let date = timeToReturn || new Date();
const minutes = date.getMinutes();
date.setSeconds(0);
var m = (Math.round(minutes/15) * 15) % 60;
var h = minutes > 52 ? (hours === 23 ? 0 : ++hours) : hours;
if (m == 0) {
if(minutes > m){
m = m + 15;
if(minutes % 15 != 0) {
if (minutes > 45) {
date.setMinutes(60)
} else if (minutes > 30) {
date.setMinutes(45)
} else if (minutes > 15) {
date.setMinutes(30)
} else if (minutes > 1) {
date.setMinutes(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);
}
}
// console.log("AFTER IF MINUTES: " +m);
// console.log("AFTER HOURS: " +h);
return timeToReturn;
return date
}
setStartDate() {
src/app/pages/publications/new-action/new-action.page.html
+2 -2
View File
@@ -36,7 +36,7 @@
[formControl]="dateControlStart"
[disabled]="disabled"
>
<mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1" (click)="setStartDate()"></mat-datepicker-toggle>
<mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1" ></mat-datepicker-toggle>
<ngx-mat-datetime-picker #picker1
[showSpinners]="showSpinners"
[showSeconds]="showSeconds"
@@ -65,7 +65,7 @@
[formControl]="dateControlEnd"
[disabled]="disabled"
>
<mat-datepicker-toggle id="new-fim" matSuffix [for]="fim" (click)="setEndDate()"></mat-datepicker-toggle>
<mat-datepicker-toggle id="new-fim" matSuffix [for]="fim" ></mat-datepicker-toggle>
<ngx-mat-datetime-picker #fim
[showSpinners]="showSpinners"
[showSeconds]="showSeconds"
src/app/pages/publications/new-action/new-action.page.ts
+17 -25
View File
@@ -157,38 +157,30 @@ export class NewActionPage implements OnInit {
}
roundTimeQuarterHour() {
var timeToReturn = new Date();
var minutes = timeToReturn.getMinutes();
var hours = timeToReturn.getHours();
roundTimeQuarterHour(timeToReturn?) {
let date = timeToReturn || new Date();
const minutes = date.getMinutes();
date.setSeconds(0);
var m = (Math.round(minutes/15) * 15) % 60;
var h = minutes > 52 ? (hours === 23 ? 0 : ++hours) : hours;
if (m == 0) {
if(minutes > m){
m = m + 15;
if(minutes % 15 != 0) {
if (minutes > 45) {
date.setMinutes(60)
} else if (minutes > 30) {
date.setMinutes(45)
} else if (minutes > 15) {
date.setMinutes(30)
} else if (minutes > 1) {
date.setMinutes(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);
}
}
return timeToReturn;
return date
}
setStartDate(){
this.dateControlStart = new FormControl(moment(this.roundTimeQuarterHour()));
this.dateControlStart = new FormControl(moment(this.roundTimeQuarterHour() as any));
}
setEndDate(){