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

further improvements

Browse Source
This commit is contained in:
tiago.kayaya
2021-05-07 14:01:30 +01:00
parent 4d299699be
commit e3e29bbafe
17 changed files with 719 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.html
+1
View File
@@ -19,6 +19,7 @@
<ion-title></ion-title>
<ion-buttons slot="end">
<button class="btn-ok" shape="round" (click)="save()">Sim</button>
<button class="btn-delete" shape="round" (click)="save()">Sim</button>
</ion-buttons>
</ion-toolbar>
</ion-footer>
src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.ts
+2 -27
View File
@@ -28,36 +28,11 @@ export class DiscartExpedientModalPage implements OnInit {
}
close(){
console.log(this.folderId);
console.log('FOLDER');
if(this.action != 'discart'){
this.processes.UpdateTaskStatus(this.folderId).subscribe(res=>{
console.log(res);
});
}
this.modalController.dismiss();
this.modalController.dismiss('No');
}
save(){
if(this.action != 'discart'){
let body = {
"serialNumber": this.serialNumber,
"action": "Tratado"
}
console.log(body);
this.processes.PostTaskAction(body);
}
else{
let body = {
"serialNumber": this.serialNumber,
"action": "Passivo"
}
console.log(body);
this.processes.PostTaskAction(body);
}
this.router.navigate(['/home/gabinete-digital/expediente']);
this.modalController.dismiss('close');
this.modalController.dismiss('Yes');
}
}
src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
+39 -5
View File
@@ -95,6 +95,7 @@ export class ExpedientTaskModalPage implements OnInit {
SouceType: 'DOC', //FOLDER
SourceId: this.task.workflowInstanceDataFields.DocId, //FolderId
DeadlineType: '',
SubjectTypes: new Array(),
};
@@ -194,12 +195,25 @@ export class ExpedientTaskModalPage implements OnInit {
SubjectTypeId: this.postData.SubjectTypeId,
UsersSelected: attendees,
DispatchFolder: this.dispatchFolder,
AttachmentList: docs
AttachmentList: docs,
//SubjectTypes: [],
}
console.log(JSON.stringify(this.postData))
console.log('this.postData', this.postData, this.taskType);
this.taskResult = await this.processes.postDespatcho(this.postData);
console.log('this.taskResult', this.taskResult);
let action_despacho = {
"serialNumber": this.task.serialNumber,
"action": "Tratado",
"ActionTypeId": 94,
"dataFields": {
"Note": "",
}
}
this.modalController.dismiss(action_despacho);
break;
case '1':
this.postData = {
DistributionType: "Paralelo",
@@ -213,6 +227,17 @@ export class ExpedientTaskModalPage implements OnInit {
}
console.log(this.postData);
this.taskResult = await this.processes.postParecer(this.postData);
console.log('this.taskResult', this.taskResult);
let action_parecer = {
"serialNumber": this.task.serialNumber,
"action": "Tratado",
"ActionTypeId": 92,
"dataFields": {
"Note": "",
}
}
this.modalController.dismiss(action_parecer);
break;
case '2':
this.postData = {
@@ -227,11 +252,20 @@ export class ExpedientTaskModalPage implements OnInit {
}
console.log(this.postData);
this.taskResult = await this.processes.postDeferimento(this.postData);
console.log('this.taskResult', this.taskResult);
let action_deferimento = {
"serialNumber": this.task.serialNumber,
"action": "Tratado",
"ActionTypeId": 93,
"dataFields": {
"Note": "",
}
}
this.modalController.dismiss(action_deferimento);
break;
}
console.log('this.taskResult', this.taskResult)
this.modalController.dismiss('openDiscart');
}
else {
this.alertController.presentAlert("Lista de intervenientes vazia. Por favor, adicione 1 ou mais intervenientes.");
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+45 -26
View File
@@ -170,17 +170,59 @@ export class ExpedienteDetailPage implements OnInit {
await modal.present();
modal.onDidDismiss().then(res=>{
console.log(res['data']);
let body = res['data'];
// alert('close '+ res['data'])
if(res['data']=='openDiscart'){
if(res['data']){
console.log('open discart');
this.distartExpedientModal();
this.distartExpedientModal(body);
}
else{
console.log('Not open');
}
});
}
async distartExpedientModal(body:any){
console.log(this.fulltask);
const modal = await this.modalController.create({
component: DiscartExpedientModalPage,
componentProps: {
serialNumber: this.fulltask.serialNumber,
folderId: this.fulltask.workflowInstanceDataFields.FolderID,
action: 'complete',
},
cssClass: 'discart-expedient-modal',
backdropDismiss: false
});
await modal.present();
modal.onDidDismiss().then(res=>{
console.log(res['data']);
if(res['data']== 'Yes'){
this.processes.CompleteTask(body);
}
else if(res['data'] == 'No'){
let otherbody = {
"serialNumber": body.serialNumber,
"action": "Passivo",
"ActionTypeId": 94,
"dataFields": {
"Note": "",
}
}
this.processes.CompleteTask(otherbody);
}
//Volta na lista principal
this.modalController.dismiss();
});
}
async distartExpedientModal2(task: any){
const modal = await this.modalController.create({
component: DiscartExpedientModalPage,
@@ -234,30 +276,7 @@ export class ExpedienteDetailPage implements OnInit {
}
});
}
async distartExpedientModal(){
console.log(this.fulltask);
const modal = await this.modalController.create({
component: DiscartExpedientModalPage,
componentProps: {
serialNumber: this.fulltask.serialNumber,
folderId: this.fulltask.workflowInstanceDataFields.FolderID,
action: 'complete',
},
cssClass: 'discart-expedient-modal',
backdropDismiss: false
});
await modal.present();
modal.onDidDismiss().then(res=>{
if(res['data']=='close'){
this.close();
/* console.log('2Expedient Discard closed2');
this.close();
this.openMenu(); */
}
});
}
async openOptions(taskAction: any) {
const popover = await this.popoverController.create({
src/app/pages/gabinete-digital/gabinete-digital.module.ts
+3
View File
@@ -17,6 +17,7 @@ import { ExpedientsPage } from 'src/app/shared/gabinete-digital/expedients/exped
import { PendentesPage } from 'src/app/shared/gabinete-digital/pendentes/pendentes.page';
import { PedidosPage } from 'src/app/shared/gabinete-digital/pedidos/pedidos.page';
import { DespachosPage } from 'src/app/shared/gabinete-digital/despachos/despachos.page';
import { DespachosPrPage } from 'src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page';
/* import { ComponentsModule } from 'src/app/components/components.module'; */
@@ -38,6 +39,7 @@ import { DespachosPage } from 'src/app/shared/gabinete-digital/despachos/despach
PedidosPage,
DespachosPage,
PendentesPage,
DespachosPrPage,
],
entryComponents: [
EmptyContainerPage,
@@ -47,6 +49,7 @@ import { DespachosPage } from 'src/app/shared/gabinete-digital/despachos/despach
PedidosPage,
DespachosPage,
PendentesPage,
DespachosPrPage,
],
schemas: [CUSTOM_ELEMENTS_SCHEMA]
})
src/app/pages/gabinete-digital/gabinete-digital.page.html
+2 -1
View File
@@ -78,7 +78,7 @@
<p class="text-center exp-card-content"><span class="number">-</span> <span class="title1">Documentos</span></p>
</div>
<div [class.active]="selectedElement == '£££££££'" class="exp-card d-md-flex d-none flex-column justify-center" (click)="notImplemented()">
<div (click)="openDespachosPrPage(); selectedElement='DispatchesPr'" [class.active]="selectedElement == 'DispatchesPr'" class="exp-card d-md-flex d-none flex-column justify-center">
<div class="d-flex justify-center">
<ion-icon src="assets/images/icons-despachos-presidente.svg"></ion-icon>
</div>
@@ -141,6 +141,7 @@
<app-expediente (openExpedientList)="openExpedientListPage()" [profile]="profile" [serialNumber]="serialNumber" class="d-flex height-100 flex-column" *ngIf="showExpedientDetail"></app-expediente>
<app-pedidos (openExpedientDetail)="openExpedientPage($event)" [profile]="profile" [segment]="segment" class="d-flex height-100 flex-column" *ngIf="showPedidos"></app-pedidos>
<app-despachos (openExpedientDetail)="openExpedientPage($event)" [profile]="profile" class="d-flex height-100 flex-column" *ngIf="showDespachos"></app-despachos>
<app-despachos-pr (openExpedientDetail)="openExpedientPage($event)" [profile]="profile" class="d-flex height-100 flex-column" *ngIf="showDespachosPr"></app-despachos-pr>
<app-pendentes (openExpedientDetail)="openExpedientPage($event)" [profile]="profile" class="d-flex height-100 flex-column" *ngIf="showPendentes"></app-pendentes>
src/app/pages/gabinete-digital/gabinete-digital.page.ts
+12
View File
@@ -48,6 +48,7 @@ export class GabineteDigitalPage implements OnInit {
showExpedients = true;
showPedidos = false;
showDespachos = false;
showDespachosPr = false;
showPendentes = false;
showExpedientDetail = false;
emptyTextDescription = 'Sem opção selecionada';
@@ -125,6 +126,7 @@ export class GabineteDigitalPage implements OnInit {
this.showExpedients = false;
this.showPedidos = false;
this.showDespachos = false;
this.showDespachosPr = false;
this.showPendentes = false;
this.showExpedientDetail = false;
}
@@ -266,6 +268,16 @@ export class GabineteDigitalPage implements OnInit {
this.showDespachos = true;
}
}
openDespachosPrPage(segment:string){
this.closeAllDesktopComponents();
if( window.innerWidth <= 1024){
this.openDespachoList();
}
else{
this.showDespachosPr = true;
}
}
openPendentesPage(segment:string){
this.closeAllDesktopComponents();