Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
dcarfixers
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
2
Issues
2
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
Commits
bbabc3a9
Commit
bbabc3a9
authored
5 years ago
by
Jansa Jose
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
change in nearbymechanics api
parent
1d667a53
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
1 deletion
+12
-1
Mechanic_model.php
application/models/Mechanic_model.php
+5
-0
Webservice_model.php
application/models/Webservice_model.php
+7
-1
No files found.
application/models/Mechanic_model.php
View file @
bbabc3a9
...
@@ -198,6 +198,10 @@ class Mechanic_model extends CI_Model {
...
@@ -198,6 +198,10 @@ class Mechanic_model extends CI_Model {
$scheduleTiming
[]
=
$schTime
*
1000
;
$scheduleTiming
[]
=
$schTime
*
1000
;
}
}
}
}
if
(
empty
(
$scheduleTiming
)){
unset
(
$mechData
[
$index
]);
continue
;
}
$rating
=
$this
->
db
->
query
(
"SELECT round(avg(rate),2) AS rating
$rating
=
$this
->
db
->
query
(
"SELECT round(avg(rate),2) AS rating
FROM mechanic_rating
FROM mechanic_rating
...
@@ -235,6 +239,7 @@ class Mechanic_model extends CI_Model {
...
@@ -235,6 +239,7 @@ class Mechanic_model extends CI_Model {
$mechData
[
$index
][
'sub_issues'
]
=
$sIssueData
;
$mechData
[
$index
][
'sub_issues'
]
=
$sIssueData
;
$mechData
[
$index
][
'scheduleTiming'
]
=
$scheduleTiming
;
$mechData
[
$index
][
'scheduleTiming'
]
=
$scheduleTiming
;
}
}
$mechData
=
array_merge
(
$mechData
);
return
$mechData
;
return
$mechData
;
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
application/models/Webservice_model.php
View file @
bbabc3a9
...
@@ -536,6 +536,11 @@ class Webservice_model extends CI_Model {
...
@@ -536,6 +536,11 @@ class Webservice_model extends CI_Model {
$scheduleTiming
[]
=
date
(
'h:i A'
,
$schTime
);
$scheduleTiming
[]
=
date
(
'h:i A'
,
$schTime
);
}
}
}
}
if
(
empty
(
$scheduleTiming
)){
unset
(
$mechData
[
$index
]);
continue
;
}
// $rating = $this->db->query("SELECT round(avg(rate),2) AS rating
// $rating = $this->db->query("SELECT round(avg(rate),2) AS rating
// FROM mechanic_rating
// FROM mechanic_rating
// WHERE mechanic_id='".$data['mechanic_id']."'");
// WHERE mechanic_id='".$data['mechanic_id']."'");
...
@@ -566,10 +571,11 @@ class Webservice_model extends CI_Model {
...
@@ -566,10 +571,11 @@ class Webservice_model extends CI_Model {
$mechData
[
$index
][
'estimate'
]
=
$estimate
;
$mechData
[
$index
][
'estimate'
]
=
$estimate
;
$mechData
[
$index
][
'sub_issues'
]
=
$sIssueData
;
$mechData
[
$index
][
'sub_issues'
]
=
$sIssueData
;
$mechData
[
$index
][
'scheduleTiming'
]
=
$scheduleTiming
;
$mechData
[
$index
][
'scheduleTiming'
]
=
$scheduleTiming
;
}
$mechData
=
array_merge
(
$mechData
);
$respArr
[
'status'
]
=
'success'
;
$respArr
[
'status'
]
=
'success'
;
$respArr
[
'message'
]
=
'success'
;
$respArr
[
'message'
]
=
'success'
;
$respArr
[
'data'
]
=
$mechData
;
$respArr
[
'data'
]
=
$mechData
;
}
return
$respArr
;
return
$respArr
;
}
}
...
...
This diff is collapsed.
Click to expand it.
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