Merge branch 'IT19070704' into 'master'

UPDATE : Student components updated

See merge request !122

frontend/src/helpers/sidebar.items.js

@@ -33,7 +33,7 @@ const sidebar_student = [
 		icon: "bx bx-category-alt",
 	},
 	{
-		display_name: "Modules",
+		display_name: "Assignments",
 		route: "/auth/student/modules",
 		icon: "bx bx-bar-chart-square",
 	},

frontend/src/pages/StudentDashboard.js

@@ -24,50 +24,42 @@ const StudentDashboard = () => {
 	const [StudentSubjects, setStudentSubjects] = useState([]);
 	const [value, onChange] = useState(new Date());
 
-	const fields = ["", "Assignment", "Subject", "Subject Code"];
-	const subjects = [
-		{ ModuleCode: "IT20300", ModuleName: "CTSE", assign: "Assignment 01" },
-		{ ModuleCode: "IT30300", ModuleName: "DMS", assign: "Assignment 02" },
-		{ ModuleCode: "IT40300", ModuleName: "SPM", assign: "Assignment 03" },
+	const fields = [
+		"",
+		"ID",
+		"Module Code",
+		"Module Name",
+		"Assignment Type",
+		"Title",
+		"Start At",
+		"End At",
+		"Actions",
 	];
+
 	const renderOrderHead = (item, index) => <th key={index}>{item}</th>;
 
 	const renderOrderBody = (item, index) => (
 		<tr key={index}>
-			<td>{}</td>
-			<td>{item.assign}</td>
-			<td>{item.ModuleName}</td>
-			<td>{item.ModuleCode}</td>
-			<td>
-				<div className="row-user" style={{ paddingTop: "0" }}>
-					{item.DeliveryStatus === "pending" ? (
-						<Badge type="warning" content={item.DeliveryStatus} />
-					) : 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>
+			<td>{index + 1}</td>
+			<td>{item.id}</td>
+			<td>{item.code}</td>
+			<td>{item.name}</td>
+			<td>{item.assignment_type}</td>
+			<td>{item.title}</td>
+			<td>{new Date(item.start_at).toLocaleString()}</td>
+			<td>{new Date(item.end_at).toLocaleString()}</td>
 		</tr>
 	);
 
 	const getAllSubjects = async () => {
 		try {
-			const res = await axios.get("/subjects");
-			setStudentSubjects(subjects);
+			const res = await axios.get(`assignments`);
+			setStudentSubjects(res.data.assignments);
 			setIsLoading(false);
 		} catch (err) {
 			console.log(err.response);
 		}
 	};
-
 	useEffect(() => getAllSubjects(), []);
 
 	return (
@@ -142,7 +134,7 @@ const StudentDashboard = () => {
 									limit="5"
 									headData={fields}
 									renderHead={(item, index) => renderOrderHead(item, index)}
-									bodyData={subjects}
+									bodyData={StudentSubjects}
 									renderBody={(item, index) => renderOrderBody(item, index)}
 								/>
 								{/* ) : (

frontend/src/pages/SubjectsStudent.js

@@ -14,24 +14,30 @@ import "../assets/css/Usercreate.css";
 const SubjectsStudent = () => {
 	const [error, setError] = useState("");
 	const [isLoading, setIsLoading] = useState(true);
-	const [SudentSubjects, setSudentSubjects] = useState([]);
-	const fields = ["", "Module Code", "Module Name", "Year", "", "Actions"];
-	const subjects = [
-		{ ModuleCode: "IT20300", ModuleName: "CTSE", Year: "4th Year" },
-		{ ModuleCode: "IT30300", ModuleName: "DMS", Year: "4th Year" },
-		{ ModuleCode: "IT40300", ModuleName: "SPM:", Year: "4th Year" },
+	const [StudentSubjects, setStudentSubjects] = useState([]);
+	const fields = [
+		"",
+		"ID",
+		"Module Code",
+		"Module Name",
+		"Assignment Type",
+		"Title",
+		"Start At",
+		"End At",
+		"Actions",
 	];
+
 	const renderOrderHead = (item, index) => <th key={index}>{item}</th>;
 
 	const renderOrderBody = (item, index) => (
 		<tr key={index}>
-			<td>{}</td>
-			<td>{item.ModuleCode}</td>
-			<td>{item.ModuleName}</td>
-			<td>{item.Year}</td>
-			<td>{}</td>
+			<td>{item.id}</td>
+			<td>{item.code}</td>
+			<td>{item.name}</td>
+			<td>{item.assignment_type}</td>
+			<td>{item.title}</td>
 			<td>
-				<Link to={`/auth/student/assignment`}>
+				<Link to={`/auth/student/assignment/${item.id}`}>
 					<button className="view-btn">View</button>
 				</Link>
 			</td>
@@ -40,8 +46,8 @@ const SubjectsStudent = () => {
 
 	const getAllSubjects = async () => {
 		try {
-			const res = await axios.get("/subjects");
-			setSudentSubjects(res.data.orders);
+			const res = await axios.get(`assignments`);
+			setStudentSubjects(res.data.assignments);
 			setIsLoading(false);
 		} catch (err) {
 			console.log(err.response);
@@ -56,9 +62,9 @@ const SubjectsStudent = () => {
 			<div id="main" className="layout__content">
 				<TopNav />
 				<div className="layout__content-main">
-					<h1 className="page-header">All Modules</h1>
+					<h1 className="page-header">All Assignments</h1>
 					<div className="card">
-						<h2>Subjects You Enrolled </h2>
+						<h2>Assignments you have to complete</h2>
 						{/* {isLoading ? (
 							<Spinner />
 						) : orderDetails.length > 0 ? ( */}
@@ -66,7 +72,7 @@ const SubjectsStudent = () => {
 							limit="5"
 							headData={fields}
 							renderHead={(item, index) => renderOrderHead(item, index)}
-							bodyData={subjects}
+							bodyData={StudentSubjects}
 							renderBody={(item, index) => renderOrderBody(item, index)}
 						/>
 						{/* ) : (