Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
I
IPok_Web
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
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
IPok
IPok_Web
Commits
5cdcdf2f
Commit
5cdcdf2f
authored
Aug 03, 2018
by
Jansa Jose
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add clicnic default
parent
7545e7c1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
Webservice_model.php
admin/application/models/Webservice_model.php
+3
-1
Search_doctor_model.php
application/models/Search_doctor_model.php
+2
-2
No files found.
admin/application/models/Webservice_model.php
View file @
5cdcdf2f
...
...
@@ -1408,10 +1408,12 @@ class Webservice_model extends CI_Model {
$this
->
db
->
join
(
'tbl_clinic'
,
'tbl_clinic_doctors.clinic_id = tbl_clinic.id'
,
'INNER'
);
$this
->
db
->
join
(
"tbl_specialization"
,
"tbl_doctors.specialization = tbl_specialization.id"
,
"LEFT"
);
if
(
isset
(
$data
[
'query'
])
&&
strlen
(
$data
[
'query'
])){
$query
=
$data
[
'query'
];
$where
=
'tbl_doctors.name LIKE '
.
"'
$query
%'"
;
$this
->
db
->
where
(
$where
);
$this
->
db
->
having
(
'distance <= 20'
);
}
if
(
isset
(
$data
[
'speciality'
])
&&
strlen
(
$data
[
'speciality'
])){
...
...
@@ -1464,7 +1466,7 @@ class Webservice_model extends CI_Model {
$datalat
=
$data
[
'location_latitude'
];
$datalong
=
$data
[
'location_longitude'
];
$where
=
"
ROUND(( 6371 * acos( cos( radians(
{
$datalat
}
) ) * cos( radians( `location_lattitude` ) ) * cos( radians( `location_longitude` ) - radians(
{
$datalong
}
) ) + sin( radians(
{
$datalat
}
) ) * sin( radians( `location_lat
titude` ) ) ) )) <="
.
50
;
$where
=
"
case when tbl_clinic_doctors.clinic_id != '0' then ROUND(( 6371 * acos( cos( radians(
{
$datalat
}
) ) * cos( radians( `location_lattitude` ) ) * cos( radians( `location_longitude` ) - radians(
{
$datalong
}
) ) + sin( radians(
{
$datalat
}
) ) * sin( radians( `location_lattitude` ) ) ) )) <="
.
50.
" else ROUND(( 6371 * acos( cos( radians(
{
$datalat
}
) ) * cos( radians( `tbl_doctors`.`default_latitude` ) ) * cos( radians( `tbl_doctors`.`default_longitude` ) - radians(
{
$datalong
}
) ) + sin( radians(
{
$datalat
}
) ) * sin( radians( `tbl_doctors`.`default_la
titude` ) ) ) )) <="
.
50
;
$this
->
db
->
where
(
$where
);
}
if
(
isset
(
$data
[
'clinic_id'
])
&&
strlen
(
$data
[
'clinic_id'
])){
...
...
application/models/Search_doctor_model.php
View file @
5cdcdf2f
...
...
@@ -173,8 +173,8 @@ public function filter_search($post_data)
tbl_doctors.price,
tbl_doctors.accept_return,
tbl_clinic.id AS clinic_id,
tbl_clinic.name AS clinic_name,
ROUND(( 6371 * acos( cos( radians(
{
$lat
}
) ) * cos( radians( `location_lattitude` ) ) * cos( radians( `location_longitude` ) - radians(
{
$lng
}
) ) + sin( radians(
{
$lat
}
) ) * sin( radians( `location_lattitude` ) ) ) )) AS clinic_distance,case when tbl_clinic_doctors.clinic_id != '0' then tbl_clinic.street_address else tbl_doctors.street_address end AS clinic_street_address,
tbl_clinic.name AS clinic_name,
case when tbl_clinic_doctors.clinic_id != '0' then
ROUND(( 6371 * acos( cos( radians(
{
$lat
}
) ) * cos( radians( `location_lattitude` ) ) * cos( radians( `location_longitude` ) - radians(
{
$lng
}
) ) + sin( radians(
{
$lat
}
) ) * sin( radians( `location_lattitude` ) ) ) ))
else ROUND(( 6371 * acos( cos( radians(
{
$lat
}
) ) * cos( radians( `default_latitude` ) ) * cos( radians( `default_longitude` ) - radians(
{
$lng
}
) ) + sin( radians(
{
$lat
}
) ) * sin( radians( `default_latitude` ) ) ) )) end
AS clinic_distance,case when tbl_clinic_doctors.clinic_id != '0' then tbl_clinic.street_address else tbl_doctors.street_address end AS clinic_street_address,
case when tbl_clinic_doctors.clinic_id != '0' then tbl_clinic.cep else tbl_doctors.cep end AS clinic_cep,
case when tbl_clinic_doctors.clinic_id != '0' then tbl_clinic.locality else tbl_doctors.locality end AS clinic_locality,
case when tbl_clinic_doctors.clinic_id != '0' then tbl_clinic.number else tbl_doctors.number end AS clinic_number,
...
...
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