diff --git a/src/app/OtherService/document-counter.service.ts b/src/app/OtherService/document-counter.service.ts index 671d4243a..6891c3cfa 100644 --- a/src/app/OtherService/document-counter.service.ts +++ b/src/app/OtherService/document-counter.service.ts @@ -4,7 +4,6 @@ import { EventoAprovacaoStore } from 'src/app/store/eventoaprovacao-store.servic import { ExpedienteGdStore } from 'src/app/store/expedientegd-store.service'; import { PendentesStore } from 'src/app/store/pendestes-store.service'; import { PedidosStore } from 'src/app/store/pedidos-store.service'; -import { ExpedienteprStore } from 'src/app/store/expedientepr-store.service'; import { DespachosprStore } from 'src/app/store/despachospr-store.service'; import { DeplomasStore } from '../store/deplomas.service'; diff --git a/src/app/Rules/deploma.service.ts b/src/app/Rules/deploma.service.ts index 26d9b0acd..a5f3ec12c 100644 --- a/src/app/Rules/deploma.service.ts +++ b/src/app/Rules/deploma.service.ts @@ -1,4 +1,5 @@ import { Injectable } from '@angular/core'; +import { CustomTaskPipe } from '../pipes/custom-task.pipe'; import { ProcessesService } from '../services/processes.service'; @Injectable({ @@ -20,6 +21,8 @@ export class DeplomaService { ] } + customTaskPipe = new CustomTaskPipe() + constructor( private processes: ProcessesService, ) { } @@ -83,4 +86,9 @@ export class DeplomaService { return this.processes.CompleteTask(body) } + + async getList() { + + } + } diff --git a/src/app/Rules/despacho.service.ts b/src/app/Rules/despacho.service.ts index 24a261d96..d270feb1d 100644 --- a/src/app/Rules/despacho.service.ts +++ b/src/app/Rules/despacho.service.ts @@ -1,8 +1,11 @@ import { Injectable } from '@angular/core'; +import { customTask, fullTask } from '../models/dailyworktask.model'; import { AttachmentList } from '../models/Excludetask'; import { PermissionService } from '../OtherService/permission.service'; +import { CustomTaskPipe } from '../pipes/custom-task.pipe'; import { ProcessesService } from '../services/processes.service'; - +import { DespachoStore } from '../store/despacho-store.service'; +import { LoaderService } from 'src/app/store/loader.service' @Injectable({ providedIn: 'root' }) @@ -20,10 +23,14 @@ export class DespachoService { 'Tarefa do Despacho': 'Tarefa de Despacho' | 'Concluir' | 'rexecucao' } - constructor( + customTaskPipe = new CustomTaskPipe() + despachoStore = DespachoStore; + + constructor( private processes: ProcessesService, - public p: PermissionService - ) { } + public p: PermissionService, + public LoaderService: LoaderService + ) { } arquivar(note:string, documents:AttachmentList, serialnumber) { @@ -181,4 +188,46 @@ export class DespachoService { return this.processes.CompleteTask(body) } + + async getList({updateStore = false}): Promise { + + this.LoaderService.push({}) + + let result: fullTask[] = [] + + try { + result = await this.processes.GetTasksList("Despacho", false).toPromise(); + } catch (error) { + + } finally { + this.LoaderService.pop({}) + } + + + result = result.filter(data => data.workflowInstanceDataFields.Status == "Active") + + let despachoList: customTask[] = new Array(); + + result.forEach((element, index) => { + + let task: customTask = this.customTaskPipe.transform(element); + despachoList.push(task); + + }); + + despachoList = this.sortArrayISODate(despachoList).reverse(); + + if(updateStore) { + this.despachoStore.reset(despachoList); + } + + return despachoList + } + + sortArrayISODate(myArray: any) { + return myArray.sort(function(a, b) { + return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0); + }); + } + } diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html index 55a31a0c0..1cdc523ab 100644 --- a/src/app/home/home.page.html +++ b/src/app/home/home.page.html @@ -3,14 +3,14 @@ - {{toDayEventStorage.eventsList.length}} + {{toDayEventStorage.eventsList.length + expedienteGdStore.count}} Início - Agenda + Agenda @@ -21,7 +21,7 @@ - Ações + Ações diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts index 1bf94036b..f8485409d 100644 --- a/src/app/home/home.page.ts +++ b/src/app/home/home.page.ts @@ -12,6 +12,8 @@ import { DocumentCounterService } from 'src/app/OtherService/document-counter.se import { PermissionService } from '../OtherService/permission.service'; import { TotalDocumentStore } from '../store/total-document.service'; import { connection } from '../services/socket/synchro.service'; +import { DespachoService } from '../Rules/despacho.service'; +import { ExpedienteGdStore } from '../store/expedientegd-store.service'; // import { NetworkService } from '../services/network.service'; @@ -44,6 +46,7 @@ export class HomePage implements OnInit { toDayEventStorage = ToDayEventStorage totalDocumentStore = TotalDocumentStore + expedienteGdStore = ExpedienteGdStore adding: "intervenient" | "CC" = "intervenient"; mobileComponent = { @@ -68,7 +71,8 @@ export class HomePage implements OnInit { connection = connection - constructor(private zone: NgZone, + constructor( + private zone: NgZone, private router: Router, public modalCtrl: AlertController, private notificationsService: NotificationsService, @@ -76,12 +80,15 @@ export class HomePage implements OnInit { private activeroute: ActivatedRoute, // private network: NetworkService, public p: PermissionService, - public documentCounterService: DocumentCounterService) { + public documentCounterService: DocumentCounterService, + private despachoRule: DespachoService) { this.router.events.subscribe((val) => { document.querySelectorAll('ion-modal').forEach((e: any) => e.remove()) }); + this.updateList() + // if (typeof Worker !== 'undefined') { // // Create a new @@ -99,14 +106,6 @@ export class HomePage implements OnInit { //this.folderId = this.navParams.get('folderId'); } - - this.notificationsService.registerCallback( - 'Create Depacho', - () =>{ - this.refreshing() - } - ) - } refreshing() { @@ -162,8 +161,16 @@ export class HomePage implements OnInit { }); } } + } + updateList() { + this.notificationsService.registerCallback( + 'despachos', + () => { + this.despachoRule.getList({updateStore: true}) + } + ) } diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts index 059bdfccf..7092329d1 100644 --- a/src/app/modals/create-process/create-process.page.ts +++ b/src/app/modals/create-process/create-process.page.ts @@ -287,6 +287,8 @@ export class CreateProcessPage implements OnInit { this.modalController.dismiss(); } catch (error) { this.toastService.badRequest('Processo não efectuado'); + + } finally { loader.remove() } diff --git a/src/app/modals/profile/profile.page.html b/src/app/modals/profile/profile.page.html index 937def0e4..7b55af5c7 100644 --- a/src/app/modals/profile/profile.page.html +++ b/src/app/modals/profile/profile.page.html @@ -1,5 +1,4 @@ - - +
- + +
- +
{{loggeduser.RoleDescription}}
@@ -28,39 +28,46 @@
-
-
{{notificationdata.length}} novas notificações - -
-
-
- - - - +
+ + + +
+ +
+ + +
+
+
+ + + + +
+
+

{{item.dateInit}}

+

{{item.dateEnd}}

+
+
+

{{item.Location}}

+

{{item.alert}}

+

{{item.desc}}

+
+
-
-

{{item.dateInit}}

-

{{item.dateEnd}}

-
-
-

{{item.Location}}

-

{{item.alert}}

-

{{item.desc}}

-
-
-
- - - + + +
+
diff --git a/src/app/modals/profile/profile.page.scss b/src/app/modals/profile/profile.page.scss index 7ec24baa5..a3541af59 100644 --- a/src/app/modals/profile/profile.page.scss +++ b/src/app/modals/profile/profile.page.scss @@ -3,7 +3,6 @@ // background-color: #0782c9; padding: 20px 20px; border: 0!important; - overflow: auto; .div-logo{ background: transparent; @@ -67,7 +66,6 @@ ion-list{ .notifications-content{ padding: 0px 20px; .item{ - display: flex; border-radius: 15px; box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07); border: solid 1px #e9e9e9; diff --git a/src/app/models/Expediente.ts b/src/app/models/Expediente.ts new file mode 100644 index 000000000..1b035eb56 --- /dev/null +++ b/src/app/models/Expediente.ts @@ -0,0 +1,16 @@ + +export interface ExpedienteFullTaskWorkflowInstanceDataFields { + FolderID: number; + Sender: string; + Subject: string; + Status: string; +} + +export interface ExpedienteFullTask { + serialNumber: string; + taskStartDate: string; + workflowDisplayName: string; + activityInstanceName: string; + totalDocuments: number; + workflowInstanceDataFields: ExpedienteFullTaskWorkflowInstanceDataFields; +} \ No newline at end of file diff --git a/src/app/models/dailyworktask.model.ts b/src/app/models/dailyworktask.model.ts index bba984a56..c57ec15b1 100644 --- a/src/app/models/dailyworktask.model.ts +++ b/src/app/models/dailyworktask.model.ts @@ -113,4 +113,18 @@ export interface expedienteTask { DispatchNumber: any AttachmentsProcessLastInstanceID: any InstanceID: any +} + + + +export interface ExpedienteTask { + SerialNumber: string + Senders : string + CreateDate : string + DocumentsQty : number + WorkflowName : string + activityInstanceName : string + Status : string + taskStartDate: string + Subject: string } \ No newline at end of file diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index f600014db..13052ad42 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -11,8 +11,8 @@

{{totalEvent}} eventos agendados para hoje

