Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
2
2022-257
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
2022-257
2022-257
Commits
614f0e14
Commit
614f0e14
authored
Nov 13, 2022
by
Miurangi Masakorala
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Multiple location compare function added
parent
e4a3a4d5
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
186 additions
and
15 deletions
+186
-15
bussifinder/src/components/MultipleResult.js
bussifinder/src/components/MultipleResult.js
+4
-0
bussifinder/src/components/PharmacyInputs/InputDetails.js
bussifinder/src/components/PharmacyInputs/InputDetails.js
+25
-13
bussifinder/src/components/Results.js
bussifinder/src/components/Results.js
+157
-2
No files found.
bussifinder/src/components/MultipleResult.js
View file @
614f0e14
...
...
@@ -185,9 +185,13 @@ const MultipleResult = () => {
}
else
if
(
businessDetails
.
value
[
businessDetails
.
value
.
length
-
1
].
type
==
'
restaurant
'
)
{
dispatch
(
addBusiness
({
'
type
'
:
'
restaurant
'
}))
navigate
(
'
/inputHotel
'
);
}
else
if
(
businessDetails
.
value
[
businessDetails
.
value
.
length
-
1
].
type
==
'
pharmacy
'
)
{
dispatch
(
addBusiness
({
'
type
'
:
'
pharmacy
'
}))
navigate
(
'
/inputPharmacy
'
);
}
}
return
(
<
Box
...
...
bussifinder/src/components/PharmacyInputs/InputDetails.js
View file @
614f0e14
...
...
@@ -92,15 +92,16 @@ export default function InputDetails() {
API
.
post
(
'
pharmacy/distanceToBStation
'
,
body
).
then
((
distanceToBusStationResult
)
=>
{
console
.
log
(
"
inside distance to bus
"
)
// let busStationDistance = "0";
let
busStationDistance
=
distanceToBusStationResult
.
data
.
distance
;
if
(
distanceToBusStationResult
.
data
.
distance
===
"
undefined
"
){
busStationDistance
=
"
200
"
;
}
else
{
busStationDistance
=
distanceToBusStationResult
.
data
.
distance
;
}
// if((busStationDistance === "0") || (busStationDistance === " ")
){
//
busStationDistance = "200";
//
}else{
//
busStationDistance = distanceToBusStationResult.data.distance;
//
}
//
console.log("bus distance",busStationDistance);
console
.
log
(
"
bus distance
"
,
busStationDistance
);
let
pharmacyObj
=
{
"
medicalPlaces
"
:
medicalPlacesCount
,
...
...
@@ -113,19 +114,30 @@ export default function InputDetails() {
"
cardPay
"
:
businessDetails
.
value
[
0
].
serviceDetails
.
card
?
1
:
0
,
}
let
pharmacyL
ocationFeatures
=
{
let
l
ocationFeatures
=
{
medicalPlacesCount
:
medicalPlacesCount
,
busStationDistance
:
busStationDistance
busStationDistance
:
busStationDistance
,
OpenHours
:
businessDetails
.
value
[
0
].
serviceDetails
.
open
?
"
Available
"
:
"
Unavailable
"
,
deliver
:
businessDetails
.
value
[
0
].
serviceDetails
.
deliver
?
"
Available
"
:
"
Unavailable
"
,
WhlChairEntrance
:
businessDetails
.
value
[
0
].
serviceDetails
.
whlentrence
?
"
Available
"
:
"
Unavailable
"
,
WhlChairPark
:
businessDetails
.
value
[
0
].
serviceDetails
.
whlpark
?
"
Available
"
:
"
Unavailable
"
,
cashPay
:
businessDetails
.
value
[
0
].
serviceDetails
.
cash
?
"
Available
"
:
"
Unavailable
"
,
cardPay
:
businessDetails
.
value
[
0
].
serviceDetails
.
card
?
"
Available
"
:
"
Unavailable
"
,
}
axios
.
post
(
'
http://127.0.0.1:5000/pharmacy
'
,
pharmacyObj
)
.
then
(
function
(
ML_
Result
)
{
console
.
log
(
"
R
esult Ml part
"
,
ML_Result
);
.
then
(
function
(
Pharmacy
Result
)
{
console
.
log
(
"
R
Prediction
"
,
PharmacyResult
.
data
);
dispatch
(
addBusiness
({
...
businessDetails
.
value
[
0
],
pharmacyLocationFeatures
:
pharmacyLocationFeatures
,
ml_result
:
ML_
Result
.
data
.
data
...
businessDetails
.
value
[
0
],
locationFeatures
:
locationFeatures
,
ml_result
:
Pharmacy
Result
.
data
.
data
}))
navigate
(
`/result`
)
//handleClose()
if
(
businessDetails
.
value
.
length
>
1
)
{
navigate
(
`/pmultipleResult`
)
}
else
{
navigate
(
`/result`
)}
handleClose
()
}).
catch
(
function
(
error
)
{
return
error
;
});
...
...
bussifinder/src/components/Results.js
View file @
614f0e14
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