Commit a7888ca1 authored by Hasitha Samarasekara's avatar Hasitha Samarasekara

Student Dashboard Added.

Student Alevel result adding form added.
parent a0272770
const mongoose = require('mongoose');
const Schema = mongoose.Schema;
const ALResultsSchema = new Schema({
student_id:{type:mongoose.Schema.Types.ObjectId,ref: 'Post'},
year:{type:String,required:false},
stream: {type:String,required:true},
subject01:{type:String,required:true},
subject02:{type:String,required:true},
subject03:{type:String,required:true},
subject01Result:{type:String,required:true},
subject02Result:{type:String,required:true},
subject03Result:{type:String,required:true},
generalEnglish:{type:String},
commonGeneralTest:{type:String},
image:{type:String},
verified: {
type: Boolean,
default: false
}
});
const ALevelResults = mongoose.model('ALevelResults',ALResultsSchema);
module.exports = ALevelResults;
\ No newline at end of file
const router = require('express').Router();
let ALevelResults = require('../models/studentALResult.model');
const mongoose = require("mongoose");
router.route('/add').post(async(req,res) =>{
const results = await ALevelResults.findOne({
student_id:req.body.student_id
})
console.log(req.body);
const student_id = mongoose.Types.ObjectId(req.body.student_id);
const year = req.body.year;
const stream = req.body.stream;
const subject01 = req.body.subject01;
const subject02 = req.body.subject02;
const subject03 = req.body.subject03;
const subject01Result = req.body.subject01Result;
const subject02Result = req.body.subject02Result;
const subject03Result = req.body.subject03Result;
const generalEnglish = req.body.generalEnglish;
const commonGeneralTest = req.body.commonGeneralTest;
const image = req.body.image;
const newResult = new ALevelResults({
student_id,
year,
stream,
subject01,
subject02,
subject03,
subject01Result,
subject02Result,
subject03Result,
generalEnglish,
commonGeneralTest,
image,
});
if(!results){
newResult.save().then(()=>{
res.json('Item update!');
})
}
else {
ALevelResults.findById(req.body.student_id, function(err, details){
if(!details){
req.status(404).send("data is not found");
}
else {
details.year = year;
details.stream = stream;
details.subject01 = subject01;
details.subject02 = subject02;
details.subject03 = subject03;
details.subject01Result = subject01Result;
details.subject02Result = subject02Result;
details.subject03Result = subject03Result;
details.generalEnglish = generalEnglish;
details.commonGeneralTest = commonGeneralTest;
details.image = image;
details.save().then( () => {
res.json('results updated!');
})
.catch(err => {
res.status(400).send("Update not possible");
});
}
})
}
});
module.exports = router;
\ No newline at end of file
......@@ -28,6 +28,7 @@ const instituteRouter = require('./routes/institute.route');
const userAccount = require('./routes/userAccount.route');
const questionManage = require('./routes/question.route');
const financeRouter = require('./routes/finance.route');
const studentResult = require('./routes/studentALResult.route');
app.use('/studentSingUp',studentRouter);
app.use('/tutorSingUp',tutorRouter);
......@@ -35,6 +36,7 @@ app.use('/instituteSingUp',instituteRouter);
app.use('/userAccount',userAccount);
app.use('/questions', questionManage);
app.use('/admin/finance', financeRouter);
app.use('/studentResults', studentResult);
app.listen(port, () => {
console.log(`Server is running on Port: ${port}`);
......
......@@ -11,9 +11,10 @@ import SignUp from "./Components/SignUp";
import beforeConfirmation from "./Components/beforeConfirmation";
import VerifiedAccount from "./Components/AccountVerified";
import Dashboard from "./Components/Admin/Dashboard";
import StudentDashboard from "./Components/Student/StudentDashboard";
import QuestionDetails from "./Components/IT18050240/question_details"
import QuestionLayout from "./Components/IT18050240/question_layout"
import AdminQuestionManagement from "./Components/IT18050240/admin_question_management.js"
//import AdminQuestionManagement from "./Components/IT18050240/admin_question_management.js"
import QuestionBank from "./Components/IT18050240/question_bank"
function App() {
......@@ -26,16 +27,21 @@ function App() {
<Route path="/SignUp" exact component={SignUp}/>
<Route path="/beforeConfirm" exact component={beforeConfirmation}/>
<Route path="/AccountVerified/:id" exact component={VerifiedAccount}/>
{/*<Route path="/studentDashboard" exact component={StudentDashboard}/>*/}
{/*<Route path="/" exact component={Dashboard}/>*/}
<Switch>
<Route path="/admin"><Dashboard/></Route>
<Route path="/studentDashboard"><StudentDashboard/></Route>
<Route path="/questiondetails" exact component={QuestionDetails}/>
<Route path="/question" exact component={QuestionLayout}/>
<Route path="/questionmanagement" exact component={AdminQuestionManagement}/>
{/*<Route path="/questionmanagement" exact component={AdminQuestionManagement}/>*/}
<Route path="/questionbank" exact component={QuestionBank}/>
<Route path="/edititem/:id" exact component={AdminQuestionManagement}/>
{/*<Route path="/edititem/:id" exact component={AdminQuestionManagement}/>*/}
</Switch>
</div>
</Router>
);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment