+
diff --git a/src/app/modals/view-document/view-document.page.ts b/src/app/modals/view-document/view-document.page.ts
index f50f4d9e5..870d9e354 100644
--- a/src/app/modals/view-document/view-document.page.ts
+++ b/src/app/modals/view-document/view-document.page.ts
@@ -6,7 +6,6 @@ import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expedient
import { ProcessesService } from 'src/app/services/processes.service';
import { EventDetailsDocumentsOptionsPage } from 'src/app/shared/popover/event-details-documents-options/event-details-documents-options.page';
import { DocumentSetUpMeetingPage } from '../document-set-up-meeting/document-set-up-meeting.page';
-import { RouteService } from 'src/app/services/route.service';
@Component({
diff --git a/src/app/pages/chat/new-group/new-group.page.ts b/src/app/pages/chat/new-group/new-group.page.ts
index 98fb86bf8..07ea8fef4 100644
--- a/src/app/pages/chat/new-group/new-group.page.ts
+++ b/src/app/pages/chat/new-group/new-group.page.ts
@@ -87,7 +87,6 @@ export class NewGroupPage implements OnInit {
this.wsChatMethodsService.subscribeToRoomUpdate(res.result.rid, res.result);
- //this.addGroupMessage.emit(res.result.rid);
}
async addContacts(room){
diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.ts b/src/app/pages/gabinete-digital/event-list/event-list.page.ts
index 0beaba346..e4353f3df 100644
--- a/src/app/pages/gabinete-digital/event-list/event-list.page.ts
+++ b/src/app/pages/gabinete-digital/event-list/event-list.page.ts
@@ -88,17 +88,17 @@ export class EventListPage implements OnInit {
if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
- this.storage.get('event-to-aproveMD').then((events) => {
+ this.storage.get('event-to-aproveMD').then((events = []) => {
this.eventsMDGPRList = events
})
- this.storage.get('event-to-aprovePR').then((events) => {
+ this.storage.get('event-to-aprovePR').then((events = []) => {
this.eventsPRList = events
})
} else {
this.platform.ready().then(() => {
- this.sqliteservice.getListOfEventAprove('Agenda Oficial MDGPR', 'Agenda Pessoal MDGPR').then((event: any[]) => {
+ this.sqliteservice.getListOfEventAprove('Agenda Oficial MDGPR', 'Agenda Pessoal MDGPR').then((event: any[] = []) => {
this.eventsMDGPRList = this.sortService.sortDate(this.transformaDataDB(event), 'taskStartDate')
//this.eventsMDGPRList = this.eventsMDGPRList.filter(element => element.interveners != null)
@@ -161,7 +161,7 @@ export class EventListPage implements OnInit {
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) {
+ this.eventsMDGPRList = ( this.eventsMDGPRList || []).filter(function(item) {
return item.activityInstanceName != 'Editar Evento'
})
@@ -176,9 +176,9 @@ export class EventListPage implements OnInit {
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) {
+ this.eventsPRList = (this.eventsPRList || []).filter(function(item) {
return item.activityInstanceName != 'Editar Evento'
- })
+ })
this.storage.set('event-to-aprovePR',this.eventsPRList).then(() => {
diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
index cd6bf13d3..c4294377e 100644
--- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
@@ -148,7 +148,6 @@ export class BookMeetingModalPage implements OnInit {
this.postData.Category = 'Reunião'
-
}
ngOnInit() {
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index af735481b..a835c6890 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -31,33 +31,40 @@
-
-
+
-
+
+
+
+
+ *ngFor = "let task of AllProcess"
+ (click)="goToProcess(task.SerialNumber || task.serialNumber, task.WorkflowName || task.workflowName || task.workflowDisplayName || task.workflowName, task.activityInstanceName)">
- {{ task.Folio }}
+
+ {{ task.Folio }}
+ {{ task.Subject }}
+ {{ task.workflowInstanceDataFields.Subject }}
{{task.DocumentsQty}}
+ {{task.DocumentsQty || task.totalDocuments}}
- {{task.Senders}}
+ {{task.Senders }}
+ {{ task.workflowInstanceDataFields.Sender }}
@@ -68,10 +75,10 @@
@@ -80,7 +87,7 @@
{{task.activityInstanceName}}
- {{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}
+ {{ task.CreateDate || task.taskStartDate | date: 'dd-MM-yyyy HH:mm' }}
+
@@ -139,7 +146,7 @@
Todas as tarefas
- {{ allProcessesList.length }} Documentos
+ {{ getAllProcessCount }} Documentos
@@ -174,20 +181,6 @@
{{pendentesstore.count}} Documentos
-
-
-
-
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index 635112419..d74ddca4f 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -382,6 +382,9 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
}
goToProcess(serialNumber: string, workflowName: string, activityName: string) {
+
+ alert('nice!!!')
+
if (workflowName == 'Despacho') {
if (activityName == 'Tarefa de Despacho' || activityName == 'Concluir Despacho') {
this.router.navigate(['/home/gabinete-digital/despachos', serialNumber, 'gabinete-digital']);
@@ -537,13 +540,30 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
this.showSignedDiploma = false
}
+
+ get AllProcess() {
+ return this.expedientegbstore.list.concat(this.pedidosstore.listparecer).concat(this.pedidosstore.listdeferimento)
+ .concat(this.despachoprstore.list).concat(this.eventoaprovacaostore.listmd).concat(this.eventoaprovacaostore.listpr)
+ .concat(this.deplomasStore.diplomasList).concat(this.deplomasStore.diplomasAssinadoList).concat(this.despachoStore.list)
+ }
+
+ get getAllProcessCount() {
+ return this.AllProcess.length
+ }
+
async LoadCounts() {
+ let allPreocesses_;
+
+ try {
+ allPreocesses_ = await this.processesbackend.GetTasksList("", false).toPromise();
+ this.loadCount = true;
+ } catch(error) {
+ this.loadCount = true;
+ }
- let allPreocesses_ = await this.processesbackend.GetTasksList("", false).toPromise();
let allProcessesList = allPreocesses_;
- this.loadCount = true;
console.log(allProcessesList)
allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Conhecimento')
allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Revisar Diploma')
@@ -596,11 +616,12 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
this.allProcessesList = removeDuplicate(this.allProcessesList);
this.allProcessesList = this.sortService.sortDate(this.allProcessesList, 'CreateDate')
- console.log('All PROCESS', this.allProcessesList)
let expedientes = await this.processesbackend.GetTaskListExpediente(false).toPromise();
expedientes = expedientes.filter(data => data.workflowInstanceDataFields.Status == "Active")
+
this.expedientegbstore.count = expedientes.length
+ this.expedientegbstore.reset(expedientes);
let despachos = await this.despachoRule.getList({ updateStore: true })
@@ -613,17 +634,25 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
let pareceresPr = await this.processesbackend.GetTasksList("Pedido de Parecer do Presidente", false).toPromise();
let allParecer = pareceres.concat(pareceresPr);
+
this.count_par_dailywork = Object.keys(allParecer.filter(data => data.workflowInstanceDataFields.Status == "Active")).length;
this.pedidosstore.countparecer = this.count_par_dailywork;
+
+ this.pedidosstore.resetparecer(allParecer.filter(data => data.workflowInstanceDataFields.Status == "Active"));
let deferimentos = await this.processesbackend.GetTasksList("Pedido de Deferimento", false).toPromise();
this.count_def_dailywork = Object.keys(deferimentos.filter(data => data.workflowInstanceDataFields.Status == "Active")).length;
this.pedidosstore.countdeferimento = this.count_def_dailywork;
+ this.pedidosstore.resetdeferimento(deferimentos.filter(data => data.workflowInstanceDataFields.Status == "Active"));
+
+
let pendentes = await this.processesbackend.GetPendingTasks(false).toPromise();
this.count_total_pending = Object.keys(pendentes).length;
this.pendentesstore.count = this.count_total_pending;
+ this.pendentesstore.reset(pendentes);
+
let despachospr = await this.processesbackend.GetTasksList("Despacho do Presidente da República", false).toPromise();
let despachosPr;
@@ -631,27 +660,28 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
despachosPr = despachospr.filter(data => data.activityInstanceName == "Tarefa de Despacho").filter(data => data.workflowInstanceDataFields.Status == "Active");
this.count_de_pr = Object.keys(despachosPr).length;
this.despachoprstore.count = this.count_de_pr;
+ this.despachoprstore.reset(despachosPr)
} else if(this.loggeduser.Profile == 'PR') {
despachosPr = despachospr.filter(data => data.activityInstanceName == "Concluir Despacho").filter(data => data.workflowInstanceDataFields.Status == "Active")
this.count_de_pr = Object.keys(despachosPr).length;
this.despachoprstore.count = this.count_de_pr;
+ this.despachoprstore.reset(despachosPr)
}
let mdEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial MDGPR', false).toPromise();
let mdEventsPessoal = await this.processesbackend.GetTasksList('Agenda Pessoal MDGPR', false).toPromise();
let eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal);
- eventsMDGPRList = eventsMDGPRList.filter(function(item) {
- return item.activityInstanceName != 'Editar Evento'
- })
+
+ eventsMDGPRList = eventsMDGPRList.filter((item) => item.activityInstanceName != 'Editar Evento')
+
this.eventoaprovacaostore.countMd = eventsMDGPRList.length
this.eventoaprovacaostore.resetmd(eventsMDGPRList);
let prEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial PR', false).toPromise();
let prEventsPessoal = await this.processesbackend.GetTasksList('Agenda Pessoal PR', false).toPromise();
let eventsPRList = prEventsOficial.concat(prEventsPessoal);
- eventsPRList = eventsPRList.filter(function(item) {
- return item.activityInstanceName != 'Editar Evento'
- })
+ eventsPRList = eventsPRList.filter((item) => item.activityInstanceName != 'Editar Evento')
+
this.eventoaprovacaostore.countPr = eventsPRList.length
this.eventoaprovacaostore.resetpr(eventsPRList);
diff --git a/src/app/pages/search/search.page.html b/src/app/pages/search/search.page.html
index 2bb5c894b..cf2b0adf8 100644
--- a/src/app/pages/search/search.page.html
+++ b/src/app/pages/search/search.page.html
@@ -198,6 +198,8 @@
{{ searchDocument.EntidadeOrganicaNome }}
{{ formateIsoDate(searchDocument.Data) }}
+
+
Ver
diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts
index 0c1207814..998dc8932 100644
--- a/src/app/pages/search/search.page.ts
+++ b/src/app/pages/search/search.page.ts
@@ -10,6 +10,7 @@ import { PublicationDetailPage } from '../publications/view-publications/publica
import { DocumentDetailPage } from 'src/app/modals/document-detail/document-detail.page';
import { SearchCategory, SearchList } from 'src/app/models/search-document';
import { ThemeService } from 'src/app/services/theme.service'
+import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
@Component({
selector: 'app-search',
@@ -94,8 +95,36 @@ export class SearchPage implements OnInit {
selected: item
});
}
+ }
- return this.select;
+ async view(item: SearchList) {
+
+ const ApplicationType = item.ApplicationType.toString()
+ const Id = item.Id
+
+ if(ApplicationType == '8' ) {
+
+ this.viewDocumentDetail(Id, ApplicationType);
+
+ } else if (ApplicationType == '361') {
+
+ const modal = await this.modalController.create({
+ component: ViewDocumentPage,
+ componentProps: {
+ trustedUrl: '',
+ file: {
+ title: item.Assunto,
+ url: '',
+ title_link: '',
+ },
+ applicationId: ApplicationType,
+ docId: item.Id,
+ },
+ cssClass: 'modal modal-desktop'
+ });
+ await modal.present();
+ }
+
}
ngOnInit() {
@@ -665,7 +694,7 @@ export class SearchPage implements OnInit {
const ApplicationType = searchDocument.ApplicationType.toString()
const Id = searchDocument.Id
- if(this.select == false){
+ if(this.select == false) {
if(this.type == "Agenda") {
const modal = await this.modalCtrl.create({
@@ -680,15 +709,16 @@ export class SearchPage implements OnInit {
await modal.present();
modal.onDidDismiss().then((res)=>{});
- } else if(this.type == "AccoesPresidenciais"){
+ } else if(this.type == "AccoesPresidenciais") {
this.viewPublicationDetail(Id);
}
- else if(this.type == "AccoesPresidenciais & ArquivoDespachoElect"){
+ else if(this.type == "AccoesPresidenciais & ArquivoDespachoElect") {
if(ApplicationType == '8' || ApplicationType == '361') {
+
+ alert('view!!')
this.viewDocumentDetail(Id, ApplicationType);
- // this.openExpedientActionsModal(searchDocument)
}
}
}
diff --git a/src/app/shared/agenda/event-list/event-list.page.ts b/src/app/shared/agenda/event-list/event-list.page.ts
index 15e28c427..2d5ff87a9 100644
--- a/src/app/shared/agenda/event-list/event-list.page.ts
+++ b/src/app/shared/agenda/event-list/event-list.page.ts
@@ -93,7 +93,7 @@ export class EventListPage implements OnInit {
async openApproveModal(eventSerialNumber, data) {
- let a =this.eventsMDGPRList.filter((elem)=>{
+ let a = this.eventsMDGPRList.filter((elem)=>{
//
return eventSerialNumber == elem.serialNumber
});
diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.html b/src/app/shared/gabinete-digital/all-processes/all-processes.page.html
index 3d0b64161..72ec3d7d4 100644
--- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.html
+++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.html
@@ -23,28 +23,34 @@
-
+
-
+
+ *ngFor = "let task of AllProcess"
+ (click)="goToProcess(task.SerialNumber || task.serialNumber, task.WorkflowName || task.workflowName|| task.workflowDisplayName , task.activityInstanceName)">
- {{ task.Folio }}
+
+
+
+ {{ task.Folio }}
+ {{ task.Subject }}
+ {{ task.workflowInstanceDataFields.Subject }}
{{task.DocumentsQty}}
+ {{task.DocumentsQty || task.totalDocuments}}
- {{task.Senders}}
+ {{task.Senders }}
+ {{ task.workflowInstanceDataFields.Sender }}
@@ -67,7 +73,7 @@
{{task.activityInstanceName}}
- {{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }}
+ {{ task.CreateDate || task.taskStartDate | date: 'dd-MM-yyyy HH:mm' }}
-
+
-
+
-
-
-
- Lista vazia
+
diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
index 2b18ae4e6..05bddf273 100644
--- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
+++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
@@ -72,12 +72,9 @@ export class EventsToApprovePage implements OnInit {
let mdEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal MDGPR', false).toPromise();
this.eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal);
this.eventsMDGPRList = this.sortService.sortArrayByDate(this.eventsMDGPRList)
- this.eventsMDGPRList = this.eventsMDGPRList.filter(function(item) {
+ this.eventsMDGPRList = ( this.eventsMDGPRList || []).filter(function(item) {
return item.activityInstanceName != 'Editar Evento'
- })
- console.log(this.eventsMDGPRList)
-
-
+ }) || []
this.storage.set('event-to-aproveMD',this.eventsMDGPRList).then(() => {
@@ -92,9 +89,9 @@ export class EventsToApprovePage implements OnInit {
console.log(prEventsPessoal)
this.eventsPRList = prEventsOficial.concat(prEventsPessoal);
this.eventsPRList = this.sortService.sortArrayByDate(this.eventsPRList)
- this.eventsPRList = this.eventsPRList.filter(function(item) {
+ this.eventsPRList = (this.eventsPRList || []).filter(function(item) {
return item.activityInstanceName != 'Editar Evento'
- })
+ })
this.storage.set('event-to-aprovePR',this.eventsPRList).then(() => {
@@ -106,7 +103,7 @@ export class EventsToApprovePage implements OnInit {
getFromDB() {
- this.storage.get('event-to-aproveMD').then((events) => {
+ this.storage.get('event-to-aproveMD').then((events = []) => {
this.eventsMDGPRList = events
console.log('DB',this.eventsMDGPRList)
})
diff --git a/src/app/store/despacho-store.service.ts b/src/app/store/despacho-store.service.ts
index 6f19a114d..b68bf2210 100644
--- a/src/app/store/despacho-store.service.ts
+++ b/src/app/store/despacho-store.service.ts
@@ -93,7 +93,7 @@ export class DespachoStoreService {
ObjectQuery() {}
- get list(): customTask[] {
+ get list(): any[] {
return this._list || []
}
diff --git a/src/app/store/pedidos-store.service.ts b/src/app/store/pedidos-store.service.ts
index 0357446a7..ef408cbce 100644
--- a/src/app/store/pedidos-store.service.ts
+++ b/src/app/store/pedidos-store.service.ts
@@ -33,12 +33,12 @@ export class PedidosStoreService {
}
- get listparecer() {
- return this._listParecer
+ get listparecer(): any[] {
+ return this._listParecer || []
}
- get listdeferimento() {
- return this._listDeferimento
+ get listdeferimento(): any[] {
+ return this._listDeferimento || []
}
get countparecer() {