Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
dcarfixers_angular
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
16
Issues
16
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Tobin
dcarfixers_angular
Commits
e72f456b
Commit
e72f456b
authored
Apr 03, 2019
by
Jansa Jose
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dc
parent
91a4535f
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
66 additions
and
11 deletions
+66
-11
dashboard.component.html
src/app/home/dashboard/dashboard.component.html
+9
-8
dashboard.component.ts
src/app/home/dashboard/dashboard.component.ts
+45
-0
index.component.html
src/app/home/index/index.component.html
+2
-2
index.component.scss
src/app/home/index/index.component.scss
+1
-1
index.component.ts
src/app/home/index/index.component.ts
+9
-0
No files found.
src/app/home/dashboard/dashboard.component.html
View file @
e72f456b
...
...
@@ -223,7 +223,7 @@
<table>
<thead>
<tr>
<th>
Order
no
</th>
<th>
Order
s
</th>
<th>
Order Date
</th>
<th>
Vehicle
</th>
<th>
Mechanic
</th>
...
...
@@ -232,8 +232,8 @@
</tr>
</thead>
<tbody>
<tr
*
ngFor=
"let bookData of successBookDtls"
>
<td>
{{
bookData.booking_id
}}
</td>
<tr
*
ngFor=
"let bookData of successBookDtls
; let i = index
"
>
<td>
{{
i+1
}}
</td>
<td>
{{bookData.scheduled_date+' '+bookData.scheduled_time}}
</td>
<td>
{{bookData.car_name}}
</td>
<td>
{{bookData.first_name+' '+bookData.last_name}}
</td>
...
...
@@ -273,7 +273,7 @@
<table>
<thead>
<tr>
<th>
Order
no
</th>
<th>
Order
s
</th>
<th>
Order Date
</th>
<th>
Vehicle
</th>
<th>
Mechanic
</th>
...
...
@@ -282,8 +282,9 @@
</tr>
</thead>
<tbody>
<tr
*
ngFor=
"let bookData of bookingDetails"
>
<td>
{{bookData.booking_id}}
</td>
<tr
*
ngFor=
"let bookData of bookingDetails;let i = index"
>
<!-- <td>{{bookData.booking_id}}</td> -->
<td>
{{i+1}}
</td>
<td>
{{bookData.scheduled_date+' '+bookData.scheduled_time}}
</td>
<td>
{{bookData.car_name}}
</td>
<td>
{{bookData.first_name+' '+bookData.last_name}}
</td>
...
...
@@ -595,10 +596,10 @@
</div>
<div
class=
"row"
>
<div
class=
"col-md-6"
>
<input
placeholder=
"LAST MAINTENANCE DATE"
type=
""
bsDatepicker
name=
"dob"
[
ngModel
]=""
>
<input
placeholder=
"LAST MAINTENANCE DATE"
type=
""
bsDatepicker
name=
"dob"
[
ngModel
]=""
(
ngModelChange
)="
get_newdate
($
event
)"
>
</div>
<div
class=
"col-md-6"
>
<input
placeholder=
"APPROX VEHICLE MILEAGE"
type=
""
[
attr
.
value
]="
"
>
<input
placeholder=
"APPROX VEHICLE MILEAGE"
type=
""
[
ngModel
]="
milage
"
(
ngModelChange
)="
get_newmilage
($
event
)
"
>
</div>
</div>
<div
class=
"row"
>
...
...
src/app/home/dashboard/dashboard.component.ts
View file @
e72f456b
...
...
@@ -7,6 +7,7 @@ import { MapsAPILoader } from '@agm/core';
import
{
SubjectService
}
from
'./../../provider/subject.service'
;
import
{
google
}
from
'@google/maps'
;
import
{
ImageStorage
}
from
'../../../environments/server.config'
;
import
{
formatDate
}
from
'@angular/common'
;
declare
var
$
;
declare
const
google
:
any
;
...
...
@@ -198,6 +199,7 @@ export class DashboardComponent implements OnInit {
this
.
bookingDetails
=
response
.
bookData
;
let
successBooking
:
any
[]
=
new
Array
();
this
.
bookingDetails
.
forEach
(
function
(
booking
)
{
if
(
booking
.
status
==
1
){
successBooking
.
push
(
booking
);
...
...
@@ -291,6 +293,14 @@ export class DashboardComponent implements OnInit {
})
}
get_newdate
(
lastdate
){
this
.
wizardData
[
'vechile_info'
][
'lastMaintanceDate'
]
=
formatDate
(
lastdate
,
'MM/dd/yyyy'
,
'en'
);
}
get_newmilage
(
event
){
this
.
wizardData
[
'vechile_info'
][
'milage'
]
=
event
;
}
removeSelectedItem
(
issue_id
,
sub_issue_id
){
let
index
=
this
.
selectedIssues
.
findIndex
(
x
=>
x
.
sub_issue_id
==
sub_issue_id
);
if
(
index
>
-
1
){
...
...
@@ -557,6 +567,41 @@ export class DashboardComponent implements OnInit {
},
500
);
}
// searchIssues(event){
// if(event.target.value == '' || event.target.value == 'undefined' || event.target.value == undefined || event.target.value == 'null' || event.target.value == null ){
// this.issuesData = this.defIssuesData;
// } else {
// const thisObj = this;
// let data: any[] = new Array();
// let serRegExp = new RegExp(event.target.value,"gi");
// thisObj.defIssuesData.forEach(function (issues,index) {
// let issueCat = issues.issue;
// let subIssueCat =issues.sub_categories;
// if(issueCat.search(serRegExp) != -1){
// thisObj.defIssuesData['exception'] = '0';
// data.push(thisObj.defIssuesData[index]);
// }else {
// issues.sub_categories.forEach(function (issues_cat_1,index_1) {
// let subIssueCat = issues_cat_1.issue_category;
// if(subIssueCat.search(serRegExp) != -1){
// thisObj.defIssuesData['exception'] = '1';
// data.push(thisObj.defIssuesData[index]);
// // console.log(thisObj.defIssuesData[index].sub_categories[index_1])
// }
// })
// }
// });
// console.log(thisObj.defIssuesData);
// this.issuesData = (data.length > 0)?data:false;
// }
// setTimeout(()=>{
// this.selectedIssues.forEach(function (issues) {
// $('[id="issue_'+issues.issue_id+'_'+issues.sub_issue_id+'"]').prop('checked', true);
// });
// },500);
// }
jumpToStep3
(){
if
(
this
.
selectedIssues
.
length
!=
0
){
this
.
step3nextRef
.
nativeElement
.
click
();
...
...
src/app/home/index/index.component.html
View file @
e72f456b
...
...
@@ -424,10 +424,10 @@
</div>
<div
class=
"row"
>
<div
class=
"col-md-6"
>
<input
placeholder=
"LAST MAINTENANCE DATE"
type=
""
bsDatepicker
name=
"dob"
[
ngModel
]="(
wizardData
&&
wizardData
.
vechile_info
&&
wizardData
.
vechile_info
.
lastMaintanceDate
)?
wizardData
.
vechile_info
.
lastMaintanceDate:
''"
>
<input
placeholder=
"LAST MAINTENANCE DATE"
type=
""
bsDatepicker
name=
"dob"
[
ngModel
]="(
wizardData
&&
wizardData
.
vechile_info
&&
wizardData
.
vechile_info
.
lastMaintanceDate
)?
wizardData
.
vechile_info
.
lastMaintanceDate:
''"
(
ngModelChange
)="
get_newdate
($
event
)"
>
</div>
<div
class=
"col-md-6"
>
<input
placeholder=
"APPROX VEHICLE MILEAGE"
type=
""
[
attr
.
value
]="(
wizardData
&&
wizardData
.
vechile_info
&&
wizardData
.
vechile_info
.
milage
)?
wizardData
.
vechile_info
.
milage:
''
"
>
<input
placeholder=
"APPROX VEHICLE MILEAGE"
type=
""
[
ngModel
]="(
wizardData
&&
wizardData
.
vechile_info
&&
wizardData
.
vechile_info
.
milage
)?
wizardData
.
vechile_info
.
milage:
''"
(
ngModelChange
)="
get_newmilage
($
event
)
"
>
</div>
</div>
<div
class=
"row"
>
...
...
src/app/home/index/index.component.scss
View file @
e72f456b
...
...
@@ -1115,7 +1115,7 @@
.service_map
{
width
:
100%
;
border
:
1px
solid
#e8e8e8
;
height
:
545
0
px
;
height
:
545px
;
margin-top
:
10px
;
}
}
...
...
src/app/home/index/index.component.ts
View file @
e72f456b
...
...
@@ -260,6 +260,15 @@ export class IndexComponent implements OnInit {
});
})
}
get_newdate
(
lastdate
){
this
.
wizardData
[
'vechile_info'
][
'lastMaintanceDate'
]
=
formatDate
(
lastdate
,
'MM/dd/yyyy'
,
'en'
);
}
get_newmilage
(
milage
){
this
.
wizardData
[
'vechile_info'
][
'milage'
]
=
milage
;
}
setIssueSelected
(
event
){
let
issue_id
=
event
.
target
.
attributes
.
issue_id
.
value
;
let
sub_issue_id
=
event
.
target
.
attributes
.
sub_issue_id
.
value
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment