This commit is contained in:
Peter Maquiran
2021-07-23 17:16:27 +01:00
parent 4fdae89fbf
commit ff2d8aa43c
5 changed files with 20 additions and 19 deletions
@@ -34,7 +34,7 @@
</ion-item>
<h5>Status</h5>
<ion-item class="ion-no-margin ion-no-padding">
<p >{{LoadedDocument.Status}}</p>
<p >{{LoadedDocument.Status}}</p>
</ion-item>
</div>
<div class="bottom-content width-100">
@@ -49,18 +49,15 @@
</ion-item>
</ion-list>
</div>
</div>
{{ LoadedDocument | json }}
<div *ngIf="LoadedDocument" class="aside-right flex-column height-100">
<div class="buttons">
<button (click)="openExpedientActionsModal('0')" class="btn-ok" shape="round" >Efectuar Despacho</button>
<div class="solid"></div>
<button (click)="openExpedientActionsModal('0')" class="btn-cancel" shape="round" >Solicitar Parecer</button>
<button (click)="openExpedientActionsModal('2')" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
<button (click)="openBookMeetingModal()" class="btn-cancel" shape="round" >Marcar Reunião</button>
<!-- <button (click)="openBookMeetingModal()" class="btn-cancel" shape="round" >Marcar Reunião</button> -->
</div>
</div>
@@ -89,16 +89,16 @@ export class DocumentDetailPage implements OnInit {
Subject: this.LoadedDocument.Assunto
},
}
} else if (this.LoadedDocument.ApplicationID == 8) {
} else if (this.LoadedDocument.ApplicationID == 8 || this.LoadedDocument.ApplicationId == 8) {
task = {
serialNumber: this.LoadedDocument.SourceId,
taskStartDate: this.LoadedDocument.CreateDate,
serialNumber: this.LoadedDocument.DocId,
taskStartDate: this.LoadedDocument.DocDate,
isEvent: true,
workflowInstanceDataFields: {
FsId: this.LoadedDocument.ApplicationID,
FsId: this.LoadedDocument.ApplicationID || this.LoadedDocument.ApplicationId,
FolderID: null,
DocId: this.LoadedDocument.SourceId,
Subject: this.LoadedDocument.SourceName
DocId: this.LoadedDocument.DocId,
Subject: this.LoadedDocument.Assunto
}
}
}
@@ -120,10 +120,8 @@ export class DocumentDetailPage implements OnInit {
await modal.present();
modal.onDidDismiss().then( async(res)=>{});
}
async openBookMeetingModal() {
let task;
@@ -133,6 +131,8 @@ export class DocumentDetailPage implements OnInit {
serialNumber: this.LoadedDocument.DispatchNumber,
taskStartDate: this.LoadedDocument.DateDispatch,
isEvent: true,
Folio: this.LoadedDocument.Assunto,
FsId: this.LoadedDocument.ApplicationID,
workflowInstanceDataFields: {
FsId: this.LoadedDocument.ApplicationID,
FolderID: null,
@@ -140,11 +140,13 @@ export class DocumentDetailPage implements OnInit {
Subject: this.LoadedDocument.Assunto
},
}
} else if (this.LoadedDocument.ApplicationID == 8) {
} else if (this.LoadedDocument.ApplicationID == 8 || this.LoadedDocument.ApplicationId == 8) {
task = {
serialNumber: this.LoadedDocument.SourceId,
taskStartDate: this.LoadedDocument.CreateDate,
isEvent: true,
Folio: this.LoadedDocument.Assunto,
FsId: this.LoadedDocument.ApplicationID,
workflowInstanceDataFields: {
FsId: this.LoadedDocument.ApplicationID,
FolderID: null,
@@ -172,5 +174,4 @@ export class DocumentDetailPage implements OnInit {
modal.onDidDismiss();
}
}
@@ -215,7 +215,6 @@ export class BookMeetingModalPage implements OnInit {
})
}
async saveTask(){
if(this.loggeduser.Profile == 'MDGPR') {
@@ -224,9 +223,10 @@ export class BookMeetingModalPage implements OnInit {
}
if(this.Form.invalid) return false
// if(this.Form.invalid) return false
alert('!')
let Attendees = this.taskParticipants.concat(this.taskParticipantsCc);
this.eventBody={
+1 -1
View File
@@ -158,7 +158,7 @@
<div class="content ion-align-items-center">
<div class="d-flex ion-justify-content-between ">
<span class="result-name">{{ searchDocument.Assunto}} -- {{ searchDocument.ApplicationType}} </span>
<span class="result-name">{{ searchDocument.Assunto}}</span>
<span class="app-name" *ngIf="itemIcons() == 'AccoesPresidenciais & ArquivoDespachoElect' ">{{ searchDocument.appName}}</span>
</div>
<div class="d-flex ion-justify-content-between ">
@@ -61,6 +61,9 @@
<span class="label">{{task.activityInstanceName}}</span>
</div>
<div class="exp-date">
{{ task.CreateDate }}
<ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
</div>
</div>