peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-21 05:45:50 +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/pages/agenda/edit-event/edit-event.page.html
-1
View File
@@ -134,7 +134,6 @@
<input matInput [ngxMatDatetimePicker]="picker1"
placeholder="Choose a date"
[(ngModel)]="postEvent.StartDate"
[min]="currentDate"
[max]="maxDate"
[disabled]="disabled"
>
src/app/pages/agenda/edit-event/edit-event.page.ts
+7 -2
View File
@@ -62,13 +62,11 @@ export class EditEventPage implements OnInit {
public showSeconds = false;
public touchUi = false;
public enableMeridian = false;
public minDate = new Date().toISOString().slice(0,10)
public endMinDate = new Date(new Date().getTime() + 15 * 60000).toISOString().slice(0,10)
public maxDate: any;
public stepHour = 1;
public stepMinute = 15;
public stepSecond = 15;
currentDate = this.roundTimeQuarterHour();
loadedEventAttachments: Attachment[] = [];
taskParticipants: any = [];
@@ -193,6 +191,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/pages/agenda/new-event/new-event.page.ts
+8 -2
View File
@@ -51,7 +51,6 @@ export class NewEventPage implements OnInit {
public stepMinute = 15;
public stepSecond = 15;
public color: ThemePalette = 'primary';
currentDate = this.roundTimeQuarterHour();
Form: FormGroup;
validateFrom = false
@@ -87,6 +86,7 @@ export class NewEventPage implements OnInit {
autoEndTime;
CalendarNamesOptions = ['Oficial', 'Pessoal']
roomId:string;
globalEnd = new Date('1999')
constructor(
private modalController: ModalController,
@@ -189,7 +189,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);
}
close() {
@@ -218,6 +218,12 @@ 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
}
setStartDate() {
if(!this.postEvent.StartDate) {
this.postEvent.StartDate = this.roundTimeQuarterHour();
src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html
+1 -1
View File
@@ -57,7 +57,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/pages/gabinete-digital/despachos/despacho/despacho.page.html
+1 -1
View File
@@ -55,7 +55,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/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html
+1 -1
View File
@@ -54,7 +54,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/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html
+1 -1
View File
@@ -53,7 +53,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/pages/gabinete-digital/diplomas/diploma/diploma.page.html
+1 -1
View File
@@ -56,7 +56,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/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html
+1 -1
View File
@@ -83,7 +83,7 @@
<div *ngIf="loadedEvent.workflowInstanceDataFields.Body">
<h5>Detalhes</h5>
<ion-item lines="none" class="ion-no-padding ion-no-margin">
<div [innerHTML]="loadedEvent.workflowInstanceDataFields.Body"></div>
<pre class="width-100 text">{{ loadedEvent.workflowInstanceDataFields.Body }} </pre>
</ion-item>
</div>
<div class="line"></div>
src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html
+1 -1
View File
@@ -85,7 +85,7 @@
<div *ngIf="loadedEvent.workflowInstanceDataFields.Body">
<h5>Detalhes</h5>
<ion-item lines="none" class="ion-no-margin ion-no-padding">
<p [innerHTML]="loadedEvent.workflowInstanceDataFields.Body"></p>
<pre class="width-100 text">{{loadedEvent.workflowInstanceDataFields.Body }} </pre>
</ion-item>
<div class="line"></div>
</div>
src/app/pages/gabinete-digital/event-list/event-list.page.ts
+5 -6
View File
@@ -156,9 +156,8 @@ export class EventListPage implements OnInit {
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.sortDate(this.eventsMDGPRList, 'taskStartDate')
this.eventsMDGPRList = this.sortService.sortArrayByDate(this.eventsMDGPRList)
@@ -170,9 +169,9 @@ export class EventListPage implements OnInit {
}
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();
this.eventsPRList = prEventsOficial.concat(prEventsPessoal);
let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR,Agenda Pessoal PR', false).toPromise();
this.eventsPRList = prEventsOficial
this.eventsPRList = this.sortService.sortDate(this.eventsPRList, 'taskStartDate')
this.eventsPRList = this.sortService.sortArrayByDate(this.eventsPRList)
src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
+13 -3
View File
@@ -135,8 +135,9 @@ export class BookMeetingModalPage implements OnInit {
this.postData.Subject = this.task.Folio;
this.postData.CalendarName = "Oficial";
this.dateControlStart = new FormControl(moment(this.roundTimeQuarterHour()));
this.dateControlEnd = new FormControl(moment(new Date(this.roundTimeQuarterHour())));
let startDate = this.roundTimeQuarterHour()
this.dateControlStart = new FormControl(moment(startDate));
this.dateControlEnd = new FormControl(moment(this.roundTimeQuarterHourPlus15(startDate)));
this.postData.Category = 'Reunião'
@@ -201,7 +202,7 @@ export class BookMeetingModalPage implements OnInit {
setDefaultTime() {
this.postData.StartDate = this.roundTimeQuarterHour();
this.postData.EndDate = (new Date(this.postData.StartDate.getTime() + 15 * 60000))
this.postData.EndDate = this.roundTimeQuarterHourPlus15(this.postData.StartDate);
}
getAttachments() {
@@ -521,6 +522,15 @@ export class BookMeetingModalPage implements OnInit {
return date
}
roundTimeQuarterHourPlus15(date:Date) {
const _date = new Date(date);
const minutes = _date .getMinutes();
_date .setMinutes(minutes + 15)
return _date
}
setStartDate() {
this.postData.StartDate = this.roundTimeQuarterHour();
}
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
+1 -1
View File
@@ -51,7 +51,7 @@
</div>
<h5>Detalhes</h5>
<ion-item class="ion-no-margin ion-no-padding">
<p [innerHTML]="task.Note"></p>
<pre class="width-100 text">{{ task.Note }} </pre>
</ion-item>
</div>
<div class="bottom-content width-100">
src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html
+1 -1
View File
@@ -59,7 +59,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/pages/gabinete-digital/gabinete-digital.page.html
+14 -12
View File
@@ -193,6 +193,20 @@
<p class="text-center exp-card-content"> {{ deplomasStore.deplomasReviewCount }} <span class="title1">Documentos</span> </p>
</div>
<!-- List -->
<div *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openDiplomasAssinarPage(); selectedElement='DiplomasParaAssinar'" [class.active]="selectedElement == 'DiplomasParaAssinar'" class="box-hover exp-card d-flex flex-column justify-center">
<div class="d-flex justify-center">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-diploma.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement != 'DiplomasParaAssinar' " src="assets/images/theme/gov/icons-expediente-diploma.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement == 'DiplomasParaAssinar' " src="assets/images/theme/gov/icons-expediente-diploma-hover.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " src="assets/images/theme/{{ThemeService.currentTheme}}/icons-expediente-diploma.svg"></ion-icon>
<ion-icon hidden *ngIf="ThemeService.currentTheme == 'doneIt' && selectedElement == 'DiplomasParaAssinar' " src="assets/images/theme/{{ThemeService.currentTheme}}/icons-expediente-diploma-hover.svg"></ion-icon>
</div>
<p class="text-center exp-card-title">Diplomas para Assinar</p>
<p class="text-center exp-card-content"> {{ deplomasStore.diplomasParaAssinartCount }} <span class="title1">Documentos</span></p>
</div>
<!-- List -->
<div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks, p.permissionList.Gabinete.pr_tasks])" (click)="openDiplomasPage('assinados'); selectedElement='DiplomasAssinados'" [class.active]="selectedElement == 'DiplomasAssinados'" class="box-hover exp-card d-flex flex-column justify-center">
@@ -206,18 +220,6 @@
<p class="text-center exp-card-content"> {{ deplomasStore.countDiplomasAssinadoListCount }} <span class="title1">Documentos</span></p>
</div>
<!-- List -->
<div *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openDiplomasAssinarPage(); selectedElement='DiplomasParaAssinar'" [class.active]="selectedElement == 'DiplomasParaAssinar'" class="box-hover exp-card d-flex flex-column justify-center">
<div class="d-flex justify-center">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-diploma.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement != 'DiplomasParaAssinar' " src="assets/images/theme/gov/icons-expediente-diploma.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' && selectedElement == 'DiplomasParaAssinar' " src="assets/images/theme/gov/icons-expediente-diploma-hover.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " src="assets/images/theme/{{ThemeService.currentTheme}}/icons-expediente-diploma.svg"></ion-icon>
<ion-icon hidden *ngIf="ThemeService.currentTheme == 'doneIt' && selectedElement == 'DiplomasParaAssinar' " src="assets/images/theme/{{ThemeService.currentTheme}}/icons-expediente-diploma-hover.svg"></ion-icon>
</div>
<p class="text-center exp-card-title">Diplomas para Assinar</p>
<p class="text-center exp-card-content"> {{ deplomasStore.diplomasParaAssinartCount }} <span class="title1">Documentos</span></p>
</div>
<!-- List -->
<div *ngIf="SessionStore.user.Profile == 'Consultant' && environment.presidencial" (click)="openDiplomaPorElaborar('gerarDiplomas'); selectedElement='gerarDiplomas'" [class.active]="selectedElement == 'gerarDiplomas'" class="box-hover exp-card d-flex flex-column justify-center">
src/app/pages/gabinete-digital/gabinete-digital.page.ts
+12 -7
View File
@@ -147,6 +147,9 @@ export class GabineteDigitalPage implements OnInit {
}
this.checkRoutes();
window['all-process-gabinete'] = this.updateAllProcess
}
closeAllDesktopComponent() {
this.desktopComponent = {
@@ -593,7 +596,7 @@ export class GabineteDigitalPage implements OnInit {
this.showDiplomasGerar = false
}
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)
@@ -609,6 +612,10 @@ export class GabineteDigitalPage implements OnInit {
// .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)
// }
if(window['all-process']) {
window['all-process']()
}
}
get getAllProcessCount() {
@@ -725,9 +732,8 @@ export class GabineteDigitalPage implements OnInit {
this.updateAllProcess()
}
let mdEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial MDGPR', false).toPromise();
let mdEventsPessoal = await this.processesbackend.GetTasksList('Agenda Pessoal MDGPR', false).toPromise();
let eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal);
let mdEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial MDGPR,Agenda Pessoal MDGPR', false).toPromise();
let eventsMDGPRList = mdEventsOficial
eventsMDGPRList = eventsMDGPRList.filter((item) => item.activityInstanceName != 'Editar Evento')
@@ -735,9 +741,8 @@ export class GabineteDigitalPage implements OnInit {
this.eventoaprovacaostore.resetmd(eventsMDGPRList);
this.updateAllProcess()
let prEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial PR', false).toPromise();
let prEventsPessoal = await this.processesbackend.GetTasksList('Agenda Pessoal PR', false).toPromise();
let eventsPRList = prEventsOficial.concat(prEventsPessoal);
let prEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial PR,Agenda Pessoal PR', false).toPromise();
let eventsPRList = prEventsOficial
eventsPRList = eventsPRList.filter((item) => item.activityInstanceName != 'Editar Evento')
this.eventoaprovacaostore.countPr = eventsPRList.length
src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html
+1 -1
View File
@@ -57,7 +57,7 @@
<div *ngIf="task.Note">
<h5>Detalhes</h5>
<ion-item class="ion-no-margin ion-no-padding">
<p [innerHTML]="task.Note"></p>
<pre class="width-100 text">{{ task.Note }} </pre>
</ion-item>
</div>
</div>
src/app/pages/publications/edit-action/edit-action.page.html
-1
View File
@@ -37,7 +37,6 @@
<input matInput [ngxMatDatetimePicker]="picker1"
placeholder="Choose a date*"
[formControl]="folder.DateBegin"
[min]="minDate"
[disabled]="disabled"
>
<mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
src/app/pages/publications/new-action/new-action.module.ts
-1
View File
@@ -18,7 +18,6 @@ import { ReactiveFormsModule } from '@angular/forms';
import { MatButtonModule } from '@angular/material/button';
import { MatSelectModule } from '@angular/material/select';
import { NgxMatMomentModule } from '@angular-material-components/moment-adapter';
import { MAT_DATE_LOCALE } from '@angular/material/core';
import { MatDatepickerModule } from '@angular/material/datepicker';
import { MatInputModule } from '@angular/material/input';
import { MatDialogModule } from '@angular/material/dialog';
src/app/pages/publications/new-action/new-action.page.ts
+8 -1
View File
@@ -73,7 +73,7 @@ export class NewActionPage implements OnInit {
this.folder = new PublicationFolder();
this.dateControlStart = new FormControl(this.roundTimeQuarterHour());
this.dateControlEnd = new FormControl(this.dateControlStart.value);
this.dateControlEnd = new FormControl(this.roundTimeQuarterHourPlus15(this.dateControlStart.value));
}
@@ -177,4 +177,11 @@ 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
}
}