From 037b82531d7bfa49035351fbaf45f896709a60c9 Mon Sep 17 00:00:00 2001
From: alen <alen@techware.in>
Date: Thu, 26 Jul 2018 17:59:27 +0530
Subject: [PATCH] july-26
---
src/pages/docupdate/docupdate.html | 8 ++++++--
src/pages/docupdate/docupdate.scss | 3 +++
src/pages/forgot/forgot.ts | 2 +-
src/pages/home/home.ts | 2 ++
src/pages/myprofile/myprofile.html | 6 ++++--
src/pages/myprofile/myprofile.scss | 24 ++----------------------
src/pages/myprofile/myprofile.ts | 2 ++
src/pages/quickride/quickride.html | 6 +++---
src/pages/quickride/quickride.ts | 2 ++
src/pages/uploaddoc/uploaddoc.ts | 2 ++
src/pages/userlocation/userlocation.ts | 12 ++++++++++++
11 files changed, 39 insertions(+), 30 deletions(-)
diff --git a/src/pages/docupdate/docupdate.html b/src/pages/docupdate/docupdate.html
index ad7e70e..b9c5f03 100644
--- a/src/pages/docupdate/docupdate.html
+++ b/src/pages/docupdate/docupdate.html
@@ -25,8 +25,12 @@
<h6>{{filename}}</h6>
<h5 *ngIf="fileData?.fileStatus=='1'">Processing</h5>
</div>
+ <div class="jr_bottom_button_bay">
+ <button ion-button class="cab_footer_btn" (click)="upload()" *ngIf="fileData?.fileStatus=='0' || fileData?.fileStatus=='3'">DONE</button>
+ <button ion-button class="cab_footer_btn" (click)="view()" *ngIf="fileData?.fileStatus!='0'">view</button>
+ </div>
</ion-content>
- <ion-footer padding>
+ <!-- <ion-footer padding>
<button ion-button class="theme_dark_bg btn_primary" (click)="upload()" *ngIf="fileData?.fileStatus=='0' || fileData?.fileStatus=='3'">DONE</button>
<button ion-button class="theme_dark_bg btn_primary" (click)="view()" *ngIf="fileData?.fileStatus!='0'">view</button>
- </ion-footer>
+ </ion-footer> -->
diff --git a/src/pages/docupdate/docupdate.scss b/src/pages/docupdate/docupdate.scss
index a4b08c4..c2c144c 100644
--- a/src/pages/docupdate/docupdate.scss
+++ b/src/pages/docupdate/docupdate.scss
@@ -101,4 +101,7 @@ page-docupdate {
letter-spacing: 2px;
color:#f7941e;
}
+.jr_bottom_button_bay{width:100%;position: fixed;bottom: 0px;padding:0px;left:0px;right:0px;text-align: center;}
+ .cab_footer_btn{width:100%;height:50px;font-weight: 300;letter-spacing: 2px;border-radius:0px !important;background: #f7941e;color:#FFF;text-align: center;font-size: 16px;margin:0px;text-transform: capitalize !important;}
+
}
diff --git a/src/pages/forgot/forgot.ts b/src/pages/forgot/forgot.ts
index cb43363..846f49c 100644
--- a/src/pages/forgot/forgot.ts
+++ b/src/pages/forgot/forgot.ts
@@ -15,7 +15,7 @@ export class ForgotPage {
constructor(public navCtrl: NavController, public navParams: NavParams, private formbuilder: FormBuilder, private myservice: Myservice) {
this.forgotForm = this.formbuilder.group({
email: ['', Validators.compose([Validators.required, Validators.pattern("[a-zA-Z0-9.-_]{1,}@[a-zA-Z.-]{2,}[.]{1}[a-zA-Z]{2,}")])],
- from:['doctor']
+ from:['driver']
})
}
diff --git a/src/pages/home/home.ts b/src/pages/home/home.ts
index 82df6af..35d57a2 100644
--- a/src/pages/home/home.ts
+++ b/src/pages/home/home.ts
@@ -34,6 +34,8 @@ export class HomePage {
this.upcoming = response.data.upcoming
this.completed = response.data.completed
}
+ else
+ this.myservice.show_alert('',response.message)
})
}
})
diff --git a/src/pages/myprofile/myprofile.html b/src/pages/myprofile/myprofile.html
index 5c163d3..69978da 100644
--- a/src/pages/myprofile/myprofile.html
+++ b/src/pages/myprofile/myprofile.html
@@ -96,8 +96,10 @@
</div>
<br>
- <button ion-button class="primary theme_dark_bg" (click)="updateProfile()">SAVE</button>
- <!-- <button ion-button class="changepass_btn" (click)="changepass()">CHANGE PASSWORD</button> -->
+ <!-- <button ion-button class="primary theme_dark_bg" (click)="updateProfile()">SAVE</button> -->
+ <div class="jr_bottom_button_bay">
+ <button ion-button class="cab_footer_btn" (click)="updateProfile()">SAVE</button>
+ </div>
</div>
</form>
</div>
diff --git a/src/pages/myprofile/myprofile.scss b/src/pages/myprofile/myprofile.scss
index 398edf9..fbcb375 100644
--- a/src/pages/myprofile/myprofile.scss
+++ b/src/pages/myprofile/myprofile.scss
@@ -107,28 +107,6 @@ page-myprofile {
text-align: left;
padding-top: 10px;
}
-
- button{
- width:100%;
- border-radius: 20px;
- height: 45px;
- font-size: 16px;
- letter-spacing: 2px;
- }
- .changepass_btn{
- border:2px solid #282828;
- height: 45px;
- border-radius: 25px;
- background: transparent;
- color: #282828;
- text-transform: uppercase;
- font-size: 16px;
- width: 100%;
- font-weight:600;
- letter-spacing: 2px;
- }
-
-
}
}
@@ -147,4 +125,6 @@ page-myprofile {
padding-top: 30px !important;
padding-bottom: 30px !important;
}
+.jr_bottom_button_bay{width:100%;position: fixed;bottom: 0px;padding:0px;left:0px;right:0px;text-align: center;}
+ .cab_footer_btn{width:100%;height:50px;font-weight: 300;letter-spacing: 2px;border-radius:0px !important;background: #f7941e;color:#FFF;text-align: center;font-size: 16px;margin:0px;text-transform: capitalize !important;}
}
diff --git a/src/pages/myprofile/myprofile.ts b/src/pages/myprofile/myprofile.ts
index 124bc17..9fd4e28 100644
--- a/src/pages/myprofile/myprofile.ts
+++ b/src/pages/myprofile/myprofile.ts
@@ -68,6 +68,8 @@ export class MyprofilePage {
this.editForm.controls['gender'].setValue(resp.data.gender)
this.editForm.controls['license'].setValue(resp.data.license_no)
}
+ else
+ this.myservice.show_alert('',resp.message)
})
}
})
diff --git a/src/pages/quickride/quickride.html b/src/pages/quickride/quickride.html
index 62207f2..2d278d0 100644
--- a/src/pages/quickride/quickride.html
+++ b/src/pages/quickride/quickride.html
@@ -43,9 +43,9 @@
<div class="jr_bottom_button_bay">
- <button ion-button class="cab_footer_btn floatLeft accept" (click)="accept()" *ngIf="!pickUp">Accept</button>
- <button ion-button class="cab_footer_btn floatRight reject" (click)="reject()" *ngIf="!pickUp">Reject</button>
- <button ion-button class="cab_footer_btn width100" (click)="pick()" *ngIf="pickUp">Pick Up</button>
+ <button ion-button class="cab_footer_btn floatLeft accept" (click)="accept()">Accept</button>
+ <button ion-button class="cab_footer_btn floatRight reject" (click)="reject()">Reject</button>
+ <!-- <button ion-button class="cab_footer_btn width100" (click)="pick()" *ngIf="pickUp">Pick Up</button> -->
</div>
</div>
diff --git a/src/pages/quickride/quickride.ts b/src/pages/quickride/quickride.ts
index 7dba5fb..7a8ee7f 100644
--- a/src/pages/quickride/quickride.ts
+++ b/src/pages/quickride/quickride.ts
@@ -44,6 +44,8 @@ export class QuickridePage {
this.data.setrideData(this.rideDetail)
}
+ else
+ this.myservice.show_alert('',resp.message)
})
}
diff --git a/src/pages/uploaddoc/uploaddoc.ts b/src/pages/uploaddoc/uploaddoc.ts
index 6e76622..7703c58 100644
--- a/src/pages/uploaddoc/uploaddoc.ts
+++ b/src/pages/uploaddoc/uploaddoc.ts
@@ -25,6 +25,8 @@ export class UploaddocPage {
if(resp.status == 'success'){
this.docs = resp.data
}
+ else
+ this.myservice.show_alert('',resp.message)
})
})
}
diff --git a/src/pages/userlocation/userlocation.ts b/src/pages/userlocation/userlocation.ts
index 26f7d3f..b80348d 100644
--- a/src/pages/userlocation/userlocation.ts
+++ b/src/pages/userlocation/userlocation.ts
@@ -34,6 +34,7 @@ export class UserlocationPage {
lastPos: any;
count: number = 0;
tempPos: any;
+ destmarker: any;
constructor(public navCtrl: NavController, public navParams: NavParams, private geolocation: Geolocation, private db: AngularFireDatabase, private storage: Storage, private myservice: Myservice, private menu: MenuController, private data: dataService, public events: Events) {
this.loadMap()
@@ -124,13 +125,22 @@ export class UserlocationPage {
if (This.markers)
This.markers.setMap(null)
+ if (This.destmarker)
+ This.destmarker.setMap(null)
+
var marker = new google.maps.Marker({
position: driverLoc,
map: This.map,
icon: dimage
});
+ var marker2 = new google.maps.Marker({
+ position: destLoc,
+ map: This.map,
+ })
+
This.markers = marker
+ This.destmarker = marker2
var cur = new google.maps.LatLng(myloc[0], myloc[0])
var lastPosn = new google.maps.LatLng(This.lastPos[0], This.lastPos[0])
@@ -250,6 +260,8 @@ export class UserlocationPage {
This.ride = response.data
This.data.setrateData(This.ride)
}
+ else
+ this.myservice.show_alert('',response.message)
})
}
})
--
libgit2 0.27.1