This commit is contained in:
tiago.kayaya
2021-05-04 16:21:53 +01:00
parent 1ccb311a0a
commit d49204b204
5 changed files with 16 additions and 10 deletions
@@ -40,9 +40,12 @@
<ion-icon slot="start" src="assets/images/icons-calendar.svg"></ion-icon>
</div>
<div class="ion-input-class">
<ion-select placeholder="Tipo" [(ngModel)]="postData.SubjectTypeId" interface="action-sheet" Cancel-text="Cancelar" required>
<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-select-option *ngFor="let type of subjectTypes" value="{{type.Code}}">{{type.Description}}</ion-select-option>
</ion-select>
</ion-item>
</div>
</div>
</div>
@@ -41,17 +41,18 @@
font-size: 25px;
}
ion-select{
padding-left: 5px;
//padding-left: 5px;
margin-left: 0;
}
.ion-input-class{
width: calc(100% - 45px);
height: 45px;
height: 51px;
border: 1px solid #ebebeb;
border-radius: 5px;
padding-left: 5px;
padding-right: 10px;
float: left;
overflow: hidden;
}
.ion-input-class-no-height{
border: 1px solid #ebebeb;
@@ -45,6 +45,7 @@ export class ExpedientTaskModalPage implements OnInit {
documents:SearchDocument[] = [];
subjectTypes:any;
selectedTypes: string[]=[];
postData: Despacho;
dispatchFolder: Folder;
@@ -142,6 +143,8 @@ export class ExpedientTaskModalPage implements OnInit {
}
async saveTask(){
console.log(this.selectedTypes);
if(this.postData.Priority=='99999861'){
this.dispatchFolder.DeadlineType = 'Normal';
@@ -209,9 +212,9 @@ export class ExpedientTaskModalPage implements OnInit {
this.postData = {
DistributionType: "Paralelo",
CountryCode: 'AO',
Priority: this.postData.Priority,
Priority: this.postData.Priority,
UserEmail: this.user,
SubjectTypeId: this.postData.SubjectTypeId,
SubjectTypeId: this.postData.SubjectTypeId, //this.selectedTypes
UsersSelected: attendees,
DispatchFolder: this.dispatchFolder,
AttachmentList: DocumentToSave
@@ -220,11 +223,7 @@ export class ExpedientTaskModalPage implements OnInit {
this.taskResult = await this.processes.postDeferimento(this.postData);
break;
}
this.modalController.dismiss('openDiscart');
/* this.distartExpedientModal();
this.close(); */
}
else {
this.alertController.presentAlert("Lista de intervenientes vazia. Por favor, adicione 1 ou mais intervenientes.");
@@ -114,7 +114,7 @@
<button (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
</div>
<div class="buttons" *ngIf="task.WorkflowName == 'Pedido de Parecer'">
<button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
<button (click)="notImplemented()" class="btn-cancel" shape="round" >Dar meu Parecer</button>
<button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
<button (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
</div>
@@ -70,6 +70,9 @@ export class PedidoPage implements OnInit {
close(){
this.modalController.dismiss();
}
notImplemented(){
this.alertService.presentAlert('Funcionalidade em desenvolvimento');
}
async LoadTaskDetail(serial: string) {