From 3a4a4137d66427a0b4548a66511063f2649c42b1 Mon Sep 17 00:00:00 2001
From: jainhere <njain_be16@thapar.edu>
Date: Sun, 17 Nov 2019 12:34:29 +0530
Subject: [PATCH] IDs replaced with names  to view at the frontend

---
 src/Pages/CreateClassroom.js             | 13 +++++--
 src/Pages/CreateSingleClassroomNavbar.js |  4 +--
 src/Pages/CreateSingleStudent.js         |  8 ++---
 src/Pages/ViewAllClasses.js              |  6 ++--
 src/Pages/ViewClass.js                   | 30 ++++++++++++++++-
 src/Pages/ViewSingleClass.js             | 10 +++---
 src/Pages/ViewStudent.js                 | 27 +++++++++++----
 src/Pages/ViewStudentReport.js           | 43 ++++++++++++++++--------
 src/Pages/ViewStudentsNavbar.js          | 12 +++----
 9 files changed, 108 insertions(+), 45 deletions(-)

diff --git a/src/Pages/CreateClassroom.js b/src/Pages/CreateClassroom.js
index 290fd39..0569c19 100644
--- a/src/Pages/CreateClassroom.js
+++ b/src/Pages/CreateClassroom.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import Button from 'react-bootstrap/Button';
 import ClassTableComponent from './Components/ClassTableComponent';
-import {get_class,} from './Components/API'
+import {get_class,get_school} from './Components/API'
 
 class CreateSchool extends React.Component {
 
@@ -12,6 +12,12 @@ class CreateSchool extends React.Component {
       .then(res => {
         const classes = res.data;
         this.setState({ClassesPresent:classes})
+        get_school(schoolid)
+        .then(res => {
+          const school = res.data;
+          this.setState({schoolname:school.name})
+          console.log("School name"+this.state.schoolname)
+        })
       })
     console.log(this.state.ClassesPresent)
   }
@@ -28,7 +34,8 @@ class CreateSchool extends React.Component {
     {
       ClassesPresent:[],
       NewClass:this.initialClassDetail,
-      deleteclassid:''
+      deleteclassid:'',
+      schoolname:''
     }
   }
 
@@ -59,7 +66,7 @@ class CreateSchool extends React.Component {
           
           <div className="row h-100 justify-content-center m-3 align-items-center">
             <div className="col-sm-12"> 
-            <p style={{fontSize:20}}>Classes present in <strong>School {SchoolId}</strong> are: </p>
+            <p style={{fontSize:20}}>Classes present in <strong>School {this.state.schoolname}</strong> are: </p>
               <em>Click on a class to explore it.</em>
               <br/>
               <br/>
diff --git a/src/Pages/CreateSingleClassroomNavbar.js b/src/Pages/CreateSingleClassroomNavbar.js
index b2fb0ee..0021e6d 100644
--- a/src/Pages/CreateSingleClassroomNavbar.js
+++ b/src/Pages/CreateSingleClassroomNavbar.js
@@ -74,12 +74,12 @@ class CreateSingleClassroomNavbar extends React.Component {
           <div className="col-sm-12">
             
             <p style={{fontSize:20}}>
-            Create a Classroom in School 
+            Create a Classroom in School &nbsp;
 
                 <select onChange={(event)=>this.myfun(event.target.value)}>
                 
                 {this.state.SchoolsPresent.map((header,index)=>{
-                return(<option key={index}>{header.id}</option>);
+                return(<option key={index} value={header.id}>{header.name}</option>);
                       })}
                 </select>
                 
diff --git a/src/Pages/CreateSingleStudent.js b/src/Pages/CreateSingleStudent.js
index 0e44e5b..3d66fbc 100644
--- a/src/Pages/CreateSingleStudent.js
+++ b/src/Pages/CreateSingleStudent.js
@@ -109,20 +109,20 @@ class CreateSingleStudent extends React.Component{
         return(
             <div className="justify-content-center align-items-center" style={{"color":"black", "fontSize":20}}>
                 
-                Class 
+                Class &nbsp; 
 
                 <select onChange={(event)=>this.myfunclass(event.target.value)}>
                 <option defaultChecked="">Please Select</option>
                     {this.state.classesPresent.map((header,index)=>{
-                    return(<option key={index}>{header.id}</option>);
+                    return(<option key={index}value={header.id}>{header.className}</option>);
                         })}
                 </select> 
                 
-                of School 
+                &nbsp; of School &nbsp; 
                 <select onChange={(event)=>this.myfun(event.target.value)}>
                 <option defaultChecked="">Please Select</option>
                     {this.state.schoolsPresent.map((header,index)=>{
-                    return(<option key={index}>{header.id}</option>);
+                    return(<option key={index}value={header.id}>{header.name}</option>);
                         })}
                 </select>
                 <div className="col-sm-12">
diff --git a/src/Pages/ViewAllClasses.js b/src/Pages/ViewAllClasses.js
index 511a901..f519e43 100644
--- a/src/Pages/ViewAllClasses.js
+++ b/src/Pages/ViewAllClasses.js
@@ -78,16 +78,16 @@ class ViewAllClasses extends React.Component {
           <div className="row h-100 justify-content-center m-3 align-items-center">
             <div className="col-sm-12"> 
               <p style={{fontSize:20}}>
-                Classes present in School 
+                Classes present in School &nbsp; 
 
                 <select onChange={(event)=>this.myfun(event.target.value)}>
                 
                 {this.state.SchoolsPresent.map((header,index)=>{
-                return(<option key={index}>{header.id}</option>);
+                return(<option key={index} value={header.id}>{header.name}</option>);
                       })}
                 </select>
                 
-                are: 
+                &nbsp; are: 
               </p>
               <em>Click on a classto explore it.</em>
               <br/>
diff --git a/src/Pages/ViewClass.js b/src/Pages/ViewClass.js
index 82b3ce5..89e5e11 100644
--- a/src/Pages/ViewClass.js
+++ b/src/Pages/ViewClass.js
@@ -3,9 +3,37 @@ import React from 'react';
 import ViewSubject from './ViewSubject';
 
 import ViewAllStudent from './ViewAllStudent';
+import {get_class,get_school} from './Components/API'
 
 class ViewClass extends React.Component{
 
+    componentDidMount()
+  {
+    const schoolid = this.props.match.params.SchoolId;
+    const classId = this.props.match.params.ClassId;
+    get_class(schoolid,classId)
+      .then(res => {
+        const classes = res.data;
+        this.setState({classname:classes.className})
+        get_school(schoolid)
+        .then(res => {
+          const school = res.data;
+          this.setState({schoolname:school.name})
+          console.log("School name"+this.state.schoolname)
+        })
+      })
+    console.log(this.state.ClassesPresent)
+  }
+  constructor(props)
+  {
+    super(props);
+    
+    this.state =
+    {
+      schoolname:'',
+      classname:''
+    }
+  }
     render()
     {
         const SchoolId = this.props.match.params.SchoolId;
@@ -14,7 +42,7 @@ class ViewClass extends React.Component{
         return(
             <div className="justify-content-center align-items-center" style={{"color":"black", "fontSize":20}}>
                 
-                Class {ClassId} of School {SchoolId}
+                Class <strong>{this.state.classname}</strong> of School <strong>{this.state.schoolname}</strong>
                 
                 <ViewSubject SchoolId ={SchoolId} ClassId = {ClassId}/>
                 
diff --git a/src/Pages/ViewSingleClass.js b/src/Pages/ViewSingleClass.js
index 9d5ecf3..8fce026 100644
--- a/src/Pages/ViewSingleClass.js
+++ b/src/Pages/ViewSingleClass.js
@@ -89,26 +89,28 @@ class ViewSingleClass extends React.Component{
         return(
             <div className="justify-content-center align-items-center" style={{"color":"black", "fontSize":20}}>
                 
-                Class 
+                Class &nbsp;  
 
                 <select onChange={(event)=>this.myfunclass(event.target.value)}>
                 <option defaultChecked="">Please Select</option>
                     {this.state.classesPresent.map((header,index)=>{
-                    return(<option key={index}>{header.id}</option>);
+                    return(<option key={index} value={header.id}>{header.className}</option>);
                         })}
                 </select> 
                 
-                of School 
+                &nbsp; of School &nbsp; 
                 <select onChange={(event)=>this.myfun(event.target.value)}>
                 <option defaultChecked="">Please Select</option>
                     {this.state.schoolsPresent.map((header,index)=>{
-                    return(<option key={index}>{header.id}</option>);
+                    return(<option key={index}value={header.id}>{header.name}</option>);
                         })}
                 </select>
                 
 
                 <div className="row h-100 justify-content-center align-items-center" style={{fontSize:12}}>
                     <div> 
+                        <br />
+                        <br />
                         <p style={{fontSize:20}}>Subjects taught are :</p>
                         <div style={{background:'white'}}>
                                 <SubjectTableComponent data={this.state.subjectsTaught} headers={["Subject Id","Subject Name","Description"]}/>
diff --git a/src/Pages/ViewStudent.js b/src/Pages/ViewStudent.js
index 24ea87b..a3b6e00 100644
--- a/src/Pages/ViewStudent.js
+++ b/src/Pages/ViewStudent.js
@@ -20,8 +20,9 @@ class ViewStudent extends React.Component {
     .then(res => {
       const semesters = res.data;
       this.setState({SemestersPresent:semesters})
+      console.log(schoolId+" "+classId+" "+this.state.SemestersPresent);
     })
-
+    
     
 
   }
@@ -38,6 +39,8 @@ class ViewStudent extends React.Component {
       marks:[],
       semesterselected :'',
       examselected :'',
+      semestername :'',
+      examname :''
       
     }
     this.myfun = this.myfun.bind(this);
@@ -47,8 +50,15 @@ class ViewStudent extends React.Component {
 myfun(value){
     const schoolId = this.props.match.params.SchoolId;
     const classId = this.props.match.params.ClassId;
-    this.setState({semesterselected:value})
-    this.setState({examselected:''})
+
+    get_semester(schoolId,value)
+    .then(res => {
+      const semester = res.data;
+      this.setState({semestername:semester.name})
+      this.setState({semesterselected:value})
+      this.setState({examselected:''})
+    })
+    
     console.log("Class Id"+classId)
   get_exam(schoolId,value,classId)
     .then(res => {
@@ -61,6 +71,11 @@ myfunexam(value)
   this.setState({examselected:value});
   const schoolId = this.props.match.params.SchoolId;
   console.log("School Id "+schoolId+' semester '+this.state.semesterselected+' exam: '+value +' student: '+this.props.match.params.StudentId)
+  get_exam(schoolId,this.state.semesterselected,this.props.match.params.ClassId,value)
+    .then(res => {
+      const exams = res.data;
+      this.setState({examname:exams.name})
+    })
   get_marks(schoolId,this.state.semesterselected,value,this.props.match.params.StudentId)
     .then(res => {
       const mark = res.data;
@@ -89,7 +104,7 @@ myfunexam(value)
               <select id="semester" name="semester" onChange={(event)=>this.myfun(event.target.value)}>
               <option defaultChecked="">Please Select</option>
               {this.state.SemestersPresent.map((header,index)=>{
-              return(<option key={index}>{header.id}</option>);
+              return(<option key={index} value={header.id}>{header.name}</option>);
                     })}
               </select>
             </div>
@@ -100,13 +115,13 @@ myfunexam(value)
           <select  id="exam" name="exam" onChange={(event)=>this.myfunexam(event.target.value)}>
                 <option defaultChecked="">Please Select</option>
                 {this.state.ExamsPresent.map((header,index)=>{
-                  return(<option key={index}>{`${header.id} `}</option>);
+                  return(<option key={index} value={header.id}>{header.name}</option>);
                     })}
               </select>
           </div>
           
           <div className="col-sm-12"> 
-            <p style={{fontSize:20}}> Marks for Semester {this.state.semesterselected} and Exam {this.state.examselected} are: </p>
+            <p style={{fontSize:20}}> Marks for Semester <strong>{this.state.semestername}</strong> and Exam <strong>{this.state.examname}</strong> are: </p>
           
             <div style={{background:'white'}}>
                       <MarksTableComponent data={this.state.marks} headers={["Subject Id","Marks Obtained"]}/>
diff --git a/src/Pages/ViewStudentReport.js b/src/Pages/ViewStudentReport.js
index a073e95..95ade1a 100644
--- a/src/Pages/ViewStudentReport.js
+++ b/src/Pages/ViewStudentReport.js
@@ -1,9 +1,9 @@
 import React from 'react';
 import {get_class,get_school,get_student,get_semester,get_exam,get_marks} from './Components/API';
 
-import SubjectTableComponent from './Components/SubjectTableComponent';
+
 import StudentTableComponent from './Components/StudentTableComponent';
-import Button from 'react-bootstrap/Button';
+
 import MarksTableComponent from './Components/MarksTableComponent';
 
 class ViewStudentReport extends React.Component{
@@ -37,7 +37,9 @@ class ViewStudentReport extends React.Component{
         ExamsPresent:[],
         marks:[],
         semesterselected :'',
-        examselected :''
+        examselected :'',
+        semesterselectedname :'',
+        examselectedname :''
         
       }
         this.myfun = this.myfun.bind(this);
@@ -46,7 +48,7 @@ class ViewStudentReport extends React.Component{
     
     myfun(value)
     {
-        console.log(value);
+        console.log("School "+value);
         get_class(value).then(res=>{ 
             const classes = res.data;
             this.setState({classesPresent:classes})
@@ -88,9 +90,15 @@ class ViewStudentReport extends React.Component{
     myfunsemester(value){
         const schoolId = this.state.schoolselected;
         const classId = this.state.classselected;
+        get_semester(schoolId,value)
+        .then(res => {
+        const semester = res.data;
+        this.setState({semesterselectedname:semester.name})
         this.setState({semesterselected:value})
         this.setState({examselected:''})
-        console.log("Class Id"+classId)
+        this.setState({examselectedname:''})
+        })
+        
       get_exam(schoolId,value,classId)
         .then(res => {
           const exams = res.data;
@@ -102,12 +110,18 @@ class ViewStudentReport extends React.Component{
       this.setState({examselected:value});
       const schoolId = this.state.schoolselected;
       console.log("School Id "+schoolId+' semester '+this.state.semesterselected+' exam: '+value +' student: '+this.state.studentselected)
-      get_marks(schoolId,this.state.semesterselected,value,this.state.studentselected)
+      get_exam(schoolId,this.state.semesterselected,this.state.classselected,value)
+        .then(res => {
+        const exams = res.data;
+        this.setState({examselectedname:exams.name})
+        get_marks(schoolId,this.state.semesterselected,value,this.state.studentselected)
         .then(res => {
           const mark = res.data;
           this.setState({marks:mark})
           console.log("Marks obtained: ",this.state.marks)
         })
+        })
+      
         
     }
     render()
@@ -120,9 +134,9 @@ class ViewStudentReport extends React.Component{
                 
                 <p style={{fontSize:20}}>School &nbsp;
                 <select onChange={(event)=>this.myfun(event.target.value)}>
-                <option defaultChecked="">Select School</option>
+                <option defaultChecked="">Please Select</option>
                     {this.state.schoolsPresent.map((header,index)=>{
-                    return(<option key={index}>{header.id}</option>);
+                    return(<option key={index} value={header.id}>{header.name}</option>);
                         })}
                 </select></p>
 
@@ -131,7 +145,7 @@ class ViewStudentReport extends React.Component{
                 <select onChange={(event)=>this.myfunclass(event.target.value)}>
                 <option defaultChecked="">Select Class</option>
                     {this.state.classesPresent.map((header,index)=>{
-                    return(<option key={index}>{header.id}</option>);
+                    return(<option key={index} value={header.id}>{header.className}</option>);
                         })}
                 </select> </p>
 
@@ -140,7 +154,7 @@ class ViewStudentReport extends React.Component{
                 <select onChange={(event)=>this.myfunstudent(event.target.value)}>
                 <option defaultChecked="">Select Student</option>
                     {this.state.studentsPresent.map((header,index)=>{
-                    return(<option key={index}>{header.id}</option>);
+                    return(<option key={index} value={header.id}>{header.name}</option>);
                         })}
                 </select> </p>
                 
@@ -157,10 +171,11 @@ class ViewStudentReport extends React.Component{
                 <div className="col-sm-6"> 
                     <p style={{fontSize:20}}> Select semester:</p>
                     <div > 
-                    <select id="semester" name="semester" onChange={(event)=>this.myfunsemester(event.target.value)}>
+                    <select id="semester" name="semester" onChange={(event)=>this.myfunsemester(event.target.value,event.target.name)}>
+                    
                     <option defaultChecked="">Please Select</option>
                     {this.state.SemestersPresent.map((header,index)=>{
-                    return(<option key={index}>{header.id}</option>);
+                    return(<option key={index} value={header.id} name1={header.name}>{header.name}</option>);
                             })}
                     </select>
                     </div>
@@ -171,13 +186,13 @@ class ViewStudentReport extends React.Component{
                 <select  id="exam" name="exam" onChange={(event)=>this.myfunexam(event.target.value)}>
                         <option defaultChecked="">Please Select</option>
                         {this.state.ExamsPresent.map((header,index)=>{
-                        return(<option key={index}>{`${header.id} `}</option>);
+                        return(<option key={index} value={header.id}>{`${header.name} `}</option>);
                             })}
                     </select>
                 </div>
                         
                 <div className="col-sm-12"> 
-                    <p style={{fontSize:20}}> Marks for Semester {this.state.semesterselected} and Exam {this.state.examselected} are: </p>
+    <p style={{fontSize:20}}> Marks obtained in exam <strong>{this.state.examselectedname}</strong> &nbsp; for semester <strong>{this.state.semesterselectedname}</strong> &nbsp;are: </p>
                 
                     <div style={{background:'white'}}>
                             <MarksTableComponent data={this.state.marks} headers={["Subject Id","Marks Obtained"]}/>
diff --git a/src/Pages/ViewStudentsNavbar.js b/src/Pages/ViewStudentsNavbar.js
index c1954b4..4d67de2 100644
--- a/src/Pages/ViewStudentsNavbar.js
+++ b/src/Pages/ViewStudentsNavbar.js
@@ -73,20 +73,20 @@ class ViewStudentsNavbar extends React.Component{
         return(
             <div className="justify-content-center align-items-center" style={{"color":"black", "fontSize":20}}>
                 
-                Class 
+                Class &nbsp;  
 
                 <select onChange={(event)=>this.myfunclass(event.target.value)}>
                 <option defaultChecked="">Please Select</option>
                     {this.state.classesPresent.map((header,index)=>{
-                    return(<option key={index}>{header.id}</option>);
+                    return(<option key={index}value={header.id}>{header.className}</option>);
                         })}
                 </select> 
                 
-                of School 
+                &nbsp; of School &nbsp;  
                 <select onChange={(event)=>this.myfun(event.target.value)}>
                 <option defaultChecked="">Please Select</option>
                     {this.state.schoolsPresent.map((header,index)=>{
-                    return(<option key={index}>{header.id}</option>);
+                    return(<option key={index}value={header.id}>{header.name}</option>);
                         })}
                 </select>
                 
@@ -113,11 +113,7 @@ class ViewStudentsNavbar extends React.Component{
                 </div>
 
 
-                {/* <ViewSubject SchoolId ={SchoolId} ClassId = {ClassId}/>
                 
-                <br />
-                <ViewAllStudent SchoolId ={SchoolId} ClassId = {ClassId}/> */}
-                {/* <AddStudent SchoolId ={SchoolId} ClassId = {ClassId}/> */}