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 {
-
Classes present in School {SchoolId} are:
+
Classes present in School {this.state.schoolname} are:
Click on a class to explore it.
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 {
- Create a Classroom in School
+ Create a Classroom in School
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(
- Class
+ Class
- of School
+ of School
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 {
- Classes present in School
+ Classes present in School
- are:
+ are:
- Class {ClassId} of School {SchoolId}
+ Class {this.state.classname} of School {this.state.schoolname}
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(
Marks for Semester {this.state.semesterselected} and Exam {this.state.examselected} are:
+
Marks obtained in exam {this.state.examselectedname} for semester {this.state.semesterselectedname} are:
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(
- Class
+ Class
this.myfunclass(event.target.value)}>
{this.state.classesPresent.map((header,index)=>{
- return();
+ return();
})}
- of School
+ of School
this.myfun(event.target.value)}>
{this.state.schoolsPresent.map((header,index)=>{
- return();
+ return();
})}
@@ -113,11 +113,7 @@ class ViewStudentsNavbar extends React.Component{