-
{{currentHoursMinutes | date: 'HH:mm'}}
-
"{{currentEvent}}"
+
{{currentHoursMinutes | date: 'HH:mm'}}
+
"{{currentEvent}}"
@@ -94,7 +94,7 @@
-
@@ -102,8 +102,8 @@
{{task.taskStartDate | date: 'HH:mm'}}
-
{{ task.workflowInstanceDataFields.Subject }}
-
{{ task.workflowInstanceDataFields.Sender }}
+
{{ task.Subject }}
+
{{ task.Senders }}
 diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index da6483b96..4202af52f 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -13,8 +13,9 @@ import { ProcessesService } from '../../services/processes.service'; import { DailyWorkTask } from '../../models/dailyworktask.model'; import { User } from 'src/app/models/user.model'; import { ToDayEventStorage } from 'src/app/store/to-day-event-storage.service'; -import { ExpedienteStorage } from 'src/app/store/expediente-storage-service.service'; import { ScreenOrientation } from '@ionic-native/screen-orientation/ngx'; +import { ExpedienteTaskPipe } from 'src/app/pipes/expediente-task.pipe'; +import { ExpedienteGdStore } from 'src/app/store/expedientegd-store.service'; @Component({ selector: 'app-events', @@ -62,15 +63,16 @@ export class EventsPage implements OnInit { // shared data toDayEventStorage = ToDayEventStorage - expedienteStorage = ExpedienteStorage + expedienteGdStore = ExpedienteGdStore + + expedienteTaskPipe = new ExpedienteTaskPipe() @Output() openExpedientListPage:EventEmitter = new EventEmitter(); loggeduser: User; existingScreenOrientation: string; - pdfSrc = "https://vadimdez.github.io/ng2-pdf-viewer/assets/pdf-test.pdf"; - + constructor( private eventService: EventsService, private router: Router, @@ -330,21 +332,13 @@ export class EventsPage implements OnInit { } LoadList() { - switch (this.loggeduser.Profile) { - case 'MDGPR': - this.processes.GetTasksList("Expediente", false).subscribe(result => { - console.log(result); - this.expedienteStorage.reset(result) - }); - break; - case 'PR': - this.processes.GetTasksList("Expediente", false).subscribe(result => { - this.expedienteStorage.reset(result) - }); - break; - default: - break; - } + this.processes.GetTaskListExpediente(false).subscribe(result => { + console.log("Expediente", result); + + const ExpedienteTask = result.map( e=> this.expedienteTaskPipe.transform(e)) + + this.expedienteGdStore.reset(ExpedienteTask) + }); } sortArrayISODate(myArray: any){ diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.html b/src/app/pages/gabinete-digital/despachos/despachos.page.html index 20c979908..a6f23f08b 100644 --- a/src/app/pages/gabinete-digital/despachos/despachos.page.html +++ b/src/app/pages/gabinete-digital/despachos/despachos.page.html @@ -26,14 +26,14 @@ refreshingText="A actualizar..."> - +
@@ -68,13 +68,13 @@
Lista vazia
-
+
diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.ts b/src/app/pages/gabinete-digital/despachos/despachos.page.ts index 1338a40c5..511b6ca78 100644 --- a/src/app/pages/gabinete-digital/despachos/despachos.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despachos.page.ts @@ -6,7 +6,8 @@ import { ModalController } from '@ionic/angular'; import { AlertService } from 'src/app/services/alert.service'; import { AuthService } from 'src/app/services/auth.service'; import { NavigationStart, Router } from '@angular/router'; -import { DespachoPageStore } from 'src/app/store/despachos-page-store.service'; +import { DespachoService } from 'src/app/Rules/despacho.service'; +import { DespachoStore } from 'src/app/store/despacho-store.service'; @Component({ selector: 'app-despachos', @@ -36,8 +37,7 @@ export class DespachosPage implements OnInit { loadedAttachments:any; dicIndex = 0; inicial = false - skeletonLoader = true - despachospagestore = DespachoPageStore; + despachoStore = DespachoStore; constructor ( private processes:ProcessesService, @@ -45,6 +45,7 @@ export class DespachosPage implements OnInit { private alertService: AlertService, private authService: AuthService, private router: Router, + private despachoRule: DespachoService ) { this.profile = 'mdgpr'; } @@ -80,52 +81,17 @@ export class DespachosPage implements OnInit { this.LoadList(); } - - openExpedientDetailPage(data) { - this.openExpedientDetail.emit(data); - } - async LoadList() { - this.skeletonLoader = true - - let result = await this.processes.GetTasksList("Despacho", false).toPromise(); - //let despachos = result.reverse().filter(data => data.activityInstanceName == "Despacho (Paralelo)"); - this.despachoList = [] - - this.skeletonLoader = false - - await result.filter(data => data.workflowInstanceDataFields.Status == "Active").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, - "Senders": element.workflowInstanceDataFields.Sender, - "CreateDate": taskDate, - "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, - "Remetente": element.workflowInstanceDataFields.Remetente, - "DocumentsQty": element.totalDocuments, - "DocId": element.workflowInstanceDataFields.DispatchDocId, - "WorkflowName": element.workflowDisplayName, - "activityInstanceName": element.activityInstanceName, - } - this.despachoList.push(task) - }); - this.despachoList = this.sortArrayISODate(this.despachoList).reverse() - this.despachospagestore.reset(this.despachoList); - + this.despachoList = await this.despachoRule.getList({updateStore: true}) } - sortArrayISODate(myArray: any) { - return myArray.sort(function(a, b) { - return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0); - }); + get skeletonLoader(): boolean { + return this.despachoRule.LoaderService.loading } + + doRefresh(event) { this.LoadList(); diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.html b/src/app/pages/gabinete-digital/expediente/expediente.page.html index b5aab96ce..e76fcb838 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.html @@ -34,13 +34,13 @@
- {{ task.Folio }} + {{ task.Subject }}
@@ -65,13 +65,13 @@
Lista vazia
-
+
diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts index b71cd0abd..385f3b67a 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts @@ -1,9 +1,9 @@ import { Component, OnInit } from '@angular/core'; import { NavigationStart, Router } from '@angular/router'; -import { DailyWorkTask } from '../../../models/dailyworktask.model'; import { ProcessesService } from 'src/app/services/processes.service'; import { ToastService } from 'src/app/services/toast.service'; -import { ExpedienteStorage } from 'src/app/store/expediente-storage-service.service'; +import { ExpedienteGdStore } from 'src/app/store/expedientegd-store.service'; +import { ExpedienteTaskPipe } from 'src/app/pipes/expediente-task.pipe'; @Component({ selector: 'app-expediente', @@ -17,17 +17,17 @@ export class ExpedientePage implements OnInit { //profile:string; showLoader:boolean; - taskslist:DailyWorkTask[] = []; + taskslist = []; serialNumber:string; - expedienteStorage = ExpedienteStorage + expedienteGdStore = ExpedienteGdStore + expedienteTaskPipe = new ExpedienteTaskPipe() constructor( private processes:ProcessesService, private router: Router, private toastService: ToastService - ) { - } + ) {} ngOnInit() { @@ -52,39 +52,25 @@ export class ExpedientePage implements OnInit { this.skeletonLoader = true try { - const expediente: object[] = await this.processes.GetTasksList("Expediente", false).toPromise() - + const expediente: object[] = await this.processes.GetTaskListExpediente(false).toPromise() const result = expediente this.taskslist = new Array(); let res = result.reverse().filter((data: any) => data.workflowInstanceDataFields.Status == "Active"); res.forEach((element: any) => { - 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: DailyWorkTask = { - "SerialNumber": element.serialNumber, - "Folio": element.workflowInstanceDataFields.Subject, - "Senders": element.workflowInstanceDataFields.Sender, - "CreateDate": taskDate, - "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, - "Remetente": element.workflowInstanceDataFields.Remetente, - "DocumentsQty": element.totalDocuments, - "WorkflowName": element.workflowDisplayName, - "activityInstanceName": element.activityInstanceName, - "Status": element.workflowInstanceDataFields.Status, - } + + let task = this.expedienteTaskPipe.transform(element) this.taskslist.push(task); }); - console.log(this.taskslist); - this.expedienteStorage.reset(this.taskslist); - this.skeletonLoader = false; + this.expedienteGdStore.reset(this.taskslist); } catch (error) { this.toastService.badRequest('Processo não encontrado') this.goBack() + } finally { + this.skeletonLoader = false; } } diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html index 6102721bf..7140133fe 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html +++ b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html @@ -30,7 +30,7 @@
@@ -62,14 +62,14 @@
Lista vazia
-
+
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts index 05792807c..f2aa80b6d 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts +++ b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts @@ -8,8 +8,9 @@ import { ExpedienteDetailPage } from 'src/app/pages/gabinete-digital/expediente/ import { AlertService } from 'src/app/services/alert.service'; import { User } from 'src/app/models/user.model'; import { AuthService } from 'src/app/services/auth.service'; -import { ExpedienteprStore } from 'src/app/store/expedientepr-store.service'; import { Location } from '@angular/common' +import { ExpedienteGdStore } from 'src/app/store/expedientegd-store.service'; +import { ExpedienteTaskPipe } from 'src/app/pipes/expediente-task.pipe'; @Component({ selector: 'app-expedientes-pr', @@ -20,7 +21,7 @@ export class ExpedientesPrPage implements OnInit { @ViewChild(CalendarComponent) myCal: CalendarComponent; - taskslist:DailyWorkTask[] = []; + taskslist= []; serialNumber:string; showLoader:boolean; @@ -28,7 +29,8 @@ export class ExpedientesPrPage implements OnInit { @Output() openExpedientDetail:EventEmitter = new EventEmitter(); skeletonLoader = true - expedienteprstore = ExpedienteprStore; + expedienteGdStore = ExpedienteGdStore; + expedienteTaskPipe = new ExpedienteTaskPipe() constructor( private processes:ProcessesService, @@ -64,32 +66,18 @@ export class ExpedientesPrPage implements OnInit { LoadList() { this.skeletonLoader = true - this.processes.GetTasksList("Expediente", false).subscribe(result => { + this.processes.GetTaskListExpediente(false).subscribe(result => { console.log(result); this.skeletonLoader = false this.showLoader =false this.taskslist = new Array(); let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active"); 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: DailyWorkTask = { - "SerialNumber": element.serialNumber, - "Folio": element.workflowInstanceDataFields.Subject, - "Senders": element.workflowInstanceDataFields.Sender, - "CreateDate": taskDate, - "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, - "Remetente": element.workflowInstanceDataFields.Remetente, - "DocumentsQty": element.totalDocuments, - "WorkflowName": element.workflowDisplayName, - "activityInstanceName": element.activityInstanceName, - "Status": element.workflowInstanceDataFields.Status, - } - this.taskslist.push(task); - }); + let task = this.expedienteTaskPipe.transform(element) + this.taskslist.push(task); + }); console.log(this.taskslist); - this.expedienteprstore.reset(this.taskslist); + this.expedienteGdStore.reset(this.taskslist); this.skeletonLoader = false }) } diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 34acf1aaa..cf1efbc1b 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -1,6 +1,5 @@ import { Component, DoCheck, OnInit, ViewChild } from '@angular/core'; import { ProcessesService } from 'src/app/services/processes.service'; -import { AlertService } from 'src/app/services/alert.service'; import { ModalController } from '@ionic/angular'; import { ActivatedRoute, NavigationEnd, NavigationExtras, Router } from '@angular/router'; import { AuthService } from 'src/app/services/auth.service'; @@ -13,7 +12,6 @@ import { EventoAprovacaoStore } from 'src/app/store/eventoaprovacao-store.servic import { ExpedienteGdStore } from 'src/app/store/expedientegd-store.service'; import { PendentesStore } from 'src/app/store/pendestes-store.service'; import { PedidosStore } from 'src/app/store/pedidos-store.service'; -import { ExpedienteprStore } from 'src/app/store/expedientepr-store.service'; import { DespachosprStore } from 'src/app/store/despachospr-store.service'; import { PermissionService } from 'src/app/OtherService/permission.service'; import { removeDuplicate } from 'src/plugin/removeDuplicate.js' @@ -21,6 +19,8 @@ import { WaitForDomService } from 'src/app/services/dom/wait-for-dom.service'; import { TotalDocumentStore } from 'src/app/store/total-document.service'; import { DeplomasStore } from 'src/app/store/deplomas.service'; import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe'; +import { NotificationsService } from 'src/app/services/notifications.service'; +import { DespachoService } from 'src/app/Rules/despacho.service'; @Component({ selector: 'app-gabinete-digital', @@ -116,7 +116,9 @@ export class GabineteDigitalPage implements OnInit, DoCheck { private router: Router, authService: AuthService, public p: PermissionService, - public waitForDomService: WaitForDomService + public waitForDomService: WaitForDomService, + private notificationsService: NotificationsService, + private despachoRule: DespachoService ) { this.loggeduser = authService.ValidatedUser; @@ -450,19 +452,15 @@ export class GabineteDigitalPage implements OnInit, DoCheck { this.showLoader = true; let allPreocesses_ = await this.processesbackend.GetTasksList("", false).toPromise(); - this.count_all_processes = Object.keys(allPreocesses_).length; + let count_all_processes = Object.keys(allPreocesses_).length; + this.totalDocumentStore.resetCount(count_all_processes) - let expedientes = await this.processesbackend.GetTasksList("Expediente", false).toPromise(); + let expedientes = await this.processesbackend.GetTaskListExpediente(false).toPromise(); expedientes = expedientes.filter(data => data.workflowInstanceDataFields.Status == "Active") - this.count_exp_dailywork = Object.keys(expedientes).length; - this.expedientegbstore.count = this.count_exp_dailywork; this.expedientegbstore.reset(expedientes) - let despachos = await this.processesbackend.GetTasksList("Despacho", false).toPromise(); - despachos = despachos.filter(data => data.workflowInstanceDataFields.Status == "Active") - this.count_desp_dailywork = Object.keys(despachos).length; - this.despachoStore.count = this.count_desp_dailywork + let despachos = await this.despachoRule.getList({updateStore: true}) this.despachoStore.reset(despachos) let pareceres = await this.processesbackend.GetTasksList("Pedido de Parecer", false).toPromise(); diff --git a/src/app/pipes/expediente-task.pipe.spec.ts b/src/app/pipes/expediente-task.pipe.spec.ts new file mode 100644 index 000000000..adb70f694 --- /dev/null +++ b/src/app/pipes/expediente-task.pipe.spec.ts @@ -0,0 +1,8 @@ +import { ExpedienteTaskPipe } from './expediente-task.pipe'; + +describe('ExpedienteTaskPipe', () => { + it('create an instance', () => { + const pipe = new ExpedienteTaskPipe(); + expect(pipe).toBeTruthy(); + }); +}); diff --git a/src/app/pipes/expediente-task.pipe.ts b/src/app/pipes/expediente-task.pipe.ts new file mode 100644 index 000000000..13cad0df5 --- /dev/null +++ b/src/app/pipes/expediente-task.pipe.ts @@ -0,0 +1,28 @@ +import { Pipe, PipeTransform } from '@angular/core'; +import { ExpedienteTask } from '../models/dailyworktask.model'; +import { ExpedienteFullTask } from '../models/Expediente'; + +@Pipe({ + name: 'expedienteTask' +}) +export class ExpedienteTaskPipe implements PipeTransform { + + transform(fullTask: ExpedienteFullTask): ExpedienteTask { + let date = new Date(fullTask.taskStartDate); + date.setMonth(date.getMonth() + 1); + let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds(); + + return { + "SerialNumber": fullTask.serialNumber, + "taskStartDate": fullTask.taskStartDate, + "Subject": fullTask.workflowInstanceDataFields.Subject, + "Senders": fullTask.workflowInstanceDataFields.Sender, + "CreateDate": taskDate, + "DocumentsQty": fullTask.totalDocuments, + "WorkflowName": fullTask.workflowDisplayName, + "activityInstanceName": fullTask.activityInstanceName, + "Status": fullTask.workflowInstanceDataFields.Status, + } + } + +} diff --git a/src/app/pipes/pipes.module.ts b/src/app/pipes/pipes.module.ts index 6d5416e45..3e5ccac18 100644 --- a/src/app/pipes/pipes.module.ts +++ b/src/app/pipes/pipes.module.ts @@ -4,10 +4,11 @@ import { SearchDocumentPipe } from './search-document.pipe'; import { CustomTaskPipe } from './custom-task.pipe'; import { EventPipe } from './event.pipe'; import { PublicationPipe } from './publication.pipe'; +import { ExpedienteTaskPipe } from './expediente-task.pipe'; @NgModule({ - declarations: [FilterPipe, SearchDocumentPipe, CustomTaskPipe, EventPipe, PublicationPipe], + declarations: [FilterPipe, SearchDocumentPipe, CustomTaskPipe, EventPipe, PublicationPipe, ExpedienteTaskPipe], exports: [FilterPipe], imports: [] }) diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts index 5ab493039..ae4fa4f18 100644 --- a/src/app/services/events.service.ts +++ b/src/app/services/events.service.ts @@ -150,7 +150,6 @@ export class EventsService { getAllMdOficialEvents(startdate:string, enddate:string): any{ let geturl = environment.apiURL + 'calendar/md'; - geturl = geturl.replace('/V4/','/V5/') let params = new HttpParams(); @@ -166,7 +165,6 @@ export class EventsService { getAllMdPessoalEvents(startdate:string, enddate:string): any{ let geturl = environment.apiURL + 'calendar/md'; - geturl = geturl.replace('/V4/','/V5/') let params = new HttpParams(); diff --git a/src/app/services/notifications.service.ts b/src/app/services/notifications.service.ts index 79e19a185..924242563 100644 --- a/src/app/services/notifications.service.ts +++ b/src/app/services/notifications.service.ts @@ -41,12 +41,6 @@ export class NotificationsService { private activeroute: ActivatedRoute, private jsonstore: JsonStore) { - this.callbacks.forEach(e=> { - if(e.type = 'Create Depacho') { - e.funx() - } - }) - } @@ -222,9 +216,9 @@ export class NotificationsService { console.log(message); var data = JSON.parse(message.payload); - console.log(data.Service); - console.log(data.IdObject); - console.log(data.Object); + console.log('data.Service', data.Service); // module + console.log('data.IdObject', data.IdObject); // Object id + console.log('data.Object', data.Object); // details if(message.actionName){ this.notificatinsRoutes(data); @@ -233,7 +227,13 @@ export class NotificationsService { //this.notificatinsRoutes(data); console.log(data) } - + + this.callbacks.forEach( e=> { + if(e.type == data.Object) { + e.funx() + } + }) + } }, (error) => { console.log('Push notification recived: failure ' + error.responseText); diff --git a/src/app/services/processes.service.ts b/src/app/services/processes.service.ts index 410f9be0f..d5fe643a9 100644 --- a/src/app/services/processes.service.ts +++ b/src/app/services/processes.service.ts @@ -6,6 +6,7 @@ import { environment } from 'src/environments/environment'; import { Observable } from 'rxjs'; import { DocumentSetUpMeeting } from '../models/CallMeeting'; import { Excludetask } from '../models/Excludetask'; +import { ExpedienteFullTask } from '../models/Expediente'; @Injectable({ providedIn: 'root' @@ -38,6 +39,24 @@ export class ProcessesService { return this.http.get(`${geturl}`, options); } + GetTaskListExpediente(onlycount1): Observable { + const processname = "Expediente" + const onlycount = false + + const geturl = environment.apiURL + 'tasks/List'; + let params = new HttpParams(); + + params = params.set("ProcessName", processname); + params = params.set("OnlyCount", onlycount.toString()); + + let options = { + headers: this.headers, + params: params + }; + + return this.http.get(`${geturl}`, options); + } + GetTask(serialnumber:string): Observable{ const geturl = environment.apiURL + 'Tasks/FindTask'; let params = new HttpParams(); diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.ts b/src/app/shared/gabinete-digital/despachos/despachos.page.ts index e06a2fe8c..6e1c32ba0 100644 --- a/src/app/shared/gabinete-digital/despachos/despachos.page.ts +++ b/src/app/shared/gabinete-digital/despachos/despachos.page.ts @@ -1,10 +1,11 @@ -import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; -import { customTask, DailyWorkTask, fullTask } from '../../../models/dailyworktask.model'; +import { Component, EventEmitter, OnInit, Output } from '@angular/core'; +import { customTask } from '../../../models/dailyworktask.model'; import { ProcessesService } from 'src/app/services/processes.service'; import { NavigationStart, Router } from '@angular/router'; import { DespachoStore } from 'src/app/store/despacho-store.service'; import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe'; - +import { NotificationsService } from 'src/app/services/notifications.service'; +import { DespachoService } from 'src/app/Rules/despacho.service' @Component({ selector: 'app-despachos', templateUrl: './despachos.page.html', @@ -15,13 +16,14 @@ export class DespachosPage implements OnInit { segment:string; @Output() openExpedientDetail:EventEmitter = new EventEmitter(); - skeletonLoader = true despachoStore = DespachoStore; customTaskPipe = new CustomTaskPipe() constructor ( private processes:ProcessesService, private router: Router, + private notificationsService: NotificationsService, + private despachoRule: DespachoService ) {} ngOnInit() { @@ -45,32 +47,16 @@ export class DespachosPage implements OnInit { async LoadList() { - this.skeletonLoader = true - - let result: fullTask[] = await this.processes.GetTasksList("Despacho", false).toPromise(); - result = result.filter(data => data.workflowInstanceDataFields.Status == "Active") - - let despachoList = new Array(); - - result.forEach((element, index) => { - - let task = this.customTaskPipe.transform(element); - despachoList.push(task); - - }); - - despachoList = this.sortArrayISODate(despachoList).reverse(); - this.despachoStore.reset(despachoList); - this.skeletonLoader = false - + await this.despachoRule.getList({updateStore: true}) + } - sortArrayISODate(myArray: any) { - return myArray.sort(function(a, b) { - return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0); - }); + + get skeletonLoader(): boolean { + return this.despachoRule.LoaderService.loading } + doRefresh() { setTimeout(() => { this.LoadList(); diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html index 48113c09a..b85b72640 100644 --- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html +++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html @@ -13,10 +13,10 @@
- +
@@ -48,13 +48,13 @@
Lista vazia
-
+
diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts index 04425d050..d25fd250e 100644 --- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts +++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts @@ -6,8 +6,9 @@ import { ModalController } from '@ionic/angular'; import { AlertService } from 'src/app/services/alert.service'; import { User } from 'src/app/models/user.model'; import { AuthService } from 'src/app/services/auth.service'; -import { ExpedienteprStore } from 'src/app/store/expedientepr-store.service'; import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe'; +import { ExpedienteGdStore } from 'src/app/store/expedientegd-store.service'; +import { ExpedienteTaskPipe } from 'src/app/pipes/expediente-task.pipe'; @Component({ selector: 'app-expedientes-pr', @@ -16,11 +17,12 @@ import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe'; }) export class ExpedientesPrPage implements OnInit { - taskslist:DailyWorkTask[] = []; + taskslist = []; serialNumber:string; skeletonLoader = true; - expedienteprstore = ExpedienteprStore; + expedienteGdStore = ExpedienteGdStore; customTaskPipe = new CustomTaskPipe() + expedienteTaskPipe = new ExpedienteTaskPipe() loggeduser: User; @Output() openExpedientDetail:EventEmitter = new EventEmitter(); @@ -62,15 +64,15 @@ export class ExpedientesPrPage implements OnInit { LoadList() { this.skeletonLoader = true; - this.processes.GetTasksList("Expediente", false).subscribe(result => { + this.processes.GetTaskListExpediente(false).subscribe(result => { this.taskslist = []; let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active"); res.forEach(element => { - let task: customTask = this.customTaskPipe.transform(element); + let task = this.expedienteTaskPipe.transform(element); this.taskslist.push(task); }); - this.expedienteprstore.reset(this.taskslist); + this.expedienteGdStore.reset(this.taskslist); this.skeletonLoader = false; }); diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.html b/src/app/shared/gabinete-digital/expedients/expedients.page.html index 43232ec41..621163895 100644 --- a/src/app/shared/gabinete-digital/expedients/expedients.page.html +++ b/src/app/shared/gabinete-digital/expedients/expedients.page.html @@ -30,7 +30,7 @@
- {{ task.Folio }} + {{ task.Subject }}
diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts index 821991bc2..348545c09 100644 --- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts +++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts @@ -1,15 +1,9 @@ -import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; -import { ActivatedRoute, NavigationEnd, NavigationExtras, NavigationStart, Router } from '@angular/router'; -import { CalendarComponent } from 'ionic2-calendar'; - -import { DailyWorkTask } from '../../../models/dailyworktask.model'; +import { Component, Input, OnInit } from '@angular/core'; +import { NavigationStart, Router } from '@angular/router'; import { ProcessesService } from 'src/app/services/processes.service'; -import { formatDate } from '@angular/common'; -import { LoadingService } from 'src/app/services/loading.service'; -import { ModalController, NavParams } from '@ionic/angular'; -import { ExpedienteDetailPage } from 'src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page'; import { AlertService } from 'src/app/services/alert.service'; import { ExpedienteGdStore } from 'src/app/store/expedientegd-store.service'; +import { ExpedienteTaskPipe } from 'src/app/pipes/expediente-task.pipe'; @Component({ selector: 'app-expedients', @@ -18,23 +12,20 @@ import { ExpedienteGdStore } from 'src/app/store/expedientegd-store.service'; }) export class ExpedientsPage implements OnInit { segment:string; - //profile:string; - @ViewChild(CalendarComponent) myCal: CalendarComponent; - - taskslist:DailyWorkTask[] = []; + taskslist = []; serialNumber:string; @Input() profile:string; skeletonLoader = true expedientegbstore = ExpedienteGdStore + expedienteTaskPipe = new ExpedienteTaskPipe() + constructor( private processes:ProcessesService, - private modalController: ModalController, private alertService: AlertService, private router: Router, - private activatedRoute: ActivatedRoute, ) { this.profile = 'mdgpr'; @@ -58,11 +49,11 @@ export class ExpedientsPage implements OnInit { } - segmentChanged(){ + segmentChanged() { this.LoadList(); } - notImplemented(){ + notImplemented() { this.alertService.presentAlert('Funcionalidade em desenvolvimento'); } @@ -70,31 +61,17 @@ export class ExpedientsPage implements OnInit { this.skeletonLoader = true - this.processes.GetTasksList("Expediente", false).subscribe(result => { + this.processes.GetTaskListExpediente(false).subscribe(result => { this.taskslist = []; this.skeletonLoader = false let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active"); 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: DailyWorkTask = { - "SerialNumber": element.serialNumber, - "Folio": element.workflowInstanceDataFields.Subject, - "Senders": element.workflowInstanceDataFields.Sender, - "CreateDate": taskDate, - "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, - "Remetente": element.workflowInstanceDataFields.Remetente, - "DocumentsQty": element.totalDocuments, - "WorkflowName": element.workflowDisplayName, - "activityInstanceName": element.activityInstanceName, - "Status": element.workflowInstanceDataFields.Status, - } + let task = this.expedienteTaskPipe.transform(element) this.taskslist.push(task); }); - console.log("Buffer store", this.taskslist) + this.expedientegbstore.reset(this.taskslist); }); } diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts index 876ae8963..00e26ec55 100644 --- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts +++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts @@ -20,7 +20,6 @@ export class PedidosPage implements OnInit { @ViewChild(CalendarComponent) myCal: CalendarComponent; - taskslist:DailyWorkTask[] = []; parecerList:any[] = []; fulltask:any; @@ -100,7 +99,6 @@ export class PedidosPage implements OnInit { this.taskType = "Pedido de Deferimento"; this.processes.GetTasksList("Pedido de Deferimento", false).subscribe(result => { - this.taskslist = result.filter(data => data.workflowInstanceDataFields.Status == "Active") this.skeletonLoader = false this.deferimentoList = new Array(); diff --git a/src/app/store/despachos-page-store.service.spec.ts b/src/app/store/despachos-page-store.service.spec.ts deleted file mode 100644 index 23e7ad08c..000000000 --- a/src/app/store/despachos-page-store.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { DespachosPageStoreService } from './despachos-page-store.service'; - -describe('DespachosPageStoreService', () => { - let service: DespachosPageStoreService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(DespachosPageStoreService); - }); - - it('should be created', () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/src/app/store/despachos-page-store.service.ts b/src/app/store/despachos-page-store.service.ts deleted file mode 100644 index 0133e247a..000000000 --- a/src/app/store/despachos-page-store.service.ts +++ /dev/null @@ -1,60 +0,0 @@ -import { Injectable } from '@angular/core'; -import { localstoreService } from './localstore.service' -import { AES, enc, SHA1 } from 'crypto-js' -import { customTask } from '../models/dailyworktask.model'; - -@Injectable({ - providedIn: 'root' -}) -export class DespachosPageStoreService { - - // main data - private _list: [] = [] - // local storage keyName - private keyName: string; - private _count = 0 - - constructor() { - - this.keyName = (SHA1(this.constructor.name)).toString() - - - setTimeout(()=>{ - let restore = localstoreService.get(this.keyName, {}) - this._list = restore.list || [] - this._count = parseInt(restore.count) || 0 - }, 10) - - } - - get list(): customTask[] { - return this._list || [] - } - - get count() { - return this._count - } - set count(value) { - this._count = value - this.save() - } - - reset(eventsList: any) { - this._list = eventsList - - this.count = this._list.length - this.save() - } - - private save() { - setTimeout(()=> { - localstoreService.set(this.keyName,{ - list: this._list, - count: this._count - }) - }, 10) - } - -} - -export const DespachoPageStore = new DespachosPageStoreService() diff --git a/src/app/store/expediente-storage-service.service.spec.ts b/src/app/store/expediente-storage-service.service.spec.ts deleted file mode 100644 index 274cd90d2..000000000 --- a/src/app/store/expediente-storage-service.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ExpedienteStorageServiceService } from './expediente-storage-service.service'; - -describe('ExpedienteStorageServiceService', () => { - let service: ExpedienteStorageServiceService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ExpedienteStorageServiceService); - }); - - it('should be created', () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/src/app/store/expediente-storage-service.service.ts b/src/app/store/expediente-storage-service.service.ts deleted file mode 100644 index 1fa536bce..000000000 --- a/src/app/store/expediente-storage-service.service.ts +++ /dev/null @@ -1,62 +0,0 @@ -import { Injectable } from '@angular/core'; -import { Event } from '../models/event.model'; -import { localstoreService } from './localstore.service' -import { AES, enc, SHA1 } from 'crypto-js' - -@Injectable({ - providedIn: 'root' -}) - -// shared data used in home and gabinete -class ExpedienteStorageServiceService { - - // main data - private _list: Event[] = [] - private _count = 0 - // local storage keyName - private keyName: string; - - constructor() { - - this.keyName = (SHA1(this.constructor.name+ 'ExpedienteStorage/forAll')).toString() - - setTimeout(()=>{ - let restore = localstoreService.get(this.keyName, []) - this._list = restore.list || [] - this._count = restore.count || 0 - }, 10) - - } - - get list() { - return this._list - } - - get count() { - return this._count - } - set count(value: number) { - this._count = value - this.save() - } - - reset(list: any) { - this._list = list - - this.count = this._list.length - this.save() - } - - private save() { - setTimeout(()=>{ - localstoreService.set(this.keyName, { - list: this._list, - count: this._count - }) - }, 10) - } - -} - - -export const ExpedienteStorage = new ExpedienteStorageServiceService() \ No newline at end of file diff --git a/src/app/store/expedientegd-store.service.ts b/src/app/store/expedientegd-store.service.ts index c4f03fd18..678d2df80 100644 --- a/src/app/store/expedientegd-store.service.ts +++ b/src/app/store/expedientegd-store.service.ts @@ -1,6 +1,7 @@ import { Injectable } from '@angular/core'; import { localstoreService } from './localstore.service' import { AES, enc, SHA1 } from 'crypto-js' +import { ExpedienteTask } from '../models/dailyworktask.model'; @Injectable({ providedIn: 'root' @@ -8,7 +9,7 @@ import { AES, enc, SHA1 } from 'crypto-js' export class ExpedientegdStoreService { // main data - private _list = [] + private _list: ExpedienteTask[] = [] // local storage keyName private keyName: string; private _count = 0 diff --git a/src/app/store/expedientepr-store.service.spec.ts b/src/app/store/expedientepr-store.service.spec.ts deleted file mode 100644 index 5e43599b2..000000000 --- a/src/app/store/expedientepr-store.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { ExpedienteprStoreService } from './expedientepr-store.service'; - -describe('ExpedienteprStoreService', () => { - let service: ExpedienteprStoreService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(ExpedienteprStoreService); - }); - - it('should be created', () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/src/app/store/expedientepr-store.service.ts b/src/app/store/expedientepr-store.service.ts deleted file mode 100644 index 5fd2c0fb2..000000000 --- a/src/app/store/expedientepr-store.service.ts +++ /dev/null @@ -1,54 +0,0 @@ -import { Injectable } from '@angular/core'; -import { localstoreService } from './localstore.service' -import { AES, enc, SHA1 } from 'crypto-js' - -@Injectable({ - providedIn: 'root' -}) -export class ExpedienteprStoreService { - // main data - private _list: [] = [] - // local storage keyName - private keyName: string; - private _count = 0 - - constructor() { - - this.keyName = (SHA1(this.constructor.name)).toString() - - setTimeout(()=>{ - let restore = localstoreService.get(this.keyName, {}) - this._list = restore.list || [] - this._count = parseInt(restore.count) || 0 - }, 10) - - } - - get list() { return this._list || [] } - - get count() { return this._count || 0 } - set count(value: number) { - this._count = value - this.save() - } - - reset(eventsList: any) { - this._list = eventsList - - this.count = this._list.length - this.save() - } - - private save() { - setTimeout(()=>{ - localstoreService.set(this.keyName,{ - list: this._list, - count: this._count - }) - }, 10) - - } - -} - -export const ExpedienteprStore = new ExpedienteprStoreService() diff --git a/src/app/store/loader.service.spec.ts b/src/app/store/loader.service.spec.ts new file mode 100644 index 000000000..aef696199 --- /dev/null +++ b/src/app/store/loader.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { LoaderService } from './loader.service'; + +describe('LoaderService', () => { + let service: LoaderService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(LoaderService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/store/loader.service.ts b/src/app/store/loader.service.ts new file mode 100644 index 000000000..53a3784a7 --- /dev/null +++ b/src/app/store/loader.service.ts @@ -0,0 +1,28 @@ +import { Injectable } from '@angular/core'; + +@Injectable({ + providedIn: 'root' +}) +export class LoaderService { + + private loadingList: { + name: string + }[] = [] + + constructor() { } + + get loading(){ + return this.loadingList.length != 0 + } + + push({name = ''}) { + this.loadingList.push({ + name: name + }) + } + + pop({}) { + this.loadingList.pop() + } + +} diff --git a/src/assets/images/icons-nav-home.svg b/src/assets/images/icons-nav-home.svg index 829cf9cea..ad505de12 100644 --- a/src/assets/images/icons-nav-home.svg +++ b/src/assets/images/icons-nav-home.svg @@ -3,11 +3,7 @@ - - - - - +