Fix merge

This commit is contained in:
Peter Maquiran
2021-06-23 15:53:14 +01:00
68 changed files with 361 additions and 388 deletions
@@ -100,9 +100,6 @@
<ion-footer class="display-none-{{showAside}} ion-no-border">
<div class="buttons">
<button class="btn-cancel" shape="round" (click)="emendTask(loadedEvent.serialNumber)">Adicionar Nota</button>
<ion-menu-button (click)="openMenu()" autoHide="false">
<ion-icon name="ellipsis-vertical-outline"></ion-icon>
</ion-menu-button>
<button class="btn-ok" shape="round" (click)="approveTask(loadedEvent.serialNumber)">Aprovar</button>
<button hidden class="btn-delete" shape="round" (click)="rejectTask(loadedEvent.serialNumber)">Rejeitar</button>
</div>
@@ -106,18 +106,7 @@ export class ApproveEventPage implements OnInit {
}); */
}
async emendTask(serialNumber:string){
/* console.log('Emendar'); */
this.menu.close();
try {
await this.openEmendMessageModal(serialNumber);
this.modalController.dismiss(null);
} catch (error) {
this.toastService.badRequest()
}
}
async rejectTask(serialNumber:string) {
@@ -158,23 +147,22 @@ export class ApproveEventPage implements OnInit {
});
return await popover.present();
}
openMenu() {
this.menu.open();
}
async openEmendMessageModal(serialNumber:string) {
async emendTask(serialNumber:string){
console.log('Desktop');
const modal = await this.modalController.create({
component: EmendMessageModalPage,
componentProps:{
},
cssClass: 'emend-message-modal',
backdropDismiss: false
});-
});
await modal.present();
modal.onDidDismiss().then( async (res) => {
modal.onDidDismiss()
.then( async (res) => {
console.log(res.data);
if(res.data !== ''){
@@ -184,24 +172,23 @@ export class ApproveEventPage implements OnInit {
"ReviewUserComment": res.data,
}
}
console.log(body);
try {
await this.processes.PostTaskAction(body).toPromise()
//this.router.navigate(['/home/gabinete-digital/event-list']);
this.goToEventsToApprove();
this.toastService.successMessage()
} catch (error) {
this.toastService.badRequest()
}
console.log(body);
try {
await this.processes.PostTaskAction(body).toPromise();
this.toastService.successMessage('Pedido enviado');
this.close();
} catch (error) {
this.toastService.badRequest();
}
}
else{
//this.alertService.presentAlert('Operação cancelada!');
}
});
//this.openEmendMessageModal(serialNumber);
//this.goBack();
}
goToEventsToApprove(){
@@ -237,5 +224,4 @@ export class ApproveEventPage implements OnInit {
}
}
@@ -22,8 +22,7 @@
</ion-refresher-content>
</ion-refresher>
<div class="main-content width-100">
<div *ngIf="despachoList">
<div *ngIf="despachoList.length >= 1" class="main-container width-100 overflow-y-auto height-100">
<ion-list>
<ion-item
class="expediente ion-no-padding cursor-pointer"
@@ -57,10 +56,8 @@
</div>
</ion-item>
</ion-list>
</div>
</div>
<div *ngIf="despachoList?.length < 1">
<div *ngIf="despachoList?.length < 1" class="overflow-y-auto height-100">
<ion-list>
<ion-item>
@@ -1,5 +1,5 @@
@import '~src/function.scss';
.main-content{
.main-container{
padding: 30px 20px 0 20px !important;
margin: 0;
color:#000;
@@ -127,7 +127,8 @@ goToDespachoPr(serialNumber:any){
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": 0,
"DocId": element.workflowInstanceDataFields.DocIdDiferimento,
"DocId": element.workflowInstanceDataFields.DispatchDocID,
"FolderID": element.workflowInstanceDataFields.FolderID,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
@@ -18,9 +18,8 @@
</ion-refresher-content>
</ion-refresher>
<div class="width-100">
<div *ngIf="despachoList">
<ion-list>
<div *ngIf="despachoList.length >= 1" class="overflow-y-auto height-100 width-100">
<ion-list part="divo">
<ion-item
class="expediente ion-no-padding cursor-pointer"
*ngFor = "let task of despachoList; let i = index"
@@ -53,10 +52,8 @@
</div>
</ion-item>
</ion-list>
</div>
</div>
<div *ngIf="despachoList?.length < 1">
<div *ngIf="despachoList.length < 1">
<ion-list>
<ion-item>
@@ -1,9 +1,10 @@
@import '~src/function.scss';
/* CONTENT */
:host{
padding: 30px 20px 0 20px !important;
margin: 0;
padding: 30px 20px 0 20px !important;
margin: 0;
}
.title{
font-family: Roboto;
font-size: 25px;
@@ -96,6 +96,8 @@ export class DespachosPage implements OnInit {
}
async LoadList(){
console.log('HERE DESK');
let result = await this.processes.GetTasksList("Despacho", false).toPromise();
//let despachos = result.reverse().filter(data => data.activityInstanceName == "Despacho (Paralelo)");
@@ -117,7 +119,8 @@ export class DespachosPage implements OnInit {
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": 0,
"DocId": element.workflowInstanceDataFields.DocIdDiferimento,
"DocId": element.workflowInstanceDataFields.DispatchDocId,
"FolderID": element.workflowInstanceDataFields.FolderID,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
@@ -129,6 +132,8 @@ export class DespachosPage implements OnInit {
this.despachoList = this.sortArrayISODate(this.despachoList).reverse()
this.despachoList.forEach( (element, index) => {
console.log(element['FolderID']);
// let aplicationId = element.workflowInstanceDataFields.SourceSecFsID;
let FolderID = element['FolderID'];
@@ -19,8 +19,8 @@
</ion-refresher-content>
</ion-refresher>
<div class="width-100">
<div *ngIf="diplomasList">
<div class="width-100 overflow-y-auto height-100">
<div *ngIf="diplomasList.length >= 1">
<ion-list >
<!-- *ngFor = "let task of parecerList; let i = index"
(click)="viewExpedientDetail(task.SerialNumber)" -->
@@ -81,7 +81,8 @@ serialNumber:string;
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": 0,
"DocId": element.workflowInstanceDataFields.DocIdDiferimento,
"DocId": element.workflowInstanceDataFields.DispatchDocID,
"FolderID": element.workflowInstanceDataFields.FolderID,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
@@ -100,7 +101,8 @@ serialNumber:string;
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Sender,
"DocumentsQty": 0,
"DocId": element.workflowInstanceDataFields.DocIdDiferimento,
"DocId": element.workflowInstanceDataFields.DispatchDocID,
"FolderID": element.workflowInstanceDataFields.FolderID,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
@@ -28,7 +28,7 @@
</ion-refresher-content>
</ion-refresher>
<div class="width-100" [ngSwitch]="segment">
<div class="width-100 overflow-y-auto height-100" [ngSwitch]="segment">
<div *ngIf="diplomasList">
<ion-list *ngSwitchCase="'validar'">
<ion-item
@@ -84,7 +84,8 @@ constructor(
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": 0,
"DocId": element.workflowInstanceDataFields.DocIdDiferimento,
"DocId": element.workflowInstanceDataFields.DispatchDocID,
"FolderID": element.workflowInstanceDataFields.FolderID,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
@@ -103,7 +104,8 @@ constructor(
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": 0,
"DocId": element.workflowInstanceDataFields.DocIdDiferimento,
"DocId": element.workflowInstanceDataFields.DispatchDocID,
"FolderID": element.workflowInstanceDataFields.FolderID,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
@@ -136,7 +138,8 @@ constructor(
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": 0,
"DocId": element.workflowInstanceDataFields.DocIdDiferimento,
"DocId": element.workflowInstanceDataFields.DispatchDocID,
"FolderID": element.workflowInstanceDataFields.FolderID,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
@@ -156,7 +159,8 @@ constructor(
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": 0,
"DocId": element.workflowInstanceDataFields.DocIdDiferimento,
"DocId": element.workflowInstanceDataFields.DispatchDocID,
"FolderID": element.workflowInstanceDataFields.FolderID,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
@@ -196,8 +196,10 @@ export class EditEventToApproveComponent implements OnInit {
Message: this.eventProcess.workflowInstanceDataFields.Message,
ParticipantsList: this.eventProcess.workflowInstanceDataFields.ParticipantsList,
Private: false,
ReviewUserComments: ''
ReviewUserComment: ''
}
console.log(event);
this.eventsService.postEventToApproveEdit(event).subscribe(()=>{
this.toastService.successMessage('Evento editado');
@@ -1,4 +1,4 @@
<ion-content>
<ion-header>
<div class="title width-100">
<div class="title-container d-flex justify-space-between">
<span class="text-center mt-0 aside-title px-20"><label>Eventos para Aprovação</label></span>
@@ -17,12 +17,14 @@
</ion-segment>
</ion-toolbar>
</div>
</ion-header>
<ion-content>
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh()">
<ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
<ion-refresher-content>
</ion-refresher-content>
</ion-refresher>
<div class="main-content" [ngSwitch]="segment" *ngIf="eventsMDGPRList">
<div class="main-content overflow-y-auto height-100" [ngSwitch]="segment" *ngIf="eventsMDGPRList.length >= 1">
<!-- <div class="header-content width-100"> -->
<!-- </div> -->
@@ -59,39 +59,15 @@ export class EventsToApprovePage implements OnInit {
this.eventsPRList = prEvents;
console.log(this.eventsPRList);
/* this.processes.GetToApprovedEvents('PR','false').subscribe(res=>{
this.showLoader = false;
this.eventsPRList = res;
console.log('this.eventsPRList', this.eventsPRList)
}); */
let mdEvents = await this.processes.GetToApprovedEvents('MDGPR','false').toPromise();
this.eventsMDGPRList = mdEvents;
console.log(this.eventsMDGPRList);
/* this.processes.GetToApprovedEvents('MDGPR','false').subscribe(res=>{
this.showLoader = false;
this.eventsMDGPRList = res;
console.log('this.eventsMDGPRList', this.eventsMDGPRList)
}); */
this.showLoader = false;
}
goToEventDetail(eventToAprove){
let InstanceId;
if(!eventToAprove.workflowInstanceDataFields.hasOwnProperty('InstanceId')){
InstanceId = ''
} else {
InstanceId =eventToAprove.workflowInstanceDataFields.InstanceId
}
let navigationExtras: NavigationExtras = {
queryParams: {
"serialNumber": eventToAprove.serialNumber,
}
};
this.router.navigate(['/home/gabinete-digital/event-list/approve-event'], navigationExtras)
goToEventDetail(event){
this.router.navigate(['/home/gabinete-digital/event-list/approve-event',event.serialNumber, 'gabinete-digital'])
}
/* async openApproveModal(eventToAprove) {
@@ -15,7 +15,7 @@
</ion-refresher-content>
</ion-refresher>
<div class="width-100" *ngIf="taskslist">
<div class="width-100 overflow-y-auto height-100" *ngIf="taskslist.length >= 1">
<ion-list>
<ion-item
class="expediente ion-no-padding cursor-pointer"
@@ -18,7 +18,7 @@
</ion-refresher-content>
</ion-refresher>
<div class="width-100" *ngIf="taskslist">
<div class="width-100 overflow-y-auto height-100" *ngIf="taskslist.length >= 1">
<ion-list>
<ion-item
class="expediente ion-no-padding cursor-pointer"
@@ -29,7 +29,7 @@
</ion-refresher>
<div class="width-100" [ngSwitch]="segment">
<div *ngIf="parecerList">
<div *ngIf="parecerList.length >= 1" class="overflow-y-auto height-100">
<ion-list *ngSwitchCase="'parecer'">
<!-- *ngFor = "let task of parecerList; let i = index"
(click)="viewExpedientDetail(task.SerialNumber)" -->
@@ -64,7 +64,7 @@
</ion-list>
</div>
<div *ngIf="deferimentoList">
<div *ngIf="deferimentoList.length >= 1" class="overflow-y-auto height-100">
<ion-list *ngSwitchCase="'deferimento'">
<ion-item
class="expediente ion-no-padding cursor-pointer"
@@ -95,7 +95,8 @@ export class PedidosPage implements OnInit {
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": 0,
"DocId": element.workflowInstanceDataFields.DocIdDiferimento,
"DocId": element.workflowInstanceDataFields.ParecerDocID,
"FolderID": element.workflowInstanceDataFields.FolderID,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
@@ -127,6 +128,7 @@ export class PedidosPage implements OnInit {
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": 0,
"DocId": element.workflowInstanceDataFields.DocIdDiferimento,
"FolderID": element.workflowInstanceDataFields.FolderID,
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
}
@@ -18,8 +18,7 @@
</ion-refresher-content>
</ion-refresher>
<div class="width-100">
<div *ngIf="pendentesList">
<div *ngIf="pendentesList.length >= 1" class="width-100 overflow-y-auto height-100">
<ion-list>
<ion-item
class="expediente ion-no-padding cursor-pointer"
@@ -49,10 +48,8 @@
</div>
</ion-item>
</ion-list>
</div>
</div>
<div *ngIf="pendentesList?.length < 1 || pendentesList.length == 0">
<div *ngIf="pendentesList.length < 1">
<ion-list>
<ion-item>
@@ -42,6 +42,7 @@ export class DeplomaOptionsPage implements OnInit {
async openAddNoteModal(actionName:string) {
this.popoverController.dismiss();
let classs;
if( window.innerWidth <= 800){
classs = 'modal modal-desktop'
@@ -109,6 +110,7 @@ export class DeplomaOptionsPage implements OnInit {
async openBookMeetingModal(task: any) {
this.popoverController.dismiss();
let classs;
if( window.innerWidth <= 800){
classs = 'book-meeting-modal modal modal-desktop'
@@ -152,6 +154,8 @@ export class DeplomaOptionsPage implements OnInit {
}
close(){}
close(){
this.popoverController.dismiss();
}
}
@@ -70,7 +70,7 @@ export class DespachosOptionsPage implements OnInit {
async openExpedientActionsModal(taskAction: any, task: any) {
//this.modalController.dismiss();
this.popoverController.dismiss();
let classs;
if( window.innerWidth <= 800){
classs = 'modal modal-desktop'
@@ -107,6 +107,7 @@ export class DespachosOptionsPage implements OnInit {
}
async distartExpedientModal(){
this.popoverController.dismiss();
console.log(this.fulltask);
const modal = await this.modalController.create({
component: DiscartExpedientModalPage,
@@ -133,6 +134,7 @@ export class DespachosOptionsPage implements OnInit {
async openBookMeetingModal(task: any) {
this.popoverController.dismiss();
let classs;
if( window.innerWidth <= 800){
classs = 'book-meeting-modal modal modal-desktop'
@@ -192,6 +194,7 @@ export class DespachosOptionsPage implements OnInit {
}
async openAddNoteModal(actionName:string) {
this.popoverController.dismiss();
let classs;
if( window.innerWidth <= 800){
classs = 'modal modal-desktop'
@@ -65,7 +65,7 @@ export class DespachosPrOptionsPage implements OnInit {
async openExpedientActionsModal(taskAction: any, task: any) {
//this.modalController.dismiss();
this.popoverController.dismiss();
let classs;
if( window.innerWidth <= 800){
classs = 'modal modal-desktop'
@@ -102,6 +102,7 @@ export class DespachosPrOptionsPage implements OnInit {
}
async distartExpedientModal(){
this.popoverController.dismiss();
console.log(this.fulltask);
const modal = await this.modalController.create({
component: DiscartExpedientModalPage,
@@ -128,6 +129,7 @@ export class DespachosPrOptionsPage implements OnInit {
async openBookMeetingModal(task: any) {
this.popoverController.dismiss();
let classs;
if( window.innerWidth <= 800){
classs = 'book-meeting-modal modal modal-desktop'
@@ -147,6 +149,7 @@ export class DespachosPrOptionsPage implements OnInit {
}
async openDelegarModal(task: any) {
this.popoverController.dismiss();
let classs;
if( window.innerWidth <= 800){
classs = 'book-meeting-modal modal modal-desktop'
@@ -187,6 +190,7 @@ export class DespachosPrOptionsPage implements OnInit {
}
async openAddNoteModal(actionName:string) {
this.popoverController.dismiss();
let classs;
if( window.innerWidth <= 800){
classs = 'modal modal-desktop'
@@ -68,6 +68,7 @@ export class OptsExpedientePrPage implements OnInit {
}
async openAddNoteModal(actionName:string) {
this.popoverController.dismiss();
let classs;
if( window.innerWidth <= 800){
classs = 'modal modal-desktop'
@@ -131,6 +132,7 @@ export class OptsExpedientePrPage implements OnInit {
}
async distartExpedientModal(body:any) {
this.popoverController.dismiss();
console.log(this.fulltask);
const modal = await this.modalController.create({
component: DiscartExpedientModalPage,
@@ -214,7 +216,7 @@ export class OptsExpedientePrPage implements OnInit {
}
async openExpedientActionsModal(taskAction: any, task: any) {
//this.modalController.dismiss();
this.popoverController.dismiss();
let classs;
if( window.innerWidth <= 800){
classs = 'modal modal-desktop'
@@ -243,13 +245,13 @@ export class OptsExpedientePrPage implements OnInit {
}
else{
console.log('Not open');
}
});
}
async openBookMeetingModal(task: any) {
this.popoverController.dismiss();
let classs;
if( window.innerWidth <= 800){
classs = 'book-meeting-modal modal modal-desktop'
@@ -289,24 +291,5 @@ export class OptsExpedientePrPage implements OnInit {
// window.history.back();
}
async badRequest(message?: string, callback?) {
const modal = await this.modalController.create({
component: BadRequestPage,
componentProps: {
message: 'hello',
},
cssClass: 'modal modal-desktop'
});
modal.present()
setTimeout(()=>{
modal.dismiss()
},1000)
}
}
@@ -80,7 +80,7 @@ export class OptsExpedientePage implements OnInit {
}
async openExpedientActionsModal(taskAction: any, task: any) {
//this.modalController.dismiss();
this.close();
let classs;
if( window.innerWidth <= 800){
classs = 'modal modal-desktop'
@@ -110,7 +110,7 @@ export class OptsExpedientePage implements OnInit {
}
async distartExpedientModal(){
console.log(this.fulltask);
this.close();
const modal = await this.modalController.create({
component: DiscartExpedientModalPage,
componentProps: {
@@ -77,6 +77,7 @@ export class RequestOptionsPage implements OnInit {
}
async openBookMeetingModal(task: any) {
this.popoverController.dismiss();
let classs;
if( window.innerWidth <= 800){
classs = 'book-meeting-modal modal modal-desktop'
@@ -96,6 +97,7 @@ export class RequestOptionsPage implements OnInit {
}
async openExpedientActionsModal(taskAction: any, task: any) {
this.popoverController.dismiss();
//this.modalController.dismiss();
let classs;
if( window.innerWidth <= 800) {
@@ -126,6 +128,7 @@ export class RequestOptionsPage implements OnInit {
}
async distartExpedientModal(){
this.popoverController.dismiss();
console.log(this.fulltask);
const modal = await this.modalController.create({
component: DiscartExpedientModalPage,
@@ -172,6 +175,7 @@ export class RequestOptionsPage implements OnInit {
}
async openAddNoteModal(actionName:string) {
this.popoverController.dismiss();
let classs;
if( window.innerWidth <= 800){
classs = 'modal modal-desktop'
@@ -239,6 +243,7 @@ export class RequestOptionsPage implements OnInit {
}
async openDarParecer(task: any) {
this.popoverController.dismiss();
// console.log(task);
let classs;
@@ -261,6 +266,7 @@ export class RequestOptionsPage implements OnInit {
}
async openDelegarModal(task: any) {
this.popoverController.dismiss();
// console.log(task);
let classs;