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

git pull made

Browse Source
This commit is contained in:
Eudes Inácio
2023-02-13 18:59:23 +01:00
parent 34c0447d24 b84161765e
commit 354059592a
47 changed files with 233 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/shared/agenda/approve-event/approve-event.page.html
+1 -1
View File
@@ -92,7 +92,7 @@
<div *ngIf="loadedEvent.workflowInstanceDataFields.Body">
<h5>Detalhes</h5>
<ion-item lines="none" class="ion-no-margin ion-no-padding">
<p class="text" [innerHTML]="loadedEvent.workflowInstanceDataFields.Body"></p>
<pre class="width-100 text">{{ loadedEvent.workflowInstanceDataFields.Body }} </pre>
</ion-item>
<div class="line"></div>
</div>
src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html
-1
View File
@@ -158,7 +158,6 @@
<input matInput [ngxMatDatetimePicker]="picker1"
placeholder="Choose a date"
[(ngModel)]="eventProcess.workflowInstanceDataFields.StartDate"
[min]="minDate" [max]="maxDate"
[disabled]="disabled"
>
<mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
src/app/shared/agenda/edit-event/edit-event.page.html
-1
View File
@@ -119,7 +119,6 @@
[(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
src/app/shared/agenda/edit-event/edit-event.page.ts
+7 -1
View File
@@ -48,7 +48,6 @@ export class EditEventPage implements OnInit {
public stepHour = 1;
public stepMinute = 15;
public stepSecond = 15;
currentDate = this.roundTimeQuarterHour();
Form: FormGroup;
validateFrom = false
@@ -238,6 +237,13 @@ export class EditEventPage implements OnInit {
return date
}
roundTimeQuarterHourPlus15(date:Date) {
const _date = new Date(date);
const minutes = _date .getMinutes();
_date .setMinutes(minutes + 15)
return _date
}
onSelectedRecurringChanged(ev:any){
this.calculetedLastOccurrence(ev);
src/app/shared/agenda/event-list/event-list.page.ts
+7 -10
View File
@@ -88,9 +88,8 @@ export class EventListPage implements OnInit {
this.showLoader = false;
}
else if(this.segment == 'PR') {
let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR', false).toPromise();
let prEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal PR', false).toPromise();
let allEvents = prEventsOficial.concat(prEventsPessoal);
let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR,Agenda Pessoal PR', false).toPromise();
let allEvents = prEventsOficial
if(allEvents.length > 0) {
this.eventsPRList = this.sortService.sortArrayByDate(allEvents).reverse();
@@ -115,19 +114,17 @@ export class EventListPage implements OnInit {
try {
if(this.segment == 'MDGPR') {
let mdEventsOficial = await this.processes.GetTasksList('Agenda Oficial MDGPR', false).toPromise();
let mdEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal MDGPR', false).toPromise();
let allEvents = mdEventsOficial.concat(mdEventsPessoal);
let mdEventsOficial = await this.processes.GetTasksList('Agenda Oficial MDGPR,Agenda Pessoal MDGPR', false).toPromise();
let allEvents = mdEventsOficial
if(allEvents.length > 0) {
this.eventsMDGPRList = this.sortService.sortArrayByDate(allEvents).reverse();
}
this.showLoader = false;
}
else if(this.segment == 'PR') {
let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR', false).toPromise();
let prEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal PR', false).toPromise();
let allEvents = prEventsOficial.concat(prEventsPessoal);
let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR,Agenda Pessoal PR', false).toPromise();
let allEvents = prEventsOficial
if(allEvents.length > 0) {
this.eventsPRList = this.sortService.sortArrayByDate(allEvents).reverse();
src/app/shared/agenda/new-event/new-event.page.html
-1
View File
@@ -136,7 +136,6 @@
placeholder="Data Inicio*"
[(ngModel)]="postEvent.StartDate"
[disabled]="disabled"
[min]="currentDate"
>
<mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1" ></mat-datepicker-toggle>
<ngx-mat-datetime-picker #picker1
src/app/shared/agenda/new-event/new-event.page.ts
+8 -1
View File
@@ -227,7 +227,7 @@ export class NewEventPage implements OnInit {
setDefaultTime() {
this.postEvent.StartDate = this.roundTimeQuarterHour(this.CalendarDate);
this.postEvent.EndDate = this.postEvent.StartDate;
this.postEvent.EndDate = this.roundTimeQuarterHourPlus15(this.postEvent.StartDate);
}
roundTimeQuarterHour(timeToReturn = new Date()): Date {
@@ -254,6 +254,13 @@ export class NewEventPage implements OnInit {
return date
}
roundTimeQuarterHourPlus15(date:Date) {
const _date = new Date(date);
const minutes = _date .getMinutes();
_date .setMinutes(minutes + 15)
return _date
}
roundTimeQuarterHour1 (timeToReturn) {
let date: any = new Date(timeToReturn) || new Date();
src/app/shared/gabinete-digital/all-processes/all-processes.page.ts
+7 -5
View File
@@ -41,6 +41,8 @@ export class AllProcessesPage implements OnInit {
public ThemeService: ThemeService
) {
this.loggeduser = SessionStore.user;
window['all-process'] = this.updateAllProcess
}
ngOnInit() {
@@ -62,9 +64,9 @@ export class AllProcessesPage implements OnInit {
doRefresh(event) {
if (event) {
setTimeout(() => {
try {
event?.target?.complete();
} catch(error) {}
try {
event?.target?.complete();
} catch(error) {}
}, 2000);
}
setTimeout(() => {
@@ -79,7 +81,7 @@ export class AllProcessesPage implements OnInit {
}, 1000);
}
updateAllProcess() {
updateAllProcess = () => {
this.AllProcess = this.expedientegbstore.list.concat(this.pedidosstore.listparecer).concat(this.pedidosstore.listdeferimento)
.concat(this.despachoprstore.list).concat(this.eventoaprovacaostore.listmd).concat(this.eventoaprovacaostore.listpr).concat(this.despachoStore.list)
.concat(this.deplomasStore.diplomasParaAssinarList).concat(this.deplomasStore.diplomasAssinadoList).concat(this.deplomasStore.DiplomaGerarList).concat(this.pendentesstore.list)
@@ -155,7 +157,7 @@ export class AllProcessesPage implements OnInit {
else if (activityName == 'Diploma Assinado') {
this.router.navigate(['/home/gabinete-digital/diplomas-assinar', serialNumber, 'gabinete-digital']);
} else {
alert('Bug!');
throw('Bug!');
}
}
else if (workflowName == 'Pedido de Parecer' || workflowName == 'Pedido de Deferimento') {
src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html
-2
View File
@@ -113,7 +113,6 @@
placeholder="Choose a date"
[(ngModel)]="startDate"
[disabled]="disabled"
[min]="currentDate"
>
<mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
<ngx-mat-datetime-picker #picker1
@@ -141,7 +140,6 @@
placeholder="Choose a date"
[(ngModel)]="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/gabinete-digital/events-to-approve/events-to-approve.page.ts
+4 -6
View File
@@ -71,9 +71,8 @@ export class EventsToApprovePage implements OnInit {
this.getFromDB();
if(this.segment != 'PR') {
let mdEventsOficial = await this.processes.GetTasksList('Agenda Oficial MDGPR', false).toPromise();
let mdEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal MDGPR', false).toPromise();
this.eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal);
let mdEventsOficial = await this.processes.GetTasksList('Agenda Oficial MDGPR,Agenda Pessoal MDGPR', false).toPromise();
this.eventsMDGPRList = mdEventsOficial
this.eventsMDGPRList = this.sortService.sortArrayByDate(this.eventsMDGPRList)
this.eventsMDGPRList = ( this.eventsMDGPRList || []).filter(function(item) {
return item.activityInstanceName != 'Editar Evento'
@@ -86,11 +85,10 @@ export class EventsToApprovePage implements OnInit {
this.eventaprovacaostore.resetmd(this.sortService.sortDate(this.eventsMDGPRList, 'CreateDate'));
}
else if(this.segment == 'PR') {
let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR', false).toPromise();
let prEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal PR', false).toPromise();
let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR,Agenda Pessoal PR', false).toPromise();
// console.log(prEventsOficial)
// console.log(prEventsPessoal)
this.eventsPRList = prEventsOficial.concat(prEventsPessoal);
this.eventsPRList = prEventsOficial
this.eventsPRList = this.sortService.sortArrayByDate(this.eventsPRList)
this.eventsPRList = (this.eventsPRList || []).filter(function(item) {
return item.activityInstanceName != 'Editar Evento'
src/app/shared/gabinete-digital/generic/task-details/task-details.page.html
+1 -1
View File
@@ -49,7 +49,7 @@
<div *ngIf="fulltask.workflowInstanceDataFields.TaskMessage">
<h5>Detalhes</h5>
<ion-item class="ion-no-margin ion-no-padding">
<p [innerHTML]="fulltask.workflowInstanceDataFields.TaskMessage"></p>
<pre class="width-100 text">{{ fulltask.workflowInstanceDataFields.TaskMessage }} </pre>
</ion-item>
</div>
</div>
src/app/shared/publication/edit-action/edit-action.page.html
-1
View File
@@ -37,7 +37,6 @@
<input matInput [ngxMatDatetimePicker]="picker1"
placeholder="Choose a date*"
[(ngModel)]="folder.DateBegin"
[min]="currentDate"
[disabled]="disabled"
>
<mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
src/app/shared/publication/new-action/new-action.page.ts
+8 -1
View File
@@ -185,6 +185,13 @@ export class NewActionPage implements OnInit {
return date
}
roundTimeQuarterHourPlus15(date:Date) {
const _date = new Date(date);
const minutes = _date .getMinutes();
_date .setMinutes(minutes + 15)
return _date
}
setStartDate() {
@@ -192,6 +199,6 @@ export class NewActionPage implements OnInit {
}
setEndDate() {
this.folder.DateEnd = this.folder.DateBegin;
this.folder.DateEnd = this.roundTimeQuarterHourPlus15(this.folder.DateBegin);
}
}