further improvements

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
+4
View File
@@ -75,6 +75,10 @@ const routes: Routes = [
{
path: 'opts-expediente',
loadChildren: () => import('./shared/popover/opts-expediente/opts-expediente.module').then( m => m.OptsExpedientePageModule)
},
{
path: 'despachos-pr',
loadChildren: () => import('./shared/gabinete-digital/despachos-pr/despachos-pr.module').then( m => m.DespachosPrPageModule)
},
/* {
@@ -77,6 +77,7 @@ export class CreateProcessPage implements OnInit {
SouceType: 'FOLDER',
SourceId: this.task.workflowInstanceDataFields.FolderID,
DeadlineType: '',
SubjectTypes: [],
};
+1
View File
@@ -6,4 +6,5 @@ export class Folder{
SouceType:string;
SourceId:string;
DeadlineType: string;
SubjectTypes: number[];
}
@@ -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>
@@ -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');
}
}
@@ -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.");
@@ -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({
@@ -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]
})
@@ -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>
@@ -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();
@@ -0,0 +1,17 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { DespachosPrPage } from './despachos-pr.page';
const routes: Routes = [
{
path: '',
component: DespachosPrPage
}
];
@NgModule({
imports: [RouterModule.forChild(routes)],
exports: [RouterModule],
})
export class DespachosPrPageRoutingModule {}
@@ -0,0 +1,20 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { IonicModule } from '@ionic/angular';
import { DespachosPrPageRoutingModule } from './despachos-pr-routing.module';
import { DespachosPrPage } from './despachos-pr.page';
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
DespachosPrPageRoutingModule
],
declarations: [DespachosPrPage]
})
export class DespachosPrPageModule {}
@@ -0,0 +1,83 @@
<ion-header class="ion-no-border1">
<div class="main-header">
<div class="thetitle"><ion-label >Despachos Presidenciais</ion-label></div>
<div class="theicon">
<button class="btn-no-color" (click)="doRefresh($event)">
<ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>
</button>
</div>
</div>
<div class="bottom-title d-flex"><h3 class="bottom-text">Presidente da República</h3></div>
</ion-header>
<ion-content>
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
<ion-refresher-content
pullingIcon="chevron-down-circle-outline"
pullingText="deslize para actualizar"
refreshingSpinner="circles"
refreshingText="A actualizar...">
</ion-refresher-content>
</ion-refresher>
<div class="main-content width-100">
<div *ngIf="despachoList">
<ion-list>
<ion-item
class="expediente ion-no-padding cursor-pointer"
*ngFor = "let task of despachoList; let i = index"
(click)="viewExpedientDetail(task.SerialNumber)"
>
<!-- [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
<div class="item width-100">
<div class="exp-top-detail">
<div class="exp-date">
<ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
</div>
<div class="exp-remetente">
<ion-label>{{task.Senders}}</ion-label>
</div>
<div class="exp-icon d-flex align-center">
<ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<label>{{task.DocumentsQty}}</label>
<!-- <ion-menu-button (click)="docIndex(i)" style="width: 35px; height: 41px;" autoHide="false">
<ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
</ion-menu-button> -->
</div>
</div>
<div class="exp-bottom-detail">
<ion-label>{{ task.Folio }}</ion-label>
</div>
</div>
</ion-item>
</ion-list>
</div>
</div>
<div *ngIf="despachoList.length < 1">
<ion-list>
<ion-item>
<ion-thumbnail slot="end">
<ion-skeleton-text animated></ion-skeleton-text>
</ion-thumbnail>
<ion-label>
<h3><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></h3>
<p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
<p><ion-skeleton-text animated style="width: 60%"></ion-skeleton-text></p>
</ion-label>
</ion-item>
<ion-item>
<ion-thumbnail slot="end">
<ion-skeleton-text animated></ion-skeleton-text>
</ion-thumbnail>
<ion-label>
<h3><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></h3>
<p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
<p><ion-skeleton-text animated style="width: 60%"></ion-skeleton-text></p>
</ion-label>
</ion-item>
</ion-list>
</div>
</ion-content>
@@ -0,0 +1,194 @@
@import '~src/function.scss';
/* CONTENT */
.main-content{
padding: 30px 20px 0 20px !important;
margin: 0;
}
.main-header{
font-family: Roboto;
font-size: 25px;
color:#000;
overflow: auto;
padding: 30px 20px 0 20px !important;
margin: 0;
.thetitle{
width: fit-content;
float: left;
}
.theicon{
width: fit-content;
float: right;
}
}
.bottom-title{
//width: 100%;
margin-left: 20px !important;
margin-right: 20px !important;
margin: 0 auto;
align-items: center;
justify-content: center;
border-bottom: 5px solid #42b9fe;
.bottom-text{
font-size: 15px !important;
font-family: Roboto !important;
color: #0d89d1 !important;
}
}
.item-list-small{
font-size: 11px;
overflow: hidden;
}
.ion-item-class{
padding: 0;
}
.label-text{
width: 100%;
padding: 0;
margin: 0;
}
//DIV
ion-item{
--background: none;
}
.item {
//border-radius: 15px;
//box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
//Sborder: solid 1px #e9e9e9;
background-color: var(--white);
margin: 0 auto;
//padding: 10px;
margin-bottom: 10px;
overflow: hidden;
}
.div-content-expediente{
width: 100%;
float: left;
border-left: 3px solid #dae3f3;
padding:5px 5px 15px 5px;
margin: 10px 0 10px 0;
background: #dae3f3;
border-radius: 20px;
}
.div-content-pendentes{
width: 100%;
float: left;
border-left: 3px solid #d9d9d9;
padding: 5px;
}
.div-content-expediente h3, .div-content-pendentes h3{
margin: 0;
padding: 0;
font-size: 14pt;
width: 100%;
}
.div-icon{
width: 10%;
font-size: 20px;
float: left;
color: #808080;
}
.div-icon ion-icon{
display: block;
margin: 0 auto;
}
.div-content-expediente p, .div-content-pendentes p{
font-size: 14pt;
color: rgb(94, 92, 92);
padding: 0;
margin: 0;
}
.span-left{
/* border: 1px solid red; */
float: left;
font-size: 12px;
padding-left: 18px;
}
.span-right{
/* border: 1px solid blue; */
text-align: right;
float: right;
font-size: 12px;
padding-right: 18px;
}
/* New CSS */
.expediente{
padding-top: 10px;
}
.exp-list-item{
//width: 368px;
overflow: auto;
/* border-bottom: 1px solid gray; */
margin: 10px auto;
}
.exp-top-detail{
width: 100%;
overflow: auto;
}
.exp-date{
width: auto;
font-family: Roboto;
font-size: 13px;
font-weight: normal;
font-stretch: normal;
font-style: normal;
line-height: normal;
letter-spacing: normal;
color: #797979;
float: left;
}
.exp-remetente{
//width: 200px;
font-family: Roboto;
font-size: 13px;
font-weight: normal;
color: #000000;
float: left;
margin-left: 16px;
}
.exp-icon{
width: 45px;
float: right;
font-size: 13px;
}
.exp-icon ion-icon{
font-size: 25px;
color: #42b9fe;
}
.exp-bottom-detail{
float: left;
font-family: Roboto;
font-size: 16px;
font-weight: 700;
color: #0d89d1;
}
.div-top-header{
width: 400px;
margin: 6px auto;
background-color: #0782c9;
overflow: auto;
}
.div-search{
font-size: 45px;
float: left;
margin: 0 0 0 10px
}
.div-logo{
background: transparent;
width: 150px;
margin: 2.5px 0 2.5px 71px;
float: left;
}
.div-logo img{
width: 100%;
}
.div-profile{
font-size: 45px;
float: right;
margin-right: 10px;
}
@@ -0,0 +1,24 @@
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { IonicModule } from '@ionic/angular';
import { DespachosPrPage } from './despachos-pr.page';
describe('DespachosPrPage', () => {
let component: DespachosPrPage;
let fixture: ComponentFixture<DespachosPrPage>;
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ DespachosPrPage ],
imports: [IonicModule.forRoot()]
}).compileComponents();
fixture = TestBed.createComponent(DespachosPrPage);
component = fixture.componentInstance;
fixture.detectChanges();
}));
it('should create', () => {
expect(component).toBeTruthy();
});
});
@@ -0,0 +1,270 @@
import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
import { CalendarComponent } from 'ionic2-calendar';
import { DailyWorkTask, tasksList } from '../../../models/dailyworktask.model';
import { ProcessesService } from 'src/app/services/processes.service';
import { formatDate } from '@angular/common';
import { ModalController } from '@ionic/angular';
import { ExpedienteDetailPage } from 'src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page';
import { AlertService } from 'src/app/services/alert.service';
import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page';
import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page';
import { AuthService } from 'src/app/services/auth.service';
import { DespachoPage } from 'src/app/pages/gabinete-digital/despachos/despacho/despacho.page';
@Component({
selector: 'app-despachos-pr',
templateUrl: './despachos-pr.page.html',
styleUrls: ['./despachos-pr.page.scss'],
})
export class DespachosPrPage implements OnInit {
//profile:string;
@ViewChild(CalendarComponent) myCal: CalendarComponent;
taskslist:DailyWorkTask[];
despachoList:DailyWorkTask[] = [];
deferimentoList:DailyWorkTask[] = [];
taskList:tasksList[] = [];
taskType: string;
serialNumber:string;
totalDocs:any;
@Input() profile:string;
segment:string;
@Output() openExpedientDetail:EventEmitter<any> = new EventEmitter<any>();
loadedAttachments:any;
dicIndex = 0;
inicial = false
constructor (
private processes:ProcessesService,
private modalController: ModalController,
private alertService: AlertService,
private authService: AuthService,
) {
this.profile = 'mdgpr';
}
ngOnInit() {
//Inicializar segment
this.segment = "despachos";
this.LoadList();
this.authService.userData$.subscribe((res:any)=>{
console.log(res);
});
}
segmentChanged(ev: any) {
this.LoadList();
}
notImplemented(){
this.alertService.presentAlert('Funcionalidade em desenvolvimento');
}
openExpedientDetailPage(data){
console.log(data);
this.openExpedientDetail.emit(data);
}
async LoadList(){
this.despachoList = new Array();
let result = await this.processes.GetTasksList("Despacho do PR", false).toPromise();
console.log(result);
await result.forEach( (element, index) => {
let task = {
"SerialNumber": element.serialNumber,
"Folio": element.workflowInstanceDataFields.Subject,
"Senders": element.workflowInstanceDataFields.Sender,
"CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": '',
"DocId": element.workflowInstanceDataFields.DocId,
"WorkflowName": element.workflowDisplayName,
"FolderID": element.workflowInstanceDataFields.FolderID
}
this.despachoList.push(task)
});
this.despachoList = this.sortArrayISODate(this.despachoList).reverse()
this.despachoList.forEach( (element, index) => {
// let aplicationId = element.workflowInstanceDataFields.SourceSecFsID;
let FolderID = element['FolderID'];
this.processes.GetDocumentDetails(FolderID, '361').subscribe(res=>{
element.DocumentsQty = res.DocumentsTotal
})
});
}
sortArrayISODate(myArray: any){
return myArray.sort(function(a, b) {
return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0);
});
}
doRefresh(event) {
this.LoadList();
setTimeout(() => {
event.target.complete();
}, 2000);
}
async viewExpedientDetail(serialNumber:any) {
console.log(this.profile);
let classs;
if( window.innerWidth <= 800){
classs = 'modal'
} else {
classs = 'modal modal-desktop'
}
const modal = await this.modalController.create({
component: DespachoPage,
componentProps:{
enterAnimation: "",
serialNumber: serialNumber,
profile: this.profile,
},
cssClass: classs,
});
await modal.present();
modal.onDidDismiss().then((res)=>{
console.log('refresh list');
this.LoadList();
});
}
// old
async openExpedientActionsModal(taskAction: any, task: any) {
//this.modalController.dismiss();
let classs;
if( window.innerWidth <= 800){
classs = 'modal modal-desktop'
} else {
classs = 'modal modal-desktop showAsideOptions'
}
const doc = this.loadedAttachments[ this.dicIndex];
task = {
serialNumber: doc.SourceId,
taskStartDate: doc.CreateDate,
isEvent: true,
workflowInstanceDataFields: {
FsId: doc.ApplicationId,
FolderID: null,
DocId: doc.SourceId,
Subject: doc.SourceName
},
}
const modal = await this.modalController.create({
component: ExpedientTaskModalPage,
componentProps: {
taskAction: taskAction,
task: task,
profile: this.profile,
},
cssClass: classs,
});
await modal.present();
modal.onDidDismiss().then(res=>{
console.log(res['data']);
if(res['data']=='openDiscart'){
console.log('open discart');
// this.distartExpedientModal();
}
});
}
async openBookMeetingModal(task: any) {
const doc = this.loadedAttachments[ this.dicIndex];
task = {
serialNumber: doc.SourceId,
taskStartDate: doc.CreateDate,
isEvent: true,
workflowInstanceDataFields: {
FsId: doc.ApplicationId,
FolderID: null,
DocId: doc.SourceId,
Subject: doc.SourceName
},
}
let classs;
if( window.innerWidth <= 800){
classs = 'book-meeting-modal modal modal-desktop'
} else {
classs = 'modal modal-desktop showAsideOptions'
}
const modal = await this.modalController.create({
component: BookMeetingModalPage,
componentProps: {
task: task,
},
cssClass: classs,
backdropDismiss: false
});
await modal.present();
modal.onDidDismiss();
}
async distartExpedientModal() {
const doc = this.taskList[ this.dicIndex];
console.log(doc, this.dicIndex, this.taskList)
const modal = await this.modalController.create({
component: DiscartExpedientModalPage,
componentProps: {
serialNumber: doc.serialNumber,
folderId: doc.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(); */
}
});
}
docIndex(index: number) {
this.dicIndex = index;
}
}
+1 -1
View File
@@ -259,7 +259,7 @@
background: rgba(51, 51, 51, 0.3);
}
.discart-expedient-modal{
--height: auto;
--height: 50%;
--border-radius: 10px;
padding: 25px;
background: rgba(51, 51, 51, 0.3);