Merge branch 'feature/pendentes-count' into develop

This commit is contained in:
gilson.manuel
2022-06-30 17:03:36 +01:00
27 changed files with 59 additions and 52 deletions
@@ -99,7 +99,7 @@ export class EditEventPage implements OnInit {
this.isEventEdited = false;
/* this.postEvent.EventRecurrence = { Type:'-1', LastOccurrence:''}; */
this.postEvent = this.navParams.get('event');
console.log(this.postEvent);
// console.log(this.postEvent);
this.caller = this.navParams.get('caller');
this.initCalendarName = this.postEvent.CalendarName;
@@ -185,7 +185,7 @@ export class EditEventPage implements OnInit {
}
calculetedLastOccurrence(type:number){
console.log(type);
// console.log(type);
var valor;
var opcao: boolean;
if (type == 0) {
@@ -211,7 +211,7 @@ export class NewEventPage implements OnInit {
}
calculetedLastOccurrence(type:number){
console.log(type);
// console.log(type);
var valor;
var opcao: boolean;
if (type == 0) {
+1 -1
View File
@@ -138,7 +138,7 @@ export class ChatPage implements OnInit {
}
SessionStore.user.ChatData = data
SessionStore.save() */
console.log(SessionStore.user.ChatData.data.authToken)
// console.log(SessionStore.user.ChatData.data.authToken)
this.chatService.refreshtoken();
this.segment = "Contactos";
@@ -44,7 +44,7 @@ export class NewGroupPage implements OnInit {
ngOnInit() {
this.chatService.refreshtoken();
console.log(this.documents)
// console.log(this.documents)
}
@@ -128,11 +128,11 @@ export class DiplomasPage implements OnInit, OnDestroy {
let task = this.pipeTask(element);
diplomasAssinadoList.push(task);
console.log('DIPLOMAS ASSINADOS', task)
// console.log('DIPLOMAS ASSINADOS', task)
});
this.diplomasAssinadoList = this.sortService.sortDate(diplomasAssinadoList, 'CreateDate')
console.log('DIPLOMAS ASSINADOS', this.diplomasAssinadoList)
// console.log('DIPLOMAS ASSINADOS', this.diplomasAssinadoList)
}, (error) => {
this.getFromDb()
@@ -657,8 +657,8 @@ export class ExpedienteDetailPage implements OnInit {
this.newGroup();
}
else {
console.log(this.task)
console.log(this.fulltask)
// console.log(this.task)
// console.log(this.fulltask)
this.dataService.set("newGroup", true);
this.dataService.set("task", this.task);
this.dataService.set("newGroupName", this.task.Folio);
@@ -108,7 +108,6 @@ export class GabineteDigitalPage implements OnInit {
despachoStore = DespachoStore;
eventoaprovacaostore = EventoAprovacaoStore;
pedidosstore = PedidosStore;
// expedienteprstore = ExpedienteprStore;
despachoprstore = DespachosprStore;
totalDocumentStore = TotalDocumentStore
deplomasStore = DeplomasStore
@@ -138,7 +137,6 @@ export class GabineteDigitalPage implements OnInit {
private router: Router,
authService: AuthService,
public waitForDomService: WaitForDomService,
//private notificationsService: NotificationsService,
private despachoRule: DespachoService,
private sqliteservice: SqliteService,
private platform: Platform,
@@ -190,7 +188,7 @@ export class GabineteDigitalPage implements OnInit {
selector: 'app-gabinete-digital ion-content .aside-wrapper',
callback: () => {
this.checkRoutes();
console.log('FIRST CALL')
// console.log('FIRST CALL')
this.LoadCounts();
}
})
@@ -202,7 +200,7 @@ export class GabineteDigitalPage implements OnInit {
this.waitForDomService.selector({
selector: 'app-gabinete-digital ion-content .aside-wrapper',
callback: () => {
console.log('SECOND CALL')
// console.log('SECOND CALL')
this.loadAllProcesses();
}
})
@@ -421,14 +419,6 @@ export class GabineteDigitalPage implements OnInit {
checkUser() {
this.selectedElement = 'allProcessesTag';
this.showAllProcesses = true;
/* switch(this.loggeduser.Profile){
case 'MDGPR':
this.showExpedients = true;
break;
case 'PR':
this.showExpedientesPr = true;
break;
} */
}
hideRefreshButton() {
+17 -1
View File
@@ -104,7 +104,23 @@ export class SearchPage implements OnInit {
if(ApplicationType == '8' ) {
this.viewDocumentDetail(Id, ApplicationType);
// this.viewDocumentDetail(Id, ApplicationType);
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();
} else if (ApplicationType == '361') {