This commit is contained in:
tiago.kayaya
2021-06-14 13:48:02 +01:00
parent 8eeac8ca56
commit f77abeec49
8 changed files with 93 additions and 130 deletions
@@ -178,7 +178,7 @@ export class ApproveEventModalPage implements OnInit {
"serialNumber": serialNumber,
"action": "Emendar",
"dataFields": {
"ReviewerUseComment": res.data,
"ReviewUseComment": res.data,
}
}
@@ -189,7 +189,7 @@ export class ApproveEventPage implements OnInit {
let body = { "serialNumber": serialNumber,
"action": "Emendar",
"dataFields": {
"ReviewerUseComment": res.data,
"ReviewUseComment": res.data,
}
}
console.log(body);
@@ -43,9 +43,12 @@
<ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
</div>
<div class="ion-input-class">
<ion-item>
<ion-label *ngIf="!selectedTypes">Tipos de assunto</ion-label>
<ion-select [(ngModel)]="selectedTypes" multiple="true" interface="action-sheet" Cancel-text="Cancelar" required>
<ion-item class="ion-no-border ion-no-padding ion-no-margin">
<ion-label>Tipo de assunto</ion-label>
<ion-select
[(ngModel)]="selectedTypes"
(ngModelChange)="onSelectedTypesChanged($event)"
multiple="true" interface="alert" Cancel-text="Cancelar" required>
<ion-select-option *ngFor="let type of subjectTypes" value="{{type.Code}}">{{type.Description}}</ion-select-option>
</ion-select>
</ion-item>
@@ -20,6 +20,7 @@ import { EventAttachment } from 'src/app/models/attachment.model';
import { User } from 'src/app/models/user.model';
import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
import { ToastService } from 'src/app/services/toast.service';
@Component({
selector: 'app-expedient-task-modal',
@@ -76,11 +77,11 @@ export class ExpedientTaskModalPage implements OnInit {
private alertController: AlertService,
private authService: AuthService,
private userAuth: AuthService,
private animationController: AnimationController) {
private animationController: AnimationController,
private toastService: ToastService,
) {
this.loggeduser = userAuth.ValidatedUser;
this.user = environment.defaultuser +'@'+ environment.domain;
this.task = this.navParams.get('task');
@@ -88,6 +89,8 @@ export class ExpedientTaskModalPage implements OnInit {
this.taskType = this.navParams.get('taskAction');
this.selectedTypes = ['99999850'];
this.postData = new Despacho();
this.participants = this.participants = new Array();
this.dispatchFolder = {
@@ -98,7 +101,7 @@ export class ExpedientTaskModalPage implements OnInit {
SourceType: 'DOC', //FOLDER
SourceId: this.task.workflowInstanceDataFields.DocID, //FolderId
DeadlineType: '',
SubjectTypes: ['99999844'],
SubjectTypes: ['99999850'],
NumberPDPP: this.task.workflowInstanceDataFields.DispatchNumber,
};
@@ -126,6 +129,17 @@ export class ExpedientTaskModalPage implements OnInit {
this.getSubjectType();
}
onSelectedTypesChanged(ev:any){
console.log(ev);
if(ev.length > 1){
console.log(ev.filter(data => data != '99999850'));
this.selectedTypes = ev.filter(data => data != '99999850');
}
if(ev.length == 0){
this.selectedTypes = ["99999850"];
}
}
close(){
this.router.navigate(['/home/gabinete-digital/expediente']);
this.modalController.dismiss(null);