Merge branch 'IT18058338' into 'master'

It18058338

See merge request !22

BackEnd/WebBackEnd/routes/studper.route.js

@@ -50,8 +50,9 @@ router.route('/student/:id').get((req , res) =>{
         .catch(err => res.status(400).json('Error :'+err));
 });
 
+//--------------------------Flask API Routes-------------------------------
 router.route('/predict_quiz_marks').post(async (req ,res) =>{
-    console.log("called");
+    console.log("marks route called");
 
     let predictDetails = {
         sex : req.body.sex,
@@ -78,7 +79,66 @@ router.route('/predict_quiz_marks').post(async (req ,res) =>{
     let response = await axios.post(options.uri, options.body)
     console.log(response.data);
     res.json(response.data)
+});
+
+router.route('/predict_pass_fail').post(async (req ,res) =>{
+    console.log("status route called");
+
+    let predictStatusDetails = {
+        sex : req.body.sex,
+        guardian : req.body.guardian,
+        studytime : req.body.studytime,
+        activities : req.body.activities,
+        internet : req.body.internet,
+        freetime : req.body.freetime,
+        absences : req.body.absences,
+        G1 : req.body.G1,
+        G2 : req.body.G2,
+    }
+
+    console.log(predictStatusDetails);
 
+    let options = {
+        uri: 'http://localhost:5000/predict_pass_fail',
+        body: JSON.stringify(predictStatusDetails),
+        method: 'POST',
+        headers: {
+            'Content-Type': 'application/json'
+        }
+    }
+    let response = await axios.post(options.uri, options.body)
+    console.log(response.data);
+    res.json(response.data)
+});
+
+router.route('/predict_grade').post(async (req ,res) =>{
+    console.log("grade route called");
+
+    let predictGradeDetails = {
+        sex : req.body.sex,
+        guardian : req.body.guardian,
+        studytime : req.body.studytime,
+        activities : req.body.activities,
+        internet : req.body.internet,
+        freetime : req.body.freetime,
+        absences : req.body.absences,
+        G1 : req.body.G1,
+        G2 : req.body.G2,
+    }
+
+    console.log(predictGradeDetails);
+
+    let options = {
+        uri: 'http://localhost:5000/predict_grade',
+        body: JSON.stringify(predictGradeDetails),
+        method: 'POST',
+        headers: {
+            'Content-Type': 'application/json'
+        }
+    }
+    let response = await axios.post(options.uri, options.body)
+    console.log(response.data);
+    res.json(response.data)
 });
 
 module.exports = router;
\ No newline at end of file

WebFrontEnd/smartcoach-frontend/src/Components/Admin/Dashboard.js

@@ -540,6 +540,8 @@ export default class Dashboard extends Component {
                                 <Route path="/admin/studper/tutor/:id" exact component={ProgressStudents}/>
                                 <Route path="/admin/studper/student/:id" exact component={ViewProgress}/>
                                 <Route path="/admin/predict_quiz_marks" exact component={ViewProgress}/>
+                                <Route path="/admin/predict_pass_fail" exact component={ViewProgress}/>
+                                <Route path="/admin/predict_grade" exact component={ViewProgress}/>
                             </div>
 
                             {/* Footer */}