Commit 768aeabf authored by Jayasith H.B.C's avatar Jayasith H.B.C

fix issue

parent 52064e0b
...@@ -40,14 +40,14 @@ const StudentDashboard = () => { ...@@ -40,14 +40,14 @@ const StudentDashboard = () => {
const renderOrderBody = (item, index) => ( const renderOrderBody = (item, index) => (
<tr key={index}> <tr key={index}>
<td>{index + 1}</td> <td>{}</td>
<td>{item.id}</td> <td>{item.id}</td>
<td>{item.code}</td> <td>{item.code}</td>
<td>{item.name}</td> <td>{item.name}</td>
<td>{item.assignment_type}</td> <td>{item.assignment_type}</td>
<td>{item.title}</td> <td>{item.title}</td>
<td>{new Date(item.start_at).toLocaleString()}</td> <td>{new Date(item.start_at).toLocaleString()}</td>
<td>{new Date(item.end_at).toLocaleString()}</td> <td>{new Date(item.updated_at).toLocaleString()}</td>
</tr> </tr>
); );
...@@ -56,10 +56,14 @@ const StudentDashboard = () => { ...@@ -56,10 +56,14 @@ const StudentDashboard = () => {
const res = await axios.get(`assignments`); const res = await axios.get(`assignments`);
setStudentSubjects(res.data.assignments); setStudentSubjects(res.data.assignments);
setIsLoading(false); setIsLoading(false);
} catch (err) { } catch (err) {
console.log(err.response); console.log(err.response);
} }
}; };
console.log(StudentSubjects);
useEffect(() => getAllSubjects(), []); useEffect(() => getAllSubjects(), []);
return ( return (
...@@ -130,13 +134,14 @@ const StudentDashboard = () => { ...@@ -130,13 +134,14 @@ const StudentDashboard = () => {
{/* {isLoading ? ( {/* {isLoading ? (
<Spinner /> <Spinner />
) : orderDetails.length > 0 ? ( */} ) : orderDetails.length > 0 ? ( */}
{StudentSubjects.length !== 0?
<Table <Table
limit="5" limit="5"
headData={fields} headData={fields}
renderHead={(item, index) => renderOrderHead(item, index)} renderHead={(item, index) => renderOrderHead(item, index)}
bodyData={StudentSubjects} bodyData={StudentSubjects}
renderBody={(item, index) => renderOrderBody(item, index)} renderBody={(item, index) => renderOrderBody(item, index)}
/> />:''}
{/* ) : ( {/* ) : (
<> <>
{setError("No Assignments found")} {setError("No Assignments found")}
......
...@@ -16,15 +16,12 @@ const SubjectsStudent = () => { ...@@ -16,15 +16,12 @@ const SubjectsStudent = () => {
const [isLoading, setIsLoading] = useState(true); const [isLoading, setIsLoading] = useState(true);
const [StudentSubjects, setStudentSubjects] = useState([]); const [StudentSubjects, setStudentSubjects] = useState([]);
const fields = [ const fields = [
"",
"ID", "ID",
"Module Code", "Module Code",
"Module Name", "Module Name",
"Assignment Type", "Assignment Type",
"Title", "Title",
"Start At", "",
"End At",
"Actions",
]; ];
const renderOrderHead = (item, index) => <th key={index}>{item}</th>; const renderOrderHead = (item, index) => <th key={index}>{item}</th>;
...@@ -68,13 +65,14 @@ const SubjectsStudent = () => { ...@@ -68,13 +65,14 @@ const SubjectsStudent = () => {
{/* {isLoading ? ( {/* {isLoading ? (
<Spinner /> <Spinner />
) : orderDetails.length > 0 ? ( */} ) : orderDetails.length > 0 ? ( */}
{StudentSubjects.length !==0?
<Table <Table
limit="5" limit="5"
headData={fields} headData={fields}
renderHead={(item, index) => renderOrderHead(item, index)} renderHead={(item, index) => renderOrderHead(item, index)}
bodyData={StudentSubjects} bodyData={StudentSubjects}
renderBody={(item, index) => renderOrderBody(item, index)} renderBody={(item, index) => renderOrderBody(item, index)}
/> />:''}
{/* ) : ( {/* ) : (
<> <>
{setError("No Assignments found")} {setError("No Assignments found")}
......
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