Merge branch 'IT19048642' into 'master'

It19048642 merge to master

See merge request !31

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/package-lock.json

 {
   "name": "bussifinder",
   "version": "0.1.0",
-  "lockfileVersion": 2,
+  "lockfileVersion": 1,
   "requires": true,
   "packages": {
     "": {
@@ -31752,21 +31752,6 @@
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
       "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="
     },
-    "string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "requires": {
-        "safe-buffer": "~5.2.0"
-      },
-      "dependencies": {
-        "safe-buffer": {
-          "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
-        }
-      }
-    },
     "string-length": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
@@ -31831,6 +31816,21 @@
         "define-properties": "^1.1.3"
       }
     },
+    "string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "requires": {
+        "safe-buffer": "~5.2.0"
+      },
+      "dependencies": {
+        "safe-buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+        }
+      }
+    },
     "stringify-object": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz",

bussifinder/src/App.js

@@ -28,8 +28,11 @@ 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';
+import GroceryTips from './components/Grocery Input/groceryTips'
 import UserSubscriptionPlan from './components/User/UserSubscriptionPlan';
 import ResultsFD from './components/ResultsFD';
 
@@ -67,6 +70,10 @@ 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="/AdminDashboard" element={<AdminDashboard />} />
+          <Route path="/GroceryTips" element={<GroceryTips />} />
           <Route path="/Area%20Analysis" element={<FactorDetails />} />
           <Route path="/AdminDashboard" element={<AdminDashboard />} />
           <Route path="/UserSubscriptionPlan" element={<UserSubscriptionPlan />} />

bussifinder/src/components/Grocery Input/InputDetails.js

@@ -76,6 +76,9 @@ export default function InputDetails() {
         }
     }, [businessDetails]);
 
+const showTips = () =>{
+navigate(`/GroceryTips`) 
+}
     const handleNext = () => {
         setActiveStep(activeStep + 1);
         if (activeStep === steps.length - 1 && businessDetails && businessDetails.value[0].type == 'Grocery') {
@@ -85,13 +88,21 @@ export default function InputDetails() {
                 "longitude": businessDetails.value[0].longitude
             }
 
-            API.post('grocery/grocerycompetitor',body).then((competResult)=>{
-                const competitorsCount = competResult.data.CompetitorCount
+             API.post('grocery/grocerycompetitor',body).then((competResult)=>{
+                 const competitorsCount = competResult.data.CompetitorCount
                 
-                API.post('grocery/grocerytraffci',body).then((trafficResult)=>{
-                    const trafficSum = trafficResult.data.TraffciSummation
+                 API.post('grocery/grocerytraffci',body).then((trafficResult)=>{
+                    console.log("tree--->",trafficResult)
+                     var trafficSum;
+                     if(!trafficResult.data.TraffciSummation){
+                        trafficSum=0
+                     }
+                     else{
+                        trafficSum = trafficResult.data.TraffciSummation
+                     }
+                     
                 
-                    console.log("comp:",competitorsCount,"traffic:",trafficSum)
+                     console.log("comp:",competitorsCount,"traffic:",trafficSum)
 
                     let groceryModelReq = {
                                             "Trafficflow": trafficSum,
@@ -112,14 +123,22 @@ export default function InputDetails() {
                     let locationFeatures = {
                         trafficSum: trafficSum,
                         competitorsCount: competitorsCount,
+                        Instoreshopping:businessDetails.value[0].serviceDetails.shopping ? "available" : "unavalable",
+                        Delivery:businessDetails.value[0].serviceDetails.delivery ?"available" : "unavalable",
+                        Website:  businessDetails.value[0].serviceDetails.web ? "available" : "unavalable",
+                        Parking :businessDetails.value[0].serviceDetails.parking ?"available" : "unavalable"
                                          }
+                             console.log(groceryModelReq)            
                     axios.post(' http://127.0.0.1:5000/grocery', groceryModelReq)
                                                 .then(function (GroceryResult) {
                                                     console.log("Prediction", GroceryResult.data)
                                                     dispatch(addBusiness({
                                                     ...businessDetails.value[0], locationFeatures: locationFeatures, ml_result: GroceryResult.data.data
                                                     }))
-                                                    navigate(`/result`)
+                                                    if (businessDetails.value.length > 1) {
+                                                        navigate(`/multipleResultG`)
+                                                    }else{navigate(`/result`)}
+                                                    
                                                     handleClose()
                                                 }).catch((error)=>{
                                                     console.log("error:",error)
@@ -342,6 +361,13 @@ export default function InputDetails() {
                                     >
                                         {activeStep === steps.length - 1 ? 'Proceed' : 'Next'}
                                     </Button>
+                                    <Button
+                                        variant="contained"
+                                        onClick={showTips}
+                                        sx={{ mt: 3, ml: 1 }}
+                                    >
+                                        Tips
+                                    </Button>
                                 </Box>
                             </React.Fragment>)}
                     </React.Fragment>

bussifinder/src/components/MultipleResult.js

@@ -184,7 +184,16 @@ 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' }))
+            navigate('/inputGrocery');
+        }
+        
+
 
 
     }

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;
                 });