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

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

Browse Source
This commit is contained in:
Peter Maquiran
2021-05-20 11:38:27 +01:00
parent b335335869 98ecb6d27b
commit 2790702a1e
24 changed files with 91 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts
+1 -1
View File
@@ -27,7 +27,7 @@ export class DespachosPrPage implements OnInit {
@ViewChild(CalendarComponent) myCal: CalendarComponent;
taskslist:DailyWorkTask[];
despachoList:DailyWorkTask[] = [];
despachoList:any[]=[];
deferimentoList:DailyWorkTask[] = [];
taskList:tasksList[] = [];
src/app/shared/gabinete-digital/despachos/despachos.page.html
+3
View File
@@ -35,6 +35,9 @@
<div class="exp-remetente">
<ion-label>{{task.Senders}}</ion-label>
</div>
<div class="exp-workflow">
<span class="label">{{task.activityInstanceName}}</span>
</div>
<div class="exp-icon d-flex align-center">
<ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<label>{{task.DocumentsQty}}</label>
src/app/shared/gabinete-digital/despachos/despachos.page.scss
+13
View File
@@ -174,4 +174,17 @@ ion-item{
font-size: 45px;
float: right;
margin-right: 10px;
}
.exp-workflow{
float: left;
margin-left: 15px;
.label{
border-radius: 20px;
background: #ffb703;
font-size: 12px;
float: right;
padding: 2.5px 13.5px 2.5px 13.5px;
color: #fff;
}
}
src/app/shared/gabinete-digital/despachos/despachos.page.ts
+1 -1
View File
@@ -26,7 +26,7 @@ export class DespachosPage implements OnInit {
@ViewChild(CalendarComponent) myCal: CalendarComponent;
taskslist:DailyWorkTask[];
despachoList:DailyWorkTask[] = [];
despachoList:any[] = [];
deferimentoList:DailyWorkTask[] = [];
taskList:tasksList[] = [];
src/app/shared/gabinete-digital/diplomas/diplomas.page.ts
+2
View File
@@ -71,6 +71,7 @@ async LoadList(){
"DocumentsQty": this.totalDocs,
"DocId": element.workflowInstanceDataFields.DocId,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
this.diplomasList.push(task);
},
@@ -85,6 +86,7 @@ async LoadList(){
"DocumentsQty": 0,
"DocId": element.workflowInstanceDataFields.DocId,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
this.diplomasList.push(task);
});
src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
+2
View File
@@ -73,6 +73,7 @@ export class ExpedientesPrPage implements OnInit {
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": 0,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
this.taskslist.push(task);
});
@@ -94,6 +95,7 @@ export class ExpedientesPrPage implements OnInit {
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": 0,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
this.taskslist.push(task);
});
src/app/shared/gabinete-digital/expedients/expedients.page.ts
+1
View File
@@ -71,6 +71,7 @@ export class ExpedientsPage implements OnInit {
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": 0,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
this.taskslist.push(task);
});
src/app/shared/gabinete-digital/pedidos/pedidos.page.html
+6
View File
@@ -48,6 +48,9 @@
<div class="exp-remetente">
<ion-label>{{task.Remetente}}</ion-label>
</div>
<div class="exp-workflow">
<span class="label">{{task.activityInstanceName}}</span>
</div>
<div class="exp-icon">
<ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<label></label>
@@ -78,6 +81,9 @@
<div class="exp-remetente">
<ion-label>{{task.Remetente}}</ion-label>
</div>
<div class="exp-workflow">
<span class="label">{{task.activityInstanceName}}</span>
</div>
<div class="exp-icon">
<ion-menu-button style="width: 35px; height: 41px;" autoHide="false">
<ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
src/app/shared/gabinete-digital/pedidos/pedidos.page.scss
+13
View File
@@ -174,4 +174,17 @@ ion-item{
font-size: 45px;
float: right;
margin-right: 10px;
}
.exp-workflow{
float: left;
margin-left: 15px;
.label{
border-radius: 20px;
background: #ffb703;
font-size: 12px;
float: right;
padding: 2.5px 13.5px 2.5px 13.5px;
color: #fff;
}
}
src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
+3 -2
View File
@@ -23,13 +23,13 @@ export class PedidosPage implements OnInit {
@ViewChild(CalendarComponent) myCal: CalendarComponent;
taskslist:DailyWorkTask[];
parecerList:DailyWorkTask[];
parecerList:any[];
fulltask:any;
parecerListResult:tasksList[] = [];
deferimentoListResult:tasksList[] = [];
deferimentoList:DailyWorkTask[];
deferimentoList:any[];
taskType: string;
@Input() serialNumber:string;
@@ -85,6 +85,7 @@ export class PedidosPage implements OnInit {
"DocumentsQty": 0,
"DocId": element.workflowInstanceDataFields.DocIdDiferimento,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
this.parecerList.push(task);
});
src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
+2
View File
@@ -87,6 +87,7 @@ export class PendentesPage implements OnInit {
"DocumentsQty": this.totalDocs,
"DocId": element.workflowInstanceDataFields.DocId,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
this.pendentesList.push(task);
},
@@ -101,6 +102,7 @@ export class PendentesPage implements OnInit {
"DocumentsQty": 0,
"DocId": element.workflowInstanceDataFields.DocId,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
this.pendentesList.push(task);
});
src/app/shared/gabinete-digital/signed-diploma/signed-diploma.component.ts
+4
View File
@@ -72,6 +72,7 @@ async LoadList(){
"DocumentsQty": this.totalDocs,
"DocId": element.workflowInstanceDataFields.DocId,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
this.diplomasList.push(task);
},
@@ -86,6 +87,7 @@ async LoadList(){
"DocumentsQty": 0,
"DocId": element.workflowInstanceDataFields.DocId,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
this.diplomasList.push(task);
});
@@ -112,6 +114,7 @@ async LoadList(){
"DocumentsQty": this.totalDocs,
"DocId": element.workflowInstanceDataFields.DocId,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
this.diplomasList.push(task);
},
@@ -126,6 +129,7 @@ async LoadList(){
"DocumentsQty": 0,
"DocId": element.workflowInstanceDataFields.DocId,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
this.diplomasList.push(task);
});