Skip to content

2
2021-049
Commit 95e18a35 authored by Gihan Tharaka's avatar Gihan Tharaka
Browse files
Options

UI Changes

parent 75714b12
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 19 deletions
WebFrontEnd/smartcoach-frontend/src/Components/Admin/view_progress.js
View file @ 95e18a35
......@@ -167,6 +167,7 @@ export default class ViewProgress extends Component{
{/*---------Display Results-------------*/}
{/* 1 */}
<div className="col-md-12 col-lg-4">
<div className="card-shadow-danger mb-3 widget-chart widget-chart2 text-left card">
<div className="widget-content">
......@@ -189,6 +190,7 @@ export default class ViewProgress extends Component{
</div>
</div>
{/* 2 */}
<div className="col-md-12 col-lg-4">
<div className="card-shadow-success mb-3 widget-chart widget-chart2 text-left card">
<div className="widget-content">
......@@ -211,6 +213,7 @@ export default class ViewProgress extends Component{
</div>
</div>
{/* 3 */}
<div className="col-md-12 col-lg-4">
{this.state.predi_marks == '' ?
......@@ -251,31 +254,16 @@ export default class ViewProgress extends Component{
</div>
</div>
<div className="widget-content-left fsize-1">
<div className="text-muted opacity-6" style={{fontWeight: "bold"}}>Predicted Marks - ({this.state.predi_marks == null ? "Pending" : this.state.predi_marks}/20)</div>
<div className="text-muted opacity-6" style={{fontWeight: "bold"}}><span className="mb-2 mr-2 badge badge-pill badge-warning">Predicted</span> Marks - ({this.state.predi_marks == null ? "Pending" : this.state.predi_marks}/20)</div>
</div>
</div>
</div>
</div>
}
{details.g3 == null
?
<div style={{marginLeft:"40px"}}>
<form onSubmit={this.onSubmitHandler}>
<Button type="submit">Predict Marks of Next Test</Button>
</form>
<form onSubmit={this.onSubmitStatusHandler} style={{marginTop:"10px"}}>
<Button type="submit">Predict Status of Student</Button>
</form>
<form onSubmit={this.onSubmitGradeHandler} style={{marginTop:"10px"}}>
<Button type="submit">Predict Grade of the Student</Button>
</form>
</div>
:
''
}
</div>
{/* 4 */}
{this.state.predi_status == '' ?
''
:
......@@ -284,7 +272,7 @@ export default class ViewProgress extends Component{
<div className="widget-content">
<div className="widget-content-outer">
<div className="widget-content-left fsize-1">
<div className="text-muted opacity-6" style={{fontWeight: "bold"}}>Predicted Status of Student : {this.state.predi_status == 1 ? "Pass" : "Fail"}</div>
<div className="text-muted opacity-6" style={{fontWeight: "bold"}}><span className="mb-2 mr-2 badge badge-pill badge-warning">Predicted</span> Status of Student : {this.state.predi_status == 1 ? "Pass" : "Fail"}</div>
</div>
</div>
</div>
......@@ -292,6 +280,7 @@ export default class ViewProgress extends Component{
</div>
}
{/* 5 */}
{this.state.predi_grade == '' ?
''
:
......@@ -300,7 +289,7 @@ export default class ViewProgress extends Component{
<div className="widget-content">
<div className="widget-content-outer">
<div className="widget-content-left fsize-1">
<div className="text-muted opacity-6" style={{fontWeight: "bold"}}>Predicted Grade of the Student : {this.state.predi_grade}</div>
<div className="text-muted opacity-6" style={{fontWeight: "bold"}}><span className="mb-2 mr-2 badge badge-pill badge-warning">Predicted</span> Grade of the Student : {this.state.predi_grade}</div>
</div>
</div>
</div>
......@@ -308,6 +297,35 @@ export default class ViewProgress extends Component{
</div>
}
{/* 6 - empty div */}
<div className="col-md-12 col-lg-4">
</div>
{details.g3 == null
?
<div className="row col-md-12">
{/* 7 */}
<div className="col-md-12 col-lg-4">
<form onSubmit={this.onSubmitHandler}>
<Button type="submit">Predict Marks of Next Test</Button>
</form>
</div>
{/* 8 */}
<div className="col-md-12 col-lg-4">
<form onSubmit={this.onSubmitStatusHandler}>
<Button type="submit">Predict Status of Student</Button>
</form>
</div>
{/* 9 */}
<div className="col-md-12 col-lg-4">
<form onSubmit={this.onSubmitGradeHandler}>
<Button type="submit">Predict Grade of the Student</Button>
</form>
</div>
</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