+
@@ -246,7 +246,8 @@
-
Despacho do Presidente da República
+
Despacho do Presidente da República
+
Despachos criados por mim
{{ despachoprstore.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 f7e17ac3f..af1a9cb3a 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -194,6 +194,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
selector: 'app-gabinete-digital ion-content .aside-wrapper',
callback: () => {
this.checkRoutes();
+ console.log('FIRST CALL')
this.LoadCounts();
}
})
@@ -205,6 +206,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
this.waitForDomService.selector({
selector: 'app-gabinete-digital ion-content .aside-wrapper',
callback: () => {
+ console.log('SECOND CALL')
this.loadAllProcesses();
}
})
@@ -224,7 +226,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
this.platform.ready().then(() => {
if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
this.storage.set('GabineteProcess', data).then(() => {
-
+
})
} else {
data.forEach(element => {
@@ -257,7 +259,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
this.hideRefreshButton();
if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
this.storage.get('GabineteProcess').then((allprocess: any[]) => {
-
+
allprocess.forEach(element => {
let date = new Date(element.taskStartDate);
date.setMonth(date.getMonth() + 1);
@@ -318,7 +320,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
this.allProcessesList = this.sortService.sortDate(this.allProcessesList, 'CreateDate')
});
-
+
})
}
@@ -352,7 +354,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
if (totalDays == 0) {
if (allday) {
customDate = this.getCustomDate(start) + ", " + this.getCustomHours(start) + " (todo dia)";
-
+
return customDate;
}
else {
@@ -415,7 +417,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
this.router.navigate(['/home/gabinete-digital/event-list/approve-event', serialNumber, 'gabinete-digital']);
}
else {
-
+
}
}
@@ -542,9 +544,18 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
let allProcessesList = allPreocesses_;
this.loadCount = true;
-
+ console.log(allProcessesList)
allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Conhecimento')
allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Revisar Diploma')
+ allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Gerar Diploma')
+ allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Gerar Diploma')
+ allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Prorrogar prazo')
+ allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Concluir Despacho por Delegação')
+ allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Tarefa de Despacho por Delegação')
+ allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Reexecutar Despacho por Delegação')
+ allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Editar Evento')
+ allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Retificar Expediente')
+ allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Agendar Reunião para o Ministro e Director')
if (!this.p.userRole(['PR'])) {
allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Assinar Diplomas')
@@ -581,11 +592,12 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
}
this.allProcessesList.push(task);
- this.allProcessesList = removeDuplicate(this.allProcessesList);
- this.allProcessesList = this.sortService.sortDate(this.allProcessesList, 'CreateDate')
-
});
+ 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
@@ -662,14 +674,14 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
this.count_dip_apr = "-";
-
+
this.loadCount = true
}
doRefresh(event) {
-
- this.LoadCounts();
+
+ this.LoadCounts();
if (event) {
setTimeout(() => {
@@ -677,7 +689,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
}, 2000);
}
else {
-
+
}
}
@@ -719,6 +731,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
openExpedientListPage() {
this.closeAllDesktopComponents();
+
if(this.loggeduser.Profile != 'PR') {
if (window.innerWidth < 701) {
//this.openExpedientList();
diff --git a/src/app/pipes/expediente-task.pipe.ts b/src/app/pipes/expediente-task.pipe.ts
index 13cad0df5..e5dc66e06 100644
--- a/src/app/pipes/expediente-task.pipe.ts
+++ b/src/app/pipes/expediente-task.pipe.ts
@@ -17,7 +17,7 @@ export class ExpedienteTaskPipe implements PipeTransform {
"taskStartDate": fullTask.taskStartDate,
"Subject": fullTask.workflowInstanceDataFields.Subject,
"Senders": fullTask.workflowInstanceDataFields.Sender,
- "CreateDate": taskDate,
+ "CreateDate": date,
"DocumentsQty": fullTask.totalDocuments,
"WorkflowName": fullTask.workflowDisplayName,
"activityInstanceName": fullTask.activityInstanceName,
diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts
index 5a689cdde..853364e77 100644
--- a/src/app/services/auth.service.ts
+++ b/src/app/services/auth.service.ts
@@ -61,9 +61,15 @@ export class AuthService {
}
if (localStorage.getItem("userChat") != null) {
- this.ValidatedUserChat = {
- data: JSON.parse(localStorage.getItem('userChat'))
- };
+
+ if(!this.ValidatedUserChat.hasOwnProperty('data')) {
+ this.ValidatedUserChat = {
+ data: JSON.parse(localStorage.getItem('userChat'))
+ };
+ } else {
+ this.ValidatedUserChat = JSON.parse(localStorage.getItem('userChat'))
+ }
+
}
}
@@ -149,8 +155,8 @@ export class AuthService {
async loginChat(responseChat = this.ValidatedUserChat) {
this.ValidatedUserChat = responseChat;
- localStorage.setItem('userChat', JSON.stringify(responseChat));
- this.storageService.store(AuthConnstants.AUTH, responseChat);
+ localStorage.setItem('userChat', JSON.stringify(responseChat));
+ this.storageService.store(AuthConnstants.AUTH, responseChat);
/* const expirationMinutes = 30;
let date = new Date().getTime();
diff --git a/src/app/services/chat.service.ts b/src/app/services/chat.service.ts
index 2748d220a..808fb7c6b 100644
--- a/src/app/services/chat.service.ts
+++ b/src/app/services/chat.service.ts
@@ -50,7 +50,7 @@ export class ChatService {
}
- getDocumentDetails(url:string){
+ getDocumentDetails(url:string) {
let headersc = new HttpHeaders();
headersc = headersc.set('X-User-Id', this.loggedUserChat['data'].userId);
headersc = headersc.set('X-Auth-Token', this.loggedUserChat['data'].authToken);
@@ -71,19 +71,19 @@ export class ChatService {
});
}
- getAllChannels(){
+ getAllChannels() {
return this.http.get(environment.apiChatUrl+'channels.list', this.options);
}
- getAllUserChannels(){
+ getAllUserChannels() {
return this.http.get(environment.apiChatUrl+'channels.list.joined', this.options);
}
- getAllRooms(){
+ getAllRooms() {
return this.http.get(environment.apiChatUrl+'rooms.get', this.options);
}
- getRoomInfo(roomId:any){
+ getRoomInfo(roomId:any) {
let params = new HttpParams();
params = params.set("roomId", roomId);
let opts = {
diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts
index ad5ffd20c..ef5c816f5 100644
--- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts
+++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts
@@ -63,6 +63,16 @@ export class AllProcessesPage implements OnInit {
//
allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Conhecimento')
+ allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Revisar Diploma')
+ allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Gerar Diploma')
+ allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Gerar Diploma')
+ allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Prorrogar prazo')
+ allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Concluir Despacho por Delegação')
+ allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Tarefa de Despacho por Delegação')
+ allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Reexecutar Despacho por Delegação')
+ allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Editar Evento')
+ allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Retificar Expediente')
+ allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Agendar Reunião para o Ministro e Director')
this.skeletonLoader = true;
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 055dc613f..c2a874c1d 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
@@ -19,7 +19,7 @@ export class EventsToApprovePage implements OnInit {
showLoader: boolean;
eventsPRList: any = []
- eventsMDGPRList: any = []
+ eventsMDGPRList;
eventPerson: EventPerson;
eventBody: EventBody;
categories: string[];
@@ -41,6 +41,7 @@ export class EventsToApprovePage implements OnInit {
}
ngOnInit() {
+ console.log('ERROR LEGN',this.eventsMDGPRList.length)
this.segment = this.loggeduser.Profile;
this.LoadToApproveEvents();
@@ -66,11 +67,18 @@ export class EventsToApprovePage implements OnInit {
this.showLoader = true;
this.getFromDB();
- if(this.segment != 'PR') {
+ if(this.segment != 'PR'){
let mdEventsOficial = await this.processes.GetTasksList('Agenda Oficial MDGPR', false).toPromise();
let mdEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal MDGPR', false).toPromise();
+ console.log(mdEventsOficial)
+ console.log(mdEventsPessoal)
this.eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal);
this.eventsMDGPRList = this.sortService.sortArrayByDate(this.eventsMDGPRList)
+ 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(() => {
@@ -82,8 +90,13 @@ export class EventsToApprovePage implements OnInit {
else if(this.segment == 'PR') {
let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR', false).toPromise();
let prEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal PR', false).toPromise();
+ console.log(prEventsOficial)
+ console.log(prEventsPessoal)
this.eventsPRList = prEventsOficial.concat(prEventsPessoal);
this.eventsPRList = this.sortService.sortArrayByDate(this.eventsPRList)
+ this.eventsPRList = this.eventsPRList.filter(function(item) {
+ return item.activityInstanceName != 'Editar Evento'
+ })
this.storage.set('event-to-aprovePR',this.eventsPRList).then(() => {
@@ -97,10 +110,12 @@ export class EventsToApprovePage implements OnInit {
getFromDB() {
this.storage.get('event-to-aproveMD').then((events) => {
this.eventsMDGPRList = events
+ console.log('DB',this.eventsMDGPRList)
})
this.storage.get('event-to-aprovePR').then((events) => {
this.eventsPRList = events
+ console.log('DB',this.eventsPRList)
})
}
@@ -153,7 +168,7 @@ export class EventsToApprovePage implements OnInit {
}, 1000)
}
- close(){
+ close() {
this.modalController.dismiss(null);
diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.html b/src/app/shared/popover/opts-expediente/opts-expediente.page.html
index b78e83d54..3798b2ee2 100644
--- a/src/app/shared/popover/opts-expediente/opts-expediente.page.html
+++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.html
@@ -8,13 +8,13 @@
-
-
+
+
-
+
-
+
diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts
index 45c33dacd..f076a25a3 100644
--- a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts
+++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts
@@ -17,6 +17,8 @@ import { PermissionService } from 'src/app/services/permission.service';
import { ThemeService } from 'src/app/services/theme.service'
import { NewGroupPage } from 'src/app/pages/chat/new-group/new-group.page';
import { RouteService } from 'src/app/services/route.service';
+import { LoginUserRespose } from 'src/app/models/user.model';
+import { AuthService } from 'src/app/services/auth.service';
@Component({
selector: 'app-opts-expediente',
@@ -34,6 +36,8 @@ export class OptsExpedientePage implements OnInit {
searchDocumentPipe = new SearchDocumentPipe()
documents:SearchList[] = [];
+ loggeduser: LoginUserRespose;
+
constructor(
private popoverController: PopoverController,
private modalController: ModalController,
@@ -45,8 +49,10 @@ export class OptsExpedientePage implements OnInit {
private attachmentsService: AttachmentsService,
private RouteService: RouteService,
private expedienteService: ExpedienteService,
- public ThemeService: ThemeService
+ public ThemeService: ThemeService,
+ private userAuth: AuthService,
) {
+ this.loggeduser = userAuth.ValidatedUser
this.task = this.navParams.get('task');
this.fulltask = this.navParams.get('fulltask');