viewer hot-fix

This commit is contained in:
Peter Maquiran
2021-10-08 19:29:21 +01:00
parent 405c989b87
commit 9ceb915fef
37 changed files with 708 additions and 360 deletions
@@ -103,9 +103,7 @@ export class ExpedientTaskModalPage implements OnInit {
private attachmentsService: AttachmentsService,
private navParams: NavParams,
private alertController: AlertService,
private authService: AuthService,
private userAuth: AuthService,
private animationController: AnimationController,
private toastService: ToastService,
private despachoService: DespachoService
) {
@@ -131,12 +129,7 @@ export class ExpedientTaskModalPage implements OnInit {
DeadlineType: '',
SubjectTypes: this.selectedTypes,
NumberPDPP: this.task.workflowInstanceDataFields.DispatchNumber,
};
console.log('task 123123', this.task)
console.log('this.aplicationId', this.aplicationId)
this.postData.DispatchFolder = this.dispatchFolder;
this.postData.UsersSelected = this.participants;
@@ -547,28 +540,6 @@ export class ExpedientTaskModalPage implements OnInit {
this.taskParticipantsCc = taskParticipantsCc;
}
async distartExpedientModal() {
const modal = await this.modalController.create({
component: DiscartExpedientModalPage,
componentProps: {
serialNumber: this.task.serialNumber,
folderId: this.task.workflowInstanceDataFields.FolderID,
action: 'complete',
},
cssClass: 'discart-expedient-modal',
backdropDismiss: false
});
await modal.present();
modal.onDidDismiss().then(res=>{
if(res['data']=='close'){
console.log('Expedient Discard closed');
this.modalController.dismiss(res['data'])
}
});
}
async setContact(data:EventPerson[]) {
if(this.adding == "intervenient"){
@@ -580,8 +551,6 @@ export class ExpedientTaskModalPage implements OnInit {
}
async closeComponent() {
this.showAttendees = false;
}
@@ -54,7 +54,7 @@
<ion-list>
<h5>Documentos Anexados</h5>
<ion-item class="ion-no-margin ion-no-padding cursor-pointer" *ngFor="let Document of fulltask.Documents">
<ion-label class="d-block" (click)="viewDocument(Document.DocId)">
<ion-label class="d-block" (click)="viewDocument(Document.DocId, Document)">
<p class="attach-title-item">{{ Document.Assunto }}<span class="span-right color-red btn-size"><ion-icon hidden name="close"></ion-icon></span></p>
<p><span class="span-left">{{ Document.Sender}}</span><span class="span-right">{{ Document.DocDate | date: 'dd/MM/yyyy HH:mm' }}</span></p>
</ion-label>
@@ -23,6 +23,7 @@ import { expedienteTask } from 'src/app/models/dailyworktask.model';
import { TaskService } from 'src/app/Rules/task.service';
import { DocumentViewerPage } from 'src/app/modals/document-viewer/document-viewer.page';
import { PermissionService } from 'src/app/services/worker/permission.service';
import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
@Component({
@@ -87,7 +88,7 @@ export class ExpedienteDetailPage implements OnInit {
}
showToast() {
this.toastService.presentToast('Não foi possível fazer login"');
this.toastService.presentToast('Não foi possível fazer login');
}
@@ -303,9 +304,27 @@ export class ExpedienteDetailPage implements OnInit {
}
async viewDocument(DocId:string) {
async viewDocument(DocId:string, Document) {
this.expedienteService.viewDocument({ApplicationId:'361', DocId})
// this.expedienteService.viewDocument({ApplicationId:'361', DocId})
const modal = await this.modalController.create({
component: ViewDocumentPage,
componentProps: {
trustedUrl: '',
file: {
title: Document.Assunto,
url: '',
title_link: '',
},
Document,
applicationId: Document.ApplicationId,
docId: Document.DocId || Document.SourceId,
folderId: this.task.FolderId
},
cssClass: 'modal modal-desktop'
});
await modal.present();
}