This commit is contained in:
tiago.kayaya
2021-05-05 17:14:44 +01:00
parent fb949400b4
commit 2003028b7d
18 changed files with 288 additions and 22 deletions
@@ -125,7 +125,7 @@ export class ApproveEventModalPage implements OnInit {
let body = { "serialNumber": serialNumber,
"action": "Emendar",
"dataFields": {
"ReviewerComments": res.data,
"ReviewerUseComment": res.data,
}
}
this.processes.PostTaskAction(body);
@@ -156,7 +156,7 @@ export class DespachoPage implements OnInit {
"serialNumber": this.serialnumber,
"action": "Conhecimento",
"dataFields": {
"ReviewerComments": note,
"ReviewerUseComment": note,
}
}
this.processes.PostTaskAction(body);
@@ -143,7 +143,7 @@ export class ApproveEventModalPage implements OnInit {
let body = { "serialNumber": serialNumber,
"action": "Emendar",
"dataFields": {
"ReviewerComments": res.data,
"ReviewerUseComment": res.data,
}
}
console.log(body);
@@ -132,7 +132,7 @@ export class ApproveEventPage implements OnInit {
"serialNumber": serialNumber,
"action": "Emendar",
"dataFields": {
"ReviewerComments": res.data,
"ReviewerUseComment": res.data,
}
}
console.log(body);
@@ -64,18 +64,17 @@
<div class="middle flex-grow-1">
<ion-label class="title">{{ task.Folio}}</ion-label>
</div>
<div class="div-icon">
<ion-menu-button autoHide="false">
<ion-icon name="ellipsis-vertical-outline"></ion-icon>
</ion-menu-button>
<div class="menu-ptions">
<button class="btn-no-color" (click)="openOptions()">
<ion-icon src="assets/images/icons-menu.svg"></ion-icon>
</button>
</div>
</div>
</div>
<div class="upper-content" style="overflow: unset !important;">
<div class="content-details">
<ion-label>
<p><span class="date">{{customDate}}</span><span class="label">Expediente</span></p>
<p><span class="color-red">Muitíssimo urgente</span></p>
<p><span class="date">{{customDate}}</span><span class="label">{{ task.WorkflowName }}</span></p>
</ion-label>
</div>
</div>
@@ -73,12 +73,9 @@
padding-top: 4px;
padding-left: 5px;
}
.div-icon{
width: 40px;
float: right;
font-size: 35px;
overflow: auto;
padding: 1px;
.btn-no-color icon{
font-size: 15px;
border: 1px solid red;
}
}
ion-item-group{
@@ -204,7 +201,7 @@ ion-button{
}
}
@media only screen and (min-width: 801px) {
.div-icon{
.menu-ptions{
display: none;
}
.content{
@@ -7,13 +7,14 @@ import { DailyWorkTask } from '../../../../models/dailyworktask.model';
import { ActivatedRoute, Router } from '@angular/router';
import { formatDate } from '@angular/common';
import { Event } from '../../../../models/event.model';
import { MenuController, ModalController, NavParams } from '@ionic/angular';
import { MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular';
import { AlertService } from 'src/app/services/alert.service';
import { ExpedientTaskModalPage } from '../expedient-task-modal/expedient-task-modal.page';
import { BookMeetingModalPage } from '../book-meeting-modal/book-meeting-modal.page';
import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page';
import { momentG } from 'src/plugin/momentG'
import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page';
import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page';
@Component({
selector: 'app-expediente-detail',
@@ -44,7 +45,8 @@ export class ExpedienteDetailPage implements OnInit {
private router: Router,
private modalController: ModalController,
private navParams: NavParams,
private alertService: AlertService) {
private alertService: AlertService,
public popoverController: PopoverController,) {
this.serialnumber = this.navParams.get('serialNumber');
this.profile = this.navParams.get('profile');
}
@@ -90,6 +92,7 @@ export class ExpedienteDetailPage implements OnInit {
"FolderId": res.workflowInstanceDataFields.FolderID,
"FsId": res.workflowInstanceDataFields.FsId,
"DocId": res.workflowInstanceDataFields.DocId,
"WorkflowName": res.workflowDisplayName,
}
console.log('task', this.task);
@@ -261,4 +264,18 @@ export class ExpedienteDetailPage implements OnInit {
});
}
async openOptions(taskAction: any) {
const popover = await this.popoverController.create({
component: OptsExpedientePage,
cssClass: 'exp-options',
componentProps: {
task: this.task,
fulltask: this.fulltask,
taskAction:taskAction,
},
translucent: true
});
return await popover.present();
}
}
@@ -179,7 +179,7 @@ export class PedidoPage implements OnInit {
"serialNumber": this.serialnumber,
"action": "Arquivo",
"dataFields": {
"ReviewerComments": '',
"ReviewerUseComment": '',
}
}
this.processes.PostTaskAction(body);