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
2023-02-01 18:04:01 +01:00
parent 8df8f98c4e 31d151ebf0
commit ac23c085fb
42 changed files with 396 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/home/home.page.ts
+16 -15
View File
@@ -87,7 +87,8 @@ export class HomePage implements OnInit {
private NativeNotificationService: NativeNotificationService,
private sqliteservice: SqliteService,
private RochetChatConnectorService: RochetChatConnectorService,
private NetworkServiceService: NetworkServiceService
private NetworkServiceService: NetworkServiceService,
public eventService: EventsService,
) {
if (SessionStore.exist) {
this.user = SessionStore.user;
@@ -169,15 +170,22 @@ export class HomePage implements OnInit {
this.updateList()
// var myWorker = new Worker(new URL('./nice.worker.js', import.meta.url));
// myWorker.onmessage = function (oEvent) {
// console.log('Worker said : ' + oEvent.data);
// }
// myWorker.postMessage('ali');
this.clearTabButtonSelection();
setTimeout(() => {
if(this.p.userPermission([this.p.permissionList.Gabinete.md_tasks]) && this.p.userPermission([this.p.permissionList.Gabinete.pr_tasks])) {
throw(SessionStore.user.FullName + 'cant have MD and PR authorization at same time');
}
if(this.p.userPermission([this.p.permissionList.Chat.access]) && !SessionStore.user?.ChatData?.data) {
throw('Chat temporarily unavailable for '+SessionStore.user.FullName + '. No ChatData');
}
if(this.p.userPermission([this.p.permissionList.Agenda.access]) && !this.eventService.hasAnyCalendar) {
throw('User '+SessionStore.user.FullName + 'has No calendar');
}
}, 1000)
}
clearTabButtonSelection() {
@@ -220,13 +228,6 @@ export class HomePage implements OnInit {
updateList() {
// this.notificationsService.registerCallback(
// 'despachos',
// () => {
// // this.despachoRule.getList({ updateStore: true })
// }
// )
document.addEventListener('pause', function () {
// console.log('App going to background');
});
src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts
+19 -4
View File
@@ -230,7 +230,7 @@ export class DocumentSetUpMeetingPage implements OnInit {
this.docs.push({
ApplicationId: e.ApplicationId || e.ApplicationType,
Source: 1,
SourceId: e.DocId || e.docID || e.docId || e.SourceId,
SourceId: e.DocId || e.docID || e.docId || e.SourceId || e.Id,
SourceName: e.Assunto
})
})
@@ -239,7 +239,7 @@ export class DocumentSetUpMeetingPage implements OnInit {
this.docs.push({
ApplicationId: this.document.ApplicationId || this.document.ApplicationType,
Source: 1,
SourceId: this.document.DocId || this.document.docID || this.document.docId || this.document.SourceId,
SourceId: this.document.DocId || this.document.docID || this.document.docId || this.document.SourceId || this.document.Id,
SourceName: this.document.Assunto
})
}
@@ -249,7 +249,7 @@ export class DocumentSetUpMeetingPage implements OnInit {
Subject: this.postData.Subject,
Body: this.postData.Body.Text,
Location: this.postData.Location,
CalendarId: this.postData.CalendarName,
CalendarId: this.selectedCalendarId(),
CalendarName: this.postData.CalendarName,
StartDate: this.postData.StartDate,
EndDate: this.postData.EndDate,
@@ -369,6 +369,7 @@ export class DocumentSetUpMeetingPage implements OnInit {
modal.onDidDismiss().then((res)=> {
if(res){
const data = res.data;
console.log('data', data)
this.attachments.push(data.selected);
}
});
@@ -378,13 +379,27 @@ export class DocumentSetUpMeetingPage implements OnInit {
this.attachments = this.attachments.filter( (e, i) => index != i);
}
validateFormInputs(){
validateFormInputs() {
let formLocation = this.postData.Location.trim();
if(!this.postData.Location && formLocation.length <= 0){
this.formLocationSatus = true;
}
}
selectedCalendarId () {
if (this._eventService.calendarNamesType[this.CalendarName]?.['Oficial'] && this.postData.CalendarName == 'Oficial') {
return this._eventService.calendarNamesType[this.CalendarName]['OficialId']
} else if (this._eventService.calendarNamesType[this.CalendarName]?.['Pessoal'] && this.postData.CalendarName == 'Pessoal') {
return this._eventService.calendarNamesType[this.CalendarName]['PessoalId']
} else {
return '11:11'
}
}
dynamicSetIntervenient({taskParticipants, taskParticipantsCc}) {
this.taskParticipants = taskParticipants;
this.taskParticipantsCc = taskParticipantsCc;
src/app/modals/forward/forward.page.ts
+1 -1
View File
@@ -147,7 +147,7 @@ export class ForwardPage implements OnInit {
"AttachmentList" :docs,
}
this.processes.CompleteParecerPrTask(body).subscribe(res=>{
this.toastService._successMessage('Processo delegado');
this.toastService._successMessage('Processo Reencaminhado');
this.goBack();
},
(error)=>{
src/app/pages/agenda/agenda.page.html
+1 -1
View File
@@ -365,7 +365,7 @@
</div>
<div class="schedule-details">
<div class="description">
<p class="m-0">{{event.event.Subject}} ....</p>
<p class="m-0">{{event.event.Subject}}</p>
</div>
<div class="location">{{event.event.Location}}</div>
src/app/pages/agenda/view-event/view-event.page.html
+1 -1
View File
@@ -85,7 +85,7 @@
<div *ngIf="loadedEvent.Body.Text">
<h5>Detalhes</h5>
<ion-item lines="none" class="ion-no-margin ion-no-padding">
<div class="width-100 text" >{{ loadedEvent.Body.Text }}</div>
<pre class="width-100 text">{{ loadedEvent.Body.Text }} </pre>
</ion-item>
<div class="line"></div>
</div>
src/app/pages/agenda/view-event/view-event.page.ts
-4
View File
@@ -189,11 +189,7 @@ export class ViewEventPage implements OnInit {
if(this.sesseionStora.user.Profile == 'MDGPR' || this.sesseionStora.user.Profile == 'PR') {
this.eventsService.getEvent(this.eventId).subscribe(res => {
const div = document.createElement("div")
div.innerHTML = res.Body.Text
res.Body.Text = div.innerText
this.loadedEvent = res;
this.addEventToDb(res);
loader.remove()
src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
-5
View File
@@ -126,11 +126,6 @@ export class DespachoPrPage implements OnInit {
"activityInstanceName": res.activityInstanceName,
}
this.fulltask = res;
this.updateProcessOnDB(res);
let thedate = new Date(this.task.CreateDate);
src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html
+1 -1
View File
@@ -35,7 +35,7 @@
<ion-list>
<div
class="expediente ion-no-padding ion-no-margin cursor-pointer"
*ngFor = "let task of listToPresent; let i = index"
*ngFor = "let task of despachoprstore.list; let i = index"
(click)="goToDespachoPr(task.SerialNumber)"
>
<!-- [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
+18 -10
View File
@@ -19,6 +19,7 @@ import { BackgroundService } from 'src/app/services/background.service';
import { SortService } from 'src/app/services/functions/sort.service';
import { ThemeService } from 'src/app/services/theme.service'
import { SessionStore } from 'src/app/store/session.service';
import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
@Component({
selector: 'app-despachos-pr',
@@ -53,6 +54,8 @@ export class DespachosPrPage implements OnInit {
despachoprstore = DespachosprStore
listToPresent = [];
customTaskPipe = new CustomTaskPipe()
constructor(
private processes: ProcessesService,
private modalController: ModalController,
@@ -65,7 +68,6 @@ export class DespachosPrPage implements OnInit {
public ThemeService: ThemeService
) {
this.loggeduser = SessionStore.user;
this.profile = 'mdgpr';
}
@@ -113,8 +115,9 @@ export class DespachosPrPage implements OnInit {
async LoadList() {
this.processes.GetTasksList("Despacho do Presidente da República", false).subscribe(async res => {
this.skeletonLoader = true
this.skeletonLoader = true
try {
let result = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
this.despachoList = [];
@@ -124,7 +127,7 @@ export class DespachosPrPage implements OnInit {
let despachosPr;
let despachos = this.sortService.sortArrayByDate(result);
if(this.loggeduser.Profile != "PR") {
if(SessionStore.user.Profile != "PR") {
if(SessionStore.user.Profile != 'Consultant') {
@@ -132,9 +135,8 @@ export class DespachosPrPage implements OnInit {
} else {
despachosPr = await despachos.reverse().filter(data => data.activityInstanceName == "Gerar Diploma" || data.activityInstanceName == "Retificar Diploma");
}
} else if (this.loggeduser.Profile == "PR") {
} else if (SessionStore.user.Profile == "PR") {
despachosPr = await despachos.reverse().filter(data => data.activityInstanceName == "Concluir Despacho");
}
@@ -157,18 +159,24 @@ export class DespachosPrPage implements OnInit {
"DocumentsQty": element.totalDocuments,
"DocId": element.workflowInstanceDataFields.DocIdDiferimento,
"WorkflowName": element.workflowDisplayName,
"FolderID": element?.workflowInstanceDataFields?.FolderID,
"activityInstanceName": element.activityInstanceName,
"Status": element?.workflowInstanceDataFields?.Status,
}
this.despachoList.push(task);
});
this.despachoList = this.sortService.sortDate(this.despachoList, 'CreateDate')
this.listToPresent = this.despachoList
this.despachoprstore.reset(this.despachoList)
}, (error) => {
} catch(error) {
this.getFromDB()
})
}
this.skeletonLoader = false
}
@@ -181,9 +189,9 @@ export class DespachosPrPage implements OnInit {
let despachosPr;
if(this.loggeduser.Profile != 'PR') {
if(SessionStore.user.Profile != 'PR') {
despachosPr = await process.reverse().filter(data => data.activityInstanceName == "Tarefa de Despacho");
} else if (this.loggeduser.Profile == 'PR') {
} else if (SessionStore.user.Profile == 'PR') {
despachosPr = await process.reverse().filter(data => data.activityInstanceName == "Concluir Despacho");
}
src/app/pages/gabinete-digital/despachos/despachos.page.html
+1 -1
View File
@@ -33,7 +33,7 @@
<ion-list>
<div
class="expediente ion-no-padding ion-no-margin cursor-pointer"
*ngFor = "let task of listToPresent; let i = index"
*ngFor = "let task of despachoStore.list; let i = index"
(click)="GoToDespacho(task.SerialNumber)"
>
<!-- [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
+10 -6
View File
@@ -73,19 +73,23 @@ export class DiplomasAssinarPage implements OnInit {
}, 1000);
}
async LoadList(){
async LoadList() {
this.skeletonLoader = true
let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
try {
let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
let diplomasAssinar = diplomas.filter(data => data.activityInstanceName == "Assinar Diploma");
let diplomasAssinar = diplomas.filter(data => data.activityInstanceName == "Assinar Diploma");
this.deplomasStore.resetDiplomasParaAssinar(diplomasAssinar)
this.diplomasList = this.sortService.sortDate(this.diplomasList, 'CreateDate')
} catch(error) {
this.deplomasStore.resetDiplomasParaAssinar(diplomasAssinar)
}
this.diplomasList = this.sortService.sortDate(this.diplomasList, 'CreateDate')
this.skeletonLoader = false
this.showLoader = false;
src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts
+26 -22
View File
@@ -57,10 +57,9 @@ export class DiplomasGerarPage implements OnInit {
goToDiploma(serialNumber:any){
this.router.navigate(['/home/gabinete-digital/diplomas-gerar',serialNumber,'gabinete-digital']);
}
goToDiploma(serialNumber:any) {
this.router.navigate(['/home/gabinete-digital/diplomas-gerar',serialNumber,'gabinete-digital']);
}
async refreshing() {
setTimeout(() => {
@@ -77,24 +76,29 @@ export class DiplomasGerarPage implements OnInit {
async LoadList(){
this.skeletonLoader = true
let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
this.diplomasList = [];
let gerarDiploma = diplomas.reverse().filter(data => data.activityInstanceName == "Gerar Diploma" || data.activityInstanceName == "Retificar Diploma");
gerarDiploma.forEach(element => {
let task: customTask = this.customTaskPipe.transform(element)
this.diplomasList.push(task);
});
this.diplomasList = this.sortService.sortDate(this.diplomasList, 'CreateDate');
this.deplomasStore.resetDiplomaGerar(this.diplomasList);
this.skeletonLoader = false
this.showLoader = false;
this.skeletonLoader = true
try {
let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
this.diplomasList = [];
let gerarDiploma = diplomas.reverse().filter(data => data.activityInstanceName == "Gerar Diploma" || data.activityInstanceName == "Retificar Diploma");
gerarDiploma.forEach(element => {
let task: customTask = this.customTaskPipe.transform(element)
this.diplomasList.push(task);
});
this.diplomasList = this.sortService.sortDate(this.diplomasList, 'CreateDate');
this.deplomasStore.resetDiplomaGerar(this.diplomasList);
} catch(error) {
}
this.skeletonLoader = false
this.showLoader = false;
}
src/app/pages/gabinete-digital/diplomas/diplomas.page.ts
+16 -7
View File
@@ -8,6 +8,7 @@ import { BackgroundService } from 'src/app/services/background.service';
import { SortService } from 'src/app/services/functions/sort.service';
import { ThemeService } from 'src/app/services/theme.service'
import { PermissionService } from 'src/app/services/permission.service';
import { DeplomasStore } from 'src/app/store/deplomas.service';
@Component({
@@ -26,7 +27,8 @@ export class DiplomasPage implements OnInit, OnDestroy {
segment: string;
skeletonLoader = true
deplomasStore = DeplomasStore
constructor(
private processes: ProcessesService,
private router: Router,
@@ -100,9 +102,7 @@ export class DiplomasPage implements OnInit, OnDestroy {
}
async LoadList() {
this.processes.GetTasksList("Despacho do Presidente da República", false).subscribe(async res => {
try {
this.skeletonLoader = true
let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
@@ -118,6 +118,8 @@ export class DiplomasPage implements OnInit, OnDestroy {
diplomasList.push(task);
});
this.deplomasStore.resetDiplomasReview(diplomasValidar)
this.diplomasList = this.sortService.sortDate(diplomasList, 'CreateDate');
@@ -132,12 +134,19 @@ export class DiplomasPage implements OnInit, OnDestroy {
});
this.diplomasAssinadoList = this.sortService.sortDate(diplomasAssinadoList, 'CreateDate')
this.deplomasStore.resetDiplomasAssinadoList(diplomasAssinados);
let diplomasAssinar = diplomas.filter(data => data.activityInstanceName == "Assinar Diploma");
this.deplomasStore.resetDiplomasParaAssinar(diplomasAssinar)
// console.log('DIPLOMAS ASSINADOS', this.diplomasAssinadoList)
}, (error) => {
} catch(error) {
this.skeletonLoader = false
this.getFromDb()
})
}
}
getFromDb() {
src/app/pages/gabinete-digital/event-list/event-list.page.html
+6 -6
View File
@@ -39,10 +39,10 @@
<div class="content height-100 d-flex flex-column">
<div [ngSwitch]="segment">
<ion-list class="width-100 height-100" *ngSwitchCase="'MDGPR'">
<div *ngIf="eventsMDGPRList" class="overflow-y-auto height-100">
<div *ngIf="eventoaprovacaostore.listmd" class="overflow-y-auto height-100">
<ion-item-sliding>
<ion-item class="Rectangle cursor-pointer" lines="none"
*ngFor="let event of eventsMDGPRList" (click)="goToEventToApproveDetail(event.serialNumber)">
*ngFor="let event of eventoaprovacaostore.listmd" (click)="goToEventToApproveDetail(event.serialNumber)">
<div class="content-mdgpr-{{event.workflowInstanceDataFields.Agenda}} width-100">
<div class="approve-event-time">
@@ -65,10 +65,10 @@
<ion-label></ion-label>
<ion-list *ngSwitchCase="'PR'">
<div *ngIf="eventsPRList" class="overflow-y-auto height-100">
<div *ngIf="eventoaprovacaostore.listpr" class="overflow-y-auto height-100">
<ion-item-sliding>
<ion-item class="Rectangle cursor-pointer" lines="none"
*ngFor="let event of eventsPRList" (click)="goToEventToApproveDetail(event.serialNumber)">
*ngFor="let event of eventoaprovacaostore.listpr" (click)="goToEventToApproveDetail(event.serialNumber)">
<div class="content-pr-{{event.workflowInstanceDataFields.Agenda}} width-100">
<div class="approve-event-time">
<p>{{event.workflowInstanceDataFields.StartDate | date: 'HH:mm'}}</p>
@@ -92,7 +92,7 @@
<div class="height-100" [ngSwitch]="segment">
<div *ngSwitchCase="'MDGPR'" class="d-flex height-100 align-center justify-content-center" >
<div
*ngIf="!skeletonLoader && (!eventsMDGPRList || eventsMDGPRList.length == 0)"
*ngIf="!skeletonLoader && (!eventoaprovacaostore.listmd || eventoaprovacaostore.listmd.length == 0)"
class="empty-list d-flex height-100 align-center justify-content-center"
>
<span>Lista vazia</span>
@@ -101,7 +101,7 @@
<div *ngSwitchCase="'PR'" class="d-flex height-100 align-center justify-content-center">
<div
*ngIf="!skeletonLoader && (!eventsMDGPRList || eventsMDGPRList.length == 0)"
*ngIf="!skeletonLoader && (!eventoaprovacaostore.listmd || eventoaprovacaostore.listmd.length == 0)"
class="empty-list d-flex height-100 align-center justify-content-center"
>
<span>Lista vazia</span>
src/app/pages/gabinete-digital/event-list/event-list.page.ts
+9 -10
View File
@@ -36,6 +36,7 @@ export class EventListPage implements OnInit {
skeletonLoader = true
eventaprovacaostore = EventoAprovacaoStore;
eventoaprovacaostore = EventoAprovacaoStore;
constructor(
private processes: ProcessesService,
@@ -147,7 +148,7 @@ export class EventListPage implements OnInit {
}
async LoadToApproveEvents() {
this.processes.GetTasksList('Agenda Oficial MDGPR', false).subscribe(async res => {
// this.processes.GetTasksList('Agenda Oficial MDGPR', false).subscribe(async res => {
this.showLoader = true;
this.skeletonLoader = true
@@ -156,11 +157,10 @@ export class EventListPage implements OnInit {
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);
this.eventsMDGPRList = this.sortService.sortDate(this.eventsMDGPRList, 'taskStartDate')
this.eventsMDGPRList = this.sortService.sortArrayByDate(this.eventsMDGPRList)
// this.eventsMDGPRList = ( this.eventsMDGPRList || []).filter(function(item) {
// return item.activityInstanceName != 'Editar Evento'
// })
this.eventoaprovacaostore.resetmd(this.eventsMDGPRList);
this.storage.set('event-to-aproveMD',this.eventsMDGPRList).then(() => {
@@ -171,11 +171,10 @@ export class EventListPage implements OnInit {
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);
this.eventsPRList = this.sortService.sortDate(this.eventsPRList, 'taskStartDate')
this.eventsPRList = this.sortService.sortArrayByDate(this.eventsPRList)
// this.eventsPRList = (this.eventsPRList || []).filter(function(item) {
// return item.activityInstanceName != 'Editar Evento'
// })
this.eventoaprovacaostore.resetpr(this.eventsPRList);
this.storage.set('event-to-aprovePR',this.eventsPRList).then(() => {
@@ -185,9 +184,9 @@ export class EventListPage implements OnInit {
this.showLoader = false;
this.skeletonLoader = false
}, (error) => {
this.getEventToAproveFromDB();
})
// }, (error) => {
// this.getEventToAproveFromDB();
// })
}
src/app/pages/gabinete-digital/expediente/expediente.page.html
+1 -1
View File
@@ -36,7 +36,7 @@
<ion-list>
<div
class="expediente ion-no-padding ion-no-margin cursor-pointer"
*ngFor = "let task of listToPresent"
*ngFor = "let task of expedientegbstore.list"
(click)="goToExpediente(task.SerialNumber)"
>
<div class="item width-100">
src/app/pages/gabinete-digital/expediente/expediente.page.ts
+4 -3
View File
@@ -9,7 +9,7 @@ import { Platform } from '@ionic/angular';
import { BackgroundService } from '../../../services/background.service';
import { ThemeService } from 'src/app/services/theme.service'
import { SortService } from 'src/app/services/functions/sort.service';
import {Storage } from '@ionic/storage';
import { Storage } from '@ionic/storage';
@Component({
selector: 'app-expediente',
@@ -73,7 +73,7 @@ export class ExpedientePage implements OnInit {
const result = res
this.taskslist = new Array();
let ress = result.filter((data: any) => data.workflowInstanceDataFields.Status == "Active");
let ress = result.filter((data: any) => data.workflowInstanceDataFields.Status == "" || data.workflowInstanceDataFields.Status == "Active");
ress.forEach((element: any) => {
@@ -86,7 +86,8 @@ export class ExpedientePage implements OnInit {
})
this.listToPresent = this.sortService.sortDate(this.taskslist, 'taskStartDate')
this.expedientegbstore.reset(this.listToPresent);
this.skeletonLoader = false;
}, (error) => {
this.getEventsFromLocalDb();
src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
+4 -6
View File
@@ -75,14 +75,12 @@ export class ExpedientesPrPage implements OnInit {
this.skeletonLoader = false
this.showLoader =false
this.taskslist = new Array();
let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active");
res.forEach(element => {
let task = this.expedienteTaskPipe.transform(element)
this.taskslist.push(task);
});
let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "" || data.workflowInstanceDataFields.Status == "Active");
this.taskslist = res.map((element) => this.expedienteTaskPipe.transform(element));
this.taskslist = this.sortService.sortDate(this.taskslist, 'CreateDate')
this.expedienteGdStore.reset(this.taskslist);
this.skeletonLoader = false
})
src/app/pages/gabinete-digital/gabinete-digital.page.html
+27 -13
View File
@@ -147,14 +147,14 @@
<fa-icon class="icon-selected" icon="align-justify"></fa-icon>
</div>
<p class="text-center exp-card-title ">Todas as tarefas</p>
<p class="text-center exp-card-content"> {{ getAllProcessCount }} <span class="title1">Documentos</span></p>
<p class="text-center exp-card-content"> {{ getAllProcessCount }} <span class="title1">Documentos</span></p>
</div>
<div *ngIf="p.userPermission([p.permissionList.Gabinete.aprove_event])" (click)="openEventsToApprovePage();selectedElement='approval'" [class.active]="selectedElement == 'approval'" class="box-hover exp-card d-flex flex-column">
<div class="d-flex justify-center">
<ion-icon src="assets/images/icons-agenda.svg"></ion-icon>
</div>
<p class="text-center exp-card-title ">Eventos para Aprovação</p>
<p class="text-center exp-card-content">{{eventoaprovacaostore.countMd + eventoaprovacaostore.countPr}} <span class="title1">Documentos</span></p>
<p class="text-center exp-card-content"> {{eventoaprovacaostore.countMd + eventoaprovacaostore.countPr}} <span class="title1">Documentos</span></p>
</div>
<div (click)="openExpedientListPage(); selectedElement='Correspondence'" [class.active]="selectedElement == 'Correspondence'" class="box-hover exp-card d-flex flex-column justify-center">
@@ -166,7 +166,7 @@
<ion-icon hidden *ngIf="ThemeService.currentTheme == 'doneIt' && selectedElement == 'Correspondence'" src="assets/images/theme/{{ThemeService.currentTheme}}/icons-correspondencia-hover.svg"></ion-icon>
</div>
<p class="text-center exp-card-title ">Expediente</p>
<p class="text-center exp-card-content">{{expedientegbstore.count}} <span class="title1">Documentos</span></p>
<p class="text-center exp-card-content"> {{expedientegbstore.count}} <span class="title1">Documentos</span></p>
</div>
<div [class.active]="selectedElementF('Pending')" (click)="openPendentesPage(); selectedElement='Pending'" class="box-hover exp-card d-flex flex-column justify-center" >
@@ -179,7 +179,7 @@
</div>
<p *ngIf="!p.userPermission([p.permissionList.Gabinete.pr_tasks])" class="text-center exp-card-title ">Pendentes</p>
<p *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])" class="text-center exp-card-title ">Meus Pendentes</p>
<p class="text-center exp-card-content"><span class="number">{{pendentesstore.count}} </span> <span class="title1">Documentos</span></p>
<p class="text-center exp-card-content"> <span class="number">{{pendentesstore.count}} </span> <span class="title1">Documentos</span></p>
</div>
<div *ngIf="!p.userPermission([p.permissionList.Gabinete.pr_tasks])" [class.active]="selectedElement == 'Dispatches'" class="box-hover exp-card d-flex flex-column justify-center" (click)="openDespachosPage(); selectedElement='Dispatches'">
@@ -191,7 +191,7 @@
<ion-icon hidden *ngIf="ThemeService.currentTheme == 'doneIt' && selectedElement == 'Dispatches'" src="assets/images/theme/{{ThemeService.currentTheme}}/icons-despachos-presidente-hover.svg"></ion-icon>
</div>
<p class="text-center exp-card-title ">Despachos</p>
<p class="text-center exp-card-content">{{despachoStore.count}} <span class="title1">Documentos</span> </p>
<p class="text-center exp-card-content"> {{despachoStore.count}} <span class="title1">Documentos</span> </p>
</div>
<div (click)="openPedidosPage('parecer'); selectedElement='RequestsForOpinion'" [class.active]="selectedElement == 'RequestsForOpinion'" class="box-hover exp-card d-flex flex-column justify-center">
@@ -204,7 +204,7 @@
</div>
<p *ngIf="!p.userPermission([p.permissionList.Gabinete.pr_tasks])" class="text-center exp-card-title ">Pedidos de Parecer</p>
<p *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])" class="text-center exp-card-title ">Pedidos de Parecer solicitados por mim</p>
<p class="text-center exp-card-content">{{pedidosstore.countparecer}} <span class="title1">Documentos</span></p>
<p class="text-center exp-card-content"> {{pedidosstore.countparecer}} <span class="title1">Documentos</span></p>
</div>
<div (click)="openPedidosPage('deferimento'); selectedElement = 'RequestForApproval'" [class.active]="selectedElement == 'RequestForApproval'" class="box-hover exp-card d-flex flex-column justify-center">
@@ -217,7 +217,7 @@
<ion-icon hidden *ngIf="ThemeService.currentTheme == 'doneIt' && selectedElement == 'RequestForApproval'" src="assets/images/theme/{{ThemeService.currentTheme}}/icons-expediente-deferimento-hover.svg"></ion-icon>
</div>
<p class="text-center exp-card-title ">Pedidos de Deferimento</p>
<p class="text-center exp-card-content">{{pedidosstore.countdeferimento}} <span class="title1">Documentos</span></p>
<p class="text-center exp-card-content"> {{pedidosstore.countdeferimento}} <span class="title1">Documentos</span></p>
</div>
<div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks, p.permissionList.Gabinete.pr_tasks])" (click)="openDespachosPrPage(); selectedElement='showDespachosPr'" [class.active]="selectedElement == 'showDespachosPr'" class="box-hover exp-card-long width-100 d-flex flex-column justify-center">
@@ -231,11 +231,12 @@
<!-- <p class="text-center exp-card-title " *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])">Despacho do Presidente da República</p> -->
<p class="text-center exp-card-title " *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])">Despacho do {{ environment.despachoLabel }}</p>
<p class="text-center exp-card-title " *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks]) && !p.userPermission([p.permissionList.Gabinete.md_tasks])">Despachos criados por mim</p>
<p class="text-center exp-card-content">{{ despachoprstore.count }} <span class="title1">Documentos</span> </p>
<p class="text-center exp-card-content"> {{ despachoprstore.count }} <span class="title1">Documentos</span> </p>
</div>
</div>
</div>
<div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openDiplomasPage('validar'); selectedElement='DiplomasPorValidar'" [class.active]="selectedElement == 'DiplomasPorValidar'" 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>
@@ -244,7 +245,7 @@
</div>
<p class="text-center exp-card-title " >Diplomas por Validar</p>
<!-- <p class="text-center exp-card-title " *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])">Diplomas por Assinar</p> -->
<p class="text-center exp-card-content">{{ deplomasStore.deplomasReviewCount }} <span class="title1">Documentos</span> </p>
<p class="text-center exp-card-content"> {{ deplomasStore.deplomasReviewCount }} <span class="title1">Documentos</span> </p>
</div>
<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">
@@ -255,7 +256,7 @@
</div>
<p class="text-center exp-card-title " *ngIf="!p.userPermission([p.permissionList.Gabinete.pr_tasks])">Diplomas assinados PR</p>
<p class="text-center exp-card-title " *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])" >Diplomas</p>
<p class="text-center exp-card-content">{{ deplomasStore.countDiplomasAssinadoListCount }} <span class="title1">Documentos</span></p>
<p class="text-center exp-card-content"> {{ deplomasStore.countDiplomasAssinadoListCount }} <span class="title1">Documentos</span></p>
</div>
<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">
@@ -268,7 +269,7 @@
</div>
<p class="text-center exp-card-title" >Diplomas por elaborar</p>
<p class="text-center exp-card-content">{{ deplomasStore.DiplomaGerarList.length }} <span class="title1">Documentos</span></p>
<p class="text-center exp-card-content"> {{ deplomasStore.DiplomaGerarList.length }} <span class="title1">Documentos</span></p>
</div>
@@ -281,8 +282,21 @@
<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>
<p class="text-center exp-card-content"> {{ deplomasStore.diplomasParaAssinartCount }} <span class="title1">Documentos</span></p>
</div>
<!-- <div *ngIf="p.userPermission([p.permissionList.Gabinete.md_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 por Assinar </p>
<p class="text-center exp-card-content"> {{ deplomasStore.diplomasParaAssinartCount }} <span class="title1">Documentos</span></p>
</div> -->
</div>
<div *ngIf="!loadCount" class="width-100">
src/app/pages/gabinete-digital/gabinete-digital.page.ts
+83 -76
View File
@@ -165,6 +165,8 @@ export class GabineteDigitalPage implements OnInit {
this.segmentVista = "boxview"
}
this.LoadCounts();
const pathname = window.location.pathname
this.router.events.forEach((event) => {
if (event instanceof NavigationEnd && event.url == pathname) {
@@ -183,6 +185,7 @@ export class GabineteDigitalPage implements OnInit {
}
});
this.hideRefreshButton();
// this.waitForDomService.selector({
@@ -193,84 +196,87 @@ export class GabineteDigitalPage implements OnInit {
// }
// })
this.backgroundservice.registerBackService('Online', () => {
// this.loadAllProcesses();
});
setTimeout(() => {
this.backgroundservice.registerBackService('Online', () => {
// this.loadAllProcesses();
});
// this.NotificationsService.registerCallback({
// type:'despachos',
// funx:() => {
// // this.loadCount();
// console.log('refresh with notification')
// }
// })
// this.NotificationsService.registerCallback({
// type:'despachos',
// funx:() => {
// // this.loadCount();
// console.log('refresh with notification')
// }
// })
// this.NotificationsService.registerCallback({
// type:'*',
// funx:() => {
// // this.LoadCounts();
// console.log('refresh with notification *')
// }
// })
// this.NotificationsService.registerCallback({
// type:'*',
// funx:() => {
// // this.LoadCounts();
// console.log('refresh with notification *')
// }
// })
// this.NotificationsService.registerCallback({
// type:'despachos-pr',
// funx:() => {
// // this.LoadCounts();
// console.log('refresh with notification')
// }
// })
// this.NotificationsService.registerCallback({
// type:'expediente',
// funx: () => {
// this.LoadCounts();
// console.log('refresh with notification')
// }
// })
// this.NotificationsService.registerCallback({
// type:'gabinete-digital',
// funx:() => {
// this.LoadCounts();
// console.log('refresh with notification')
// }
// })
// this.NotificationsService.registerCallback({
// type:'parecer',
// funx: () => {
// this.LoadCounts();
// console.log('refresh with notification')
// }
// })
// this.NotificationsService.registerCallback({
// type: 'deferimento',
// funx: () => {
// this.LoadCounts();
// console.log('refresh with notification')
// }
// })
// this.NotificationsService.registerCallback({
// type: 'diplomas-assinar',
// funx: () => {
// this.LoadCounts();
// console.log('refresh with notification')
// }
// })
// this.NotificationsService.registerCallback({
// type: 'diplomas',
// funx: () => {
// this.LoadCounts();
// console.log('refresh with notification')
// }
// })
// this.NotificationsService.registerCallback({
// type: 'expedientes-pr',
// funx: () => {
// this.LoadCounts();
// console.log('refresh with notification')
// }
// })
// this.NotificationsService.registerCallback({
// type:'despachos-pr',
// funx:() => {
// // this.LoadCounts();
// console.log('refresh with notification')
// }
// })
// this.NotificationsService.registerCallback({
// type:'expediente',
// funx: () => {
// this.LoadCounts();
// console.log('refresh with notification')
// }
// })
// this.NotificationsService.registerCallback({
// type:'gabinete-digital',
// funx:() => {
// this.LoadCounts();
// console.log('refresh with notification')
// }
// })
// this.NotificationsService.registerCallback({
// type:'parecer',
// funx: () => {
// this.LoadCounts();
// console.log('refresh with notification')
// }
// })
// this.NotificationsService.registerCallback({
// type: 'deferimento',
// funx: () => {
// this.LoadCounts();
// console.log('refresh with notification')
// }
// })
// this.NotificationsService.registerCallback({
// type: 'diplomas-assinar',
// funx: () => {
// this.LoadCounts();
// console.log('refresh with notification')
// }
// })
// this.NotificationsService.registerCallback({
// type: 'diplomas',
// funx: () => {
// this.LoadCounts();
// console.log('refresh with notification')
// }
// })
// this.NotificationsService.registerCallback({
// type: 'expedientes-pr',
// funx: () => {
// this.LoadCounts();
// console.log('refresh with notification')
// }
// })
}, 100);
}
async loadAllProcesses() {
@@ -614,7 +620,8 @@ export class GabineteDigitalPage implements OnInit {
loadNum = 0
async LoadCounts() {
this.updateAllProcess()
let expedientes;
this.showLoader = true
@@ -629,7 +636,7 @@ export class GabineteDigitalPage implements OnInit {
this.loadNum++;
expedientes = (expedientes || [] ).filter(data => data.workflowInstanceDataFields.Status == "Active")
expedientes = (expedientes || [] ).filter(data => data.workflowInstanceDataFields.Status == "" || data.workflowInstanceDataFields.Status == "Active")
expedientes = expedientes.filter((item) => {
return item.activityInstanceName != 'Retificar Expediente'
src/app/pages/gabinete-digital/pedidos/pedidos.page.html
+4 -4
View File
@@ -38,13 +38,13 @@
<div class="width-100" [ngSwitch]="segment">
<ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
<div *ngIf="listToPresentparecerList">
<div *ngIf="pedidosstorage.listparecer">
<ion-list *ngSwitchCase="'parecer'">
<!-- *ngFor = "let task of pedidosstorage.listparecer; let i = index"
(click)="viewExpedientDetail(task.SerialNumber)" -->
<div
class="expediente ion-no-padding ion-no-margin cursor-pointer"
*ngFor = "let task of listToPresentparecerList"
*ngFor = "let task of pedidosstorage.listparecer"
(click)="goToPedido(task.SerialNumber)"
>
<!-- (click)="viewExpedientDetail(task.SerialNumber)" -->
@@ -78,11 +78,11 @@
</ion-list>
</div>
<div *ngIf="listToPresentdeferimentoList">
<div *ngIf="pedidosstorage.listdeferimento">
<ion-list *ngSwitchCase="'deferimento'">
<div
class="expediente ion-no-padding ion-no-margin cursor-pointer"
*ngFor = "let task of listToPresentdeferimentoList"
*ngFor = "let task of pedidosstorage.listdeferimento"
(click)="goToPedido(task.SerialNumber)"
>
<!-- (click)="viewExpedientDetail(task.SerialNumber)" -->
src/app/pages/gabinete-digital/pendentes/pendentes.page.html
+1 -1
View File
@@ -27,7 +27,7 @@
</ion-refresher>
<app-task-list class="height-100"
[taskList] = listToPresent
[taskList] = pendentesstore.list
[skeletonLoader] = skeletonLoader
(viewTaskDetail)="viewTaskDetails($event)"
> </app-task-list>
src/app/pages/gabinete-digital/pendentes/pendentes.page.ts
+1
View File
@@ -106,6 +106,7 @@ export class PendentesPage implements OnInit {
pendentesList = removeDuplicate(pendentesList)
pendentesList = this.sortService.sortDate(pendentesList, 'CreateDate');
this.pendentesstore.reset(pendentesList);
this.listToPresent = pendentesList;
this.storage.set('pendente-list',pendentesList).then(() => {
src/app/services/chat/message.service.ts
+6 -7
View File
@@ -1,18 +1,18 @@
import { Injectable } from '@angular/core';
import { Message } from 'src/app/models/chatMethod';
import { SessionStore } from 'src/app/store/session.service';
import { capitalizeTxt } from 'src/plugin/text'
import { NfService } from 'src/app/services/chat/nf.service'
import { capitalizeTxt } from 'src/plugin/text';
import { NfService } from 'src/app/services/chat/nf.service';
import { RochetChatConnectorService } from 'src/app/services/chat/rochet-chat-connector.service';
import { showDateDuration } from 'src/plugin/showDateDuration';
import { ChatMethodsService } from './chat-methods.service'
import { MessageModel } from '../../models/beast-orm'
import { AESEncrypt } from '../aesencrypt.service'
import { ChatMethodsService } from './chat-methods.service';
import { MessageModel } from '../../models/beast-orm';
import { AESEncrypt } from '../aesencrypt.service';
import { HttpEventType } from '@angular/common/http';
import { AttachmentsService } from 'src/app/services/attachments.service';
import { NetworkServiceService , ConnectionStatus} from 'src/app/services/network-service.service';
import { ChatSystemService } from './chat-system.service';
import { v4 as uuidv4 } from 'uuid'
import { v4 as uuidv4 } from 'uuid';
@Injectable({
providedIn: 'root'
@@ -180,7 +180,6 @@ export class MessageService {
async send(): Promise<any> {
if(this.messageSend) {
console.log('sended')
return new Promise((resolve, reject) => {
resolve('solve')
})
src/app/services/events.service.ts
+7 -7
View File
@@ -110,7 +110,7 @@ export class EventsService {
if (SessionStore.user.Profile == 'MDGPR') {
for (let calendar of SessionStore.user.OwnerCalendars) {
this.hasAnyCalendar = false
this.hasAnyCalendar = true
if (calendar.CalendarName == 'Oficial') {
@@ -133,7 +133,7 @@ export class EventsService {
}
for (let sharedCalendar of SessionStore.user.SharedCalendars) {
this.hasAnyCalendar = false
this.hasAnyCalendar = true
if (sharedCalendar.CalendarName == 'Oficial') {
@@ -158,7 +158,7 @@ export class EventsService {
else if (SessionStore.user.Profile == 'PR') {
for (let calendar of SessionStore.user.OwnerCalendars) {
this.hasAnyCalendar = false
this.hasAnyCalendar = true
if (calendar.CalendarName == 'Oficial') {
this.hasOwnOficial = true
@@ -181,7 +181,7 @@ export class EventsService {
}
for (let calendar of SessionStore.user.OwnerCalendars) {
this.hasAnyCalendar = false
this.hasAnyCalendar = true
if(!this.usersCalendarIds.includes(calendar.OwnerUserId)) {
this.usersCalendarIds.push(calendar.OwnerUserId)
}
@@ -213,7 +213,7 @@ export class EventsService {
}
for (let sharedCalendar of SessionStore.user.SharedCalendars) {
this.hasAnyCalendar = false
this.hasAnyCalendar = true
if(!this.usersCalendarIds.includes(sharedCalendar.OwnerUserId)) {
this.usersCalendarIds.push(sharedCalendar.OwnerUserId)
@@ -246,7 +246,7 @@ export class EventsService {
for (let sharedCalendar of SessionStore.user.SharedCalendars) {
this.hasAnyCalendar = false
this.hasAnyCalendar = true
if(sharedCalendar?.OwnerUserId) {
this.GetCalendarName(sharedCalendar.OwnerUserId).subscribe((e)=> {
this.calendarNames[sharedCalendar.CalendarId] = e.FullName
@@ -266,7 +266,7 @@ export class EventsService {
}
for (let sharedCalendar of SessionStore.user.OwnerCalendars) {
this.hasAnyCalendar = false
this.hasAnyCalendar = true
this.calendarNames[sharedCalendar.CalendarId] = 'Meu calendario'
src/app/services/notifications.service.ts
+28 -26
View File
@@ -12,6 +12,7 @@ import { EventTrigger } from '../services/eventTrigger.service';
import { SessionStore } from '../store/session.service';
import { ActionPerformed, PushNotificationSchema, PushNotifications, Token, } from '@capacitor/push-notifications';
import { notificationObject } from '../models/notifications';
import { v4 as uuidv4 } from 'uuid'
@Injectable({
providedIn: 'root'
@@ -38,43 +39,44 @@ export class NotificationsService {
private platform: Platform,
private router: Router,
private zone: NgZone,
private eventtrigger: EventTrigger,) {
private eventtrigger: EventTrigger,) {}
registerCallback({type, funx, id = uuidv4()} : {
type: notificationObject,
funx: Function
id?: string
}) {
this.callbacks[id] = { funx, id, type}
return id;
}
deleteCallback(id) {
delete this.callbacks[id]
}
// registerCallback({type, funx, id = uuidv4()} : {
// type: notificationObject,
// funx: Function
// id?: string
// }) {
// this.callbacks[id] = { funx, id, type}
// return id;
// }
private async runNotificationCallback(notification) {
for (const [key, value] of Object.entries(this.callbacks)) {
if(value.type == notification.data.Object) {
// private async runNotificationCallback(notification) {
const dontRepeat = await value.funx(notification)
// for (const [key, value] of Object.entries(this.callbacks)) {
// if(value.type == notification.data.Object) {
if(dontRepeat) {
delete this.callbacks[key]
}
// const dontRepeat = await value.funx(notification)
} else if (value.type == '*') {
const dontRepeat = await value.funx(notification)
// if(dontRepeat) {
// delete this.callbacks[key]
// }
if(dontRepeat) {
delete this.callbacks[key]
}
}
// } else if (value.type == '*') {
// const dontRepeat = await value.funx(notification)
}
// if(dontRepeat) {
// delete this.callbacks[key]
// }
// }
// }
// }
}
getTokenByUserIdAndId(user, userID) {
// const geturl = environment.apiURL + 'notifications/user/' + userID;
src/app/services/rules/event.service.ts
+6 -1
View File
@@ -21,9 +21,14 @@ export class EventService {
if(this.p.userRole(['PR'])) {
alert('pr')
return this.eventService.postEventPr(body, calendar)
} else {
} else if(this.p.userRole(['MDGPR'])) {
alert('md')
return this.eventService.postEventMd(body, calendar)
} else {
alert('other')
return this.eventService.postEventGeneric(body, calendar, body.CalendarId)
}
}
src/app/shared/agenda/event-list/event-list.page.ts
+38 -1
View File
@@ -59,7 +59,7 @@ export class EventListPage implements OnInit {
ngOnChanges() {
this.LoadToApproveEvents();
setTimeout(() => {
this.LoadToApproveEvents();
this.LoadToApproveEventsNoLoader();
}, 3000)
}
@@ -107,6 +107,43 @@ export class EventListPage implements OnInit {
}
}
async LoadToApproveEventsNoLoader() {
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);
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);
if(allEvents.length > 0) {
this.eventsPRList = this.sortService.sortArrayByDate(allEvents).reverse();
}
this.showLoader = false;
} else {
let genericEvents = await this.processes.GetTasksList('Agendar Evento', false).toPromise();
if(genericEvents.length > 0) {
this.eventsGenericList = this.sortService.sortArrayByDate(genericEvents).reverse();
}
this.showLoader = false;
}
} catch(erro) {
this.showLoader = false;
}
}
async openApproveModal(eventSerialNumber, data) {
src/app/shared/agenda/view-event/view-event.page.html
+1 -1
View File
@@ -82,7 +82,7 @@
<div *ngIf="loadedEvent.Body.Text">
<h5>Detalhes</h5>
<ion-item lines="none" class="ion-no-margin ion-no-padding">
<div class="text"> {{ loadedEvent.Body.Text }} </div>
<pre class="text">{{ loadedEvent.Body.Text }} </pre>
</ion-item>
<div class="line"></div>
</div>
src/app/shared/agenda/view-event/view-event.page.ts
-3
View File
@@ -105,9 +105,6 @@ export class ViewEventPage implements OnInit {
if(this.sesseionStora.user.Profile == 'MDGPR' || this.sesseionStora.user.Profile == 'PR') {
this.eventsService.getEvent(this.eventId).subscribe(res => {
const div = document.createElement("div")
div.innerHTML = res.Body.Text
res.Body.Text = div.innerText
this.loadedEvent = res;
this.today = new Date(res.StartDate);
src/app/shared/gabinete-digital/all-processes/all-processes.page.html
+2 -2
View File
@@ -2,11 +2,11 @@
<!-- <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar> -->
<div class="title">
<div class="thetitle"><ion-label >Todas as tarefas</ion-label></div>
<div class="theicon">
<!-- <div class="theicon">
<button title="Atualizar" class="btn-no-color" (click)="refreshing()">
<ion-icon slot="end" class="title-icon font-awesome" name="reload-circle"></ion-icon>
</button>
</div>
</div> -->
</div>
</ion-header>
<ion-content>
src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
+11 -11
View File
@@ -24,16 +24,16 @@
<ion-refresher-content>
</ion-refresher-content>
</ion-refresher>
<div class="main-content overflow-y-auto height-100" [ngSwitch]="segment" *ngIf="eventsPRList">
<div class="main-content overflow-y-auto height-100" [ngSwitch]="segment" *ngIf="eventaprovacaostore.listpr">
<div *ngSwitchCase="'MDGPR'" class="height-100">
<div *ngIf="eventsMDGPRList">
<div *ngIf="eventaprovacaostore.listmd">
<ion-list class="width-100" *ngIf="eventsMDGPRList.length != 0" >
<ion-list class="width-100" *ngIf="eventaprovacaostore.listmd.length != 0" >
<div
class="expediente item-hover ion-no-padding ion-no-margin cursor-pointer"
*ngFor="let event of eventsMDGPRList"
*ngFor="let event of eventaprovacaostore.listmd"
(click)="goToEventDetail(event)"
>
<!-- (click)="openApproveModal(event)" -->
@@ -52,9 +52,9 @@
</ion-list>
</div>
<div *ngIf="eventsMDGPRList" class="centered-div">
<div *ngIf="eventaprovacaostore.listmd" class="centered-div">
<div *ngIf="eventsMDGPRList.length == 0">
<div *ngIf="eventaprovacaostore.listmd.length == 0">
<div *ngSwitchCase="'MDGPR'">
<div class="d-flex height-90 align-center justify-content-center"
>
@@ -65,12 +65,12 @@
</div>
</div>
<div *ngSwitchCase="'PR'">
<div *ngIf="eventsPRList.length != 0">
<div *ngIf="eventaprovacaostore.listpr.length != 0">
<ion-list class="width-100" *ngSwitchCase="'PR'">
<div class="width-100" *ngIf="eventsPRList">
<div class="width-100" *ngIf="eventaprovacaostore.listpr">
<div
class="expediente item-hover ion-no-padding ion-no-margin cursor-pointer"
*ngFor="let event of eventsPRList"
*ngFor="let event of eventaprovacaostore.listpr"
(click)="goToEventDetail(event)"
>
<div class="item event-pr-{{event.workflowInstanceDataFields.Agenda}} width-100">
@@ -90,10 +90,10 @@
</div>
<div *ngIf="eventsPRList.length == 0" class="centered-div d-flex height-90 align-center justify-content-center">
<div *ngIf="eventaprovacaostore.listpr.length == 0" class="centered-div d-flex height-90 align-center justify-content-center">
<div *ngSwitchCase="'PR'" >
<div class="d-flex align-center justify-content-center"
*ngIf="eventsPRList.length < 1">
*ngIf="eventaprovacaostore.listpr.length < 1">
Lista vazia
</div>
</div>
src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
+2 -2
View File
@@ -81,7 +81,7 @@ export class EventsToApprovePage implements OnInit {
})
//this.eventaprovacaostore.resetmd(this.sortService.sortDate(this.eventsMDGPRList, 'CreateDate'));
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();
@@ -97,7 +97,7 @@ export class EventsToApprovePage implements OnInit {
this.storage.set('event-to-aprovePR',this.eventsPRList).then(() => {
})
//this.eventaprovacaostore.resetpr(this.sortService.sortDate(this.eventsPRList, 'CreateDate'));
this.eventaprovacaostore.resetpr(this.sortService.sortDate(this.eventsPRList, 'CreateDate'));
}
this.showLoader = false;
}
src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
+2 -5
View File
@@ -66,11 +66,8 @@ export class ExpedientesPrPage implements OnInit {
this.processes.GetTaskListExpediente(false).subscribe(result => {
this.taskslist = [];
let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active");
res.forEach(element => {
let task = this.expedienteTaskPipe.transform(element);
this.taskslist.push(task);
});
let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "" || data.workflowInstanceDataFields.Status == "Active");
this.taskslist = res.map((element) => this.expedienteTaskPipe.transform(element));
this.taskslist = this.sortService.sortDate(this.taskslist, 'CreateDate')
src/app/shared/gabinete-digital/expedients/expedients.page.ts
+15 -16
View File
@@ -65,17 +65,16 @@ export class ExpedientsPage implements OnInit {
this.taskslist = [];
this.skeletonLoader = false
let res = result.filter(data => data.workflowInstanceDataFields.Status == "Active");
res.forEach(element => {
let task = this.expedienteTaskPipe.transform(element)
this.taskslist.push(task);
let res = result.filter(data => data.workflowInstanceDataFields.Status == "" || data.workflowInstanceDataFields.Status == "Active");
});
this.taskslist = res.map((e) => this.expedienteTaskPipe.transform(e))
this.taskslist = this.sortService.sortDate(this.taskslist, 'CreateDate')
this.addProcessTODb(this.taskslist);
this.taskslist = this.taskslist.filter(function(item) {
return item.activityInstanceName != 'Retificar Expediente'
})
})
this.expedientegbstore.reset(this.taskslist);
}, (error) => {
this.getEventsFromLocalDb();
@@ -94,16 +93,16 @@ export class ExpedientsPage implements OnInit {
})
}
doRefresh() {
doRefresh() {
setTimeout(() => {
this.LoadList();
}, 1000)
}
goToExpediente(serialNumber: any) {
this.router.navigate(['/home/gabinete-digital/expediente', serialNumber, 'gabinete-digital']);
}
setTimeout(() => {
this.LoadList();
}, 1000)
}
goToExpediente(serialNumber: any) {
this.router.navigate(['/home/gabinete-digital/expediente', serialNumber, 'gabinete-digital']);
}
}
src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.scss
+12 -21
View File
@@ -30,28 +30,19 @@
margin-bottom: 5px !important;
margin-top: 5px !important;
}
@media only screen and (max-width: 800px) {
.btn-ok, .btn-cancel, .btn-delete{
width: 100% !important;
}
.arrow-right{
display: flex;
justify-content: flex-end;
}
@media only screen and (min-width: 1024px) {
.arrow-right{
display: flex;
justify-content: flex-end;
}
.btn-cancel{
width: 100% !important;
margin-bottom: 10px !important;
}
.btn-delete, .btn-ok{
width: 100% !important;
margin-bottom: 10px !important;
margin-top: 10px !important;
}
/* .solid{
display: block;
} */
.btn-cancel{
width: 100% !important;
margin-bottom: 10px !important;
}
.btn-delete, .btn-ok{
width: 100% !important;
margin-bottom: 10px !important;
margin-top: 10px !important;
}
src/app/shared/popover/opts-expediente/opts-expediente.page.html
+2 -2
View File
@@ -8,8 +8,8 @@
<div class="width-100">
<div class="d-flex width-100">
<div class="flex-grow-1">
<button *ngIf="loggeduser.Profile == 'MDGPR'" class="btn-cancel desk" shape="round"> Enviar para o PR </button>
<button *ngIf="loggeduser.Profile == 'MDGPR'" (click)="openAddNoteModal('Aprovar')" class="btn-cancel" shape="round" >Avaliação Superior</button>
<button *ngIf="SessionStore.user.Profile == 'MDGPR'" class="btn-cancel desk" shape="round"> Enviar para o PR </button>
<button *ngIf="SessionStore.user.Profile == 'MDGPR'" (click)="openAddNoteModal('Aprovar')" class="btn-cancel" shape="round" >Avaliação Superior</button>
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="btn-cancel desk" shape="round"> Solicitar revisão </button>
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openAddNoteModal('Revisão')" class="btn-cancel" shape="round" >Mandar para Revisão</button>
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="btn-cancel desk" shape="round">Outras opções </button>
src/app/shared/popover/opts-expediente/opts-expediente.page.ts
+1 -2
View File
@@ -17,7 +17,6 @@ import { PermissionService } from 'src/app/services/permission.service';
import { ThemeService } from 'src/app/services/theme.service'
import { NewGroupPage } from 'src/app/pages/chat/new-group/new-group.page';
import { RouteService } from 'src/app/services/route.service';
import { LoginUserRespose } from 'src/app/models/user.model';
import { SessionStore } from 'src/app/store/session.service';
@Component({
@@ -36,7 +35,7 @@ export class OptsExpedientePage implements OnInit {
searchDocumentPipe = new SearchDocumentPipe()
documents:SearchList[] = [];
loggeduser: LoginUserRespose;
SessionStore = SessionStore;
constructor(
private popoverController: PopoverController,
src/app/shared/popover/request-options/request-options.page.html
+1 -1
View File
@@ -5,7 +5,7 @@
<button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
<div class="solid"></div>
<button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
<button *ngIf="!p.userRole(['PR'])" (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
<button *ngIf="!p.userRole(['PR']) && !p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
<button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
<button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
<button (click)="cancel()" class="btn-cancel" shape="round" >Cancelar</button>
src/environments/environment.ts
+1 -1
View File
@@ -3,4 +3,4 @@ import { oaprDev } from './suport/oapr'
import { doneITDev } from './suport/doneIt'
export const environment: Environment = oaprDev;
export const environment: Environment = doneITDev;
src/global.scss
+5
View File
@@ -1426,4 +1426,9 @@ $font-size: 11pt;
ngx-mat-datetime-content button.mat-stroked-button {
top: -56px;
margin-bottom: -35px;
}
pre {
font-family: 'Roboto' !important;
font-size: 12pt !important;
}
version/git-version.ts
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "e0b1892de",
"SHA": "e0b1892def4a79cbaff67ce690683ae1b3403470",
"shortSHA": "8df8f98c4",
"SHA": "8df8f98c4eccab3ae1fd0a5f6e3171f35ae3b048",
"branch": "no_bug_movemente",
"lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Wed Feb 1 09:17:48 2023 +0100'",
"lastCommitMessage": "remove pedido de deferimento pr",
"lastCommitNumber": "4701",
"lastCommitTime": "'Wed Feb 1 09:20:58 2023 +0100'",
"lastCommitMessage": "fix",
"lastCommitNumber": "4702",
"change": "",
"changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/modals/document-detail/document-detail.page.html\n\tmodified: src/environments/environment.prod.ts",
"changeStatus": "On branch no_bug_movemente\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/home/home.page.ts\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified: src/app/modals/forward/forward.page.ts\n\tmodified: src/app/pages/agenda/agenda.page.html\n\tmodified: src/app/pages/agenda/view-event/view-event.page.html\n\tmodified: src/app/pages/agenda/view-event/view-event.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos/despachos.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diplomas.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.html\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente.page.ts\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedidos.page.html\n\tmodified: src/app/pages/gabinete-digital/pendentes/pendentes.page.html\n\tmodified: src/app/pages/gabinete-digital/pendentes/pendentes.page.ts\n\tmodified: src/app/services/chat/message.service.ts\n\tmodified: src/app/services/events.service.ts\n\tmodified: src/app/services/notifications.service.ts\n\tmodified: src/app/services/rules/event.service.ts\n\tmodified: src/app/shared/agenda/event-list/event-list.page.ts\n\tmodified: src/app/shared/agenda/view-event/view-event.page.html\n\tmodified: src/app/shared/agenda/view-event/view-event.page.ts\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.html\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts\n\tmodified: src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts\n\tmodified: src/app/shared/gabinete-digital/expedients/expedients.page.ts\n\tmodified: src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.scss\n\tmodified: src/app/shared/popover/opts-expediente/opts-expediente.page.html\n\tmodified: src/app/shared/popover/opts-expediente/opts-expediente.page.ts\n\tmodified: src/app/shared/popover/request-options/request-options.page.html\n\tmodified: src/environments/environment.ts\n\tmodified: src/global.scss\n\tmodified: version/git-version.ts",
"changeAuthor": "peter.maquiran"
}