peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 12:37:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

save

Browse Source
This commit is contained in:
tiago.kayaya
2021-10-18 17:10:33 +01:00
parent dc45e49f58
commit 2f4c8eeddf
6 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config.xml
+2 -2
View File
@@ -3,7 +3,7 @@
<name>gabinete digital</name> <name>gabinete digital</name>
<description>An awesome Ionic/Cordova app.</description> <description>An awesome Ionic/Cordova app.</description>
<author email="hi@ionicframework.com" href="http://ionicframework.com/">Ionic Framework Team</author> <author email="hi@ionicframework.com" href="http://ionicframework.com/">Ionic Framework Team</author>
<content original-src="index.html" src="http://localhost:8100" /> <content src="index.html" />
<access origin="*" /> <access origin="*" />
<allow-navigation href="*" /> <allow-navigation href="*" />
<allow-navigation href="*" /> <allow-navigation href="*" />
@@ -81,7 +81,7 @@
</mfp:windows10> </mfp:windows10>
<mfp:appChecksum>0</mfp:appChecksum> <mfp:appChecksum>0</mfp:appChecksum>
</mfp:windows> </mfp:windows>
<mfp:platformVersion>8.0.0.00-20210905-154328</mfp:platformVersion> <mfp:platformVersion>8.0.0.00-20210308-063916</mfp:platformVersion>
<mfp:clientCustomInit enabled="false" /> <mfp:clientCustomInit enabled="false" />
<mfp:server runtime="mfp" url="http://gpr-dev-10.gabinetedigital.local:9080" /> <mfp:server runtime="mfp" url="http://gpr-dev-10.gabinetedigital.local:9080" />
<mfp:serverUri url="" /> <mfp:serverUri url="" />
package-lock.json
Generated
+3 -3
View File
@@ -23602,9 +23602,9 @@
} }
}, },
"typescript": { "typescript": {
"version": "4.4.3", "version": "4.3.5",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.3.tgz", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz",
"integrity": "sha512-4xfscpisVgqqDfPaJo5vkd+Qd/ItkoagnHpufr+i2QCHBsNYp+G7UAoyFl8aPtx879u38wPV65rZ8qbGZijalA==", "integrity": "sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==",
"dev": true "dev": true
}, },
"ua-parser-js": { "ua-parser-js": {
src/app/modals/view-document/view-document.page.ts
+3 -6
View File
@@ -15,9 +15,6 @@ import { DocumentSetUpMeetingPage } from '../document-set-up-meeting/document-se
}) })
export class ViewDocumentPage implements OnInit { export class ViewDocumentPage implements OnInit {
url: string;
a:string = "https://equilibrium.dyndns.info/FileShare/pdfjs/web/viewer.html?file=";
viewerUrl: string;
trustedUrl: any; trustedUrl: any;
file: any; file: any;
applicationId: any; applicationId: any;
@@ -49,11 +46,11 @@ export class ViewDocumentPage implements OnInit {
ngOnInit() { ngOnInit() {
this.processes.GetViewer(this.docId, this.applicationId).subscribe(res=> { this.processes.GetViewer(this.docId, this.applicationId).subscribe(res=> {
const link: string = res const link: string = res;
this.trustedUrl = this.sanitazer.bypassSecurityTrustResourceUrl(link); this.trustedUrl = this.sanitazer.bypassSecurityTrustResourceUrl(link);
}, ()=>{ }, ()=>{
this.close() this.close();
}) });
} }
src/app/services/functions/file.service.ts
+1 -1
View File
@@ -314,7 +314,7 @@ export class FileService {
} }
viewDocumentByUrl(url) { viewDocumentByUrl(url) {
const browser = this.iab.create(url,"_blank"); const browser = this.iab.create(url,"_parent");
browser.show(); browser.show();
} }
} }
src/app/shared/chat/messages/messages.page.html
+3
View File
@@ -71,6 +71,9 @@
</div> </div>
</div> </div>
</div> </div>
<div *ngIf="frameUrl">
<iframe id="iframe" [src]="frameUrl" height="100%" width="100%" title="Iframe Example"></iframe>
</div>
{{last ? scrollToBottom() : ''}} {{last ? scrollToBottom() : ''}}
</div> </div>
</div> </div>
src/app/shared/chat/messages/messages.page.ts
+3 -1
View File
@@ -56,6 +56,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
mesageItemDropdownOptions: boolean = false; mesageItemDropdownOptions: boolean = false;
scrollToBottomBtn = false; scrollToBottomBtn = false;
longPressActive = false; longPressActive = false;
frameUrl: any;
constructor( constructor(
public popoverController: PopoverController, public popoverController: PopoverController,
@@ -248,7 +249,8 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
} }
else{ else{
let fullUrl = "https://www.tabularium.pt" + url; let fullUrl = "https://www.tabularium.pt" + url;
this.fileService.viewDocumentByUrl(fullUrl); this.frameUrl = fullUrl;
//this.fileService.viewDocumentByUrl(fullUrl);
} }
} }