diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 0add18cc..49d5f558 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -42,7 +42,7 @@ export class MyApp { // Here you can do any higher level native things you might need. this.statusBar.styleDefault(); if (this.platform.is('android')) { - this.statusBar.overlaysWebView(true); + this.statusBar.overlaysWebView(false); this.statusBar.backgroundColorByHexString('#db4437'); } this.splashScreen.hide(); diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 013a5a48..93b2ee28 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -70,6 +70,9 @@ import { IonicImageViewerModule } from 'ionic-img-viewer'; import { CameraProvider } from '../providers/common-provider/camera'; import { LoadingProvider } from '../providers/common-provider/loading'; import { Camera } from '@ionic-native/camera'; + +import { Geolocation } from '@ionic-native/geolocation'; + @NgModule({ declarations: [ MyApp, @@ -149,7 +152,7 @@ import { Camera } from '@ionic-native/camera'; AwsServiceProvider, QuestionCategoryProvider, CameraProvider,Camera, - LoadingProvider + LoadingProvider,Geolocation ] }) export class AppModule {} \ No newline at end of file diff --git a/src/pages/auth/auth.html b/src/pages/auth/auth.html index ac993ea6..0582bd7f 100755 --- a/src/pages/auth/auth.html +++ b/src/pages/auth/auth.html @@ -9,7 +9,7 @@ - Circle Image + Circle Image @@ -47,7 +47,7 @@ - Circle Image + Circle Image diff --git a/src/pages/auth/auth.scss b/src/pages/auth/auth.scss index 6402eaff..eb8db318 100755 --- a/src/pages/auth/auth.scss +++ b/src/pages/auth/auth.scss @@ -23,6 +23,7 @@ page-auth { } .rounded-circle { border-radius: 50%!important; + } .img-fluid{ max-width: 40%; diff --git a/src/pages/auth/auth.ts b/src/pages/auth/auth.ts index 945c36dc..1e2a7cba 100755 --- a/src/pages/auth/auth.ts +++ b/src/pages/auth/auth.ts @@ -9,6 +9,7 @@ import { FingerprintAIO } from '@ionic-native/fingerprint-aio'; import { AwsServiceProvider } from '../../providers/aws-service/aws-service'; import { LoadingProvider } from '../../providers/common-provider/loading'; +import { ConstantsProvider } from '../../providers/constants/constants'; /** * Generated class for the AuthPage page. * @@ -29,9 +30,9 @@ pin:any; mpinaccess:boolean =false; newpassword:any; ConfirmPassword:any; - - constructor(public navCtrl: NavController, public navParams: NavParams,public Menu:MenuController,public fb:FormBuilder,public shared:CognitoServiceProvider,public toast:ToastProvider,public faio:FingerprintAIO,public aws:AwsServiceProvider,public loadingCtrl:LoadingProvider) { - + commonImage:any; + constructor(public navCtrl: NavController, public navParams: NavParams,public Menu:MenuController,public fb:FormBuilder,public shared:CognitoServiceProvider,public toast:ToastProvider,public faio:FingerprintAIO,public aws:AwsServiceProvider,public loadingCtrl:LoadingProvider,public commonconstant:ConstantsProvider) { + this.commonImage = this.commonconstant.commonimage; this.shared.refresh(); this.getuserDetails(); diff --git a/src/pages/input/input.html b/src/pages/input/input.html index 28573253..2030e60a 100755 --- a/src/pages/input/input.html +++ b/src/pages/input/input.html @@ -15,10 +15,14 @@ - - {{applicatentDetails.applicat_details[0].applicant_name | titlecase}} +   {{applicatentDetails.applicat_details[0].applicant_name | titlecase}}
+ + + {{applicatentDetails.customer_segment_name}} + +
@@ -38,10 +42,7 @@ {{applicatentDetails.product_name}} / {{applicatentDetails.subproduct_name}}
- - - {{applicatentDetails.customer_segment_name}} - + diff --git a/src/pages/input/input.scss b/src/pages/input/input.scss index c7700587..572fdfc9 100755 --- a/src/pages/input/input.scss +++ b/src/pages/input/input.scss @@ -58,15 +58,14 @@ page-input{ margin-bottom: 0px !important; height: 50px; } + .mat-raised-button{ border-radius: 30px; padding: 19px 45px; line-height: 0px; box-shadow: 0 16px 38px -12px rgba(0,0,0,.56), 0 4px 25px 0 rgba(0,0,0,.12), 0 8px 10px -5px rgba(0,0,0,.2) !important; } - ion-fab[middle]{ - top:17% !important; - } + .fab-md-optblue{ box-shadow: 0 16px 38px -12px rgba(0, 0, 0, 0.56), 0 4px 25px 0 rgba(0, 0, 0, 0.12), 0 8px 10px -5px rgba(0, 0, 0, 0.2) !important; } @@ -75,7 +74,7 @@ page-input{ } .cardinfo { - font-size: 18px!important; - padding-bottom: 20px!important; + font-size: 19px!important; + padding-bottom: 30px!important; } } \ No newline at end of file diff --git a/src/pages/input/input.ts b/src/pages/input/input.ts index 30a32768..5313792e 100755 --- a/src/pages/input/input.ts +++ b/src/pages/input/input.ts @@ -13,6 +13,8 @@ import { PdtriggerProvider } from '../../providers/pdtrigger/pdtrigger'; import { AwsServiceProvider } from '../../providers/aws-service/aws-service'; import { PdListPage } from '../pd-list/pd-list'; import { OtpPage } from '../otp/otp'; + +import { Geolocation, PositionError, Geoposition } from '@ionic-native/geolocation'; /** * Generated class for the InputPage page. * @@ -41,7 +43,11 @@ scheduleDate:any; updateSchedule:any; acceptedAccess:boolean = false; startedAccess:boolean = false; - constructor(public navCtrl: NavController, public navParams: NavParams,public fb:FormBuilder,public statusBar:StatusBar,public platform: Platform,public launchNavigator:LaunchNavigator,public aws:AwsServiceProvider,public pdDetails:PdtriggerProvider) { + +currentPosPDofficer:any; + constructor(public navCtrl: NavController, public navParams: NavParams,public fb:FormBuilder,public statusBar:StatusBar,public platform: Platform,public launchNavigator:LaunchNavigator,public aws:AwsServiceProvider,public pdDetails:PdtriggerProvider,public geolocation:Geolocation) { + + /***Header value pass */ this.statusBar.styleDefault(); @@ -62,7 +68,7 @@ startedAccess:boolean = false; { this.initiatedAccess = true; } - + //console.log(this.initiatedAccess); if(this.applicatentDetails.pd_status == 'INITIATED') { this.startedAccess = true; @@ -141,7 +147,16 @@ startedAccess:boolean = false; } pdinitiated(appdetails) { let data:any; - data = {'pd_id':appdetails.pd_id,'pd_status':'INITIATED','mobile_no':appdetails.applicat_details[0].mobile_no,'officerName':appdetails.pd_allocated_to,'firstName':appdetails.applicat_details[0].applicant_name,'fk_updatedby':this.users,'updatedon':currentdate}; + + + this.geolocation.getCurrentPosition().then((resp) => { + // resp.coords.latitude + // resp.coords.longitude + + this.currentPosPDofficer = resp.coords.latitude+","+resp.coords.longitude; + data = {'pd_id':appdetails.pd_id,'pd_status':'INITIATED','mobile_no':appdetails.applicat_details[0].mobile_no,'officerName':appdetails.pd_allocated_to,'firstName':appdetails.applicat_details[0].applicant_name,'fk_updatedby':this.users,'updatedon':currentdate,'link':this.currentPosPDofficer}; + + this.pdDetails.updatepdStatus(data).subscribe(res=> { this.updateinitiated = res; @@ -154,6 +169,9 @@ startedAccess:boolean = false; this.startedAccess = false; } }) + }).catch((error) => { + console.log('Error getting location', error); + }); } startPdDiscussion(appdetails) diff --git a/src/pages/otp/otp.html b/src/pages/otp/otp.html index 9acbe421..04b03525 100644 --- a/src/pages/otp/otp.html +++ b/src/pages/otp/otp.html @@ -22,7 +22,7 @@ - Circle Image + Circle Image diff --git a/src/pages/otp/otp.scss b/src/pages/otp/otp.scss index a64da600..dcebe40d 100644 --- a/src/pages/otp/otp.scss +++ b/src/pages/otp/otp.scss @@ -23,6 +23,8 @@ page-otp { } .rounded-circle { border-radius: 50%!important; + background-image: url('../assets/img/misc/avatar.jpg'); + } .img-fluid{ max-width: 40%; diff --git a/src/pages/otp/otp.ts b/src/pages/otp/otp.ts index f27a4773..4b847cd1 100644 --- a/src/pages/otp/otp.ts +++ b/src/pages/otp/otp.ts @@ -3,6 +3,7 @@ import { IonicPage, NavController, NavParams, MenuController } from 'ionic-angul import { PdtriggerProvider } from '../../providers/pdtrigger/pdtrigger'; import { PdQuestionCategoryPage } from '../pd-question-category/pd-question-category'; import { ToastProvider } from '../../providers/common-provider/toast'; +import { ConstantsProvider } from '../../providers/constants/constants'; /** * Generated class for the OtpPage page. * @@ -19,7 +20,9 @@ export class OtpPage { otpStatus: any; applicatentDetails: any; - constructor(public navCtrl: NavController, public navParams: NavParams,public pddetails:PdtriggerProvider,public toast:ToastProvider,public Menu:MenuController) { + commonImage:any; + constructor(public navCtrl: NavController, public navParams: NavParams,public pddetails:PdtriggerProvider,public toast:ToastProvider,public Menu:MenuController,public commonconstant:ConstantsProvider) { + this.commonImage = this.commonconstant.commonimage; this.applicatentDetails = this.navParams.get('pdDetails'); } diff --git a/src/pages/password/password.html b/src/pages/password/password.html index 6c8f84e3..8e49115a 100755 --- a/src/pages/password/password.html +++ b/src/pages/password/password.html @@ -19,7 +19,7 @@ - Circle Image + Circle Image diff --git a/src/pages/password/password.scss b/src/pages/password/password.scss index 68c1b052..e6a0816d 100755 --- a/src/pages/password/password.scss +++ b/src/pages/password/password.scss @@ -23,6 +23,7 @@ page-password { } .rounded-circle { border-radius: 50%!important; + background-image: url('../assets/img/misc/avatar.jpg'); } .img-fluid{ max-width: 40%; diff --git a/src/pages/password/password.ts b/src/pages/password/password.ts index 4aaaa1a0..edbd40a0 100755 --- a/src/pages/password/password.ts +++ b/src/pages/password/password.ts @@ -3,6 +3,7 @@ import { IonicPage, NavController, NavParams } from 'ionic-angular'; import { AwsServiceProvider } from '../../providers/aws-service/aws-service'; import { PdListPage } from '../pd-list/pd-list'; import { ToastProvider } from '../../providers/common-provider/toast'; +import { ConstantsProvider } from '../../providers/constants/constants'; /** * Generated class for the PasswordPage page. * @@ -16,12 +17,15 @@ import { ToastProvider } from '../../providers/common-provider/toast'; templateUrl: 'password.html', }) export class PasswordPage { + commonImage: string; newpassword: any; confirmPassword: any; pin:any; Username:any; Password:any; - constructor(public navCtrl: NavController, public navParams: NavParams,public aws:AwsServiceProvider,public toast:ToastProvider) { + + constructor(public navCtrl: NavController, public navParams: NavParams,public aws:AwsServiceProvider,public toast:ToastProvider,public commonconstant:ConstantsProvider) { + this.commonImage = this.commonconstant.commonimage; this.Username = this.navParams.get('Username'); this.Password = this.navParams.get('Password'); } diff --git a/src/pages/pd-list/pd-list.html b/src/pages/pd-list/pd-list.html index daf0f40a..d3f401fe 100755 --- a/src/pages/pd-list/pd-list.html +++ b/src/pages/pd-list/pd-list.html @@ -3,7 +3,7 @@ - PD Listing + PD Cases - PD Listing + PD Questions Category cate.fk_question_category_id == categroyId)[0]; console.log(this.questionCate); - if(this.questionCate.questions.length !="0"){ + // if(this.questionCate.questions.length !="0"){ this.navCtrl.push(PdQuestionPage,{'questionDetails':this.questionCate,'pdDetails':this.pdinfo}); - }else - { - this.getcategoryList(); - this.toast.pdTriggerappmessage('No Question Available'); - } + // }else + // { + // this.getcategoryList(); + // this.toast.pdTriggerappmessage('No Question Available'); + // } } completed() diff --git a/src/pages/pd-question/pd-question.html b/src/pages/pd-question/pd-question.html index 0c600166..4fd5e6f3 100644 --- a/src/pages/pd-question/pd-question.html +++ b/src/pages/pd-question/pd-question.html @@ -10,7 +10,7 @@ - PD Question + {{questionDetails.category_name}} Category diff --git a/src/pages/pd-question/pd-question.ts b/src/pages/pd-question/pd-question.ts index 3f449af4..e5aa32f9 100644 --- a/src/pages/pd-question/pd-question.ts +++ b/src/pages/pd-question/pd-question.ts @@ -73,7 +73,7 @@ export class PdQuestionPage { } ionViewWillLeave() { - this.navCtrl.setRoot(PdQuestionCategoryPage); + this.navCtrl.setRoot(PdQuestionCategoryPage,{'pdDetails':this.pdinfo}); } scrollIndicatiorTab() @@ -173,17 +173,19 @@ export class PdQuestionPage { getpdQuestionDetails() { this.questionDetails = this.navParams.get('questionDetails'); - //console.log('157',this.questionDetails); + console.log('157',this.questionDetails); this.pdinfo = this.navParams.get('pdDetails'); // console.log(this.pdinfo); for(let qustimage of this.questionDetails.questions) { + if(qustimage.images !==undefined){ for(let image of qustimage.images) { image.questionId = qustimage.fk_question_id; this.docArray.push(image); } } + } console.log(this.docArray); for(let i=1;i<=this.questionDetails.questions_count;i++){ let j = i.toString(); diff --git a/src/providers/aws-service/aws-service.ts b/src/providers/aws-service/aws-service.ts index 704dea24..bcb34d2d 100644 --- a/src/providers/aws-service/aws-service.ts +++ b/src/providers/aws-service/aws-service.ts @@ -96,7 +96,7 @@ apiurl:any; ////(auth); const userData = { Username: auth.Username, - Pool: lenderUserPool + Pool: sineedgedevUserpool }; let cognitoUser = new CognitoUser(userData); return Observable.create(observe => {