Skip to content

C
Callmycab-Driverapp
Commit 5dc7d1df by Alen Jose
Options

Merge branch 'alen' into 'master'

july25-css See merge request alen/CMC-driver!19
parents 0464b360 96d0a463
Showing with 48 additions and 100 deletions
src/pages/docupdate/docupdate.html
......@@ -27,6 +27,6 @@
</div>
</ion-content>
<ion-footer padding>
<button ion-button class="primary btn_primary" (click)="upload()" *ngIf="fileData?.fileStatus=='0' || fileData?.fileStatus=='3'">DONE</button>
<button ion-button class="primary btn_primary" (click)="view()" *ngIf="fileData?.fileStatus!='0'">view</button>
<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>
src/pages/docupdate/docupdate.ts
......@@ -107,7 +107,7 @@ export class DocupdatePage {
// handle error
console.log(error)
});
// this.document.viewDocument(this.baseUrl + this.fileData.image, 'application/pdf', options)
// this.document.viewDocument(this.baseUrl + this.fileData.image, 'application/pdf', options) //document viewer plugin
}
else {
this.photoViewer.show(this.baseUrl + this.fileData.image);
......
src/pages/myprofile/myprofile.html
......@@ -50,27 +50,27 @@
</div>
<ion-item>
<ion-label>DOB</ion-label>
<ion-datetime displayFormat="DD MMM YYYY" min="1950" max={{maxDate}} formControlName="dob">
<ion-datetime displayFormat="DD MMM YYYY" placeholder="Date of Birth" min="1950" max={{maxDate}} formControlName="dob">
</ion-datetime>
</ion-item>
<div class="er_req textCenter" *ngIf="editForm.controls.dob.invalid && (editForm.get('dob').dirty || editForm.get('dob').touched)">
Select your DOB
</div>
<div radio-group formControlName="gender" class="gender_radio">
<ion-list radio-group formControlName="gender">
<div class="floatLeft">
<ion-radio value="male" checked class="floatLeft"></ion-radio>
<ion-label class="floatLeft">Male</ion-label>
<div class="clear"></div>
</div>
<div class="floatLeft">
<ion-radio value="female" class="floatLeft"></ion-radio>
<ion-label class="floatLeft">Female</ion-label>
<div class="clear"></div>
</div>
<div class="clear"></div>
</ion-list>
<div class="floatLeft">
<ion-radio value="male" checked class="floatLeft"></ion-radio>
<ion-label class="floatLeft">Male</ion-label>
<div class="clear"></div>
</div>
<div class="floatLeft">
<ion-radio value="female" class="floatLeft"></ion-radio>
<ion-label class="floatLeft">Female</ion-label>
<div class="clear"></div>
</div>
<div class="clear"></div>
</div>
<ion-item>
<ion-input type="text" placeholder="License Number" formControlName="license"></ion-input>
......@@ -96,7 +96,7 @@
</div>
<br>
<button ion-button class="primary" (click)="updateProfile()">SAVE</button>
<button ion-button class="primary theme_dark_bg" (click)="updateProfile()">SAVE</button>
<!-- <button ion-button class="changepass_btn" (click)="changepass()">CHANGE PASSWORD</button> -->
</div>
</form>
......
src/pages/myprofile/myprofile.scss
page-myprofile {
.myprofile_wrapper{
width: 100%;
h4{
text-align:left;
......@@ -52,9 +53,11 @@ page-myprofile {
.signup_form_content{
width: 100%;
padding-top:30px;
.input {
.text-input{
margin: 0px;
width:100%;
height: 50px;
border-bottom:1px solid #b7b7b7;
font-size: 28px;
......@@ -83,10 +86,19 @@ page-myprofile {
}
}
.item{
margin-bottom: 20px;
margin-bottom: 0px;
padding-left:0px;
}
.item-inner{
border:none;
.datetime {
width:100%;
border-bottom:1px solid #b7b7b7;
padding:0px;
font-size: 28px;
font-weight: 300;
}
}
p{
......@@ -126,4 +138,13 @@ page-myprofile {
// over-written
.radio-md .radio-inner{background-color: #f7941e !important;}
.radio-md .radio-checked{border-color:#404041 !important}
.label{padding-left:10px !important;font-size:28px !important;margin:0px !important; font-weight: 300;padding-right:10px;}
.radio{
top: 8px !important;
position: relative !important
}
.gender_radio{
padding-top: 30px !important;
padding-bottom: 30px !important;
}
}
src/pages/uploaddoc/uploaddoc.html
......@@ -27,82 +27,7 @@
<div class="clear"></div>
</ion-label>
</ion-item>
<!-- <ion-item>
<ion-radio value="2">
</ion-radio>
<ion-label>
<div class="upload_doc_circle">
</div>
<div class="upload_doc_detail">
Police Clearance Certificate
</div>
<div class="clear"></div>
</ion-label>
</ion-item>
<ion-item>
<ion-radio value="3">
</ion-radio>
<ion-label>
<div class="upload_doc_circle">
</div>
<div class="upload_doc_detail">
Fitness Certificate
</div>
<div class="clear"></div>
</ion-label>
</ion-item>
<ion-item>
<ion-radio value="4">
</ion-radio>
<ion-label>
<div class="upload_doc_circle">
</div>
<div class="upload_doc_detail">
Vehicle Registration
</div>
<div class="clear"></div>
</ion-label>
</ion-item>
<ion-item>
<ion-radio value="5">
</ion-radio>
<ion-label>
<div class="upload_doc_circle">
</div>
<div class="upload_doc_detail">
Vehicle Permit
</div>
<div class="clear"></div>
</ion-label>
</ion-item>
<ion-item>
<ion-radio value="6">
</ion-radio>
<ion-label>
<div class="upload_doc_circle">
</div>
<div class="upload_doc_detail">
Commercial Insurance
</div>
<div class="clear"></div>
</ion-label>
</ion-item>
<ion-item>
<ion-radio value="7">
</ion-radio>
<ion-label>
<div class="upload_doc_circle">
</div>
<div class="upload_doc_detail">
Tax Receipt
</div>
<div class="clear"></div>
</ion-label>
</ion-item> -->
</ion-list>
</div>
</div>
</ion-content>
<!-- <ion-footer padding>
<button ion-button class="btn_primary" (click)="docupdate()">CONTINUE</button>
</ion-footer> -->
src/pages/uploaddoc/uploaddoc.scss
......@@ -22,10 +22,12 @@ page-uploaddoc {
padding-top: 20px;
.list{
.item {
padding-left: 0px;
padding-right:0px;
.item-inner{
border:none;
padding-top: 10px !important;
padding-bottom: 10px !important;
padding-top: 0px !important;
padding-bottom: 0px !important;
.label {
margin: 0px;
.upload_doc_circle{
......
src/pages/userlocation/userlocation.ts
......@@ -139,9 +139,9 @@ export class UserlocationPage {
marker.setIcon(dimage);
if (google.maps.geometry.spherical.computeDistanceBetween(destLoc, driverLoc) < 100) {
This.loc.to = This.details.drop_area
This.loc.from = This.details.pickup_area
This.temp = true
This.loc.to = This.details.drop_area
This.loc.from = This.details.pickup_area
This.temp = true
}
This.calculateAndDisplayRoute(directionsService, This.directionsDisplay, destLoc, driverLoc);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment