mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
Merge branch 'feature/viewer-attachment' of bitbucket.org:equilibriumito/gabinete-digital-fo into feature/viewer-attachment
This commit is contained in:
Generated
+1
-1
@@ -53484,7 +53484,7 @@
|
|||||||
},
|
},
|
||||||
"cordova-plugin-ffmpeg": {
|
"cordova-plugin-ffmpeg": {
|
||||||
"version": "git+ssh://git@github.com/MaximBelov/cordova-plugin-ffmpeg.git#535a64e437f81b34bacf090da7fc97e6754189c7",
|
"version": "git+ssh://git@github.com/MaximBelov/cordova-plugin-ffmpeg.git#535a64e437f81b34bacf090da7fc97e6754189c7",
|
||||||
"from": "cordova-plugin-ffmpeg@https://github.com/MaximBelov/cordova-plugin-ffmpeg.git"
|
"from": "cordova-plugin-ffmpeg@github:MaximBelov/cordova-plugin-ffmpeg"
|
||||||
},
|
},
|
||||||
"cordova-plugin-file": {
|
"cordova-plugin-file": {
|
||||||
"version": "6.0.2",
|
"version": "6.0.2",
|
||||||
|
|||||||
@@ -68,6 +68,7 @@ export class fullTask {
|
|||||||
workflowInstanceFolio: string
|
workflowInstanceFolio: string
|
||||||
workflowInstanceID: number
|
workflowInstanceID: number
|
||||||
workflowName: string
|
workflowName: string
|
||||||
|
isDelegated: boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
export const activityInstanceNameArray = [
|
export const activityInstanceNameArray = [
|
||||||
|
|||||||
@@ -135,6 +135,15 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="container-div">
|
||||||
|
<div>
|
||||||
|
<ion-item>
|
||||||
|
<ion-label>Todo dia</ion-label>
|
||||||
|
<ion-checkbox [(ngModel)]="allDayCheck" (ionChange)="onCheckboxChange($event)"></ion-checkbox>
|
||||||
|
</ion-item>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="container-div width-100">
|
<div class="container-div width-100">
|
||||||
<div class="ion-item-class-2 width-100">
|
<div class="ion-item-class-2 width-100">
|
||||||
<div class="ion-icon-class">
|
<div class="ion-icon-class">
|
||||||
@@ -163,7 +172,8 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="container-div width-100">
|
|
||||||
|
<div *ngIf="!allDayCheck" class="container-div width-100">
|
||||||
<div class="ion-item-class-2 width-100 d-flex">
|
<div class="ion-item-class-2 width-100 d-flex">
|
||||||
<div class="ion-icon-class">
|
<div class="ion-icon-class">
|
||||||
<ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
|
<ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
|
||||||
|
|||||||
@@ -88,6 +88,7 @@ export class EditEventPage implements OnInit {
|
|||||||
|
|
||||||
sesseionStora = SessionStore
|
sesseionStora = SessionStore
|
||||||
environment = environment
|
environment = environment
|
||||||
|
allDayCheck: boolean = false;
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private modalController: ModalController,
|
private modalController: ModalController,
|
||||||
@@ -112,6 +113,7 @@ export class EditEventPage implements OnInit {
|
|||||||
|
|
||||||
this.caller = this.navParams.get('caller');
|
this.caller = this.navParams.get('caller');
|
||||||
this.initCalendarName = this.postEvent.CalendarName;
|
this.initCalendarName = this.postEvent.CalendarName;
|
||||||
|
this.allDayCheck = this.postEvent.IsAllDayEvent;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -652,4 +654,28 @@ export class EditEventPage implements OnInit {
|
|||||||
}
|
}
|
||||||
return string;
|
return string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
onCheckboxChange(event: any) {
|
||||||
|
if (this.allDayCheck) {
|
||||||
|
this.postEvent.IsAllDayEvent = this.allDayCheck;
|
||||||
|
this.postEvent.StartDate = this.setAlldayTime(this.postEvent.StartDate)
|
||||||
|
|
||||||
|
console.log('Recurso ativado!!');
|
||||||
|
} else {
|
||||||
|
this.postEvent.IsAllDayEvent = this.allDayCheck;
|
||||||
|
console.log('Recurso desativado');
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
setAlldayTime(timeToReturn) {
|
||||||
|
let date: any = new Date(timeToReturn) || new Date();
|
||||||
|
let newdate = new Date();
|
||||||
|
date.setHours(0)
|
||||||
|
date.setMinutes(0)
|
||||||
|
date.setSeconds(0);
|
||||||
|
|
||||||
|
|
||||||
|
return date
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -116,7 +116,7 @@
|
|||||||
<div>
|
<div>
|
||||||
<ion-item>
|
<ion-item>
|
||||||
<ion-label>Todo dia</ion-label>
|
<ion-label>Todo dia</ion-label>
|
||||||
<ion-checkbox [(ngModel)]="recursoAtivado" (ionChange)="onCheckboxChange($event)"></ion-checkbox>
|
<ion-checkbox [(ngModel)]="allDayCheck" (ionChange)="onCheckboxChange($event)"></ion-checkbox>
|
||||||
</ion-item>
|
</ion-item>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -131,7 +131,19 @@
|
|||||||
|
|
||||||
<div class="ion-input-class flex-grow-1 justify-center align-center material-inputs materia-top" [class.input-error]="Form?.get('Date')?.invalid && validateFrom ">
|
<div class="ion-input-class flex-grow-1 justify-center align-center material-inputs materia-top" [class.input-error]="Form?.get('Date')?.invalid && validateFrom ">
|
||||||
|
|
||||||
<mat-form-field appearance="none" class="date-hour-picker">
|
<!-- <mat-form-field appearance="none" class="date-hour-picker">
|
||||||
|
|
||||||
|
<input matInput [matDatepicker]="picker1"
|
||||||
|
placeholder="Data Inicio*"
|
||||||
|
[(ngModel)]="postEvent.StartDate"
|
||||||
|
[disabled]="disabled"
|
||||||
|
>
|
||||||
|
<mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
|
||||||
|
<mat-datepicker #picker1></mat-datepicker> -->
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<input matInput [ngxMatDatetimePicker]="picker1"
|
<input matInput [ngxMatDatetimePicker]="picker1"
|
||||||
placeholder="Data Inicio*"
|
placeholder="Data Inicio*"
|
||||||
[(ngModel)]="postEvent.StartDate"
|
[(ngModel)]="postEvent.StartDate"
|
||||||
@@ -142,6 +154,8 @@
|
|||||||
|
|
||||||
[stepHour]="1"
|
[stepHour]="1"
|
||||||
[stepMinute]="15"
|
[stepMinute]="15"
|
||||||
|
[hideTime]="!allDayCheck"
|
||||||
|
[disabled]="true"
|
||||||
|
|
||||||
>
|
>
|
||||||
</ngx-mat-datetime-picker>
|
</ngx-mat-datetime-picker>
|
||||||
|
|||||||
@@ -881,15 +881,14 @@ export class NewEventPage implements OnInit {
|
|||||||
|
|
||||||
onCheckboxChange(event: any) {
|
onCheckboxChange(event: any) {
|
||||||
if (this.allDayCheck) {
|
if (this.allDayCheck) {
|
||||||
this.allDayCheck = !this.allDayCheck
|
|
||||||
this.postEvent.IsAllDayEvent = this.allDayCheck;
|
this.postEvent.IsAllDayEvent = this.allDayCheck;
|
||||||
|
this.postEvent.StartDate = this.setAlldayTime(this.postEvent.StartDate)
|
||||||
|
|
||||||
console.log('Recurso desativado');
|
|
||||||
} else {
|
|
||||||
this.allDayCheck = !this.allDayCheck
|
|
||||||
this.postEvent.IsAllDayEvent = this.allDayCheck;
|
|
||||||
this.postEvent.StartDate = this.setAlldayTime(this.CalendarDate)
|
|
||||||
console.log('Recurso ativado!!');
|
console.log('Recurso ativado!!');
|
||||||
|
} else {
|
||||||
|
this.postEvent.IsAllDayEvent = this.allDayCheck;
|
||||||
|
console.log('Recurso desativado');
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -27,7 +27,7 @@
|
|||||||
<div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="option-desc">Outras opções</div>
|
<div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="option-desc">Outras opções</div>
|
||||||
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
|
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
|
||||||
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
|
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
|
||||||
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
|
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks]) && !isDelegated" (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
|
||||||
<button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
|
<button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
|
||||||
|
|
||||||
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks]) && task.Status != 'Pending'" (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
|
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks]) && task.Status != 'Pending'" (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
|
||||||
|
|||||||
@@ -48,6 +48,7 @@ export class DespachoPrPage implements OnInit {
|
|||||||
|
|
||||||
dropButton = false
|
dropButton = false
|
||||||
selectedIndex = 0
|
selectedIndex = 0
|
||||||
|
isDelegated:boolean = false;
|
||||||
|
|
||||||
|
|
||||||
showOptions = false
|
showOptions = false
|
||||||
@@ -120,7 +121,8 @@ export class DespachoPrPage implements OnInit {
|
|||||||
async LoadTaskDetail(serial: string) {
|
async LoadTaskDetail(serial: string) {
|
||||||
this.processes.GetTask(serial).subscribe((res: fullTask) => {
|
this.processes.GetTask(serial).subscribe((res: fullTask) => {
|
||||||
this.TaskService.loadDiplomas();
|
this.TaskService.loadDiplomas();
|
||||||
|
console.log('is delegate despach pr',res.isDelegated)
|
||||||
|
this.isDelegated = res.isDelegated
|
||||||
this.task = {
|
this.task = {
|
||||||
"SerialNumber": res.serialNumber,
|
"SerialNumber": res.serialNumber,
|
||||||
"Folio": res.workflowInstanceDataFields.Subject,
|
"Folio": res.workflowInstanceDataFields.Subject,
|
||||||
|
|||||||
@@ -24,7 +24,7 @@
|
|||||||
<div class="option-desc" *ngIf="task.WorkflowName == 'Despacho do Presidente da República' ">Reencaminhar para Área Jurídica</div>
|
<div class="option-desc" *ngIf="task.WorkflowName == 'Despacho do Presidente da República' ">Reencaminhar para Área Jurídica</div>
|
||||||
<button (click)="openAddNoteModal('Gerar Diploma')" *ngIf="task.WorkflowName == 'Despacho do Presidente da República'" class="btn-cancel" style="margin-bottom: 0px !important;" shape="round" >Gerar Diploma </button>
|
<button (click)="openAddNoteModal('Gerar Diploma')" *ngIf="task.WorkflowName == 'Despacho do Presidente da República'" class="btn-cancel" style="margin-bottom: 0px !important;" shape="round" >Gerar Diploma </button>
|
||||||
<div class="option-desc" *ngIf="task.WorkflowName == 'Despacho do Presidente da República' " >Outras opções</div>
|
<div class="option-desc" *ngIf="task.WorkflowName == 'Despacho do Presidente da República' " >Outras opções</div>
|
||||||
<button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
|
<button *ngIf="!isDelegated" (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
|
||||||
<div class="solid"></div>
|
<div class="solid"></div>
|
||||||
<button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
|
<button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
|
||||||
<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>
|
||||||
@@ -34,7 +34,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="buttons" *ngIf="task.activityInstanceName == 'Reexecutar Despacho'">
|
<div class="buttons" *ngIf="task.activityInstanceName == 'Reexecutar Despacho'">
|
||||||
<button (click)="openAddNoteModal('Executado')" class="btn-cancel" shape="round" >Executado</button>
|
<button (click)="openAddNoteModal('Executado')" class="btn-cancel" shape="round" >Executado</button>
|
||||||
<button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
|
<button *ngIf="!isDelegated" (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
|
||||||
<div class="solid"></div>
|
<div class="solid"></div>
|
||||||
<button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
|
<button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
|
||||||
<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>
|
||||||
|
|||||||
@@ -59,6 +59,7 @@ export class DespachoPage implements OnInit {
|
|||||||
dropButton = true
|
dropButton = true
|
||||||
|
|
||||||
showOptions = false
|
showOptions = false
|
||||||
|
isDelegated = false;
|
||||||
|
|
||||||
|
|
||||||
constructor(private activateRoute: ActivatedRoute,
|
constructor(private activateRoute: ActivatedRoute,
|
||||||
@@ -136,7 +137,8 @@ export class DespachoPage implements OnInit {
|
|||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.log(error)
|
console.log(error)
|
||||||
}
|
}
|
||||||
|
console.log('is Delegated',res.isDelegated)
|
||||||
|
this.isDelegated = res.isDelegated;
|
||||||
this.task = {
|
this.task = {
|
||||||
"SerialNumber": res.serialNumber,
|
"SerialNumber": res.serialNumber,
|
||||||
"Folio": res.workflowInstanceDataFields.Subject,
|
"Folio": res.workflowInstanceDataFields.Subject,
|
||||||
|
|||||||
+1
-1
@@ -25,7 +25,7 @@
|
|||||||
<div class="aside-right-container flex-column height-100 overflow-y-auto">
|
<div class="aside-right-container flex-column height-100 overflow-y-auto">
|
||||||
<div class="buttons">
|
<div class="buttons">
|
||||||
<button (click)="enviarDiploma({note: '', documents: [], serialnumber: task.SerialNumber})" class="btn-cancel" shape="round" >Enviar Diploma</button>
|
<button (click)="enviarDiploma({note: '', documents: [], serialnumber: task.SerialNumber})" class="btn-cancel" shape="round" >Enviar Diploma</button>
|
||||||
<button (click)="openDelegarModal()" class="btn-cancel" shape="round" >Delegar</button>
|
<button *ngIf="!isDelegated" (click)="openDelegarModal()" class="btn-cancel" shape="round" >Delegar</button>
|
||||||
<button (click)="openBookMeetingModal()" class="btn-cancel" shape="round" >Marcar Reunião</button>
|
<button (click)="openBookMeetingModal()" class="btn-cancel" shape="round" >Marcar Reunião</button>
|
||||||
<button (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para pendentes</button>
|
<button (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para pendentes</button>
|
||||||
<div class="solid"></div>
|
<div class="solid"></div>
|
||||||
|
|||||||
@@ -36,6 +36,7 @@ export class DiplomasGerarPage implements OnInit {
|
|||||||
attachments:any;
|
attachments:any;
|
||||||
customDate: any;
|
customDate: any;
|
||||||
caller:string;
|
caller:string;
|
||||||
|
isDelegated: boolean;
|
||||||
|
|
||||||
showOptions = false
|
showOptions = false
|
||||||
constructor(
|
constructor(
|
||||||
@@ -101,6 +102,8 @@ export class DiplomasGerarPage implements OnInit {
|
|||||||
|
|
||||||
this.processes.GetTask(serial).subscribe(res => {
|
this.processes.GetTask(serial).subscribe(res => {
|
||||||
this.TaskService.loadDiplomas()
|
this.TaskService.loadDiplomas()
|
||||||
|
console.log('is delegated', res.isDelegated)
|
||||||
|
this.isDelegated = res.isDelegated;
|
||||||
this.task = {
|
this.task = {
|
||||||
"SerialNumber": res.serialNumber,
|
"SerialNumber": res.serialNumber,
|
||||||
"Folio": res.workflowInstanceDataFields.Subject,
|
"Folio": res.workflowInstanceDataFields.Subject,
|
||||||
|
|||||||
@@ -23,7 +23,7 @@
|
|||||||
<div class="solid"></div>
|
<div class="solid"></div>
|
||||||
<button (click)="distartExpedientModal('descartar')" class="btn-cancel" shape="round" >Arquivar</button>
|
<button (click)="distartExpedientModal('descartar')" class="btn-cancel" shape="round" >Arquivar</button>
|
||||||
<div hidden class="solid"></div>
|
<div hidden class="solid"></div>
|
||||||
<button hidden class="btn-cancel" shape="round" >Delegar</button>
|
<button *ngIf="!isDelegated" hidden class="btn-cancel" shape="round" >Delegar</button>
|
||||||
<button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</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>
|
<button (click)="attachDocument()" class="btn-cancel" shape="round" >Anexar Documento <br />(Gestão Documental)</button>
|
||||||
</div>
|
</div>
|
||||||
@@ -35,7 +35,7 @@
|
|||||||
<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)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
|
||||||
<div hidden class="solid"></div>
|
<div hidden class="solid"></div>
|
||||||
<button hidden class="btn-cancel" shape="round" >Delegar</button>
|
<button *ngIf="!isDelegated" hidden class="btn-cancel" shape="round" >Delegar</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@@ -44,6 +44,7 @@ export class ExpedientePrPage implements OnInit {
|
|||||||
loggeduser: LoginUserRespose;
|
loggeduser: LoginUserRespose;
|
||||||
documents: SearchList[] = [];
|
documents: SearchList[] = [];
|
||||||
attachments:any;
|
attachments:any;
|
||||||
|
isDelegated: boolean;
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private processes: ProcessesService,
|
private processes: ProcessesService,
|
||||||
@@ -115,7 +116,8 @@ export class ExpedientePrPage implements OnInit {
|
|||||||
let date = new Date(res.taskStartDate);
|
let date = new Date(res.taskStartDate);
|
||||||
date.setMonth(date.getMonth() + 1);
|
date.setMonth(date.getMonth() + 1);
|
||||||
let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
|
let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
|
||||||
|
console.log('is delegated expeidente pr',res.isDelegated)
|
||||||
|
this.isDelegated = res.isDelegated
|
||||||
this.TaskService.loadExpedientes();
|
this.TaskService.loadExpedientes();
|
||||||
this.task = {
|
this.task = {
|
||||||
"SerialNumber": res.serialNumber,
|
"SerialNumber": res.serialNumber,
|
||||||
|
|||||||
@@ -60,7 +60,7 @@
|
|||||||
<div *ngIf="task.WorkflowName == 'Pedido de Deferimento'">
|
<div *ngIf="task.WorkflowName == 'Pedido de Deferimento'">
|
||||||
<div class="buttons" *ngIf="task.activityInstanceName == 'Tarefa de Deferimento'">
|
<div class="buttons" *ngIf="task.activityInstanceName == 'Tarefa de Deferimento'">
|
||||||
<button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
|
<button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
|
||||||
<button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
|
<button *ngIf="!isDelegated" (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
|
||||||
<div class="solid"></div>
|
<div class="solid"></div>
|
||||||
<button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
|
<button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
|
||||||
<button *ngIf="loggeduser.Profile != 'PR' && !p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
|
<button *ngIf="loggeduser.Profile != 'PR' && !p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
|
||||||
@@ -69,7 +69,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="buttons" *ngIf="task.activityInstanceName == 'Reapreciar Deferimento'">
|
<div class="buttons" *ngIf="task.activityInstanceName == 'Reapreciar Deferimento'">
|
||||||
<button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
|
<button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
|
||||||
<button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
|
<button *ngIf="!isDelegated" (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
|
||||||
<div class="solid"></div>
|
<div class="solid"></div>
|
||||||
<button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
|
<button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
|
||||||
<button *ngIf="loggeduser.Profile != 'PR' && !p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
|
<button *ngIf="loggeduser.Profile != 'PR' && !p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
|
||||||
@@ -78,7 +78,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="buttons" *ngIf="task.activityInstanceName == 'Concluir Deferimento'">
|
<div class="buttons" *ngIf="task.activityInstanceName == 'Concluir Deferimento'">
|
||||||
<button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
|
<button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
|
||||||
<button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
|
<button *ngIf="!isDelegated" (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
|
||||||
<div class="solid"></div>
|
<div class="solid"></div>
|
||||||
<button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
|
<button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
|
||||||
<button hidden (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
|
<button hidden (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
|
||||||
|
|||||||
@@ -51,6 +51,7 @@ export class PedidoPage implements OnInit {
|
|||||||
taskArrayActions = [];
|
taskArrayActions = [];
|
||||||
|
|
||||||
showOptions = false
|
showOptions = false
|
||||||
|
isDelegated: boolean;
|
||||||
constructor(private activatedRoute: ActivatedRoute,
|
constructor(private activatedRoute: ActivatedRoute,
|
||||||
private processes: ProcessesService,
|
private processes: ProcessesService,
|
||||||
private menu: MenuController,
|
private menu: MenuController,
|
||||||
@@ -106,7 +107,8 @@ export class PedidoPage implements OnInit {
|
|||||||
this.fulltask = res
|
this.fulltask = res
|
||||||
|
|
||||||
this.TaskService.loadPedidos();
|
this.TaskService.loadPedidos();
|
||||||
|
console.log('is delegated pedido', res.isDelegated)
|
||||||
|
this.isDelegated = res.isDelegated
|
||||||
if (res.workflowDisplayName == 'Pedido de Parecer' || res.workflowDisplayName == 'Pedido de Parecer do Presidente') {
|
if (res.workflowDisplayName == 'Pedido de Parecer' || res.workflowDisplayName == 'Pedido de Parecer do Presidente') {
|
||||||
|
|
||||||
let date = new Date(res.taskStartDate);
|
let date = new Date(res.taskStartDate);
|
||||||
|
|||||||
@@ -20,7 +20,7 @@
|
|||||||
<div class="flex-grow-1 width-50 pl-10">
|
<div class="flex-grow-1 width-50 pl-10">
|
||||||
<button (click)="openTaskProcessModal('1',fulltask)" class="btn-cancel width-100" shape="round" >Solicitar Parecer</button>
|
<button (click)="openTaskProcessModal('1',fulltask)" class="btn-cancel width-100" shape="round" >Solicitar Parecer</button>
|
||||||
<button *ngIf="!p.userRole(['PR']) && !p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openTaskProcessModal('2',fulltask)" class="btn-cancel width-100" shape="round" >Pedido de Deferimento</button>
|
<button *ngIf="!p.userRole(['PR']) && !p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openTaskProcessModal('2',fulltask)" class="btn-cancel width-100" shape="round" >Pedido de Deferimento</button>
|
||||||
<button (click)="openDelegarModal(task)" class="btn-cancel width-100" shape="round" >Delegar</button>
|
<button *ngIf="!isDelegated" (click)="openDelegarModal(task)" class="btn-cancel width-100" shape="round" >Delegar</button>
|
||||||
<button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" full class="btn-cancel width-100" shape="round" >Enviar para Pendentes</button>
|
<button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" full class="btn-cancel width-100" shape="round" >Enviar para Pendentes</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -36,7 +36,7 @@
|
|||||||
|
|
||||||
<div class="buttons" *ngIf="task.activityInstanceName == 'Tarefa de Despacho' && task.WorkflowName != 'Despacho do Presidente da República' ">
|
<div class="buttons" *ngIf="task.activityInstanceName == 'Tarefa de Despacho' && task.WorkflowName != 'Despacho do Presidente da República' ">
|
||||||
<button (click)="openAddNoteModal('Executado')" class="btn-cancel" shape="round" >Executado</button>
|
<button (click)="openAddNoteModal('Executado')" class="btn-cancel" shape="round" >Executado</button>
|
||||||
<button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
|
<button *ngIf="!isDelegated" (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
|
||||||
<div class="solid"></div>
|
<div class="solid"></div>
|
||||||
<button (click)="openTaskProcessModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
|
<button (click)="openTaskProcessModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
|
||||||
<button (click)="openTaskProcessModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
|
<button (click)="openTaskProcessModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
|
||||||
@@ -47,7 +47,7 @@
|
|||||||
|
|
||||||
<div class="buttons" *ngIf="task.activityInstanceName == 'Reexecutar Despacho'">
|
<div class="buttons" *ngIf="task.activityInstanceName == 'Reexecutar Despacho'">
|
||||||
<button (click)="openAddNoteModal('Executado')" class="btn-cancel" shape="round" >Executado</button>
|
<button (click)="openAddNoteModal('Executado')" class="btn-cancel" shape="round" >Executado</button>
|
||||||
<button (click)="openDelegarModal(task)" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Delegar</button>
|
<button (click)="openDelegarModal(task)" *ngIf="task.Status != 'Pending' && !isDelegated" class="btn-cancel" shape="round" >Delegar</button>
|
||||||
<div class="solid"></div>
|
<div class="solid"></div>
|
||||||
<button (click)="openTaskProcessModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
|
<button (click)="openTaskProcessModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
|
||||||
<button (click)="openTaskProcessModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
|
<button (click)="openTaskProcessModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ export class DespachosOptionsPage implements OnInit {
|
|||||||
fulltask: fullTask;
|
fulltask: fullTask;
|
||||||
serialNumber: string;
|
serialNumber: string;
|
||||||
environment = environment
|
environment = environment
|
||||||
|
isDelegated: boolean
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private processes: ProcessesService,
|
private processes: ProcessesService,
|
||||||
@@ -41,6 +42,8 @@ export class DespachosOptionsPage implements OnInit {
|
|||||||
) {
|
) {
|
||||||
this.task = this.navParams.get('task')
|
this.task = this.navParams.get('task')
|
||||||
this.fulltask = this.navParams.get('fulltask')
|
this.fulltask = this.navParams.get('fulltask')
|
||||||
|
console.log('is delegated ',this.fulltask.isDelegated )
|
||||||
|
this.isDelegated = this.fulltask.isDelegated;
|
||||||
|
|
||||||
|
|
||||||
this.serialNumber = this.task.SerialNumber
|
this.serialNumber = this.task.SerialNumber
|
||||||
|
|||||||
@@ -19,7 +19,7 @@
|
|||||||
<div class="flex-grow-1 width-50 pl-10">
|
<div class="flex-grow-1 width-50 pl-10">
|
||||||
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
|
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
|
||||||
<!-- <button *ngIf="!p.userRole(['PR'])" (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button> -->
|
<!-- <button *ngIf="!p.userRole(['PR'])" (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button> -->
|
||||||
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
|
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks]) && !isDelegated" (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
|
||||||
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks]) && task.Status != 'Pending'" (click)="sendExpedienteToPending()" full class="btn-cancel" shape="round" >Enviar para Pendentes</button>
|
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks]) && task.Status != 'Pending'" (click)="sendExpedienteToPending()" full class="btn-cancel" shape="round" >Enviar para Pendentes</button>
|
||||||
<button (click)="cancle()" full class="btn-cancel" shape="round" >Cancelar</button>
|
<button (click)="cancle()" full class="btn-cancel" shape="round" >Cancelar</button>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ export class DespachosPrOptionsPage implements OnInit {
|
|||||||
serialNumber: string;
|
serialNumber: string;
|
||||||
profile: string
|
profile: string
|
||||||
environment = environment
|
environment = environment
|
||||||
|
isDelegated: boolean;
|
||||||
|
|
||||||
constructor(private activateRoute: ActivatedRoute,
|
constructor(private activateRoute: ActivatedRoute,
|
||||||
private processes: ProcessesService,
|
private processes: ProcessesService,
|
||||||
@@ -45,6 +46,8 @@ export class DespachosPrOptionsPage implements OnInit {
|
|||||||
) { }
|
) { }
|
||||||
|
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
|
console.log('is delegated', this.fulltask.isDelegated)
|
||||||
|
this.isDelegated = this.fulltask.isDelegated;
|
||||||
|
|
||||||
this.profile = "mdgpr";
|
this.profile = "mdgpr";
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
<div>
|
<div>
|
||||||
<div class="buttons">
|
<div class="buttons">
|
||||||
<button (click)="enviarDiploma({note: '', documents: [], serialnumber: task.SerialNumber})" class="btn-cancel" shape="round" >Enviar Diploma</button>
|
<button (click)="enviarDiploma({note: '', documents: [], serialnumber: task.SerialNumber})" class="btn-cancel" shape="round" >Enviar Diploma</button>
|
||||||
<button (click)="openDelegarModal()" class="btn-cancel" shape="round" >Delegar</button>
|
<button *ngIf="!isDelegated" (click)="openDelegarModal()" class="btn-cancel" shape="round" >Delegar</button>
|
||||||
<div class="solid"></div>
|
<div class="solid"></div>
|
||||||
<button (click)="openBookMeetingModal()" class="btn-cancel" shape="round" >Marcar Reunião</button>
|
<button (click)="openBookMeetingModal()" class="btn-cancel" shape="round" >Marcar Reunião</button>
|
||||||
<button (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
|
<button (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ export class DiplomasGerarOptionsPage implements OnInit {
|
|||||||
task: customTask
|
task: customTask
|
||||||
fulltask: fullTask;
|
fulltask: fullTask;
|
||||||
serialNumber: string;
|
serialNumber: string;
|
||||||
|
isDelegated: boolean
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private processes: ProcessesService,
|
private processes: ProcessesService,
|
||||||
@@ -40,6 +41,7 @@ export class DiplomasGerarOptionsPage implements OnInit {
|
|||||||
this.task = this.navParams.get('task')
|
this.task = this.navParams.get('task')
|
||||||
this.fulltask = this.navParams.get('fulltask')
|
this.fulltask = this.navParams.get('fulltask')
|
||||||
this.serialNumber = this.navParams.get('serialNumber')
|
this.serialNumber = this.navParams.get('serialNumber')
|
||||||
|
this.isDelegated = this.fulltask.isDelegated;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
<div *ngIf="task.WorkflowName == 'Pedido de Deferimento'">
|
<div *ngIf="task.WorkflowName == 'Pedido de Deferimento'">
|
||||||
<div class="buttons" *ngIf="task.activityInstanceName == 'Tarefa de Deferimento'">
|
<div class="buttons" *ngIf="task.activityInstanceName == 'Tarefa de Deferimento'">
|
||||||
<button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
|
<button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
|
||||||
<button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
|
<button *ngIf="!isDelegated" (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
|
||||||
<div class="solid"></div>
|
<div class="solid"></div>
|
||||||
<button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
|
<button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
|
||||||
<button *ngIf="!p.userRole(['PR']) && !p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
|
<button *ngIf="!p.userRole(['PR']) && !p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
|
||||||
@@ -12,7 +12,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="buttons" *ngIf="task.activityInstanceName == 'Reapreciar Deferimento'">
|
<div class="buttons" *ngIf="task.activityInstanceName == 'Reapreciar Deferimento'">
|
||||||
<button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
|
<button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
|
||||||
<button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
|
<button *ngIf="!isDelegated" (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
|
||||||
<div class="solid"></div>
|
<div class="solid"></div>
|
||||||
<button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
|
<button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
|
||||||
<button *ngIf="!p.userRole(['PR']) && !p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
|
<button *ngIf="!p.userRole(['PR']) && !p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
|
||||||
@@ -22,7 +22,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="buttons" *ngIf="task.activityInstanceName == 'Concluir Deferimento'">
|
<div class="buttons" *ngIf="task.activityInstanceName == 'Concluir Deferimento'">
|
||||||
<button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
|
<button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
|
||||||
<button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
|
<button *ngIf="!isDelegated" (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
|
||||||
<div class="solid"></div>
|
<div class="solid"></div>
|
||||||
<button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
|
<button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
|
||||||
<!-- <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> -->
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ export class RequestOptionsPage implements OnInit {
|
|||||||
serialNumber : string;
|
serialNumber : string;
|
||||||
showEnviarPendentes = false;
|
showEnviarPendentes = false;
|
||||||
taskActions = [];
|
taskActions = [];
|
||||||
|
isDelegated: boolean;
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private popoverController: PopoverController,
|
private popoverController: PopoverController,
|
||||||
@@ -44,6 +45,7 @@ export class RequestOptionsPage implements OnInit {
|
|||||||
this.fulltask = this.navParams.get('fulltask');
|
this.fulltask = this.navParams.get('fulltask');
|
||||||
this.serialNumber = this.navParams.get('serialNumber');
|
this.serialNumber = this.navParams.get('serialNumber');
|
||||||
this.taskActions = this.navParams.get('actions');
|
this.taskActions = this.navParams.get('actions');
|
||||||
|
this.isDelegated = this.fulltask.isDelegated;
|
||||||
|
|
||||||
this.activatedRoute.queryParams.subscribe(params => {
|
this.activatedRoute.queryParams.subscribe(params => {
|
||||||
if(params["serialNumber"]) {
|
if(params["serialNumber"]) {
|
||||||
|
|||||||
Reference in New Issue
Block a user