Commit 847a6825 authored by Devinda's avatar Devinda

fix errors automatic_question/ lessonandexampage/question_bank/lessonupload

parent 3491792d
import React, { PureComponent } from 'react'; import React, { PureComponent } from 'react';
import axios from 'axios'; import axios from 'axios';
import Upload from '../../Images/upload.png';
import PDF from '../../Images/pdficon.png'; import PDF from '../../Images/pdficon.png';
import PW from '../../Images/pptxicon.png'; import PW from '../../Images/pptxicon.png';
...@@ -13,7 +13,8 @@ interface UploadState { ...@@ -13,7 +13,8 @@ interface UploadState {
imagename: string; imagename: string;
filetype :string, filetype :string,
lessonname:string, lessonname:string,
lessonno: string, lessonno: any,
filename :string
}; };
class UploadPage extends PureComponent<{}, UploadState> { class UploadPage extends PureComponent<{}, UploadState> {
...@@ -29,6 +30,7 @@ class UploadPage extends PureComponent<{}, UploadState> { ...@@ -29,6 +30,7 @@ class UploadPage extends PureComponent<{}, UploadState> {
filetype: '', filetype: '',
lessonname:'', lessonname:'',
lessonno:'', lessonno:'',
filename:''
}; };
} }
...@@ -36,7 +38,23 @@ class UploadPage extends PureComponent<{}, UploadState> { ...@@ -36,7 +38,23 @@ class UploadPage extends PureComponent<{}, UploadState> {
this.fetchRecent(); this.fetchRecent();
} }
componentDidUpdate=()=> { componentDidUpdate=()=> {
// let str = this.state.recentImage.filename; this.fetchRecent();
}
fetchRecent = () => {
axios.get('http://localhost:5000/recent')
.then((response) => {
this.setState({
filename: response.data.filename,
lessonname :response.data.lessonname,
lessonno :response.data.lessonno
});
})
.catch(err => alert('Error: ' + err));
//let str = this.state.filename;
// //
// if (str.includes(".pdf")) { // if (str.includes(".pdf")) {
// this.setState({ // this.setState({
...@@ -49,26 +67,6 @@ class UploadPage extends PureComponent<{}, UploadState> { ...@@ -49,26 +67,6 @@ class UploadPage extends PureComponent<{}, UploadState> {
// filetype :".pptx" // filetype :".pptx"
// }); // });
// } // }
// else {
//
// }
}
fetchRecent = () => {
axios.get('http://localhost:5000/recent')
.then((response) => {
this.setState({ recentImage: response.data.image });
})
.catch(err => alert('Error: ' + err));
if(this.state.filetype==""){
this.setState({
imagename: PW,
filetype :"",
lessonname:"",
lessonno:"",
});
}
} }
uploadImage = () => { uploadImage = () => {
...@@ -94,9 +92,12 @@ class UploadPage extends PureComponent<{}, UploadState> { ...@@ -94,9 +92,12 @@ class UploadPage extends PureComponent<{}, UploadState> {
return ( return (
<div className="UploadPage"> <div className="UploadPage">
<div className="Recent"> <div className="Recent">
<div className="container text-left">
<div className="col-10" >
<hr />
<div className="row"> <div className="row">
<div className="col-sm-5"> <div className="col-sm-6">
<label>Lesson name: </label> <label>Lesson name: </label>
<div style={{padding: '0px'}}> <div style={{padding: '0px'}}>
<input type="text" required className="form-control" <input type="text" required className="form-control"
...@@ -105,7 +106,7 @@ class UploadPage extends PureComponent<{}, UploadState> { ...@@ -105,7 +106,7 @@ class UploadPage extends PureComponent<{}, UploadState> {
</div> </div>
</div> </div>
<div className="col-sm-5"> <div className="col-sm-6">
<label>Lesson no: </label> <label>Lesson no: </label>
<div style={{padding: '0px'}}> <div style={{padding: '0px'}}>
<input type="text" required className="form-control" <input type="text" required className="form-control"
...@@ -116,7 +117,7 @@ class UploadPage extends PureComponent<{}, UploadState> { ...@@ -116,7 +117,7 @@ class UploadPage extends PureComponent<{}, UploadState> {
</div> </div>
<div className="row"> <div className="row">
<div className="col-sm-5"> <div className="col-sm-6">
<label>Lesson caption: </label> <label>Lesson caption: </label>
<div style={{padding: '0px'}}> <div style={{padding: '0px'}}>
<input <input
...@@ -129,7 +130,7 @@ class UploadPage extends PureComponent<{}, UploadState> { ...@@ -129,7 +130,7 @@ class UploadPage extends PureComponent<{}, UploadState> {
</div> </div>
</div> </div>
<div className="col-sm-5"> <div className="col-sm-6">
<label>Upload file: </label> <label>Upload file: </label>
<div style={{padding: '0px'}}> <div style={{padding: '0px'}}>
<input <input
...@@ -152,35 +153,34 @@ class UploadPage extends PureComponent<{}, UploadState> { ...@@ -152,35 +153,34 @@ class UploadPage extends PureComponent<{}, UploadState> {
<div className="row"> <div className="row">
<div className="col-sm-5"> <div className="col-sm-12">
<button type ="submit" value ="Submit"
className = "btn btn-block btn-warning mt-3" onClick={this.uploadImage}> ADD
</button>
</div>
<div className="col-sm-5">
<button type ="submit" value ="Submit" <button type ="submit" value ="Submit"
className = "btn btn-block btn-success mt-3" onClick={this.uploadImage}> ADD className = "btn btn-block btn-success mt-3" onClick={this.uploadImage}> ADD
</button> </button>
</div> </div>
</div> </div>
</div>
<br/><br/> <br/><br/>
<div className="border">
<div style={{margin: "15px"}}>
<h5 className="text-center"> Recent Upload File </h5>
<p className="text-center"> File type : (.pdf) <img src={PDF} alt="upload-image" style={{width:'30px'}}/> </p>
<p className="text-center"> Lesson No: 1 {this.state.lessonno} </p>
<p className="text-center"> Lesson Name: Accounting{this.state.lessonname} </p>
<div className="border">
<div style={{margin: "15px"}}>
<h5 className="text-center"> Recent Upload File </h5>
{/*<p className="text-center"> File type : ({this.state.filetype} ) <img src={this.state.imagename} alt="upload-image" style={{width:'30px'}}/> </p>*/}
{/*<p className="text-center"> This quiz closed on Sunday,02 May 2021,7:10PM</p>*/}
<p className="text-center"> time limit :1 hour 30 mins</p>
<p className="text-center">Grading method: highest grade</p>
</div>
</div> </div>
</div> </div>
<br/><br/>
</div></div>
</div> </div>
); );
} }
} }
......
...@@ -56,7 +56,7 @@ export default class Automatic_question extends Component { ...@@ -56,7 +56,7 @@ export default class Automatic_question extends Component {
/> />
<br/> <br/>
<button className="btn btn-block btn btn-secondary" type="submit" value="Submit" style={{ color: "white" }}>Create new Question</button> <button className="btn btn-block btn btn-secondary" type="submit" value="Submit" style={{ color: "white" }}>Create New Quiz</button>
</div> </div>
......
...@@ -29,10 +29,6 @@ export default class LessonAndExam extends Component { ...@@ -29,10 +29,6 @@ export default class LessonAndExam extends Component {
render(){ render(){
return( return(
<div className="container"> <div className="container">
<div className="p-3 mb-2 bg-light text-dark text-left">Accounting Lecture</div>
<div className="text-left ml-3">
<p>First lab session will be started from 10/02/2021 at 4.00pm</p>
</div>
{this.state.lessonList.map((file) => ( {this.state.lessonList.map((file) => (
...@@ -40,7 +36,7 @@ export default class LessonAndExam extends Component { ...@@ -40,7 +36,7 @@ export default class LessonAndExam extends Component {
<div className=""> <div className="">
<div className="p-3 mb-2 bg-light text-dark text-left">Accounting Lecture {file.lessonno}</div> <div className="p-3 mb-2 bg-light text-dark text-left">Accounting Lecture {file.lessonno}</div>
<div className="text-left ml-3"> <div className="text-left ml-3">
<p>First lab session will be started from 10/02/2021 at 4.00pm</p>
</div> </div>
<div className="row"> <div className="row">
<div className="col-1"> <div className="col-1">
......
...@@ -91,10 +91,8 @@ export default class QuestionBankUI extends Component { ...@@ -91,10 +91,8 @@ export default class QuestionBankUI extends Component {
return ( return (
<div className="container text-left"> <div className="container text-left">
<div className="col-sm-10" > <div className="col-sm-10" >
<h4> Business Studies</h4>
<h6>Dashboard/My courses/Business Studies/Question bank/Questions</h6>
<hr /> <hr />
</div> </div>
......
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