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

Git pull made- changes made on list order

Browse Source
This commit is contained in:
Eudes Inácio
2021-10-19 08:25:03 +01:00
parent a21a196248 dc45e49f58
commit a4a730a87e
20 changed files with 228 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/Rules/despacho.service.ts
+9 -6
View File
@@ -7,6 +7,7 @@ import { DespachoStore } from '../store/despacho-store.service';
import { LoaderService } from 'src/app/store/loader.service'
import { SessionStore } from '../store/session.service';
import { PermissionService } from '../services/worker/permission.service';
import { SortService } from '../services/functions/sort.service';
@Injectable({
providedIn: 'root'
@@ -31,7 +32,8 @@ export class DespachoService {
constructor(
private processes: ProcessesService,
public p: PermissionService,
public LoaderService: LoaderService
public LoaderService: LoaderService,
private sortService: SortService,
) { }
arquivar(note:string, documents:AttachmentList, serialnumber) {
@@ -251,7 +253,7 @@ export class DespachoService {
});
despachoList = this.sortArrayISODate(despachoList).reverse();
despachoList = this.sortService.sortArrayByDate(despachoList).reverse();
if(updateStore) {
this.despachoStore.reset(despachoList);
@@ -270,20 +272,21 @@ export class DespachoService {
let result = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
let despachosPr;
let despachos = this.sortService.sortArrayByDate(result);
switch (SessionStore.user.Profile) {
case 'MDGPR':
despachosPr = result.reverse().filter(data => data.activityInstanceName == "Tarefa de Despacho");
despachosPr = despachos.reverse().filter(data => data.activityInstanceName == "Tarefa de Despacho");
break;
case 'PR':
despachosPr = result.reverse().filter(data => data.activityInstanceName == "Concluir Despacho");
despachosPr = despachos.reverse().filter(data => data.activityInstanceName == "Concluir Despacho");
break;
}
}
sortArrayISODate(myArray: any) {
/* sortArrayISODate(myArray: any) {
return myArray.sort(function(a, b) {
return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0);
});
}
} */
}
src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
+12 -19
View File
@@ -18,8 +18,8 @@ import { __awaiter } from 'tslib';
import { DespachosprStore } from 'src/app/store/despachospr-store.service';
import { SqliteService } from 'src/app/services/sqlite.service';
import { synchro } from 'src/app/services/socket/synchro.service';
import { BackgroundService } from 'src/app/services/background.service';
import { SortService } from 'src/app/services/functions/sort.service';
@Component({
selector: 'app-despachos-pr',
@@ -61,7 +61,8 @@ export class DespachosPrPage implements OnInit {
private authService: AuthService,
private router: Router,
private sqliteservice: SqliteService,
private backgroundservice: BackgroundService
private backgroundservice: BackgroundService,
private sortService: SortService,
) {
this.loggeduser = authService.ValidatedUser;
@@ -113,35 +114,33 @@ export class DespachosPrPage implements OnInit {
async LoadList() {
this.processes.GetTasksList("Despacho do Presidente da República", false).subscribe(async res => {
this.skeletonLoader = true
let result = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
this.despachoList = [];
this.skeletonLoader = false;
console.log(result);
let despachosPr;
let despachos = this.sortService.sortArrayByDate(result);
switch (this.loggeduser.Profile) {
case 'MDGPR':
despachosPr = await result.reverse().filter(data => data.activityInstanceName == "Tarefa de Despacho");
despachosPr = await despachos.reverse().filter(data => data.activityInstanceName == "Tarefa de Despacho");
break;
case 'PR':
console.log(result);
despachosPr = await result.reverse().filter(data => data.activityInstanceName == "Concluir Despacho");
despachosPr = await despachos.reverse().filter(data => data.activityInstanceName == "Concluir Despacho");
break;
}
console.log(despachosPr);
despachosPr = despachosPr.filter(data => data.workflowInstanceDataFields.Status == "Active");
despachosPr.forEach((element, index) => {
let date = new Date(element.taskStartDate);
date.setMonth(date.getMonth() + 1);
let taskDate = date.getFullYear() + "-" + date.getMonth() + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds();
let task = {
"SerialNumber": element.serialNumber,
"Folio": element.workflowInstanceDataFields.Subject,
@@ -154,7 +153,7 @@ export class DespachosPrPage implements OnInit {
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
this.despachoList.push(task);
console.log(this.despachoList);
});
@@ -214,12 +213,6 @@ export class DespachosPrPage implements OnInit {
})
}
sortArrayISODate(myArray: any) {
return myArray.sort(function (a, b) {
return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0);
});
}
doRefresh() {
setTimeout(() => {
src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
+4 -3
View File
@@ -7,6 +7,7 @@ import { ModalController, NavParams } from '@ionic/angular';
import { AlertService } from 'src/app/services/alert.service';
import { DiplomaPage } from 'src/app/pages/gabinete-digital/diplomas/diploma/diploma.page';
import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
import { SortService } from 'src/app/services/functions/sort.service';
@Component({
selector: 'app-diplomas-assinar',
@@ -31,6 +32,7 @@ export class DiplomasAssinarPage implements OnInit {
private modalController: ModalController,
private alertService: AlertService,
private router: Router,
private sortService: SortService,
) {
}
@@ -39,7 +41,7 @@ export class DiplomasAssinarPage implements OnInit {
const pathname = location.pathname + location.search
this.LoadList()
this.router.events.forEach((event) => {
if (event instanceof NavigationEnd && event.url.startsWith(pathname)) {
if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) {
@@ -78,8 +80,7 @@ export class DiplomasAssinarPage implements OnInit {
this.diplomasList = [];
let diplomasAssinar = diplomas.reverse().filter(data => data.activityInstanceName == "Assinar Diploma");
console.log(diplomasAssinar);
diplomasAssinar = this.sortService.sortArrayByDate(diplomasAssinar);
diplomasAssinar.forEach(element => {
let task: customTask = this.customTaskPipe.transform(element)
this.diplomasList.push(task);
src/app/pages/gabinete-digital/diplomas/diplomas.page.ts
+15 -20
View File
@@ -4,8 +4,8 @@ import { DailyWorkTask } from '../../../models/dailyworktask.model';
import { ProcessesService } from 'src/app/services/processes.service';
import { SqliteService } from 'src/app/services/sqlite.service';
import { synchro } from 'src/app/services/socket/synchro.service';
import { BackgroundService } from 'src/app/services/background.service';
import { SortService } from 'src/app/services/functions/sort.service';
@Component({
selector: 'app-diplomas',
@@ -29,11 +29,10 @@ export class DiplomasPage implements OnInit, OnDestroy {
private router: Router,
private activatedRoute: ActivatedRoute,
private sqliteservice: SqliteService,
private backgroundservice: BackgroundService
private backgroundservice: BackgroundService,
private sortService: SortService,
) {
this.diplomasList = [];
//Inicializar segment
this.segment = 'validar';
this.activatedRoute.queryParams.subscribe(params => {
if (params['validar'] == 'true') {
@@ -189,7 +188,7 @@ export class DiplomasPage implements OnInit, OnDestroy {
diplomasList.push(task);
});
this.diplomasList = this.sortArrayISODate(diplomasList.reverse());
this.diplomasList = this.sortService.sortArrayByDate(diplomasList.reverse());
let diplomasAssinados = diplomas.reverse().filter(data => data.activityInstanceName == "Diploma Assinado");
@@ -200,7 +199,7 @@ export class DiplomasPage implements OnInit, OnDestroy {
diplomasAssinadoList.push(task);
});
console.log('diplomasAssinados', diplomasAssinados)
this.diplomasAssinadoList = this.sortArrayISODate(diplomasAssinadoList).reverse();
this.diplomasAssinadoList = this.sortService.sortArrayByDate(diplomasAssinadoList).reverse();
}, (error) => {
this.getFromDb()
@@ -219,18 +218,18 @@ export class DiplomasPage implements OnInit, OnDestroy {
let task = this.pipeTaskOffline(element)
diplomasList.push(task);
});
this.diplomasList = this.sortArrayISODate(diplomasList.reverse());
});
this.diplomasList = this.sortService.sortArrayByDate(diplomasList).reverse();
let diplomasAssinados = process.reverse().filter(data => data.activityInstanceName == "Diploma Assinado");
let diplomasAssinadoList = []
diplomasAssinados.forEach(async element => {
let task = this.pipeTaskOffline(element)
diplomasAssinadoList.push(task);
});
console.log('diplomasAssinados', diplomasAssinados)
this.diplomasAssinadoList = this.sortArrayISODate(diplomasAssinadoList).reverse();
let task = this.pipeTaskOffline(element)
diplomasAssinadoList.push(task);
});
console.log('diplomasAssinados', diplomasAssinados)
this.diplomasAssinadoList = this.sortService.sortArrayByDate(diplomasAssinadoList).reverse();
})
}
@@ -244,7 +243,7 @@ export class DiplomasPage implements OnInit, OnDestroy {
"SerialNumber": element.serialNumber,
"Folio": element.workflowInstanceDataFields.Subject,
"Senders": element.workflowInstanceDataFields.Sender,
"CreateDate": taskDate,
"CreateDate": new Date(element.taskStartDate),
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": element.totalDocuments,
@@ -264,7 +263,7 @@ export class DiplomasPage implements OnInit, OnDestroy {
"SerialNumber": element.serialNumber,
"Folio": JSON.parse(element.workflowInstanceDataFields).Subject,
"Senders": JSON.parse(element.workflowInstanceDataFields).Sender,
"CreateDate": taskDate,
"CreateDate": new Date(element.taskStartDate),
"DocumentURL": JSON.parse(element.workflowInstanceDataFields).ViewerRequest,
"Remetente": JSON.parse(element.workflowInstanceDataFields).Remetente,
"DocumentsQty": element.totalDocuments,
@@ -275,11 +274,7 @@ export class DiplomasPage implements OnInit, OnDestroy {
}
}
sortArrayISODate(myArray: any) {
return myArray.sort(function (a, b) {
return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0);
});
}
async refreshing() {
setTimeout(() => {
src/app/pages/gabinete-digital/event-list/event-list.page.ts
+10 -9
View File
@@ -11,6 +11,7 @@ import { Location } from '@angular/common';
import { SqliteService } from '../../../services/sqlite.service';
import { BackgroundService } from '../../../services/background.service';
import { Platform } from '@ionic/angular';
import { SortService } from 'src/app/services/functions/sort.service';
@Component({
selector: 'app-event-list',
@@ -40,6 +41,7 @@ export class EventListPage implements OnInit {
private location: Location,
private sqliteservice: SqliteService,
private platform: Platform,
private sortService: SortService,
private backgroundservice: BackgroundService
) { }
@@ -80,12 +82,13 @@ export class EventListPage implements OnInit {
this.platform.ready().then(() => {
this.sqliteservice.getListOfEventAprove('Agenda Oficial MDGPR', 'Agenda Pessoal MDGPR').then((event: any[]) => {
this.eventsMDGPRList = event
this.eventsMDGPRList = this.sortService.sortArrayByDate(event).reverse()
console.log("All evento to aprove from db ", event)
})
this.sqliteservice.getListOfEventAprove('Agenda Oficial PR', 'Agenda Pessoal PR').then((event: any[]) => {
this.eventsPRList = event
this.eventsPRList = this.sortService.sortArrayByDate(event).reverse()
console.log("All evento to aprove from db ", event)
})
})
@@ -97,26 +100,24 @@ export class EventListPage implements OnInit {
}
async LoadToApproveEvents() {
this.processes.GetTasksList('Agenda Oficial MDGPR', false).subscribe(async res => {
this.showLoader = true;
this.skeletonLoader = true
console.log(this.segment);
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();
this.eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal);
console.log('Event aprove', this.eventsMDGPRList);
this.eventaprovacaostore.resetmd(this.eventsMDGPRList);
this.eventsMDGPRList = this.sortService.sortArrayByDate(this.eventsMDGPRList).reverse()
this.eventaprovacaostore.resetmd(this.sortService.sortArrayByDate(this.eventsMDGPRList).reverse());
}
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);
this.eventaprovacaostore.resetpr(this.eventsPRList);
this.eventsPRList = this.sortService.sortArrayByDate(this.eventsPRList).reverse();
this.eventaprovacaostore.resetpr(this.sortService.sortArrayByDate(this.eventsPRList).reverse());
}
this.showLoader = false;
this.skeletonLoader = false
src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
+41 -42
View File
@@ -10,6 +10,7 @@ import { ModalService } from 'src/app/services/modal.service';
import { SqliteService } from 'src/app/services/sqlite.service';
import { BackgroundService } from 'src/app/services/background.service';
import { SortService } from 'src/app/services/functions/sort.service';
@Component({
selector: 'app-pedidos',
@@ -46,6 +47,7 @@ export class PedidosPage implements OnInit {
private activatedRoute: ActivatedRoute,
private modalService: ModalService,
private sqliteservice: SqliteService,
private sortService: SortService,
private backgroundservice: BackgroundService
) {
//Inicializar segment
@@ -67,23 +69,23 @@ export class PedidosPage implements OnInit {
ngOnInit() {
this.LoadList()
this.router.events.forEach((event) => {
if(event instanceof NavigationStart && '/home/gabinete-digital/pedidos?parecer=true'.startsWith(event.url) ||
event instanceof NavigationStart && '/home/gabinete-digital/pedidos?deferimento=true'.startsWith(event.url)
) {
if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) {
this.refreshing()
} else {
this.LoadList()
}
}
});
this.backgroundservice.registerBackService('Online', () => {
this.getFromDb();
});
this.router.events.forEach((event) => {
if (event instanceof NavigationStart && '/home/gabinete-digital/pedidos?parecer=true'.startsWith(event.url) ||
event instanceof NavigationStart && '/home/gabinete-digital/pedidos?deferimento=true'.startsWith(event.url)
) {
if (window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) {
this.refreshing()
} else {
this.LoadList()
}
}
});
this.backgroundservice.registerBackService('Online', () => {
this.getFromDb();
});
}
goBack() {
@@ -126,27 +128,27 @@ export class PedidosPage implements OnInit {
if (this.segment == 'parecer') {
this.taskType = "Pedido de Parecer";
let parecer = await this.processes.GetTasksList("Pedido de Parecer", false).toPromise();
let parecerPr = await this.processes.GetTasksList("Pedido de Parecer do Presidente", false).toPromise();
this.skeletonLoader = false
let allParecer = parecer.concat(parecerPr).reverse().filter(data => data.workflowInstanceDataFields.Status == "Active")
this.parecerList = [];
allParecer.filter(data => data.workflowInstanceDataFields.Status == "Active").forEach(element => {
let date = new Date(element.taskStartDate);
date.setMonth(date.getMonth() + 1);
let taskDate = date.getFullYear() + "-" + date.getMonth() + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds();
let task = {
"SerialNumber": element.serialNumber,
"Folio": element.workflowInstanceDataFields.Subject,
"Senders": element.workflowInstanceDataFields.Sender,
"CreateDate": taskDate,
"CreateDate": new Date(element.taskStartDate),
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": element.totalDocuments,
@@ -157,32 +159,32 @@ export class PedidosPage implements OnInit {
this.parecerList.push(task);
});
this.sqliteservice.addProcess(this.parecerList);
this.listToPresentparecerList = this.parecerList
this.listToPresentparecerList = this.sortService.sortArrayISODate(this.parecerList);
}
else if (this.segment == 'deferimento') {
this.taskType = "Pedido de Deferimento";
this.processes.GetTasksList("Pedido de Deferimento", false).subscribe(result => {
this.skeletonLoader = false
console.log(result);
this.deferimentoList = [];
let res = result.filter(data => data.workflowInstanceDataFields.Status == "Active")
res = res.reverse()
res.forEach(element => {
let date = new Date(element.taskStartDate);
date.setMonth(date.getMonth() + 1);
let taskDate = date.getFullYear() + "-" + date.getMonth() + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds();
let task = {
"SerialNumber": element.serialNumber,
"Folio": element.workflowInstanceDataFields.Subject,
"Senders": element.workflowInstanceDataFields.Sender,
"CreateDate": taskDate,
"CreateDate": new Date(element.taskStartDate),
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": element.totalDocuments,
@@ -190,20 +192,17 @@ export class PedidosPage implements OnInit {
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
if (element.workflowInstanceDataFields.Status == "Active") {
this.deferimentoList.push(task);
}
});
this.sqliteservice.addProcess(this.deferimentoList);
this.listToPresentdeferimentoList = this.deferimentoList
});
this.sqliteservice.addProcess(this.deferimentoList);
this.listToPresentdeferimentoList = this.sortService.sortArrayISODate(this.deferimentoList);
}
}, (error) => {
this.getFromDb()
})
@@ -237,7 +236,7 @@ export class PedidosPage implements OnInit {
parecerlist.push(task)
}
})
this.listToPresentparecerList = parecerlist;
this.listToPresentparecerList = this.sortService.sortArrayISODate(parecerlist);
console.log('parecer', process)
})
@@ -263,7 +262,7 @@ export class PedidosPage implements OnInit {
deferimentolist.push(task)
}
})
this.listToPresentdeferimentoList = deferimentolist;
this.listToPresentdeferimentoList = this.sortService.sortArrayISODate(deferimentolist);
console.log('deferimento', process)
})
}
src/app/pages/gabinete-digital/pendentes/pendentes.page.ts
+6 -10
View File
@@ -13,6 +13,7 @@ import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
import { SqliteService } from 'src/app/services/sqlite.service';
import { BackgroundService } from 'src/app/services/background.service';
import { Platform } from '@ionic/angular';
import { SortService } from 'src/app/services/functions/sort.service';
@Component({
@@ -44,7 +45,8 @@ export class PendentesPage implements OnInit {
private activatedRoute: ActivatedRoute,
private sqliteservice: SqliteService,
private platform: Platform,
private backgroundservices: BackgroundService
private backgroundservices: BackgroundService,
private sortService: SortService,
) {
this.loggeduser = authService.ValidatedUser;
this.profile = 'mdgpr';
@@ -100,7 +102,7 @@ export class PendentesPage implements OnInit {
});
pendentesList = removeDuplicate(pendentesList)
pendentesList = this.sortArrayISODate(pendentesList);
pendentesList = this.sortService.sortArrayByDate(pendentesList);
this.listToPresent = pendentesList;
this.skeletonLoader = false;
@@ -110,12 +112,6 @@ export class PendentesPage implements OnInit {
}
sortArrayISODate(myArray: any) {
return myArray.sort(function (a, b) {
return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0);
});
}
getFromDb() {
this.platform.ready().then(() => {
@@ -125,7 +121,7 @@ export class PendentesPage implements OnInit {
var workflow = JSON.parse(element.workflowInstanceDataFields);
if (workflow.Status === "Pending") {
let task = {
"CreateDate": element.taskStartDate,
"CreateDate": new Date(element.taskStartDate),
"DocumentsQty": element.totalDocuments,
"FolderID": workflow.FolderID,
"Folio": workflow.Subject,
@@ -139,7 +135,7 @@ export class PendentesPage implements OnInit {
}
});
pendingList = this.sortArrayISODate(pendingList);
pendingList = this.sortService.sortArrayISODate(pendingList);
this.listToPresent = pendingList;
console.log('pendentes', pendingList)
src/app/services/auth.service.ts
-1
View File
@@ -108,7 +108,6 @@ export class AuthService {
localStorage.setItem('Meteor.userId',responseChat['data'].userId);
this.cookieService.set('rc_token', responseChat['data'].authToken);
this.cookieService.set('rc_uid', responseChat['data'].userId);
alert(this.cookieService.get('rc_uid'));
this.storageService.store(AuthConnstants.AUTH, responseChat);
return true;
}
src/app/services/functions/sort.service.spec.ts
+16
View File
@@ -0,0 +1,16 @@
import { TestBed } from '@angular/core/testing';
import { SortService } from './sort.service';
describe('SortService', () => {
let service: SortService;
beforeEach(() => {
TestBed.configureTestingModule({});
service = TestBed.inject(SortService);
});
it('should be created', () => {
expect(service).toBeTruthy();
});
});
src/app/services/functions/sort.service.ts
+21
View File
@@ -0,0 +1,21 @@
import { Injectable } from '@angular/core';
@Injectable({
providedIn: 'root'
})
export class SortService {
constructor() { }
sortArrayISODate(myArray: any) {
return myArray.sort(function (a, b) {
return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0);
});
}
sortArrayByDate(myArray: any) {
console.log(myArray[0].taskStartDate);
return myArray.sort(function (a, b) {
return (new Date(a.workflowInstanceDataFields.StartDate) < new Date(b.workflowInstanceDataFields.StartDate)) ? -1 : ((new Date(a.workflowInstanceDataFields.StartDate) > new Date(b.workflowInstanceDataFields.StartDate)) ? 1 : 0);
});
}
}
src/app/shared/agenda/approve-event/approve-event.page.html
+7 -7
View File
@@ -21,7 +21,7 @@
<ion-icon src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
</div>
<div class="header-title flex-grow-1 cursor-pointer">
<label>{{loadedEvent.workflowInstanceDataFields.Subject}} </label>
<label>{{loadedEvent.workflowInstanceDataFields.Subject}} 11</label>
</div>
<div (click)="editar(loadedEvent.serialNumber)" class="header-icon-right display-none-{{showAside}}">
@@ -89,15 +89,15 @@
</div>
</div>
<div *ngIf="loadedAttachments" class="bottom-content width-100">
<div *ngIf="loadedEvent.Documents" class="bottom-content width-100">
<ion-list>
<h5>Documentos Anexados</h5>
<h5>Documentos Anexados </h5>
<ion-item class="ion-no-margin ion-no-padding"
*ngFor="let attach of loadedAttachments"
(click)="viewDocument(attach.SourceId)">
*ngFor="let attachment of loadedEvent.Documents"
(click)="viewDocument(attachment.DocId, attachment)">
<ion-label>
<p class="attach-title-item d-block">{{attach.SourceName}}</p>
<p><span class="span-left">{{attach.Stakeholders}}</span><span class="span-right">{{ attach.CreateDate | date: 'dd-MM-yyyy HH:mm' }}</span></p>
<p class="attach-title-item d-block">{{attachment.Assunto}}</p>
<p><span class="span-left">{{attachment.Sender}}</span><span class="span-right">{{ attachment.DocDate | date: 'dd-MM-yyyy HH:mm' }}</span></p>
</ion-label>
</ion-item>
</ion-list>
src/app/shared/agenda/approve-event/approve-event.page.ts
+34 -20
View File
@@ -9,6 +9,7 @@ import { EmendMessageModalPage } from 'src/app/pages/agenda/emend-message-modal/
import { EventActionsPopoverPage } from 'src/app/pages/agenda/event-actions-popover/event-actions-popover.page';
import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
import { ToastService } from 'src/app/services/toast.service';
import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
@Component({
selector: 'app-approve-event',
@@ -23,7 +24,7 @@ export class ApproveEventPage implements OnInit {
customDate:any;
today:any;
show: boolean = false;
months = ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"];
days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"];
@@ -62,7 +63,7 @@ export class ApproveEventPage implements OnInit {
this.getAttachments();
}
ngOnChanges() {
/* ngOnChanges() {
this.getTask();
this.getAttachments();
@@ -76,7 +77,7 @@ export class ApproveEventPage implements OnInit {
this.getAttachments();
}, 10000)
}
} */
notImplemented() {
this.alertService.presentAlert('Funcionalidade em desenvolvimento');
@@ -90,12 +91,12 @@ export class ApproveEventPage implements OnInit {
getTask() {
this.processes.GetTask(this.serialNumber).subscribe(res => {
// console.log(res);
console.log(res);
this.loadedEvent = res;
this.today = new Date(res.workflowInstanceDataFields.StartDate);
// console.log(new Date(this.today));
this.customDate = this.days[this.today.getDay()]+ ", " + this.today.getDate() +" de " + ( this.months[this.today.getMonth()]);
})
}
@@ -115,9 +116,9 @@ export class ApproveEventPage implements OnInit {
loader.remove()
}
/* this.approveEventDismiss.emit({
/* this.approveEventDismiss.emit({
"serialNumber": serialNumber,
"action": "Aprovar",
"action": "Aprovar",
"saveData": {
loadedEvent: this.loadedEvent,
today: this.today,
@@ -127,7 +128,7 @@ export class ApproveEventPage implements OnInit {
}
async rejectTask(serialNumber:string) {
let body = { "serialNumber": serialNumber, "action": "Rejeitar" }
console.log(body);
@@ -144,20 +145,33 @@ export class ApproveEventPage implements OnInit {
}
}
async getAttachments() {
this.loadedAttachments = await this.attachmentsService.getAttachmentsById(this.InstanceId).toPromise();
}
viewDocument(sourceId) {
this.processes.GetDocumentUrl(sourceId, '8').subscribe(res=>{
/* console.log(res); */
const url: string = res.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1");
const browser = this.iab.create(url,"_blank");
browser.show();
async viewDocument(DocId:string, Document) {
const modal = await this.modalController.create({
component: ViewDocumentPage,
componentProps: {
trustedUrl: '',
file: {
title: Document.Assunto,
url: '',
title_link: '',
},
Document,
applicationId: Document.ApplicationId,
docId: Document.DocId || Document.SourceId,
folderId: this.loadedEvent.FolderId,
task: this.loadedEvent
},
cssClass: 'modal modal-desktop'
});
await modal.present();
}
async openOptions(ev:any) {
@@ -186,9 +200,9 @@ export class ApproveEventPage implements OnInit {
modal.onDidDismiss()
.then( async (res) => {
console.log(res.data);
if(res.data !== ''){
let body = { "serialNumber": serialNumber,
let body = { "serialNumber": serialNumber,
"action": "Emendar",
"dataFields": {
"ReviewUserComment": res.data,
@@ -197,7 +211,7 @@ export class ApproveEventPage implements OnInit {
console.log(body);
const loader = this.toastService.loading()
try {
try {
await this.processes.PostTaskAction(body).toPromise();
this.toastService.successMessage('Pedido enviado');
this.close();
@@ -211,7 +225,7 @@ export class ApproveEventPage implements OnInit {
//this.alertService.presentAlert('Operação cancelada!');
}
});
//this.openEmendMessageModal(serialNumber);
//this.goBack();
}
src/app/shared/agenda/event-list/event-list.page.html
+1 -1
View File
@@ -2,7 +2,7 @@
<div class="header-content">
<div class="header-title d-flex align-center justify-between width-100">
<div class="flex-grow-1">Eventos para Aprovação</div>
<div (click)="ngOnChanges()">
<div (click)="refreshing()">
<button class="btn-no-color" >
<ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>
</button>
src/app/shared/agenda/event-list/event-list.page.ts
+20 -5
View File
@@ -6,6 +6,7 @@ import { ModalController } from '@ionic/angular';
import { NavigationEnd, Router } from '@angular/router';
import { AuthService } from 'src/app/services/auth.service';
import { LoginUserRespose } from 'src/app/models/user.model';
import { SortService } from 'src/app/services/functions/sort.service';
@Component({
selector: 'app-event-list',
@@ -36,6 +37,7 @@ export class EventListPage implements OnInit {
private modalController: ModalController,
private router: Router,
private userAuth: AuthService,
private sortService: SortService,
) {
this.loggeduser = userAuth.ValidatedUser;
}
@@ -54,8 +56,8 @@ export class EventListPage implements OnInit {
}
ngOnChanges() {
this.LoadToApproveEvents();
}
//this.LoadToApproveEvents();
}
segmentChanged(ev: any) {
this.LoadToApproveEvents();
@@ -71,12 +73,21 @@ export class EventListPage implements OnInit {
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();
this.eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal);
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();
this.eventsPRList = prEventsOficial.concat(prEventsPessoal);
let allEvents = prEventsOficial.concat(prEventsPessoal);
console.log(allEvents);
if(allEvents.length > 0){
this.eventsPRList = this.sortService.sortArrayByDate(allEvents).reverse();
}
}
this.showLoader = false;
}
@@ -84,7 +95,7 @@ export class EventListPage implements OnInit {
async openApproveModal(eventSerialNumber, data) {
let a =this.eventsMDGPRList.filter((elem)=>{
console.log(eventSerialNumber," ",elem.serialNumber)
//console.log(eventSerialNumber," ",elem.serialNumber)
return eventSerialNumber == elem.serialNumber
});
@@ -95,6 +106,10 @@ export class EventListPage implements OnInit {
});
}
refreshing() {
this.LoadToApproveEvents();
}
doRefresh(event) {
this.LoadToApproveEvents();
console.log('refresh');
src/app/shared/gabinete-digital/all-processes/all-processes.page.ts
+5 -2
View File
@@ -7,6 +7,7 @@ import { removeDuplicate } from 'src/plugin/removeDuplicate.js';
import { SqliteService } from '../../../services/sqlite.service';
import { synchro } from '../../../services/socket/synchro.service';
import { Platform } from '@ionic/angular';
import { SortService } from 'src/app/services/functions/sort.service';
@Component({
selector: 'app-all-processes',
@@ -26,7 +27,8 @@ export class AllProcessesPage implements OnInit {
private router: Router,
private authService: AuthService,
private sqliteservice: SqliteService,
private platform: Platform
private platform: Platform,
private sortService: SortService,
) {
this.loggeduser = authService.ValidatedUser;
}
@@ -93,7 +95,8 @@ export class AllProcessesPage implements OnInit {
}
this.allProcessesList.push(task);
this.allProcessesList = removeDuplicate(this.allProcessesList)
this.allProcessesList = this.sortArrayISODate(this.allProcessesList).reverse();
//this.allProcessesList = this.sortArrayISODate(this.allProcessesList).reverse();
this.allProcessesList = this.sortService.sortArrayISODate(this.allProcessesList).reverse();
});
src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts
+4 -7
View File
@@ -6,6 +6,7 @@ import { LoginUserRespose } from 'src/app/models/user.model';
import { NavigationStart, Router } from '@angular/router';
import { DespachosprStore } from 'src/app/store/despachospr-store.service';
import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
import { SortService } from 'src/app/services/functions/sort.service';
@Component({
selector: 'app-despachos-pr',
@@ -24,6 +25,7 @@ constructor (
private processes:ProcessesService,
private authService: AuthService,
private router: Router,
private sortService: SortService,
) {
this.loggeduser = authService.ValidatedUser;
@@ -32,7 +34,7 @@ constructor (
ngOnInit() {
this.LoadList()
this.router.events.forEach((event) => {
if (event instanceof NavigationStart &&
event.url.startsWith('/home/gabinete-digital?despachospr=true')) {
@@ -72,17 +74,12 @@ constructor (
despachoList.push(task);
});
despachoList = this.sortArrayISODate(despachoList).reverse()
despachoList = this.sortService.sortArrayByDate(despachoList).reverse()
this.despachosprstore.reset(despachoList);
this.skeletonLoader = false;
}
sortArrayISODate(myArray: any){
return myArray.sort(function(a, b) {
return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0);
});
}
refreshing(){
setTimeout(() => {
src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
+6 -4
View File
@@ -6,6 +6,7 @@ import { ModalController } from '@ionic/angular';
import { AlertService } from 'src/app/services/alert.service';
import { DeplomasStore } from 'src/app/store/deplomas.service';
import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
import { SortService } from 'src/app/services/functions/sort.service';
@Component({
selector: 'app-diplomas-assinar',
@@ -26,12 +27,13 @@ export class DiplomasAssinarPage implements OnInit {
private modalController: ModalController,
private alertService: AlertService,
private router: Router,
private sortService: SortService,
) { }
ngOnInit() {
this.LoadList()
this.router.events.forEach((event) => {
if (event instanceof NavigationStart && '/home/gabinete-digital?diplomasassinar=true'.startsWith(event.url)) {
if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) {
@@ -68,13 +70,13 @@ export class DiplomasAssinarPage implements OnInit {
console.log(diplomasAssinar);
diplomasAssinar.forEach(element => {
let task: customTask = this.customTaskPipe.transform(element)
this.diplomasList.push(task);
this.deplomasStore.resetDiplomasList(this.diplomasList)
this.deplomasStore.resetDiplomasList(this.sortService.sortArrayByDate(this.diplomasList));
});
}
}
}
src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
+9 -5
View File
@@ -7,6 +7,7 @@ import { NavigationStart, Router } from '@angular/router';
import { LoginUserRespose } from 'src/app/models/user.model';
import { AuthService } from 'src/app/services/auth.service';
import { EventoAprovacaoStore } from 'src/app/store/eventoaprovacao-store.service';
import { SortService } from 'src/app/services/functions/sort.service';
@Component({
selector: 'app-events-to-approve',
@@ -31,6 +32,7 @@ export class EventsToApprovePage implements OnInit {
private modalController: ModalController,
private router: Router,
private userAuth: AuthService,
private sortService: SortService,
)
{
this.loggeduser = userAuth.ValidatedUser;
@@ -41,9 +43,9 @@ export class EventsToApprovePage implements OnInit {
this.LoadToApproveEvents();
this.router.events.forEach((event) => {
if (event instanceof NavigationStart &&
if (event instanceof NavigationStart &&
'/home/gabinete-digital?eventos=true'.startsWith(event.url)) {
if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) {
this.doRefresh()
} else {
@@ -65,13 +67,15 @@ export class EventsToApprovePage 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.eventaprovacaostore.resetmd(this.eventsMDGPRList);
console.log(this.sortService.sortArrayByDate(this.eventsMDGPRList));
this.eventaprovacaostore.resetmd(this.sortService.sortArrayByDate(this.eventsMDGPRList).reverse());
}
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);
this.eventaprovacaostore.resetpr(this.eventsPRList);
this.eventaprovacaostore.resetpr(this.sortService.sortArrayByDate(this.eventsPRList).reverse());
}
this.showLoader = false;
}
@@ -123,7 +127,7 @@ export class EventsToApprovePage implements OnInit {
setTimeout(()=>{
this.LoadToApproveEvents();
}, 1000)
}
close(){
this.modalController.dismiss(null);
src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
+5 -3
View File
@@ -9,6 +9,7 @@ import { AlertService } from 'src/app/services/alert.service';
import { PedidoPage } from 'src/app/pages/gabinete-digital/pedidos/pedido/pedido.page';
import { PedidosStore } from 'src/app/store/pedidos-store.service';
import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
import { SortService } from 'src/app/services/functions/sort.service';
@Component({
selector: 'app-pedidos',
templateUrl: './pedidos.page.html',
@@ -43,6 +44,7 @@ export class PedidosPage implements OnInit {
private processes:ProcessesService,
private modalController: ModalController,
private alertService: AlertService,
private sortService: SortService,
) {
this.profile = 'mdgpr';
}
@@ -70,7 +72,7 @@ export class PedidosPage implements OnInit {
segmentChanged(ev: any) {
this.LoadList();
}
async LoadList() {
this.skeletonLoader = true;
@@ -92,7 +94,7 @@ export class PedidosPage implements OnInit {
let task: customTask = this.customTaskPipe.transform(element);
this.parecerList.push(task);
});
this.pedidosstore.resetparecer(this.parecerList);
this.pedidosstore.resetparecer(this.sortService.sortArrayByDate(this.parecerList));
}
else if(this.segment == 'deferimento') {
@@ -108,7 +110,7 @@ export class PedidosPage implements OnInit {
let task: customTask = this.customTaskPipe.transform(element);
this.deferimentoList.push(task);
});
this.pedidosstore.resetdeferimento(this.deferimentoList);
this.pedidosstore.resetdeferimento(this.sortService.sortArrayByDate(this.deferimentoList));
});
}
src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
+3 -7
View File
@@ -7,6 +7,7 @@ import { AuthService } from 'src/app/services/auth.service';
import { PendentesStore } from 'src/app/store/pendestes-store.service';
import { LoginUserRespose } from 'src/app/models/user.model';
import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
import { SortService } from 'src/app/services/functions/sort.service';
@Component({
selector: 'app-pendentes',
@@ -28,6 +29,7 @@ export class PendentesPage implements OnInit {
private processes:ProcessesService,
private authService: AuthService,
private router: Router,
private sortService: SortService,
) {
this.loggeduser = authService.ValidatedUser;
}
@@ -60,18 +62,12 @@ export class PendentesPage implements OnInit {
});
pendentesList = removeDuplicate( pendentesList)
pendentesList = this.sortArrayISODate(pendentesList);
pendentesList = this.sortService.sortArrayByDate(pendentesList);
this.pendentesstore.reset(pendentesList);
this.skeletonLoader = false;
}
sortArrayISODate(myArray: any){
return myArray.sort(function(a, b) {
return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0);
});
}
doRefresh() {
setTimeout(()=>{
this.LoadList();