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

merge

Browse Source
This commit is contained in:
Peter Maquiran
2022-12-16 15:46:40 +01:00
parent 7e70078a0a 9d6dda91a8
commit b5c34739fc
7 changed files with 123 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package-lock.json
Generated
+18 -3
View File
@@ -3,6 +3,8 @@
"version": "0.0.1",
"lockfileVersion": 1,
"requires": true,
<<<<<<< HEAD
=======
<<<<<<< HEAD
"packages": {
"": {
@@ -31969,6 +31971,7 @@
},
=======
>>>>>>> b1b28d97e5e154d67ee3e1041a51f1669de00b65
>>>>>>> 839062013b575d399f5309046afd9d240f4b484c
"dependencies": {
"@ampproject/remapping": {
"version": "1.0.1",
@@ -32771,6 +32774,8 @@
"integrity": "sha512-tk5QlnXfSE2Zu3mJVC3f11Guu5iqnLtNkvvClNHjz/e4FsJEmprfXWCv/QImWs5fLsismHcn31LKYBfWIhOv9g==",
"requires": {
"@types/cordova": "^0.0.34"
<<<<<<< HEAD
=======
},
"dependencies": {
"@types/cordova": {
@@ -32778,6 +32783,7 @@
"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
"integrity": "sha512-rkiiTuf/z2wTd4RxFOb+clE7PF4AEJU0hsczbUdkHHBtkUmpWQpEddynNfJYKYtZFJKbq4F+brfekt1kx85IZA=="
}
>>>>>>> 839062013b575d399f5309046afd9d240f4b484c
}
},
"@awesome-cordova-plugins/document-viewer": {
@@ -34084,13 +34090,17 @@
"resolved": "https://registry.npmjs.org/@capacitor-community/camera-preview/-/camera-preview-1.2.1.tgz",
"integrity": "sha512-rskj/12TR4X8cUzvkWvygf7A/4TFUld9BU5nAc1gc3LXU06FGP0R/6MxZKQdf20qqRaTRLPrF3HFAlkz7xb6yg==",
"requires": {
<<<<<<< HEAD
"@capacitor/core": "^4.6.1"
=======
"@capacitor/core": "^3.6.0"
>>>>>>> 839062013b575d399f5309046afd9d240f4b484c
},
"dependencies": {
"@capacitor/core": {
"version": "3.6.0",
"resolved": "https://registry.npmjs.org/@capacitor/core/-/core-3.6.0.tgz",
"integrity": "sha512-F94ozABHXxq1xMcNGMnOVP73WZDWYR1PrJEfVfl9Ja0BXGEJURIxmHBc842OX3rrt3+g0ELHyhX9LTH16eeonw==",
"version": "4.6.1",
"resolved": "https://registry.npmjs.org/@capacitor/core/-/core-4.6.1.tgz",
"integrity": "sha512-7A2IV9E8umgu9u0fChUTjQJq+Jp25GJZMmWxoQN/nVx/1rcpFJ4m1xo3NPBoIRs+aV7FR+BM17mPrnkKlA8N2g==",
"requires": {
"tslib": "^2.1.0"
}
@@ -36825,6 +36835,11 @@
"integrity": "sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==",
"dev": true
},
"@types/cordova": {
"version": "0.0.34",
"resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz",
"integrity": "sha512-rkiiTuf/z2wTd4RxFOb+clE7PF4AEJU0hsczbUdkHHBtkUmpWQpEddynNfJYKYtZFJKbq4F+brfekt1kx85IZA=="
},
"@types/cors": {
"version": "2.8.12",
"resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.12.tgz",
src/app/modals/profile/profile.page.html
+3
View File
@@ -31,6 +31,9 @@
<ion-header class=" bg-blue ion-no-border">
<div class="profile-content">
<div class="profile-name d-flex justify-content-center width-100">
<ion-label >{{loggeduser.FullName}}</ion-label>
</div>
<div class="profile-title d-flex justify-content-center width-100">
<ion-label *ngIf="loggeduser.RoleDescription" >{{loggeduser.RoleDescription}}</ion-label>
</div>
src/app/modals/profile/profile.page.scss
+7
View File
@@ -82,6 +82,13 @@
font-size: 40px;
}
.profile-name {
font-weight: 300;
font-size: 20px !important;
margin-bottom: 17px !important;
color: var(--profile-text-color) !important;
}
.profile-title {
font-weight: 300;
font-size: 20px !important;
src/app/pages/agenda/new-event/new-event.page.html
+5 -4
View File
@@ -124,7 +124,7 @@
[disabled]="disabled"
[min]="currentDate"
>
<mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
<mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1" (click)="setStartDate()"></mat-datepicker-toggle>
<ngx-mat-datetime-picker #picker1
[showSpinners]="showSpinners"
[showSeconds]="showSeconds"
@@ -147,16 +147,17 @@
<!--
[className]="Form?.get('Subject')?.invalid ? 'input-error ion-input-class flex-grow-1' : 'ion-input-class ion-input-class flex-grow-1' "
-->
<div (click)="openFim()" class="ion-input-class flex-grow-1 justify-center align-center materia-top" [class.input-error]="Form?.get('Date')?.invalid && validateFrom ">
<div class="ion-input-class flex-grow-1 justify-center align-center materia-top" [class.input-error]="Form?.get('Date')?.invalid && validateFrom ">
<mat-form-field appearance="none" class="date-hour-picker">
<input matInput [ngxMatDatetimePicker]="fim"
placeholder="Data de fim*"
[(ngModel)]="postEvent.EndDate"
[disabled]="disabled"
[min]="currentDate"
[min]="postEvent.StartDate"
>
<mat-datepicker-toggle id="new-fim" matSuffix [for]="fim"></mat-datepicker-toggle>
<mat-datepicker-toggle id="new-fim" matSuffix [for]="fim" (click)="setEndDate()"></mat-datepicker-toggle>
<ngx-mat-datetime-picker #fim
[showSpinners]="showSpinners"
[showSeconds]="showSeconds"
src/app/pages/agenda/new-event/new-event.page.ts
+41 -7
View File
@@ -47,10 +47,10 @@ export class NewEventPage implements OnInit {
public touchUi = false;
public enableMeridian = false;
public stepHour = 1;
public stepMinute = 5;
public stepSecond = 5;
public stepMinute = 15;
public stepSecond = 15;
public color: ThemePalette = 'primary';
currentDate = new Date();
currentDate = this.roundTimeQuarterHour();
Form: FormGroup;
validateFrom = false
@@ -163,10 +163,7 @@ export class NewEventPage implements OnInit {
if( window.innerWidth >= 1024){
this.modalController.dismiss();
}
};
};
}
@@ -174,6 +171,43 @@ export class NewEventPage implements OnInit {
this.modalController.dismiss();
}
roundTimeQuarterHour() {
var timeToReturn = new Date();
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;
var h = minutes > 52 ? (hours === 23 ? 0 : ++hours) : hours;
if (m == 0) {
timeToReturn.setHours(h);
timeToReturn.setMinutes(m);
}else{
if(minutes > m){
m = m + 15;
timeToReturn.setHours(h);
timeToReturn.setMinutes(m);
}
}
console.log("AFTER MINUTES: " +m);
console.log("AFTER HOURS: " +h);
return timeToReturn;
}
setStartDate(){
this.postEvent.StartDate = this.roundTimeQuarterHour();
}
setEndDate(){
this.postEvent.EndDate = this.postEvent.StartDate;
}
getRecurrenceTypes() {
this.eventService.getRecurrenceTypes().subscribe( res => {
src/app/shared/agenda/new-event/new-event.page.html
+5 -5
View File
@@ -121,7 +121,7 @@
<ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
</div>
<div class="ion-input-class flex-grow-1 justify-center align-center material-inputs materia-top" [class.input-error]="Form?.get('Date')?.invalid && validateFrom ">
<div class="ion-input-class flex-grow-1 justify-center align-center material-inputs materia-top" >
<mat-form-field appearance="none" class="date-hour-picker">
<input matInput [ngxMatDatetimePicker]="picker1"
@@ -130,8 +130,8 @@
[disabled]="disabled"
[min]="currentDate"
>
<mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
<ngx-mat-datetime-picker #picker1
<mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1" (click)="setStartDate()"></mat-datepicker-toggle>
<ngx-mat-datetime-picker #picker1
[showSpinners]="showSpinners"
[showSeconds]="showSeconds"
[stepHour]="stepHour" [stepMinute]="stepMinute"
@@ -160,9 +160,9 @@
placeholder="Data de fim*"
[(ngModel)]="postEvent.EndDate"
[disabled]="disabled"
[min]="currentDate"
[min]="postEvent.StartDate"
>
<mat-datepicker-toggle id="new-fim" matSuffix [for]="fim"></mat-datepicker-toggle>
<mat-datepicker-toggle id="new-fim" matSuffix [for]="fim" (click)="setEndDate()"></mat-datepicker-toggle>
<ngx-mat-datetime-picker #fim
[showSpinners]="showSpinners"
[showSeconds]="showSeconds"
src/app/shared/agenda/new-event/new-event.page.ts
+44 -5
View File
@@ -61,9 +61,9 @@ export class NewEventPage implements OnInit {
public touchUi = false;
public enableMeridian = false;
public stepHour = 1;
public stepMinute = 5;
public stepSecond = 5;
currentDate = new Date();
public stepMinute = 15;
public stepSecond = 15;
currentDate = this.roundTimeQuarterHour();
public color: ThemePalette = 'primary';
recurringTypes = []
selectedRecurringType: any;
@@ -100,7 +100,7 @@ export class NewEventPage implements OnInit {
Form: FormGroup;
validateFrom = false;
autoStartTime;
autoEndTime;
autoEndTime;
public options = [
{ value: true, label: 'True' },
@@ -136,8 +136,8 @@ export class NewEventPage implements OnInit {
}
ngOnInit() {
// this.roundTimeQuarterHour();
if(!this.CalendarName) {
this.CalendarName = this.loggeduser.Profile;
@@ -210,6 +210,7 @@ export class NewEventPage implements OnInit {
this.setIntervenientCC.emit(this.taskParticipantsCc);
}
this.date = new Date(2021,9,4,5,6,7);
@@ -217,6 +218,44 @@ export class NewEventPage implements OnInit {
}
roundTimeQuarterHour() {
var timeToReturn = new Date();
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) {
timeToReturn.setHours(h);
timeToReturn.setMinutes(m);
}else{
if(minutes > m){
m = m + 15;
timeToReturn.setHours(h);
timeToReturn.setMinutes(m);
}
}
// console.log("AFTER IF MINUTES: " +m);
// console.log("AFTER HOURS: " +h);
return timeToReturn;
}
setStartDate(){
this.postEvent.StartDate = this.roundTimeQuarterHour();
}
setEndDate(){
this.postEvent.EndDate = this.postEvent.StartDate;
}
runValidation() {
this.validateFrom = true;
if(new Date(this.postEvent.StartDate).getTime() > new Date(this.postEvent.EndDate).getTime()){