diff --git a/REMEMBER.txt b/REMEMBER.txt index 8ea1b3c..b13dbc6 100644 --- a/REMEMBER.txt +++ b/REMEMBER.txt @@ -112,5 +112,5 @@ https://www.youtube.com/watch?v=fU8uM5oU1wY&t=1640s android:name="android.hardware.location.network" android:required="false" /> - +https://www.npmjs.com/package/flutterwave-angular-v3 npm install flutterwave-angular-v3 diff --git a/src/app/pages/myfiles/myfiles.page.html b/src/app/pages/myfiles/myfiles.page.html index c9296cb..842eb2e 100644 --- a/src/app/pages/myfiles/myfiles.page.html +++ b/src/app/pages/myfiles/myfiles.page.html @@ -38,9 +38,15 @@
- +
- + - + diff --git a/src/app/pages/myfiles/myfiles.page.ts b/src/app/pages/myfiles/myfiles.page.ts index fdc5729..80548a8 100644 --- a/src/app/pages/myfiles/myfiles.page.ts +++ b/src/app/pages/myfiles/myfiles.page.ts @@ -1,8 +1,10 @@ -import { Component, OnInit } from '@angular/core'; -import {NavController} from "@ionic/angular"; +import {Component, OnInit, ViewChild} from '@angular/core'; +import {LoadingController, NavController} from "@ionic/angular"; import {Router} from "@angular/router"; import { WrenchService } from 'src/app/services/wrench.service'; import {SessionDataProviderService} from "../../store/session-data-provider.service"; +import {Camera, CameraResultType, CameraSource} from "@capacitor/camera"; +//import {visit} from "@angular/compiler-cli/src/ngtsc/util/src/visitor"; @Component({ selector: 'app-myfiles', @@ -10,16 +12,20 @@ import {SessionDataProviderService} from "../../store/session-data-provider.serv styleUrls: ['./myfiles.page.scss'], }) export class MyfilesPage implements OnInit { - +@ViewChild('title') title; +@ViewChild('description') description; tabs = 'myfiles'; session_image_server:string=''; curr_session:string=""; + isDisabled:boolean = true; + constructor( private navctr: NavController, private router: Router, public sessionDataProviderService: SessionDataProviderService, - private wrenchService: WrenchService + private wrenchService: WrenchService, + private loadingCtrl: LoadingController ) { @@ -69,4 +75,73 @@ export class MyfilesPage implements OnInit { ); } + inVerify(){ + this.isDisabled = true; + if ( this.title !='' && this.description !=''){ + this.isDisabled = false; + } + } + + uploadData: { + action:number, + member_id: number, + uid: string, + sessionid: string, + msg_type:'FILE', + file_name: string, + file_size: number, + file_type: string, + file_data: string, + title:string, + description: string + }; + + uploadResult:any; + async startCamera(cameraMode){ + const image = await Camera.getPhoto({ + quality: 50, + width : 600, + height : 300, + allowEditing: false, + resultType: CameraResultType.Base64, + source: (cameraMode == 100 ) ? CameraSource.Camera : CameraSource.Photos // Camera, Photos or Prompt! + }); + + if (image) { + const loading = await this.loadingCtrl.create({ + message: 'Uploading Banner', + duration: 5000, + }); + var file_size = parseInt(String(image.base64String.toString().length / 1.3224954) ) ; + // this.saveImage(image) + //debugger; + //image.base64String + this.uploadData={ + action:11307, + member_id: this.sessionDataProviderService.member_id, + uid: this.sessionDataProviderService.member_uid, + sessionid: this.sessionDataProviderService.session , + msg_type:'FILE', + file_name: `myfile.${image.format}`, + file_size: file_size , + file_type: `image/${image.format}`, + file_data: image.base64String, + title: this.title, + description: this.description + }; + //console.log(image); + loading.present(); + this.wrenchService.uploadFile(this.uploadData).subscribe( + uploadResult => { + this.uploadResult = uploadResult; + console.log("this.wrenchService.uploadFile RETURN DATA->", this.uploadResult); + this.title=''; + this.description =''; + this.getMyFiles(); + } + ); + + console.log( this.uploadData); + } + } } diff --git a/src/app/pages/ownersjob/ownersjob.page.ts b/src/app/pages/ownersjob/ownersjob.page.ts index dbf0b5e..591d353 100644 --- a/src/app/pages/ownersjob/ownersjob.page.ts +++ b/src/app/pages/ownersjob/ownersjob.page.ts @@ -145,7 +145,7 @@ if ( this.job_duration== undefined || this.job_duration < 1){ email: '', assign_mode: 110022 }; -console.log('XXX-> ', this.reqData ); +// console.log('XXX-> ', this.reqData ); // debugger; const loading = await this.loadingCtrl.create({