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

Browse Source
This commit is contained in:
Peter Maquiran
2022-06-22 16:11:18 +01:00
parent 4a694b1570 49111eaaf7
commit 21083f34b1
27 changed files with 215 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/shared/agenda/approve-event/approve-event.page.html
+8 -3
View File
@@ -66,9 +66,14 @@
<ion-label>
<p>{{customDate}}</p>
<p *ngIf="toDateString(loadedEvent.workflowInstanceDataFields.StartDate) == toDateString(loadedEvent.workflowInstanceDataFields.EndDate)">das {{loadedEvent.workflowInstanceDataFields.StartDate | date: 'HH:mm'}} às {{loadedEvent.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}</p>
<p *ngIf="toDateString(loadedEvent.workflowInstanceDataFields.StartDate) != toDateString(loadedEvent.workflowInstanceDataFields.EndDate)">{{loadedEvent.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ loadedEvent.workflowInstanceDataFields.StartDate | date: 'dd/M/yy'}} </p>
<p *ngIf="!loadedEvent.workflowInstanceDataFields.IsRecurring">(Não se repete)</p>
<p *ngIf="loadedEvent.workflowInstanceDataFields.IsRecurring">Repete</p>
<p *ngIf="toDateString(loadedEvent.workflowInstanceDataFields.StartDate) != toDateString(loadedEvent.workflowInstanceDataFields.EndDate)">{{loadedEvent.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ loadedEvent.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}} </p>
<p>
<span *ngIf="loadedEvent.workflowInstanceDataFields.OccurrenceType == 0">Diário</span>
<span *ngIf="loadedEvent.workflowInstanceDataFields.OccurrenceType == 1">Semanal</span>
<span *ngIf="loadedEvent.workflowInstanceDataFields.OccurrenceType == 2">Mensal</span>
<span *ngIf="loadedEvent.workflowInstanceDataFields.OccurrenceType == 3">Anual</span>
<span *ngIf="loadedEvent.workflowInstanceDataFields.OccurrenceType == -1">(Não se repete)</span>
</p>
</ion-label>
</div>
src/app/shared/agenda/approve-event/approve-event.page.ts
+1
View File
@@ -71,6 +71,7 @@ export class ApproveEventPage implements OnInit {
this.processes.GetTask(this.serialNumber).subscribe(res => {
this.loadedEvent = res;
console.log(this.loadedEvent);
this.today = new Date(res.workflowInstanceDataFields.StartDate);
//
this.customDate = this.days[this.today.getDay()]+ ", " + this.today.getDate() +" de " + ( this.months[this.today.getMonth()]);
src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html
+3 -3
View File
@@ -158,7 +158,7 @@
<mat-form-field appearance="none" class="width-100 date-hour-picker d-none d-md-block">
<input matInput [ngxMatDatetimePicker]="picker1"
placeholder="Choose a date"
[formControl]="dateControlStart"
[(ngModel)]="eventProcess.workflowInstanceDataFields.StartDate"
[min]="minDate" [max]="maxDate"
[disabled]="disabled"
>
@@ -196,8 +196,8 @@
<mat-form-field appearance="none" class="width-100 date-hour-picker d-none d-md-block">
<input matInput [ngxMatDatetimePicker]="fim"
placeholder="Choose a date"
[formControl]="dateControlEnd"
[min]="minDate" [max]="maxDate"
[(ngModel)]="eventProcess.workflowInstanceDataFields.EndDate"
[min]="endMinDate" [max]="maxDate"
[disabled]="disabled"
>
<mat-datepicker-toggle id="new-fim" matSuffix [for]="fim"></mat-datepicker-toggle>
src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts
+49 -5
View File
@@ -41,7 +41,7 @@ export class EditEventToApprovePage implements OnInit {
public showSeconds = false;
public touchUi = false;
public enableMeridian = false;
public minDate = new Date().toISOString().slice(0,10)
public minDate = new Date()
public endMinDate = new Date(new Date().getTime() + 15 * 60000);
public maxDate: any;
public stepHour = 1;
@@ -179,6 +179,9 @@ export class EditEventToApprovePage implements OnInit {
}
onSelectedRecurringChanged(ev:any) {
this.calculetedLastOccurrence(ev);
if(ev.length > 1) {
this.eventProcess.workflowInstanceDataFields.OccurrenceType = ev.filter(data => data != '-1');
@@ -188,6 +191,44 @@ export class EditEventToApprovePage implements OnInit {
}
}
calculetedLastOccurrence(type:number){
var valor;
var opcao: boolean;
if (type == 0) {
valor = 7;
opcao = true;
} else if(type == 1){
valor = 30;
opcao = true;
} else if(type == 2){
valor = 1;
opcao = false;
}else if(type == 3){
valor = 5;
opcao = false;
}
this.defineLastOccurrence(valor, opcao);
}
defineLastOccurrence(valor:number, opcao:boolean){
var time = new Date(this.eventProcess.workflowInstanceDataFields.EndDate);
if (opcao == true) {
time.setDate(time.getDate() + valor);
this.eventProcess.workflowInstanceDataFields.LastOccurrence = time;
} else {
time = new Date(
time.getFullYear() + valor,
time.getMonth(),
time.getDate(),
time.getHours(),
time.getMinutes()
);
this.eventProcess.workflowInstanceDataFields.LastOccurrence = time;
}
}
setOtherData() {
if(this.eventProcess.workflowInstanceDataFields.ParticipantsList) {
this.eventProcess.workflowInstanceDataFields.ParticipantsList.forEach(e => {
@@ -274,7 +315,10 @@ export class EditEventToApprovePage implements OnInit {
if(this.Form.invalid) return false
// set dates to eventProcess object
this.getDatepickerData()
this.dateControlStart = new FormControl(moment(new Date(this.eventProcess.workflowInstanceDataFields.StartDate)).add(1, 'hours'));
this.dateControlEnd = new FormControl(moment(new Date(this.eventProcess.workflowInstanceDataFields.EndDate)).add(1, 'hours'));
// this.restoreDatepickerData()
// this.getDatepickerData()
this.taskParticipantsCc.forEach( e => {
e.IsRequired = false
@@ -289,13 +333,14 @@ export class EditEventToApprovePage implements OnInit {
}
})
const event: EventToApproveEdit = {
SerialNumber: this.eventProcess.serialNumber,
Body: this.eventProcess.workflowInstanceDataFields.Body,
Location: this.eventProcess.workflowInstanceDataFields.Location,
Subject: this.eventProcess.workflowInstanceDataFields.Subject,
StartDate: this.eventProcess.workflowInstanceDataFields.StartDate,
EndDate: this.eventProcess.workflowInstanceDataFields.EndDate,
StartDate: this.dateControlStart.value,
EndDate: this.dateControlEnd.value,
ReviewUserComment: '',
Agenda: this.eventProcess.workflowInstanceDataFields.Agenda,
MDName: this.eventProcess.workflowInstanceDataFields.MDName,
@@ -506,7 +551,6 @@ export class EditEventToApprovePage implements OnInit {
}
getDatepickerData() {
this.eventProcess.workflowInstanceDataFields.StartDate = this.dateStart
this.eventProcess.workflowInstanceDataFields.EndDate = this.dateEnd
src/app/shared/agenda/edit-event/edit-event.page.html
+2
View File
@@ -118,6 +118,7 @@
[(ngModel)]="postEvent.StartDate"
[max]="maxDate"
[disabled]="disabled"
[min]="currentDate"
>
<mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
<ngx-mat-datetime-picker #picker1
@@ -146,6 +147,7 @@
[(ngModel)]="postEvent.EndDate"
[max]="maxDate"
[disabled]="disabled"
[min]="currentDate"
>
<mat-datepicker-toggle id="new-fim" matSuffix [for]="fim"></mat-datepicker-toggle>
<ngx-mat-datetime-picker #fim
src/app/shared/agenda/edit-event/edit-event.page.ts
+44 -8
View File
@@ -48,6 +48,7 @@ export class EditEventPage implements OnInit {
public stepHour = 1;
public stepMinute = 5;
public stepSecond = 5;
currentDate = new Date();
Form: FormGroup;
validateFrom = false
@@ -118,14 +119,6 @@ export class EditEventPage implements OnInit {
this.setIntervenient.emit(this.taskParticipants);
this.setIntervenientCC.emit(this.taskParticipantsCc);
this.isEventEdited = false;
if(this.postEvent.IsRecurring == false) {
this.isRecurring = "Não se repete";
}
else{
this.isRecurring = "Repete";
}
}
this.initCalendarName = this.postEvent.CalendarName;
@@ -136,6 +129,8 @@ export class EditEventPage implements OnInit {
this.postEvent.EventRecurrence.Type = this.postEvent.EventRecurrence.Type.toString();
this.postEvent.EventRecurrence.LastOccurrence = this.currentDate;
setTimeout(() => {
this.postEvent.EventRecurrence.Type = this.postEvent.EventRecurrence.Type.toString();
@@ -225,6 +220,8 @@ export class EditEventPage implements OnInit {
}
onSelectedRecurringChanged(ev:any){
this.calculetedLastOccurrence(ev);
if(ev.length > 1){
@@ -235,6 +232,45 @@ export class EditEventPage implements OnInit {
}
}
calculetedLastOccurrence(type:number){
console.log(type);
var valor;
var opcao: boolean;
if (type == 0) {
valor = 7;
opcao = true;
} else if(type == 1){
valor = 30;
opcao = true;
} else if(type == 2){
valor = 1;
opcao = false;
}else if(type == 3){
valor = 5;
opcao = false;
}
this.defineLastOccurrence(valor, opcao);
}
defineLastOccurrence(valor:number, opcao:boolean){
var time = new Date(this.postEvent.EndDate);
if (opcao == true) {
time.setDate(time.getDate() + valor);
this.postEvent.EventRecurrence.LastOccurrence = time;
} else {
time = new Date(
time.getFullYear() + valor,
time.getMonth(),
time.getDate(),
time.getHours(),
time.getMinutes()
);
this.postEvent.EventRecurrence.LastOccurrence = time;
}
}
async save() {
src/app/shared/agenda/event-list/event-list.page.scss
+1
View File
@@ -98,6 +98,7 @@
font-style: normal;
line-height: normal;
letter-spacing: normal;
text-transform: none ;
color: var(--title-text-color);
margin: 0;
padding: 0;
src/app/shared/agenda/new-event/new-event.page.html
+2
View File
@@ -128,6 +128,7 @@
placeholder="Choose a date"
[(ngModel)]="postEvent.StartDate"
[disabled]="disabled"
[min]="currentDate"
>
<mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
<ngx-mat-datetime-picker #picker1
@@ -159,6 +160,7 @@
placeholder="Choose a date"
[(ngModel)]="postEvent.EndDate"
[disabled]="disabled"
[min]="currentDate"
>
<mat-datepicker-toggle id="new-fim" matSuffix [for]="fim"></mat-datepicker-toggle>
<ngx-mat-datetime-picker #fim
src/app/shared/agenda/new-event/new-event.page.ts
+40
View File
@@ -63,6 +63,7 @@ export class NewEventPage implements OnInit {
public stepHour = 1;
public stepMinute = 5;
public stepSecond = 5;
currentDate = new Date();
public color: ThemePalette = 'primary';
recurringTypes = []
selectedRecurringType: any;
@@ -364,6 +365,8 @@ export class NewEventPage implements OnInit {
onSelectedRecurringChanged(ev:any){
this.calculetedLastOccurrence(ev);
if(ev.length > 1){
this.postEvent.EventRecurrence.Type = ev.filter(data => data != '-1');
@@ -373,8 +376,45 @@ export class NewEventPage implements OnInit {
}
}
calculetedLastOccurrence(type:number){
console.log(type);
var valor;
var opcao: boolean;
if (type == 0) {
valor = 7;
opcao = true;
} else if(type == 1){
valor = 30;
opcao = true;
} else if(type == 2){
valor = 1;
opcao = false;
}else if(type == 3){
valor = 5;
opcao = false;
}
this.defineLastOccurrence(valor, opcao);
}
defineLastOccurrence(valor:number, opcao:boolean){
var time = new Date(this.postEvent.EndDate);
if (opcao == true) {
time.setDate(time.getDate() + valor);
this.postEvent.EventRecurrence.LastOccurrence = time;
} else {
time = new Date(
time.getFullYear() + valor,
time.getMonth(),
time.getDate(),
time.getHours(),
time.getMinutes()
);
this.postEvent.EventRecurrence.LastOccurrence = time;
}
}
async save() {
this.injectValidation()
src/app/shared/agenda/view-event/view-event.page.html
+2 -3
View File
@@ -53,13 +53,12 @@
<p>{{customDate}}</p>
<p *ngIf="toDateString(loadedEvent.StartDate) == toDateString(loadedEvent.EndDate)">das {{loadedEvent.StartDate | date: 'HH:mm'}} às {{loadedEvent.EndDate | date: 'HH:mm'}}</p>
<p *ngIf="toDateString(loadedEvent.StartDate) != toDateString(loadedEvent.EndDate)">{{loadedEvent.StartDate | date: 'd/M/yy' }} - {{ loadedEvent.StartDate | date: 'dd/M/yy'}} </p>
<p *ngIf="!loadedEvent.IsRecurring">(Não se repete)</p>
<p *ngIf="loadedEvent.IsRecurring">
<p>
<span *ngIf="loadedEvent.EventRecurrence.Type == 0">Diário</span>
<span *ngIf="loadedEvent.EventRecurrence.Type == 1">Semanal</span>
<span *ngIf="loadedEvent.EventRecurrence.Type == 2">Mensal</span>
<span *ngIf="loadedEvent.EventRecurrence.Type == 3">Anual</span>
<span *ngIf="loadedEvent.EventRecurrence.Type == -1">Nunca</span>
<span *ngIf="loadedEvent.EventRecurrence.Type == -1">(Não se repete)</span>
</p>
</ion-label>
src/app/shared/agenda/view-event/view-event.page.ts
+1
View File
@@ -105,6 +105,7 @@ export class ViewEventPage implements OnInit {
this.eventsService.getEvent(this.eventId).subscribe(res => {
this.loadedEvent = res;
console.log(this.loadedEvent);
this.today = new Date(res.StartDate);
this.customDate = this.days[this.today.getDay()]+ ", " + this.today.getDate() +" de " + ( this.months[this.today.getMonth()]);
}, (error)=> {
src/app/shared/publication/edit-action/edit-action.page.html
+1 -1
View File
@@ -36,7 +36,7 @@
<input matInput [ngxMatDatetimePicker]="picker1"
placeholder="Choose a date*"
[(ngModel)]="folder.DateBegin"
[min]="minDate"
[min]="currentDate"
[disabled]="disabled"
>
<mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
src/app/shared/publication/edit-action/edit-action.page.ts
+1
View File
@@ -29,6 +29,7 @@ export class EditActionPage implements OnInit {
public stepSecond = 5;
public dateControlStart = new FormControl(moment("DD MM YYYY hh"));
public dateControlEnd = new FormControl(moment("DD MM YYYY hh"));
public currentDate = new Date();
folder: PublicationFolder;
@Input() folderId: string;
src/app/shared/publication/new-action/new-action.page.html
+2
View File
@@ -46,6 +46,7 @@
placeholder="Choose a date*"
[(ngModel)]="folder.DateBegin"
[disabled]="disabled"
[min]="currentDate"
>
<mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
<ngx-mat-datetime-picker #picker1
@@ -82,6 +83,7 @@
placeholder="Choose a date*"
[(ngModel)]="folder.DateEnd"
[disabled]="disabled"
[min]="currentDate"
>
<mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker2"></mat-datepicker-toggle>
<ngx-mat-datetime-picker #picker2
src/app/shared/publication/new-action/new-action.page.ts
+1
View File
@@ -25,6 +25,7 @@ export class NewActionPage implements OnInit {
public stepHour = 1;
public stepMinute = 5;
public stepSecond = 5;
currentDate = new Date();
public endMinDate = new Date(new Date().getTime() + 15 * 60000);
Form: FormGroup;
src/app/shared/publication/view-publications/view-publications.page.ts
+3 -2
View File
@@ -53,10 +53,10 @@ export class ViewPublicationsPage implements OnInit {
this.folderId = this.folderId['ProcessId']
}
this.getPublicationsIds();
this.getPublicationDetail();
//this.getPublicationsIds();
window['app-view-publications-page-doRefresh'] = this.doRefresh
this.getPublicationDetail();
}
ngOnChanges(changes: any): void {
@@ -196,6 +196,7 @@ export class ViewPublicationsPage implements OnInit {
}
async openEditPublication(folderId?:any){
if( window.innerWidth < 701) {
const modal = await this.modalController.create({
component: EditActionPage,