Merge branch 'IT19023410' of http://gitlab.sliit.lk/2022-257/2022-257 into IT19048642

Backend/src/controller/pharmacy.controller.js

@@ -68,13 +68,13 @@ const getDistanceToBusStation = async (req, res) => {
         
         var config = {
             method: 'get',
-            url: `https://maps.googleapis.com/maps/api/place/nearbysearch/json?keyword=bus station&location=${latitude},${longitude}&radius=10000&type=bus station&keyword=&key=${process.env.API_KEY_SECRET}`,
+            url: `https://maps.googleapis.com/maps/api/place/nearbysearch/json?keyword=bus station&location=${latitude},${longitude}&radius=6000&type=bus station&keyword=&key=${process.env.API_KEY_SECRET}`,
             headers: { }
         };
 
         axios(config)
             .then(function (response) {
-                console.log("23232xcc",response.data.results)
+                //console.log("23232xcc",response.data.results)
                 let newlongitude = response.data.results[0].geometry.location.lat;
                 let newlatitude = response.data.results[0].geometry.location.lng;
                 console.log("Nearest Bus station latitude: ",newlatitude);

bussifinder/src/App.js

@@ -27,6 +27,7 @@ import InputGroceryDetails from './components/InputGroceryDetails';
 import MultipleResult from './components/MultipleResult';
 import ResultsWOTypes from './components/ResultsWOTypes';
 import LocationBasedPredict from './components/LocationBasedPredict';
+import MultipleResultP from './components/PharmacyInputs/MultupleResultsP';
 import MultipleResultG from './components/Grocery Input/MultipleResultG'
 import FactorDetails from './components/FactorDetails';
 import AdminDashboard  from './components/Admin/AdminDashboard';
@@ -65,6 +66,7 @@ function App() {
           <Route path="/resultWOTypes" element={<ResultsWOTypes/>} />
           <Route path="/Service" element={<BusinessTypePage />} />
           <Route path="/locationBasedPredict" element={<LocationBasedPredict />} />
+          <Route path="/pmultipleResult" element={<MultipleResultP/>} />
           <Route path="/multipleResultG" element={<MultipleResultG/>} />
           <Route path="/Factor%20Details" element={<FactorDetails />} />
           <Route path="/AdminDashboard" element={<AdminDashboard />} />

bussifinder/src/components/MultipleResult.js

@@ -184,6 +184,9 @@ 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');
         }
         else if (businessDetails.value[businessDetails.value.length - 1].type == 'grocery') {
             dispatch(addBusiness({ 'type': 'grocery' }))
@@ -192,6 +195,7 @@ const MultipleResult = () => {
         
 
 
+
     }
     return (
         <Box

bussifinder/src/components/PharmacyInputs/InputDetails.js

@@ -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 pharmacyLocationFeatures = {
+                let locationFeatures = {
                     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("Result Ml part ",ML_Result);
+                .then(function (PharmacyResult) {
+                console.log("RPrediction ",PharmacyResult.data);
                     dispatch(addBusiness({
-                        ...businessDetails.value[0], pharmacyLocationFeatures: pharmacyLocationFeatures, ml_result: ML_Result.data.data
+                        ...businessDetails.value[0], locationFeatures: locationFeatures, ml_result: PharmacyResult.data.data
                     }))
-                    navigate(`/result`)
-                    //handleClose()
+                    if (businessDetails.value.length > 1) {
+
+                        navigate(`/pmultipleResult`)
+
+                    }else{navigate(`/result`)}
+                    handleClose()
+
                 }).catch(function (error) {
                     return error;
                 });