Skip to content

F
ForexWeb
Commit ae247ee6 by Adarsh K
Options

Merge branch 'amal' into 'master'

Amal See merge request !7
parents 6829f8dc d17ac470
Showing with 117 additions and 43 deletions
src/app/checker/addforex/addforex.component.html
......@@ -100,9 +100,12 @@
<div class="row">
<div class="col">
<div class="provider_data_content">
<p>Contact</p>
<p>Contact Name</p>
<input class="provider_input" placeholder="" type="text" formControlName="contact">
</div>
<div class="s_error" *ngIf="!providerForm.controls['contact'].valid">
<div class="s_validation" *ngIf="providerForm.controls['contact'].hasError('pattern')">{{error_msg.pattern}}</div>
</div>
<div class="s_error" *ngIf="!providerForm.controls['contact'].valid && providerSubmit">
<div class="s_validation" *ngIf="providerForm.controls['contact'].hasError('required')">{{error_msg.required}} </div>
</div>
......
src/app/checker/addforex/addforex.component.ts
......@@ -13,6 +13,7 @@ export class AddforexComponent implements OnInit {
providerForm: FormGroup;
mobnumPattern = '^((\\+?)|0)?[0-9]{8,15}$';
emailPattern = '^[a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,4}$';
contactPattern = '[a-zA-Z ]*';
providerSubmit: boolean;
lang = 'en';
error_msg: any[];
......@@ -43,7 +44,7 @@ export class AddforexComponent implements OnInit {
'name': ['', Validators.compose([Validators.required])],
'cr_manager': ['', Validators.compose([Validators.required])],
'cr_id': ['', Validators.compose([Validators.required])],
'contact': ['', Validators.compose([Validators.required])],
'contact': ['', Validators.compose([Validators.required, Validators.pattern('^[a-zA-Z \-\']+')])],
'location': ['', Validators.compose([Validators.required])],
'email_id': ['', Validators.compose([Validators.required, Validators.maxLength(50), Validators.pattern(this.emailPattern)])],
// tslint:disable-next-line:max-line-length
......
src/app/checker/addprovider/addprovider.component.html
......@@ -98,9 +98,12 @@
<div class="row">
<div class="col">
<div class="provider_data_content">
<p>Contact</p>
<p>Contact Name</p>
<input class="provider_input" placeholder="" type="text" formControlName="contact">
</div>
<div class="s_error" *ngIf="!providerForm.controls['contact'].valid">
<div class="s_validation" *ngIf="providerForm.controls['contact'].hasError('pattern')">{{error_msg.pattern}}</div>
</div>
<div class="s_error" *ngIf="!providerForm.controls['contact'].valid && providerSubmit">
<div class="s_validation" *ngIf="providerForm.controls['contact'].hasError('required')">{{error_msg.required}} </div>
</div>
......
src/app/checker/addprovider/addprovider.component.ts
......@@ -41,7 +41,7 @@ export class AddproviderComponent implements OnInit {
'name': ['', Validators.compose([Validators.required])],
'cr_manager': ['', Validators.compose([Validators.required])],
'cr_id': ['', Validators.compose([Validators.required])],
'contact': ['', Validators.compose([Validators.required])],
'contact': ['', Validators.compose([Validators.required, Validators.pattern('^[a-zA-Z \-\']+')])],
'location': ['', Validators.compose([Validators.required])],
'email_id': ['', Validators.compose([Validators.required, Validators.maxLength(50), Validators.pattern(this.emailPattern)])],
// tslint:disable-next-line:max-line-length
......
src/app/checker/editforex/editforex.component.html
......@@ -67,9 +67,12 @@
</div>
<div class="col">
<div class="provider_data_content">
<p>Contact</p>
<p>Contact Name</p>
<input class="provider_input" placeholder="" type="text" formControlName="contact">
</div>
<div class="s_error" *ngIf="!providerForm.controls['contact'].valid">
<div class="s_validation" *ngIf="providerForm.controls['contact'].hasError('pattern')">{{error_msg.pattern}}</div>
</div>
<div class="s_error" *ngIf="!providerForm.controls['contact'].valid && providerSubmit">
<div class="s_validation" *ngIf="providerForm.controls['contact'].hasError('required')">{{error_msg.required}} </div>
</div>
......
src/app/checker/editforex/editforex.component.ts
......@@ -12,7 +12,7 @@ import { FormControl, FormGroup, FormBuilder, Validators, ValidationErrors } fro
export class EditforexComponent implements OnInit {
provider: any;
funcName: any;
lang = 'ar';
lang = 'en';
responseMsg: any;
error: boolean;
success: boolean;
......@@ -48,7 +48,7 @@ export class EditforexComponent implements OnInit {
console.log(id);
this.providerForm = this.formBuilder.group({
'cr_manager': ['', Validators.compose([Validators.required])],
'contact': ['', Validators.compose([Validators.required])],
'contact': ['', Validators.compose([Validators.required, Validators.pattern('^[a-zA-Z \-\']+')])],
'location': ['', Validators.compose([Validators.required])],
'email_id': ['', Validators.compose([Validators.required, Validators.maxLength(50), Validators.pattern(this.emailPattern)])],
// tslint:disable-next-line:max-line-length
......
src/app/checker/editprovider/editprovider.component.html
......@@ -67,9 +67,12 @@
</div>
<div class="col">
<div class="provider_data_content">
<p>Contact</p>
<p>Contact Name</p>
<input class="provider_input" placeholder="" type="text" formControlName="contact">
</div>
<div class="s_error" *ngIf="!providerForm.controls['contact'].valid">
<div class="s_validation" *ngIf="providerForm.controls['contact'].hasError('pattern')">{{error_msg.pattern}}</div>
</div>
<div class="s_error" *ngIf="!providerForm.controls['contact'].valid && providerSubmit">
<div class="s_validation" *ngIf="providerForm.controls['contact'].hasError('required')">{{error_msg.required}} </div>
</div>
......@@ -111,6 +114,11 @@
</div>
</div>
<div class="col">
<div class="provider_data_content">
</div>
</div>
<!-- <div class="col">
<div class="provider_data_content">
<p></p>
......
src/app/checker/editprovider/editprovider.component.ts
......@@ -12,7 +12,7 @@ import { FormControl, FormGroup, FormBuilder, Validators, ValidationErrors } fro
export class EditproviderComponent implements OnInit {
provider: any;
funcName: any;
lang = 'ar';
lang = 'en';
responseMsg: any;
error: boolean;
success: boolean;
......@@ -46,7 +46,7 @@ export class EditproviderComponent implements OnInit {
console.log(id);
this.providerForm = this.formBuilder.group({
'cr_manager': ['', Validators.compose([Validators.required])],
'contact': ['', Validators.compose([Validators.required])],
'contact': ['', Validators.compose([Validators.required, Validators.pattern('^[a-zA-Z \-\']+')])],
'location': ['', Validators.compose([Validators.required])],
'email_id': ['', Validators.compose([Validators.required, Validators.maxLength(50), Validators.pattern(this.emailPattern)])],
// tslint:disable-next-line:max-line-length
......
src/app/checker/forexprovider/forexprovider.component.html
......@@ -38,7 +38,7 @@
<th>Location</th>
<th>CR Manager</th>
<th>CR ID</th>
<th>Contact</th>
<th>Contact Name</th>
<th>Phone</th>
<th>Email ID</th>
<th class="textRight">
......@@ -55,7 +55,7 @@
<td>{{provider.contact | titlecase}}</td>
<td>{{provider.phone}}</td>
<td>{{provider.email_id}}</td>
<td class="textRight">
<td class="textRight pl0 pr0">
<button class="edit_btn"(click)="editClick(provider.id)"></button>
<button class="delete_btn" (click)="deleteClick(provider.id)"></button>
</td>
......
src/app/checker/home/home.component.html
......@@ -4,6 +4,9 @@
<h4>Forex Delivery Service Provider</h4>
</div>
<div class="col-md-6 textRight relative">
<button class="logout" (click)="goToPage('checker/currency_list')">
<img src="assets/images/asset_currency.png">
Currency</button>
<button class="logout" (click)="logout()">
<img src="assets/images/asset_logout.png">
Logout</button>
......
src/app/checker/manageprovider/manageprovider.component.html
......@@ -38,7 +38,7 @@
<th>Location</th>
<th>CR Manager</th>
<th>CR ID</th>
<th>Contact</th>
<th>Contact Name</th>
<th>Phone</th>
<th>Email ID</th>
<th class="textRight">
......@@ -55,7 +55,7 @@
<td>{{provider.contact | titlecase}}</td>
<td>{{provider.phone}}</td>
<td>{{provider.email_id}}</td>
<td class="textRight">
<td class="textRight pl0 pr0">
<button class="edit_btn"(click)="editClick(provider.id)"></button>
<button class="delete_btn" (click)="deleteClick(provider.id)"></button>
</td>
......
src/app/delivery/add-driver/add-driver.component.html
......@@ -8,6 +8,9 @@
<h4>Driver Management</h4>
</div>
<div class="col-md-6 textRight relative">
<button class="logout" (click)="goToPage('delivery')">
<img src="assets/images/asset_home.png">
Home</button>
<button class="logout" (click)="logout()">
<img src="assets/images/asset_logout.png">
Logout</button>
......@@ -134,6 +137,7 @@
<div class="s_validation" *ngIf="providerForm.controls['email_id'].hasError('required')">{{error_msg.required}} </div>
</div>
</div>
<div class="col"></div>
</div>
<!-- <div class="row">
......
src/app/delivery/edit-driver/edit-driver.component.html
......@@ -4,9 +4,12 @@
<header class="provider_header">
<div class="row">
<div class="col-md-6">
<h4>Forex Delivery Service Provider</h4>
<h4>Forex Delivery Driver</h4>
</div>
<div class="col-md-6 textRight relative">
<button class="logout" (click)="goToPage('delivery')">
<img src="assets/images/asset_home.png">
Home</button>
<button class="logout" (click)="logout()">
<img src="assets/images/asset_logout.png">
Logout</button>
......@@ -17,11 +20,11 @@
</header>
<section>
<div class="provider_content">
<h3>Edit Delivery Service Provider</h3>
<h3>Edit Forex Delivery Driver</h3>
<div class="provider_inner_content">
<div class="alert alert-success alert-dismissible" *ngIf="success">
<a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>
<strong>Success!</strong> Provider updated successfully.
<strong>Success!</strong> Forex Delivery Driver updated successfully.
</div>
<div class="alert alert-danger alert-dismissible" *ngIf="error">
<a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>
......@@ -79,8 +82,6 @@
<div class="s_validation" *ngIf="providerForm.controls['phone'].hasError('required')">{{error_msg.required}} </div>
</div>
</div>
</div>
<div class="row">
<div class="col">
<div class="provider_data_content">
<p>Email id</p>
......@@ -94,18 +95,8 @@
<div class="s_validation" *ngIf="providerForm.controls['email_id'].hasError('required')">{{error_msg.required}} </div>
</div>
</div>
<div class="col">
<div class="provider_data_content">
</div>
</div>
<!-- <div class="col">
<div class="provider_data_content">
<p></p>
<div class="edit_delivery">Edit Delivery Driver</div>
</div>
</div> -->
</div>
</div>
<div class="row">
<div class="col">
<div class="add_provider_btn_bay">
......
src/app/delivery/edit-driver/edit-driver.component.ts
......@@ -12,7 +12,7 @@ import { FormControl, FormGroup, FormBuilder, Validators, ValidationErrors } fro
export class EditDriverComponent implements OnInit {
provider: any;
funcName: any;
lang = 'ar';
lang = 'en';
responseMsg: any;
error: boolean;
success: boolean;
......
src/app/delivery/editprovider/editprovider.component.html
......@@ -7,7 +7,9 @@
<h4>Forex Delivery Service Provider</h4>
</div>
<div class="col-md-6 textRight relative">
<button class="logout" (click)="goToPage('delivery')">
<img src="assets/images/asset_home.png">
Home</button>
<button class="logout" (click)="logout()">
<img src="assets/images/asset_logout.png">
Logout</button>
......@@ -65,9 +67,13 @@
</div>
<div class="col">
<div class="provider_data_content">
<p>Contact</p>
<p>Contact Name</p>
<input class="provider_input" placeholder="" type="text" formControlName="contact">
</div>
<div class="s_error" *ngIf="!providerForm.controls['contact'].valid">
<div class="s_validation" *ngIf="providerForm.controls['contact'].hasError('pattern')">{{error_msg.pattern}}</div>
</div>
<div class="s_error" *ngIf="!providerForm.controls['contact'].valid && providerSubmit">
<div class="s_validation" *ngIf="providerForm.controls['contact'].hasError('required')">{{error_msg.required}} </div>
</div>
......@@ -104,6 +110,11 @@
<div class="s_validation" *ngIf="providerForm.controls['email_id'].hasError('required')">{{error_msg.required}} </div>
</div>
</div>
<div class="col">
</div>
<div class="col">
</div>
<!-- <div class="col">
<div class="provider_data_content">
......
src/app/delivery/editprovider/editprovider.component.ts
......@@ -12,7 +12,7 @@ import { FormControl, FormGroup, FormBuilder, Validators, ValidationErrors } fro
export class EditproviderComponent implements OnInit {
provider: any;
funcName: any;
lang = 'ar';
lang = 'en';
responseMsg: any;
error: boolean;
success: boolean;
......@@ -44,7 +44,7 @@ export class EditproviderComponent implements OnInit {
this.getProfile();
this.providerForm = this.formBuilder.group({
'cr_manager': ['', Validators.compose([Validators.required])],
'contact': ['', Validators.compose([Validators.required])],
'contact': ['', Validators.compose([Validators.required, Validators.pattern('^[a-zA-Z \-\']+')])],
'location': ['', Validators.compose([Validators.required])],
'email_id': ['', Validators.compose([Validators.required, Validators.maxLength(50), Validators.pattern(this.emailPattern)])],
// tslint:disable-next-line:max-line-length
......
src/app/delivery/list-driver/list-driver.component.html
......@@ -7,7 +7,9 @@
<h4>Driver Management</h4>
</div>
<div class="col-md-6 textRight relative">
<button class="logout" (click)="goToPage('delivery')">
<img src="assets/images/asset_home.png">
Home</button>
<button class="logout" (click)="logout()">
<img src="assets/images/asset_logout.png">
Logout</button>
......@@ -51,7 +53,7 @@
<td>{{provider.cr_id}}</td>
<td>{{provider.phone}}</td>
<td>{{provider.email_id}}</td>
<td class="textRight">
<td class="textRight pl0 pr0">
<button class="edit_btn"(click)="editClick(provider.id)"></button>
<button class="delete_btn" (click)="deleteClick(provider.id)"></button>
</td>
......
src/app/delivery/transaction/transaction.component.html
......@@ -7,6 +7,12 @@
<h4>Forex Transaction List</h4>
</div>
<div class="col-md-6 textRight relative">
<button class="logout" (click)="goToPage('delivery/driverlist')">
<img src="assets/images/asset_driver.png">
Driver Management</button>
<button class="logout" (click)="goToPage('delivery/editprovider')">
<img src="assets/images/asset_settings.png">
Settings</button>
<button class="logout" (click)="logout()">
<img src="assets/images/asset_logout.png">
Logout</button>
......
src/app/forex/currency/currency.component.html
......@@ -7,7 +7,9 @@
<h4>Forex Currency Rate</h4>
</div>
<div class="col-md-6 textRight relative">
<button class="logout" (click)="goToPage('forex')">
<img src="assets/images/asset_home.png">
Home</button>
<button class="logout" (click)="logout()">
<img src="assets/images/asset_logout.png">
Logout</button>
......
src/app/forex/editprovider/editprovider.component.html
......@@ -7,6 +7,9 @@
<h4>Forex Provider</h4>
</div>
<div class="col-md-6 textRight relative">
<button class="logout" (click)="goToPage('forex')">
<img src="assets/images/asset_home.png">
Home</button>
<button class="logout" (click)="logout()">
<img src="assets/images/asset_logout.png">
Logout</button>
......@@ -64,9 +67,12 @@
</div>
<div class="col">
<div class="provider_data_content">
<p>Contact</p>
<p>Contact Name</p>
<input class="provider_input" placeholder="" type="text" formControlName="contact">
</div>
<div class="s_error" *ngIf="!providerForm.controls['contact'].valid">
<div class="s_validation" *ngIf="providerForm.controls['contact'].hasError('pattern')">{{error_msg.pattern}}</div>
</div>
<div class="s_error" *ngIf="!providerForm.controls['contact'].valid && providerSubmit">
<div class="s_validation" *ngIf="providerForm.controls['contact'].hasError('required')">{{error_msg.required}} </div>
</div>
......
src/app/forex/editprovider/editprovider.component.ts
......@@ -46,7 +46,7 @@ export class EditproviderComponent implements OnInit {
this.getProviderList();
this.providerForm = this.formBuilder.group({
'cr_manager': ['', Validators.compose([Validators.required])],
'contact': ['', Validators.compose([Validators.required])],
'contact': ['', Validators.compose([Validators.required, Validators.pattern('^[a-zA-Z \-\']+')])],
'location': ['', Validators.compose([Validators.required])],
'email_id': ['', Validators.compose([Validators.required, Validators.maxLength(50), Validators.pattern(this.emailPattern)])],
// tslint:disable-next-line:max-line-length
......
src/app/forex/transaction/transaction.component.html
......@@ -7,6 +7,12 @@
<h4>Forex Transaction List</h4>
</div>
<div class="col-md-6 textRight relative">
<button class="logout" (click)="goToPage('forex/currency')">
<img src="assets/images/asset_currency.png">
Currency</button>
<button class="logout" (click)="goToPage('forex/editprovider')">
<img src="assets/images/asset_settings.png">
Settings</button>
<button class="logout" (click)="logout()">
<img src="assets/images/asset_logout.png">
Logout</button>
......
src/app/start/login/login.component.html
......@@ -40,7 +40,7 @@
<div class="login_row">
<h6 (click)="goToPage('start/forgot')">Forgot Password</h6>
</div>
<div class="login_row">
<!-- <div class="login_row">
<p class="textCenter" style="text-align:center !important;">Choose Language</p>
<br>
......@@ -48,7 +48,7 @@
<option value="0">English</option>
<option value="1">Arabic</option>
</select>
</div>
</div> -->
</div>
</div>
</div>
......
src/styles.scss
......@@ -696,4 +696,28 @@ section.module.parallax {
border:1px solid #1ca8cb;
}
}
}
.row{
.provider_data_content{
.provider_pin{
font-size: 45px;
}
}
}
.provider_content{
.provider_inner_content{
table{
tbody{
tr{
td{
padding-left: 25px;
}
}
}
}
}
}
\ No newline at end of file
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