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

Fix merge

Browse Source
This commit is contained in:
Peter Maquiran
2021-06-23 15:53:14 +01:00
parent d923fe381e 0f3fb2a602
commit 149ac76410
68 changed files with 361 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html
+2 -5
View File
@@ -22,8 +22,7 @@
</ion-refresher-content>
</ion-refresher>
<div class="main-content width-100">
<div *ngIf="despachoList">
<div *ngIf="despachoList.length >= 1" class="main-container width-100 overflow-y-auto height-100">
<ion-list>
<ion-item
class="expediente ion-no-padding cursor-pointer"
@@ -57,10 +56,8 @@
</div>
</ion-item>
</ion-list>
</div>
</div>
<div *ngIf="despachoList?.length < 1">
<div *ngIf="despachoList?.length < 1" class="overflow-y-auto height-100">
<ion-list>
<ion-item>
src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.scss
+1 -1
View File
@@ -1,5 +1,5 @@
@import '~src/function.scss';
.main-content{
.main-container{
padding: 30px 20px 0 20px !important;
margin: 0;
color:#000;
src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts
+2 -1
View File
@@ -127,7 +127,8 @@ goToDespachoPr(serialNumber:any){
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": 0,
"DocId": element.workflowInstanceDataFields.DocIdDiferimento,
"DocId": element.workflowInstanceDataFields.DispatchDocID,
"FolderID": element.workflowInstanceDataFields.FolderID,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
src/app/shared/gabinete-digital/despachos/despachos.page.html
+3 -6
View File
@@ -18,9 +18,8 @@
</ion-refresher-content>
</ion-refresher>
<div class="width-100">
<div *ngIf="despachoList">
<ion-list>
<div *ngIf="despachoList.length >= 1" class="overflow-y-auto height-100 width-100">
<ion-list part="divo">
<ion-item
class="expediente ion-no-padding cursor-pointer"
*ngFor = "let task of despachoList; let i = index"
@@ -53,10 +52,8 @@
</div>
</ion-item>
</ion-list>
</div>
</div>
<div *ngIf="despachoList?.length < 1">
<div *ngIf="despachoList.length < 1">
<ion-list>
<ion-item>
src/app/shared/gabinete-digital/despachos/despachos.page.scss
+3 -2
View File
@@ -1,9 +1,10 @@
@import '~src/function.scss';
/* CONTENT */
:host{
padding: 30px 20px 0 20px !important;
margin: 0;
padding: 30px 20px 0 20px !important;
margin: 0;
}
.title{
font-family: Roboto;
font-size: 25px;
src/app/shared/gabinete-digital/despachos/despachos.page.ts
+6 -1
View File
@@ -96,6 +96,8 @@ export class DespachosPage implements OnInit {
}
async LoadList(){
console.log('HERE DESK');
let result = await this.processes.GetTasksList("Despacho", false).toPromise();
//let despachos = result.reverse().filter(data => data.activityInstanceName == "Despacho (Paralelo)");
@@ -117,7 +119,8 @@ export class DespachosPage implements OnInit {
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": 0,
"DocId": element.workflowInstanceDataFields.DocIdDiferimento,
"DocId": element.workflowInstanceDataFields.DispatchDocId,
"FolderID": element.workflowInstanceDataFields.FolderID,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
@@ -129,6 +132,8 @@ export class DespachosPage implements OnInit {
this.despachoList = this.sortArrayISODate(this.despachoList).reverse()
this.despachoList.forEach( (element, index) => {
console.log(element['FolderID']);
// let aplicationId = element.workflowInstanceDataFields.SourceSecFsID;
let FolderID = element['FolderID'];
src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
+2 -2
View File
@@ -19,8 +19,8 @@
</ion-refresher-content>
</ion-refresher>
<div class="width-100">
<div *ngIf="diplomasList">
<div class="width-100 overflow-y-auto height-100">
<div *ngIf="diplomasList.length >= 1">
<ion-list >
<!-- *ngFor = "let task of parecerList; let i = index"
(click)="viewExpedientDetail(task.SerialNumber)" -->
src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
+4 -2
View File
@@ -81,7 +81,8 @@ serialNumber:string;
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": 0,
"DocId": element.workflowInstanceDataFields.DocIdDiferimento,
"DocId": element.workflowInstanceDataFields.DispatchDocID,
"FolderID": element.workflowInstanceDataFields.FolderID,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
@@ -100,7 +101,8 @@ serialNumber:string;
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Sender,
"DocumentsQty": 0,
"DocId": element.workflowInstanceDataFields.DocIdDiferimento,
"DocId": element.workflowInstanceDataFields.DispatchDocID,
"FolderID": element.workflowInstanceDataFields.FolderID,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
src/app/shared/gabinete-digital/diplomas/diplomas.page.html
+1 -1
View File
@@ -28,7 +28,7 @@
</ion-refresher-content>
</ion-refresher>
<div class="width-100" [ngSwitch]="segment">
<div class="width-100 overflow-y-auto height-100" [ngSwitch]="segment">
<div *ngIf="diplomasList">
<ion-list *ngSwitchCase="'validar'">
<ion-item
src/app/shared/gabinete-digital/diplomas/diplomas.page.ts
+8 -4
View File
@@ -84,7 +84,8 @@ constructor(
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": 0,
"DocId": element.workflowInstanceDataFields.DocIdDiferimento,
"DocId": element.workflowInstanceDataFields.DispatchDocID,
"FolderID": element.workflowInstanceDataFields.FolderID,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
@@ -103,7 +104,8 @@ constructor(
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": 0,
"DocId": element.workflowInstanceDataFields.DocIdDiferimento,
"DocId": element.workflowInstanceDataFields.DispatchDocID,
"FolderID": element.workflowInstanceDataFields.FolderID,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
@@ -136,7 +138,8 @@ constructor(
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": 0,
"DocId": element.workflowInstanceDataFields.DocIdDiferimento,
"DocId": element.workflowInstanceDataFields.DispatchDocID,
"FolderID": element.workflowInstanceDataFields.FolderID,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
@@ -156,7 +159,8 @@ constructor(
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": 0,
"DocId": element.workflowInstanceDataFields.DocIdDiferimento,
"DocId": element.workflowInstanceDataFields.DispatchDocID,
"FolderID": element.workflowInstanceDataFields.FolderID,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts
+3 -1
View File
@@ -196,8 +196,10 @@ export class EditEventToApproveComponent implements OnInit {
Message: this.eventProcess.workflowInstanceDataFields.Message,
ParticipantsList: this.eventProcess.workflowInstanceDataFields.ParticipantsList,
Private: false,
ReviewUserComments: ''
ReviewUserComment: ''
}
console.log(event);
this.eventsService.postEventToApproveEdit(event).subscribe(()=>{
this.toastService.successMessage('Evento editado');
src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
+4 -2
View File
@@ -1,4 +1,4 @@
<ion-content>
<ion-header>
<div class="title width-100">
<div class="title-container d-flex justify-space-between">
<span class="text-center mt-0 aside-title px-20"><label>Eventos para Aprovação</label></span>
@@ -17,12 +17,14 @@
</ion-segment>
</ion-toolbar>
</div>
</ion-header>
<ion-content>
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh()">
<ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
<ion-refresher-content>
</ion-refresher-content>
</ion-refresher>
<div class="main-content" [ngSwitch]="segment" *ngIf="eventsMDGPRList">
<div class="main-content overflow-y-auto height-100" [ngSwitch]="segment" *ngIf="eventsMDGPRList.length >= 1">
<!-- <div class="header-content width-100"> -->
<!-- </div> -->
src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
+3 -27
View File
@@ -59,39 +59,15 @@ export class EventsToApprovePage implements OnInit {
this.eventsPRList = prEvents;
console.log(this.eventsPRList);
/* this.processes.GetToApprovedEvents('PR','false').subscribe(res=>{
this.showLoader = false;
this.eventsPRList = res;
console.log('this.eventsPRList', this.eventsPRList)
}); */
let mdEvents = await this.processes.GetToApprovedEvents('MDGPR','false').toPromise();
this.eventsMDGPRList = mdEvents;
console.log(this.eventsMDGPRList);
/* this.processes.GetToApprovedEvents('MDGPR','false').subscribe(res=>{
this.showLoader = false;
this.eventsMDGPRList = res;
console.log('this.eventsMDGPRList', this.eventsMDGPRList)
}); */
this.showLoader = false;
}
goToEventDetail(eventToAprove){
let InstanceId;
if(!eventToAprove.workflowInstanceDataFields.hasOwnProperty('InstanceId')){
InstanceId = ''
} else {
InstanceId =eventToAprove.workflowInstanceDataFields.InstanceId
}
let navigationExtras: NavigationExtras = {
queryParams: {
"serialNumber": eventToAprove.serialNumber,
}
};
this.router.navigate(['/home/gabinete-digital/event-list/approve-event'], navigationExtras)
goToEventDetail(event){
this.router.navigate(['/home/gabinete-digital/event-list/approve-event',event.serialNumber, 'gabinete-digital'])
}
/* async openApproveModal(eventToAprove) {
src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html
+1 -1
View File
@@ -15,7 +15,7 @@
</ion-refresher-content>
</ion-refresher>
<div class="width-100" *ngIf="taskslist">
<div class="width-100 overflow-y-auto height-100" *ngIf="taskslist.length >= 1">
<ion-list>
<ion-item
class="expediente ion-no-padding cursor-pointer"
src/app/shared/gabinete-digital/expedients/expedients.page.html
+1 -1
View File
@@ -18,7 +18,7 @@
</ion-refresher-content>
</ion-refresher>
<div class="width-100" *ngIf="taskslist">
<div class="width-100 overflow-y-auto height-100" *ngIf="taskslist.length >= 1">
<ion-list>
<ion-item
class="expediente ion-no-padding cursor-pointer"
src/app/shared/gabinete-digital/pedidos/pedidos.page.html
+2 -2
View File
@@ -29,7 +29,7 @@
</ion-refresher>
<div class="width-100" [ngSwitch]="segment">
<div *ngIf="parecerList">
<div *ngIf="parecerList.length >= 1" class="overflow-y-auto height-100">
<ion-list *ngSwitchCase="'parecer'">
<!-- *ngFor = "let task of parecerList; let i = index"
(click)="viewExpedientDetail(task.SerialNumber)" -->
@@ -64,7 +64,7 @@
</ion-list>
</div>
<div *ngIf="deferimentoList">
<div *ngIf="deferimentoList.length >= 1" class="overflow-y-auto height-100">
<ion-list *ngSwitchCase="'deferimento'">
<ion-item
class="expediente ion-no-padding cursor-pointer"
src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
+3 -1
View File
@@ -95,7 +95,8 @@ export class PedidosPage implements OnInit {
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": 0,
"DocId": element.workflowInstanceDataFields.DocIdDiferimento,
"DocId": element.workflowInstanceDataFields.ParecerDocID,
"FolderID": element.workflowInstanceDataFields.FolderID,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
@@ -127,6 +128,7 @@ export class PedidosPage implements OnInit {
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": 0,
"DocId": element.workflowInstanceDataFields.DocIdDiferimento,
"FolderID": element.workflowInstanceDataFields.FolderID,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
src/app/shared/gabinete-digital/pendentes/pendentes.page.html
+2 -5
View File
@@ -18,8 +18,7 @@
</ion-refresher-content>
</ion-refresher>
<div class="width-100">
<div *ngIf="pendentesList">
<div *ngIf="pendentesList.length >= 1" class="width-100 overflow-y-auto height-100">
<ion-list>
<ion-item
class="expediente ion-no-padding cursor-pointer"
@@ -49,10 +48,8 @@
</div>
</ion-item>
</ion-list>
</div>
</div>
<div *ngIf="pendentesList?.length < 1 || pendentesList.length == 0">
<div *ngIf="pendentesList.length < 1">
<ion-list>
<ion-item>