Merge branch 'developer' of bitbucket.org:equilibriumito/gabinete-digital into developer

This commit is contained in:
Peter Maquiran
2021-10-19 14:39:02 +01:00
50 changed files with 1851 additions and 1540 deletions
@@ -382,7 +382,7 @@ export class CreateProcessPage implements OnInit {
}
else{
this.validateField = true;
this.toastService.badRequest('Por favor adicione uma nota');
this.toastService.badRequest('Por favor adicione uma descrição');
}
loader.remove();
break;
@@ -15,9 +15,6 @@ import { DocumentSetUpMeetingPage } from '../document-set-up-meeting/document-se
})
export class ViewDocumentPage implements OnInit {
url: string;
a:string = "https://equilibrium.dyndns.info/FileShare/pdfjs/web/viewer.html?file=";
viewerUrl: string;
trustedUrl: any;
file: any;
applicationId: any;
@@ -49,11 +46,11 @@ export class ViewDocumentPage implements OnInit {
ngOnInit() {
this.processes.GetViewer(this.docId, this.applicationId).subscribe(res=> {
const link: string = res
const link: string = res;
this.trustedUrl = this.sanitazer.bypassSecurityTrustResourceUrl(link);
}, ()=>{
this.close()
})
this.close();
});
}