mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
set time by default and round number to 15
This commit is contained in:
@@ -138,7 +138,7 @@
|
|||||||
[(ngModel)]="postData.StartDate"
|
[(ngModel)]="postData.StartDate"
|
||||||
[disabled]="disabled"
|
[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
|
<ngx-mat-datetime-picker #picker1
|
||||||
[showSpinners]="showSpinners"
|
[showSpinners]="showSpinners"
|
||||||
[showSeconds]="showSeconds"
|
[showSeconds]="showSeconds"
|
||||||
@@ -166,7 +166,7 @@
|
|||||||
[disabled]="disabled"
|
[disabled]="disabled"
|
||||||
[min]="postData.StartDate"
|
[min]="postData.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
|
<ngx-mat-datetime-picker #fim
|
||||||
[showSpinners]="showSpinners"
|
[showSpinners]="showSpinners"
|
||||||
[showSeconds]="showSeconds"
|
[showSeconds]="showSeconds"
|
||||||
|
|||||||
@@ -141,8 +141,6 @@ export class DocumentSetUpMeetingPage implements OnInit {
|
|||||||
this.setDefaultTime()
|
this.setDefaultTime()
|
||||||
this.getRecurrenceTypes();
|
this.getRecurrenceTypes();
|
||||||
|
|
||||||
this.setStartDate();
|
|
||||||
this.setEndDate();
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -153,8 +151,20 @@ export class DocumentSetUpMeetingPage implements OnInit {
|
|||||||
}
|
}
|
||||||
|
|
||||||
setDefaultTime() {
|
setDefaultTime() {
|
||||||
// this.postData.StartDate = new Date()
|
this.setStartDate()
|
||||||
// this.postData.EndDate = (new Date(new Date().getTime() + 15 * 60000))
|
this.setEndDate();
|
||||||
|
}
|
||||||
|
|
||||||
|
setStartDate() {
|
||||||
|
if(!this.postData.StartDate) {
|
||||||
|
this.postData.StartDate = this.roundTimeQuarterHour();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
setEndDate() {
|
||||||
|
if(!this.postData.EndDate) {
|
||||||
|
this.postData.EndDate = this.postData.StartDate;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
close() {
|
close() {
|
||||||
@@ -430,45 +440,27 @@ export class DocumentSetUpMeetingPage implements OnInit {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
roundTimeQuarterHour() {
|
roundTimeQuarterHour(timeToReturn?) {
|
||||||
var timeToReturn = new Date();
|
let date = timeToReturn || new Date();
|
||||||
var minutes = timeToReturn.getMinutes();
|
const minutes = date.getMinutes();
|
||||||
var hours = timeToReturn.getHours();
|
date.setSeconds(0);
|
||||||
|
|
||||||
var m = (Math.round(minutes/15) * 15) % 60;
|
if(minutes % 15 != 0) {
|
||||||
var h = minutes > 52 ? (hours === 23 ? 0 : ++hours) : hours;
|
|
||||||
|
|
||||||
if (m == 0) {
|
if (minutes > 45) {
|
||||||
if(minutes > m){
|
date.setMinutes(60)
|
||||||
m = m + 15;
|
} else if (minutes > 30) {
|
||||||
}
|
date.setMinutes(45)
|
||||||
timeToReturn.setHours(h);
|
} else if (minutes > 15) {
|
||||||
timeToReturn.setMinutes(m);
|
date.setMinutes(30)
|
||||||
}else{
|
} else if (minutes > 1) {
|
||||||
if(minutes > m){
|
date.setMinutes(15)
|
||||||
|
|
||||||
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;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
setStartDate(){
|
return date
|
||||||
this.postData.StartDate = this.roundTimeQuarterHour();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
setEndDate(){
|
|
||||||
this.postData.EndDate = this.postData.StartDate;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ export class PublicationFolder {
|
|||||||
ProcessId: string;
|
ProcessId: string;
|
||||||
Description: string;
|
Description: string;
|
||||||
Detail: string;
|
Detail: string;
|
||||||
DateBegin: string;
|
DateBegin: any;
|
||||||
DateEnd: string;
|
DateEnd: any;
|
||||||
ActionType: string;
|
ActionType: string;
|
||||||
}
|
}
|
||||||
@@ -171,37 +171,26 @@ export class EditEventPage implements OnInit {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
roundTimeQuarterHour() {
|
roundTimeQuarterHour(timeToReturn?) {
|
||||||
var timeToReturn = new Date();
|
let date = timeToReturn || new Date();
|
||||||
// var minutes = timeToReturn.getMinutes();
|
const minutes = date.getMinutes();
|
||||||
var minutes = timeToReturn.getMinutes();
|
date.setSeconds(0);
|
||||||
var hours = timeToReturn.getHours();
|
|
||||||
|
|
||||||
// console.log("MINUTOS: " +minutes);
|
if(minutes % 15 != 0) {
|
||||||
// console.log("BEFORE MINUTES: " +(Math.round(minutes/15) * 15));
|
|
||||||
|
|
||||||
var m = (Math.round(minutes/15) * 15) % 60;
|
if (minutes > 45) {
|
||||||
// console.log("AFTER MINUTES: " +m);
|
date.setMinutes(60)
|
||||||
var h = minutes > 52 ? (hours === 23 ? 0 : ++hours) : hours;
|
} else if (minutes > 30) {
|
||||||
|
date.setMinutes(45)
|
||||||
if (m == 0) {
|
} else if (minutes > 15) {
|
||||||
if(minutes > m){
|
date.setMinutes(30)
|
||||||
m = m + 15;
|
} else if (minutes > 1) {
|
||||||
|
date.setMinutes(15)
|
||||||
}
|
}
|
||||||
timeToReturn.setHours(h);
|
|
||||||
timeToReturn.setMinutes(m);
|
|
||||||
}else{
|
|
||||||
if(minutes > m){
|
|
||||||
|
|
||||||
m = m + 15;
|
}
|
||||||
|
|
||||||
timeToReturn.setHours(h);
|
return date
|
||||||
timeToReturn.setMinutes(m);
|
|
||||||
}else {
|
|
||||||
timeToReturn.setHours(h);
|
|
||||||
timeToReturn.setMinutes(m);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onSelectedRecurringChanged(ev?:any) {
|
onSelectedRecurringChanged(ev?:any) {
|
||||||
|
|||||||
@@ -123,7 +123,7 @@
|
|||||||
[(ngModel)]="postEvent.StartDate"
|
[(ngModel)]="postEvent.StartDate"
|
||||||
[disabled]="disabled"
|
[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
|
<ngx-mat-datetime-picker #picker1
|
||||||
[showSpinners]="showSpinners"
|
[showSpinners]="showSpinners"
|
||||||
[showSeconds]="showSeconds"
|
[showSeconds]="showSeconds"
|
||||||
@@ -156,7 +156,7 @@
|
|||||||
[min]="postEvent.StartDate"
|
[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
|
<ngx-mat-datetime-picker #fim
|
||||||
[showSpinners]="showSpinners"
|
[showSpinners]="showSpinners"
|
||||||
[showSeconds]="showSeconds"
|
[showSeconds]="showSeconds"
|
||||||
|
|||||||
@@ -195,46 +195,38 @@ export class NewEventPage implements OnInit {
|
|||||||
}
|
}
|
||||||
|
|
||||||
roundTimeQuarterHour(timeToReturn?) {
|
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();
|
if(minutes % 15 != 0) {
|
||||||
var hours = timeToReturn.getHours();
|
|
||||||
|
|
||||||
var m = (Math.round(minutes/15) * 15) % 60;
|
if (minutes > 45) {
|
||||||
var h = minutes > 52 ? (hours === 23 ? 0 : ++hours) : hours;
|
date.setMinutes(60)
|
||||||
|
} else if (minutes > 30) {
|
||||||
if (m == 0) {
|
date.setMinutes(45)
|
||||||
if(minutes > m){
|
} else if (minutes > 15) {
|
||||||
m = m + 15;
|
date.setMinutes(30)
|
||||||
}
|
} else if (minutes > 1) {
|
||||||
timeToReturn.setHours(h);
|
date.setMinutes(15)
|
||||||
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;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
setStartDate(){
|
return date
|
||||||
|
}
|
||||||
|
|
||||||
|
setStartDate() {
|
||||||
|
if(!this.postEvent.StartDate) {
|
||||||
this.postEvent.StartDate = this.roundTimeQuarterHour();
|
this.postEvent.StartDate = this.roundTimeQuarterHour();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
setEndDate(){
|
setEndDate(){
|
||||||
|
if(!this.postEvent.EndDate) {
|
||||||
this.postEvent.EndDate = this.postEvent.StartDate;
|
this.postEvent.EndDate = this.postEvent.StartDate;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
getRecurrenceTypes() {
|
getRecurrenceTypes() {
|
||||||
|
|||||||
+2
-2
@@ -124,7 +124,7 @@
|
|||||||
[formControl]="dateControlStart"
|
[formControl]="dateControlStart"
|
||||||
[disabled]="disabled"
|
[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
|
<ngx-mat-datetime-picker #picker1
|
||||||
[showSpinners]="showSpinners"
|
[showSpinners]="showSpinners"
|
||||||
[showSeconds]="showSeconds"
|
[showSeconds]="showSeconds"
|
||||||
@@ -152,7 +152,7 @@
|
|||||||
[disabled]="disabled"
|
[disabled]="disabled"
|
||||||
[min] = "dateControlStart.value"
|
[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
|
<ngx-mat-datetime-picker #fim
|
||||||
[showSpinners]="showSpinners"
|
[showSpinners]="showSpinners"
|
||||||
[showSeconds]="showSeconds"
|
[showSeconds]="showSeconds"
|
||||||
|
|||||||
+16
-27
@@ -135,8 +135,8 @@ export class BookMeetingModalPage implements OnInit {
|
|||||||
this.postData.Subject = this.task.Folio;
|
this.postData.Subject = this.task.Folio;
|
||||||
this.postData.CalendarName = "Oficial";
|
this.postData.CalendarName = "Oficial";
|
||||||
|
|
||||||
this.dateControlStart = new FormControl(moment(new Date()));
|
this.dateControlStart = new FormControl(moment(this.roundTimeQuarterHour()));
|
||||||
this.dateControlEnd = new FormControl(moment(new Date(new Date().getTime() + 15 * 60000)));
|
this.dateControlEnd = new FormControl(moment(new Date(this.roundTimeQuarterHour() + 15 * 60000)));
|
||||||
|
|
||||||
this.postData.Category = 'Reunião'
|
this.postData.Category = 'Reunião'
|
||||||
|
|
||||||
@@ -499,36 +499,25 @@ export class BookMeetingModalPage implements OnInit {
|
|||||||
|
|
||||||
|
|
||||||
roundTimeQuarterHour(timeToReturn?) {
|
roundTimeQuarterHour(timeToReturn?) {
|
||||||
var timeToReturn = timeToReturn || new Date();
|
let date = timeToReturn || new Date();
|
||||||
var minutes = timeToReturn.getMinutes();
|
const minutes = date.getMinutes();
|
||||||
var hours = timeToReturn.getHours();
|
date.setSeconds(0);
|
||||||
|
|
||||||
var m = (Math.round(minutes/15) * 15) % 60;
|
if(minutes % 15 != 0) {
|
||||||
var h = minutes > 52 ? (hours === 23 ? 0 : ++hours) : hours;
|
|
||||||
|
|
||||||
if (m == 0) {
|
if (minutes > 45) {
|
||||||
if(minutes > m){
|
date.setMinutes(60)
|
||||||
m = m + 15;
|
} else if (minutes > 30) {
|
||||||
}
|
date.setMinutes(45)
|
||||||
timeToReturn.setHours(h);
|
} else if (minutes > 15) {
|
||||||
timeToReturn.setMinutes(m);
|
date.setMinutes(30)
|
||||||
} else {
|
} else if (minutes > 1) {
|
||||||
if(minutes > m) {
|
date.setMinutes(15)
|
||||||
|
|
||||||
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() {
|
setStartDate() {
|
||||||
|
|||||||
@@ -36,7 +36,7 @@
|
|||||||
[formControl]="dateControlStart"
|
[formControl]="dateControlStart"
|
||||||
[disabled]="disabled"
|
[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
|
<ngx-mat-datetime-picker #picker1
|
||||||
[showSpinners]="showSpinners"
|
[showSpinners]="showSpinners"
|
||||||
[showSeconds]="showSeconds"
|
[showSeconds]="showSeconds"
|
||||||
@@ -65,7 +65,7 @@
|
|||||||
[formControl]="dateControlEnd"
|
[formControl]="dateControlEnd"
|
||||||
[disabled]="disabled"
|
[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
|
<ngx-mat-datetime-picker #fim
|
||||||
[showSpinners]="showSpinners"
|
[showSpinners]="showSpinners"
|
||||||
[showSeconds]="showSeconds"
|
[showSeconds]="showSeconds"
|
||||||
|
|||||||
@@ -157,38 +157,30 @@ export class NewActionPage implements OnInit {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
roundTimeQuarterHour() {
|
roundTimeQuarterHour(timeToReturn?) {
|
||||||
var timeToReturn = new Date();
|
let date = timeToReturn || new Date();
|
||||||
var minutes = timeToReturn.getMinutes();
|
const minutes = date.getMinutes();
|
||||||
var hours = timeToReturn.getHours();
|
date.setSeconds(0);
|
||||||
|
|
||||||
var m = (Math.round(minutes/15) * 15) % 60;
|
if(minutes % 15 != 0) {
|
||||||
var h = minutes > 52 ? (hours === 23 ? 0 : ++hours) : hours;
|
|
||||||
|
|
||||||
if (m == 0) {
|
if (minutes > 45) {
|
||||||
if(minutes > m){
|
date.setMinutes(60)
|
||||||
m = m + 15;
|
} else if (minutes > 30) {
|
||||||
}
|
date.setMinutes(45)
|
||||||
timeToReturn.setHours(h);
|
} else if (minutes > 15) {
|
||||||
timeToReturn.setMinutes(m);
|
date.setMinutes(30)
|
||||||
}else{
|
} else if (minutes > 1) {
|
||||||
if(minutes > m) {
|
date.setMinutes(15)
|
||||||
|
|
||||||
m = m + 15;
|
|
||||||
|
|
||||||
timeToReturn.setHours(h);
|
|
||||||
timeToReturn.setMinutes(m);
|
|
||||||
}else {
|
|
||||||
timeToReturn.setHours(h);
|
|
||||||
timeToReturn.setMinutes(m);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return timeToReturn;
|
}
|
||||||
|
|
||||||
|
return date
|
||||||
}
|
}
|
||||||
|
|
||||||
setStartDate(){
|
setStartDate(){
|
||||||
this.dateControlStart = new FormControl(moment(this.roundTimeQuarterHour()));
|
this.dateControlStart = new FormControl(moment(this.roundTimeQuarterHour() as any));
|
||||||
}
|
}
|
||||||
|
|
||||||
setEndDate(){
|
setEndDate(){
|
||||||
|
|||||||
@@ -217,36 +217,25 @@ export class EditEventPage implements OnInit {
|
|||||||
}
|
}
|
||||||
|
|
||||||
roundTimeQuarterHour() {
|
roundTimeQuarterHour() {
|
||||||
var timeToReturn = new Date();
|
let date = new Date();
|
||||||
// var minutes = timeToReturn.getMinutes();
|
const minutes = date.getMinutes();
|
||||||
var minutes = timeToReturn.getMinutes();
|
date.setSeconds(0);
|
||||||
var hours = timeToReturn.getHours();
|
|
||||||
|
|
||||||
// console.log("MINUTOS: " +minutes);
|
if(minutes % 15 != 0) {
|
||||||
// console.log("BEFORE MINUTES: " +(Math.round(minutes/15) * 15));
|
|
||||||
|
|
||||||
var m = (Math.round(minutes/15) * 15) % 60;
|
if (minutes > 45) {
|
||||||
// console.log("AFTER MINUTES: " +m);
|
date.setMinutes(60)
|
||||||
var h = minutes > 52 ? (hours === 23 ? 0 : ++hours) : hours;
|
} else if (minutes > 30) {
|
||||||
|
date.setMinutes(45)
|
||||||
if (m == 0) {
|
} else if (minutes > 15) {
|
||||||
if(minutes > m){
|
date.setMinutes(30)
|
||||||
m = m + 15;
|
} else if (minutes > 1) {
|
||||||
|
date.setMinutes(15)
|
||||||
}
|
}
|
||||||
timeToReturn.setHours(h);
|
|
||||||
timeToReturn.setMinutes(m);
|
|
||||||
}else{
|
|
||||||
if(minutes > m){
|
|
||||||
|
|
||||||
m = m + 15;
|
}
|
||||||
|
|
||||||
timeToReturn.setHours(h);
|
return date
|
||||||
timeToReturn.setMinutes(m);
|
|
||||||
}else {
|
|
||||||
timeToReturn.setHours(h);
|
|
||||||
timeToReturn.setMinutes(m);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onSelectedRecurringChanged(ev:any){
|
onSelectedRecurringChanged(ev:any){
|
||||||
|
|||||||
@@ -129,7 +129,7 @@
|
|||||||
[disabled]="disabled"
|
[disabled]="disabled"
|
||||||
[min]="currentDate"
|
[min]="currentDate"
|
||||||
>
|
>
|
||||||
<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
|
<ngx-mat-datetime-picker #picker1
|
||||||
[showSpinners]="showSpinners"
|
[showSpinners]="showSpinners"
|
||||||
[showSeconds]="showSeconds"
|
[showSeconds]="showSeconds"
|
||||||
@@ -161,7 +161,7 @@
|
|||||||
[disabled]="disabled"
|
[disabled]="disabled"
|
||||||
[min]="postEvent.StartDate"
|
[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
|
<ngx-mat-datetime-picker #fim
|
||||||
[showSpinners]="showSpinners"
|
[showSpinners]="showSpinners"
|
||||||
[showSeconds]="showSeconds"
|
[showSeconds]="showSeconds"
|
||||||
|
|||||||
@@ -231,42 +231,41 @@ export class NewEventPage implements OnInit {
|
|||||||
this.postEvent.EndDate = this.postEvent.StartDate;
|
this.postEvent.EndDate = this.postEvent.StartDate;
|
||||||
}
|
}
|
||||||
|
|
||||||
roundTimeQuarterHour(timeToReturn?) {
|
roundTimeQuarterHour(timeToReturn?): Date {
|
||||||
var timeToReturn = timeToReturn || new Date();
|
|
||||||
// var minutes = timeToReturn.getMinutes();
|
|
||||||
var minutes = timeToReturn.getMinutes();
|
|
||||||
var hours = timeToReturn.getHours();
|
|
||||||
|
|
||||||
// console.log("MINUTOS: " +minutes);
|
let date: any = new Date(timeToReturn) || Date();
|
||||||
// console.log("BEFORE MINUTES: " +(Math.round(minutes/15) * 15));
|
const minutes = date.getMinutes();
|
||||||
|
date.setSeconds(0);
|
||||||
|
|
||||||
var m = (Math.round(minutes/15) * 15) % 60;
|
if(minutes % 15 != 0) {
|
||||||
// console.log("AFTER MINUTES: " +m);
|
|
||||||
var h = minutes > 52 ? (hours === 23 ? 0 : ++hours) : hours;
|
|
||||||
|
|
||||||
if (m == 0) {
|
if (minutes > 45) {
|
||||||
if(minutes > m){
|
date.setMinutes(60)
|
||||||
m = m + 15;
|
} else if (minutes > 30) {
|
||||||
}
|
date.setMinutes(45)
|
||||||
timeToReturn.setHours(h);
|
} else if (minutes > 15) {
|
||||||
timeToReturn.setMinutes(m);
|
date.setMinutes(30)
|
||||||
}else{
|
} else if (minutes > 1) {
|
||||||
if(minutes > m){
|
date.setMinutes(15)
|
||||||
|
|
||||||
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
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
roundTimeQuarterHour1 (timeToReturn) {
|
||||||
|
let date: any = new Date(timeToReturn) || Date();
|
||||||
|
const minutes = date.getMinutes();
|
||||||
|
date.setSeconds(0);
|
||||||
|
|
||||||
|
if((minutes % 15) != 0 ) {
|
||||||
|
let a = (Math.floor(minutes / 15) + 1) * 15
|
||||||
|
date.setMinutes(a)
|
||||||
|
}
|
||||||
|
|
||||||
|
return date
|
||||||
}
|
}
|
||||||
|
|
||||||
setStartDate(){
|
setStartDate(){
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<ion-header class="ion-no-border pt-20 px-20">
|
<ion-header class="ion-no-border pt-20 px-20">
|
||||||
<div class="title-content d-flex align-center justify-space-between ">
|
<div class="title-content d-flex align-center justify-space-between ">
|
||||||
<div class="div-title">
|
<div class="div-title">
|
||||||
<ion-label class="title"> Nova Acção</ion-label>
|
<ion-label class="title"> Nova Acção ...</ion-label>
|
||||||
</div>
|
</div>
|
||||||
<!-- <div class="actionType">
|
<!-- <div class="actionType">
|
||||||
<ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
|
<ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
|
||||||
@@ -40,14 +40,13 @@
|
|||||||
max="2025">
|
max="2025">
|
||||||
</ion-datetime> -->
|
</ion-datetime> -->
|
||||||
|
|
||||||
|
|
||||||
<mat-form-field appearance="none" class="width-100 date-hour-picker d-md-block">
|
<mat-form-field appearance="none" class="width-100 date-hour-picker d-md-block">
|
||||||
<input matInput [ngxMatDatetimePicker]="picker1"
|
<input matInput [ngxMatDatetimePicker]="picker1"
|
||||||
placeholder="Data inicio*"
|
placeholder="Data inicio*"
|
||||||
[(ngModel)]="folder.DateBegin"
|
[(ngModel)]="folder.DateBegin"
|
||||||
[disabled]="disabled"
|
[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
|
<ngx-mat-datetime-picker #picker1
|
||||||
[showSpinners]="showSpinners"
|
[showSpinners]="showSpinners"
|
||||||
[showSeconds]="showSeconds"
|
[showSeconds]="showSeconds"
|
||||||
@@ -83,7 +82,7 @@
|
|||||||
[(ngModel)]="folder.DateEnd"
|
[(ngModel)]="folder.DateEnd"
|
||||||
[disabled]="disabled"
|
[disabled]="disabled"
|
||||||
>
|
>
|
||||||
<mat-datepicker-toggle id="new-fim" matSuffix [for]="picker2" (click)="setEndDate()"></mat-datepicker-toggle>
|
<mat-datepicker-toggle id="new-fim" matSuffix [for]="picker2" ></mat-datepicker-toggle>
|
||||||
<ngx-mat-datetime-picker #picker2
|
<ngx-mat-datetime-picker #picker2
|
||||||
[showSpinners]="showSpinners"
|
[showSpinners]="showSpinners"
|
||||||
[showSeconds]="showSeconds"
|
[showSeconds]="showSeconds"
|
||||||
|
|||||||
@@ -31,10 +31,6 @@ export class NewActionPage implements OnInit {
|
|||||||
Form: FormGroup;
|
Form: FormGroup;
|
||||||
validateFrom = false
|
validateFrom = false
|
||||||
|
|
||||||
public dateControlStart = new FormControl(moment("DD MM YYYY hh"));
|
|
||||||
public dateControlEnd = new FormControl(moment("DD MM YYYY hh"));
|
|
||||||
|
|
||||||
|
|
||||||
@Output() closeDesktopComponent= new EventEmitter<any>();
|
@Output() closeDesktopComponent= new EventEmitter<any>();
|
||||||
@Output() getActions= new EventEmitter<any>();
|
@Output() getActions= new EventEmitter<any>();
|
||||||
|
|
||||||
@@ -44,15 +40,11 @@ export class NewActionPage implements OnInit {
|
|||||||
) {
|
) {
|
||||||
this.folder = new PublicationFolder();
|
this.folder = new PublicationFolder();
|
||||||
|
|
||||||
|
|
||||||
|
this.setStartDate()
|
||||||
|
this.setEndDate()
|
||||||
}
|
}
|
||||||
|
|
||||||
get dateStart () {
|
|
||||||
return this.dateControlStart.value
|
|
||||||
}
|
|
||||||
|
|
||||||
get dateEnd () {
|
|
||||||
return this.dateControlEnd.value
|
|
||||||
}
|
|
||||||
|
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
this.segment = "Evento";
|
this.segment = "Evento";
|
||||||
@@ -150,44 +142,56 @@ export class NewActionPage implements OnInit {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
round() {
|
||||||
|
let date = new Date();
|
||||||
|
const minutes = date.getMinutes();
|
||||||
|
date.setSeconds(0);
|
||||||
|
|
||||||
|
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)
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
return date
|
||||||
|
}
|
||||||
|
|
||||||
roundTimeQuarterHour() {
|
roundTimeQuarterHour() {
|
||||||
var timeToReturn = new Date();
|
let date = new Date();
|
||||||
var minutes = timeToReturn.getMinutes();
|
const minutes = date.getMinutes();
|
||||||
var hours = timeToReturn.getHours();
|
date.setSeconds(0);
|
||||||
|
|
||||||
var m = (Math.round(minutes/15) * 15) % 60;
|
if(minutes % 15 != 0) {
|
||||||
var h = minutes > 52 ? (hours === 23 ? 0 : ++hours) : hours;
|
|
||||||
|
|
||||||
if (m == 0) {
|
if (minutes > 45) {
|
||||||
if(minutes > m){
|
date.setMinutes(60)
|
||||||
m = m + 15;
|
} else if (minutes > 30) {
|
||||||
}
|
date.setMinutes(45)
|
||||||
timeToReturn.setHours(h);
|
} else if (minutes > 15) {
|
||||||
timeToReturn.setMinutes(m);
|
date.setMinutes(30)
|
||||||
}else{
|
} else if (minutes > 1) {
|
||||||
if(minutes > m){
|
date.setMinutes(15)
|
||||||
|
|
||||||
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;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
setStartDate(){
|
return date
|
||||||
this.dateControlStart = new FormControl(moment(this.roundTimeQuarterHour()));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
setEndDate(){
|
|
||||||
this.dateControlEnd = this.dateControlStart;
|
setStartDate() {
|
||||||
|
this.folder.DateBegin = this.roundTimeQuarterHour()
|
||||||
|
}
|
||||||
|
|
||||||
|
setEndDate() {
|
||||||
|
this.folder.DateEnd = this.folder.DateBegin;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
export let versionData = {
|
export let versionData = {
|
||||||
"shortSHA": "0bf43b629",
|
"shortSHA": "35945a55e",
|
||||||
"SHA": "0bf43b629c1963689cb2a829757e095a2f7d575c",
|
"SHA": "35945a55e747eca0538c0032b782a7acdbd453db",
|
||||||
"branch": "no_bug_movemente",
|
"branch": "no_bug_movemente",
|
||||||
"lastCommitAuthor": "'Peter Maquiran'",
|
"lastCommitAuthor": "'Peter Maquiran'",
|
||||||
"lastCommitTime": "'Mon Feb 6 13:52:08 2023 +0100'",
|
"lastCommitTime": "'Mon Feb 6 15:00:42 2023 +0100'",
|
||||||
"lastCommitMessage": "change date picker",
|
"lastCommitMessage": "remove refresh button",
|
||||||
"lastCommitNumber": "4733",
|
"lastCommitNumber": "4734",
|
||||||
"change": "",
|
"change": "",
|
||||||
"changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html\n\tmodified: src/app/shared/gabinete-digital/despachos/despachos.page.html\n\tmodified: src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html\n\tmodified: src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html\n\tmodified: src/app/shared/gabinete-digital/diplomas/diplomas.page.html\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html\n\tmodified: src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html\n\tmodified: src/app/shared/gabinete-digital/expedients/expedients.page.html\n\tmodified: src/app/shared/gabinete-digital/pedidos/pedidos.page.html\n\tmodified: src/app/shared/gabinete-digital/pendentes/pendentes.page.html",
|
"changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified: src/app/models/publicationfolder.ts\n\tmodified: src/app/pages/agenda/edit-event/edit-event.page.ts\n\tmodified: src/app/pages/agenda/new-event/new-event.page.html\n\tmodified: src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified: src/app/pages/publications/new-action/new-action.page.html\n\tmodified: src/app/pages/publications/new-action/new-action.page.ts\n\tmodified: src/app/shared/agenda/edit-event/edit-event.page.ts\n\tmodified: src/app/shared/agenda/new-event/new-event.page.html\n\tmodified: src/app/shared/agenda/new-event/new-event.page.ts\n\tmodified: src/app/shared/publication/new-action/new-action.page.html\n\tmodified: src/app/shared/publication/new-action/new-action.page.ts",
|
||||||
"changeAuthor": "peter.maquiran"
|
"changeAuthor": "peter.maquiran"
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user