peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-20 21:35:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://bitbucket.org/equilibriumito/gabinete-digital-fo into bugfix/goback-button-event

Browse Source
This commit is contained in:
EQUILIBRIUM\hirondino.van-dunem
2022-07-01 16:44:54 +01:00
parent 1c84a09afe 93b7004410
commit 1218c405f5
42 changed files with 440 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/edit-event/edit-event.page.ts
+2 -2
View File
@@ -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) {
src/app/pages/agenda/event-actions-popover/event-actions-popover.page.html
+1
View File
@@ -8,6 +8,7 @@
<div class="buttons">
<button *ngIf="activityInstanceName == 'Aprovar Evento'" class="btn-cancel" shape="round" (click)="emendarTask()">Rever</button>
<button *ngIf="activityInstanceName == 'Aprovar Evento'" class="btn-cancel" shape="round" (click)="editTask()">Editar</button>
<button *ngIf="activityInstanceName == 'Aprovar Evento'" class="btn-cancel" shape="round" (click)="approveTask()">Aprovar</button>
<div class="solid"></div>
<button *ngIf="activityInstanceName != 'Aprovar Evento'" class="btn-cancel" shape="round" (click)="editTask()">Editar</button>
src/app/pages/agenda/new-event/new-event.page.ts
+1 -1
View File
@@ -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) {
src/app/pages/chat/chat.page.ts
+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";
src/app/pages/chat/group-messages/group-messages.page.html
+1 -1
View File
@@ -11,7 +11,7 @@
</div>
<div class="middle-container" *ngIf="!showMessageOptions">
<div class="middle add-ellipsis">
<ion-label class="title">{{wsChatMethodsService.getGroupRoom(roomId).name}}</ion-label>
<ion-label class="title">{{groupNameFormart}}</ion-label>
</div>
</div>
<div class="middle-container-options" *ngIf="showMessageOptions">
src/app/pages/chat/group-messages/group-messages.page.ts
+2
View File
@@ -68,6 +68,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
selectedMsgId: string;
roomCountDownDate: any;
downloadFile: any;
groupNameFormart = "";
@ViewChild('scrollMe') private myScrollContainer: ElementRef;
@@ -116,6 +117,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
this.wsChatMethodsService.getGroupRoom(this.roomId).loadHistory({});
this.wsChatMethodsService.getGroupRoom(this.roomId).scrollDown = this.scrollToBottomClicked;
this.wsChatMethodsService.openRoom(this.roomId)
this.groupNameFormart = this.wsChatMethodsService.getGroupRoom(this.roomId).name.split('-').join(' ')
setTimeout(() => {
this.scrollToBottomClicked()
src/app/pages/chat/new-group/new-group.page.ts
+1 -1
View File
@@ -44,7 +44,7 @@ export class NewGroupPage implements OnInit {
ngOnInit() {
this.chatService.refreshtoken();
console.log(this.documents)
// console.log(this.documents)
}
src/app/pages/gabinete-digital/diplomas/diplomas.page.ts
+2 -76
View File
@@ -81,80 +81,6 @@ export class DiplomasPage implements OnInit, OnDestroy {
}
/* async loadDiplomas(){
this.activatedRoute.data.subscribe(data => {
switch (this.segment) {
case 'validar':
let diplomasValidar = data['diplomas'].filter(data => data.activityInstanceName == "Revisar Diploma");
diplomasValidar.forEach(async element => {
let DocId = element.workflowInstanceDataFields.FolderID;
let ApplicationId = element.workflowInstanceDataFields.ApplicationId;
let res = await this.processes.GetDocumentDetails(DocId, '361').toPromise();
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": res.DocumentsTotal,
"DocId": element.workflowInstanceDataFields.DocIdDiferimento,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
this.diplomasList.push(task);
this.diplomasList = removeDuplicate( this.diplomasList)
});
this.showLoader = false;
break;
case 'assinados':
//this.diplomasList = new Array();
let diplomasAssinados = data.diplomas.reverse().filter(data => data.activityInstanceName == "Diploma Assinado");
diplomasAssinados.forEach(async element => {
let DocId = element.workflowInstanceDataFields.FolderID;
let ApplicationId = element.workflowInstanceDataFields.ApplicationId;
let res = await this.processes.GetDocumentDetails(DocId, '361').toPromise();
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": this.totalDocs,
"DocId": element.workflowInstanceDataFields.DocIdDiferimento,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
this.diplomasList.push(task);
this.diplomasList = removeDuplicate( this.diplomasList)
});
this.showLoader = false;
break;
}
});
} */
async getTotalDocs(DocId: any) {
let res = await this.processes.GetDocumentDetails(DocId, '361').toPromise();
@@ -202,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()
src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html
+1 -2
View File
@@ -101,9 +101,8 @@
</div>
<div *ngIf="loadedEvent" class="aside-right flex-column height-100">
{{ loadedEvent.activityInstanceName }}
<div class="aside-buttons">
<button full class="btn-cancel" shape="round" *ngIf="loadedEvent.activityInstanceName == 'Aprovar Evento'">Editar evento</button>
<button (click)="editar(loadedEvent.serialNumber)" full class="btn-cancel" shape="round" *ngIf="loadedEvent.activityInstanceName == 'Aprovar Evento'">Editar evento</button>
<button (click)="approveTask(loadedEvent.serialNumber)" full class="btn-cancel" shape="round" *ngIf="loadedEvent.activityInstanceName == 'Aprovar Evento'">Aprovar</button>
<button (click)="emendTask(loadedEvent.serialNumber)" class="btn-cancel" shape="round" >Rever</button>
<div class="solid"></div>
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+2 -2
View File
@@ -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);
src/app/pages/gabinete-digital/gabinete-digital.page.ts
+29 -13
View File
@@ -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() {
@@ -545,6 +535,7 @@ export class GabineteDigitalPage implements OnInit {
async LoadCounts() {
let expedientes;
this.showLoader = true
try {
expedientes = await this.processesbackend.GetTaskListExpediente(false).toPromise();
@@ -618,6 +609,8 @@ export class GabineteDigitalPage implements OnInit {
this.count_total_pending = Object.keys(pendentes).length;
this.pendentesstore.count = this.count_total_pending;
pendentes = pendentes.map((element)=> this.customTaskPipe.transform(element))
this.pendentesstore.reset(pendentes);
let depachoAPI: any = await this.processesbackend.GetTasksList("Despacho do Presidente da República", false).toPromise();
@@ -657,7 +650,30 @@ export class GabineteDigitalPage implements OnInit {
let diplomasValidar = depachoAPI.filter(data => data.activityInstanceName == "Revisar Diploma");
this.count_dip_pv = Object.keys(diplomasValidar).length;
this.deplomasStore.resetDiplomasReview(diplomasValidar)
diplomasValidar = diplomasValidar.filter(data => data.activityInstanceName != "Tarefa de Despacho");
this.deplomasStore.resetDiplomasReview(diplomasValidar.map((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();
return {
"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.DocIdDiferimento,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
"Status": element.workflowInstanceDataFields.Status,
}
}))
let diplomasAssinar = depachoAPI.filter(data => data.activityInstanceName == "Assinar Diploma");
src/app/pages/gabinete-digital/pendentes/pendentes.page.ts
+1 -1
View File
@@ -112,7 +112,7 @@ export class PendentesPage implements OnInit {
this.skeletonLoader = false;
}, (error) => {
if(error.status == 0){
if(error.status == 0) {
this.getFromDb();
}
})
src/app/pages/search/search.page.ts
+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') {