Commit a3d5962d authored by Weerasinghe D.N.H's avatar Weerasinghe D.N.H

UPDATE : Student components updated

parent 5d4ba196
...@@ -33,7 +33,7 @@ const sidebar_student = [ ...@@ -33,7 +33,7 @@ const sidebar_student = [
icon: "bx bx-category-alt", icon: "bx bx-category-alt",
}, },
{ {
display_name: "Modules", display_name: "Assignments",
route: "/auth/student/modules", route: "/auth/student/modules",
icon: "bx bx-bar-chart-square", icon: "bx bx-bar-chart-square",
}, },
......
...@@ -24,50 +24,42 @@ const StudentDashboard = () => { ...@@ -24,50 +24,42 @@ const StudentDashboard = () => {
const [StudentSubjects, setStudentSubjects] = useState([]); const [StudentSubjects, setStudentSubjects] = useState([]);
const [value, onChange] = useState(new Date()); const [value, onChange] = useState(new Date());
const fields = ["", "Assignment", "Subject", "Subject Code"]; const fields = [
const subjects = [ "",
{ ModuleCode: "IT20300", ModuleName: "CTSE", assign: "Assignment 01" }, "ID",
{ ModuleCode: "IT30300", ModuleName: "DMS", assign: "Assignment 02" }, "Module Code",
{ ModuleCode: "IT40300", ModuleName: "SPM", assign: "Assignment 03" }, "Module Name",
"Assignment Type",
"Title",
"Start At",
"End At",
"Actions",
]; ];
const renderOrderHead = (item, index) => <th key={index}>{item}</th>; const renderOrderHead = (item, index) => <th key={index}>{item}</th>;
const renderOrderBody = (item, index) => ( const renderOrderBody = (item, index) => (
<tr key={index}> <tr key={index}>
<td>{}</td> <td>{index + 1}</td>
<td>{item.assign}</td> <td>{item.id}</td>
<td>{item.ModuleName}</td> <td>{item.code}</td>
<td>{item.ModuleCode}</td> <td>{item.name}</td>
<td> <td>{item.assignment_type}</td>
<div className="row-user" style={{ paddingTop: "0" }}> <td>{item.title}</td>
{item.DeliveryStatus === "pending" ? ( <td>{new Date(item.start_at).toLocaleString()}</td>
<Badge type="warning" content={item.DeliveryStatus} /> <td>{new Date(item.end_at).toLocaleString()}</td>
) : item.DeliveryStatus === "preparing" ? (
<Badge type="primary" content={item.DeliveryStatus} />
) : item.DeliveryStatus === "delivering" ? (
<Badge type="success" content={item.DeliveryStatus} />
) : item.DeliveryStatus === "delivered" ? (
<Badge type="success" content={item.DeliveryStatus} />
) : item.DeliveryStatus === "submitted" ? (
<Badge type="normal" content={item.DeliveryStatus} />
) : (
""
)}
</div>
</td>
</tr> </tr>
); );
const getAllSubjects = async () => { const getAllSubjects = async () => {
try { try {
const res = await axios.get("/subjects"); const res = await axios.get(`assignments`);
setStudentSubjects(subjects); setStudentSubjects(res.data.assignments);
setIsLoading(false); setIsLoading(false);
} catch (err) { } catch (err) {
console.log(err.response); console.log(err.response);
} }
}; };
useEffect(() => getAllSubjects(), []); useEffect(() => getAllSubjects(), []);
return ( return (
...@@ -142,7 +134,7 @@ const StudentDashboard = () => { ...@@ -142,7 +134,7 @@ const StudentDashboard = () => {
limit="5" limit="5"
headData={fields} headData={fields}
renderHead={(item, index) => renderOrderHead(item, index)} renderHead={(item, index) => renderOrderHead(item, index)}
bodyData={subjects} bodyData={StudentSubjects}
renderBody={(item, index) => renderOrderBody(item, index)} renderBody={(item, index) => renderOrderBody(item, index)}
/> />
{/* ) : ( {/* ) : (
......
...@@ -14,24 +14,30 @@ import "../assets/css/Usercreate.css"; ...@@ -14,24 +14,30 @@ import "../assets/css/Usercreate.css";
const SubjectsStudent = () => { const SubjectsStudent = () => {
const [error, setError] = useState(""); const [error, setError] = useState("");
const [isLoading, setIsLoading] = useState(true); const [isLoading, setIsLoading] = useState(true);
const [SudentSubjects, setSudentSubjects] = useState([]); const [StudentSubjects, setStudentSubjects] = useState([]);
const fields = ["", "Module Code", "Module Name", "Year", "", "Actions"]; const fields = [
const subjects = [ "",
{ ModuleCode: "IT20300", ModuleName: "CTSE", Year: "4th Year" }, "ID",
{ ModuleCode: "IT30300", ModuleName: "DMS", Year: "4th Year" }, "Module Code",
{ ModuleCode: "IT40300", ModuleName: "SPM:", Year: "4th Year" }, "Module Name",
"Assignment Type",
"Title",
"Start At",
"End At",
"Actions",
]; ];
const renderOrderHead = (item, index) => <th key={index}>{item}</th>; const renderOrderHead = (item, index) => <th key={index}>{item}</th>;
const renderOrderBody = (item, index) => ( const renderOrderBody = (item, index) => (
<tr key={index}> <tr key={index}>
<td>{}</td> <td>{item.id}</td>
<td>{item.ModuleCode}</td> <td>{item.code}</td>
<td>{item.ModuleName}</td> <td>{item.name}</td>
<td>{item.Year}</td> <td>{item.assignment_type}</td>
<td>{}</td> <td>{item.title}</td>
<td> <td>
<Link to={`/auth/student/assignment`}> <Link to={`/auth/student/assignment/${item.id}`}>
<button className="view-btn">View</button> <button className="view-btn">View</button>
</Link> </Link>
</td> </td>
...@@ -40,8 +46,8 @@ const SubjectsStudent = () => { ...@@ -40,8 +46,8 @@ const SubjectsStudent = () => {
const getAllSubjects = async () => { const getAllSubjects = async () => {
try { try {
const res = await axios.get("/subjects"); const res = await axios.get(`assignments`);
setSudentSubjects(res.data.orders); setStudentSubjects(res.data.assignments);
setIsLoading(false); setIsLoading(false);
} catch (err) { } catch (err) {
console.log(err.response); console.log(err.response);
...@@ -56,9 +62,9 @@ const SubjectsStudent = () => { ...@@ -56,9 +62,9 @@ const SubjectsStudent = () => {
<div id="main" className="layout__content"> <div id="main" className="layout__content">
<TopNav /> <TopNav />
<div className="layout__content-main"> <div className="layout__content-main">
<h1 className="page-header">All Modules</h1> <h1 className="page-header">All Assignments</h1>
<div className="card"> <div className="card">
<h2>Subjects You Enrolled </h2> <h2>Assignments you have to complete</h2>
{/* {isLoading ? ( {/* {isLoading ? (
<Spinner /> <Spinner />
) : orderDetails.length > 0 ? ( */} ) : orderDetails.length > 0 ? ( */}
...@@ -66,7 +72,7 @@ const SubjectsStudent = () => { ...@@ -66,7 +72,7 @@ const SubjectsStudent = () => {
limit="5" limit="5"
headData={fields} headData={fields}
renderHead={(item, index) => renderOrderHead(item, index)} renderHead={(item, index) => renderOrderHead(item, index)}
bodyData={subjects} bodyData={StudentSubjects}
renderBody={(item, index) => renderOrderBody(item, index)} renderBody={(item, index) => renderOrderBody(item, index)}
/> />
{/* ) : ( {/* ) : (
......
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