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

improve

Browse Source
This commit is contained in:
Peter Maquiran
2021-08-06 09:42:34 +01:00
parent c081a1ac28
commit 15a22e28be
4 changed files with 18 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/Rules/despacho.service.ts
+11 -14
View File
@@ -50,7 +50,6 @@ export class DespachoService {
// }, // },
// "AttachmentList" :documents, // "AttachmentList" :documents,
// } // }
// return this.processes.CompleteTask(body) // return this.processes.CompleteTask(body)
// } // }
@@ -93,7 +92,6 @@ export class DespachoService {
// } // }
} }
rexecucao({note, documents, serialnumber}) { rexecucao({note, documents, serialnumber}) {
let body = { let body = {
"serialNumber": serialnumber, "serialNumber": serialnumber,
@@ -123,18 +121,17 @@ export class DespachoService {
return this.processes.CompleteTask(body) return this.processes.CompleteTask(body)
} }
// Finalizar({serialNumber}) {
Finalizar({serialNumber}) { // const body = {
const body = { // "serialNumber": serialNumber,
"serialNumber": serialNumber, // "action": "Conhecimento",
"action": "Conhecimento", // "ActionTypeId": 104,
"ActionTypeId": 104, // "dataFields": {
"dataFields": { // "ReviewUserComment": '',
"ReviewUserComment": '', // },
}, // "AttachmentList" :null,
"AttachmentList" :null, // }
} // }
}
sendExpedienteToPending(serialnumber) { sendExpedienteToPending(serialnumber) {
return this.processes.SetTaskToPending(serialnumber) return this.processes.SetTaskToPending(serialnumber)
src/app/modals/create-process/create-process.page.ts
-2
View File
@@ -198,7 +198,6 @@ export class CreateProcessPage implements OnInit {
async saveTask() { async saveTask() {
if(!this.p.userRole(['PR'])) { if(!this.p.userRole(['PR'])) {
this.injectValidation() this.injectValidation()
this.runValidation() this.runValidation()
@@ -239,7 +238,6 @@ export class CreateProcessPage implements OnInit {
this.dispatchFolder.SubjectTypes = this.selectedTypes; this.dispatchFolder.SubjectTypes = this.selectedTypes;
const loader = this.toastService.loading() const loader = this.toastService.loading()
switch (this.loggeduser.Profile) { switch (this.loggeduser.Profile) {
case 'MDGPR': case 'MDGPR':
src/app/modals/document-detail/document-detail.page.html
+2 -1
View File
@@ -53,7 +53,8 @@
<div *ngIf="LoadedDocument" class="aside-right flex-column height-100"> <div *ngIf="LoadedDocument" class="aside-right flex-column height-100">
<div class="buttons"> <div class="buttons">
<button (click)="openExpedientActionsModal('0')" class="btn-ok" shape="round" >Marcar Despacho</button> <button *ngIf="!p.userRole(['PR'])" (click)="openExpedientActionsModal('0')" class="btn-ok" shape="round" >Marcar Despacho</button>
<button *ngIf="!p.userRole(['MDGPR'])" (click)="openExpedientActionsModal('0')" class="btn-ok" shape="round" >Efetuar Despacho</button>
<div class="solid"></div> <div class="solid"></div>
<button (click)="openExpedientActionsModal('0')" class="btn-cancel" shape="round" >Solicitar Parecer</button> <button (click)="openExpedientActionsModal('0')" class="btn-cancel" shape="round" >Solicitar Parecer</button>
<button *ngIf="!p.userRole(['PR'])" (click)="openExpedientActionsModal('2')" class="btn-cancel" shape="round" >Pedido de Deferimento</button> <button *ngIf="!p.userRole(['PR'])" (click)="openExpedientActionsModal('2')" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
+5 -6
View File
@@ -93,16 +93,15 @@
<div *ngIf="task" class="aside-right flex-column height-100"> <div *ngIf="task" class="aside-right flex-column height-100">
<div class="buttons"> <div class="buttons">
<button (click)="openAddNoteModal('Aprovar')" class="btn-cancel" shape="round" >Aprovar</button>
<button (click)="openAddNoteModal('Revisão')" class="btn-cancel" shape="round" >Mandar para Revisão</button>
<button (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efectuar Despacho</button> <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efectuar Despacho</button>
<button (click)="distartExpedientModal('descartar')" class="btn-cancel" shape="round" >Descartar</button>
<div class="solid"></div>
<button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button> <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
<button (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button> <button (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
<button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button> <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
<button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button> <button (click)="attachDocument()" class="btn-cancel" shape="round" >Anexar Documento <br />(Gestão Documental)</button>
<div hidden class="solid"></div> <button (click)="distartExpedientModal('descartar')" class="btn-cancel" shape="round" >Descartar</button>
<button hidden class="btn-cancel" shape="round" >Delegar</button> <div class="solid"></div>
<button hidden (click)="showToast()" class="btn-cancel" shape="round" >ShowToast</button>
</div> </div>
</div> </div>