Merge branch 'developer' of bitbucket.org:equilibriumito/gabinete-digital into developer

This commit is contained in:
Peter Maquiran
2021-05-26 11:43:44 +01:00
4 changed files with 20 additions and 6 deletions
+1 -1
View File
@@ -184,7 +184,7 @@ export class ProcessesService {
}
postDespatchoPr(body:any) {
const geturl = environment.apiURL + 'Processes/CreateExpedientePR';
const geturl = environment.apiURL + 'Processes/CreateDispatchPR';
let options = {
headers: this.headers,
};
@@ -28,10 +28,10 @@
<ion-item
class="expediente ion-no-padding cursor-pointer"
*ngFor = "let task of despachoList; let i = index"
(click)="goToDespachoPr(task.SerialNumber)"
(click)="goToDespacho(task.SerialNumber)"
>
<!-- [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
<div class="item width-100" *ngIf="task.Status == 'Active'">
<div class="item width-100">
<div class="exp-top-detail">
<div class="exp-date">
<ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
@@ -45,6 +45,10 @@
<div class="exp-icon d-flex align-center">
<ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<label>{{task.DocumentsQty}}</label>
<!-- <ion-menu-button (click)="docIndex(i)" style="width: 35px; height: 41px;" autoHide="false">
<ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
</ion-menu-button> -->
</div>
</div>
<div class="exp-bottom-detail">
@@ -56,7 +60,7 @@
</div>
</div>
<div *ngIf="loading">
<div *ngIf="despachoList.length < 1">
<ion-list>
<ion-item>
@@ -1,5 +1,4 @@
@import '~src/function.scss';
/* CONTENT */
.main-content{
padding: 30px 20px 0 20px !important;
margin: 0;
@@ -98,13 +98,15 @@ goToDespachoPr(serialNumber:any){
this.loading = true;
let result = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
console.log(result);
let despachosPr;
switch (this.loggeduser.Profile) {
case 'MDGPR':
despachosPr = result.reverse().filter(data => data.activityInstanceName == "Tarefa de Despacho");
break;
case 'PR':
despachosPr = result.reverse().filter(data => data.activityInstanceName == "Assinar diploma");
despachosPr = result.reverse().filter(data => data.activityInstanceName == "Concluir Despacho");
break;
}
console.log(despachosPr);
@@ -161,6 +163,15 @@ doRefresh() {
}, 2000);
}
goToDespacho(serialNumber:any){
let navigationExtras: NavigationExtras = {
queryParams: {
"serialNumber": serialNumber,
}
};
this.router.navigate(['/home/gabinete-digital/despachos-pr/despacho-pr'], navigationExtras);
}
async viewExpedientDetail(serialNumber:any) {
console.log(this.profile);