Skip to content

2
2022-158
Commit 74305be8 authored by Thiwanka K.A.T's avatar Thiwanka K.A.T 🎯
Browse files
Options

Merge branch 'master' into 'IT19076362' 

Master

See merge request !107
parents c04ae0a6 7bcede41
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 156 additions and 22681 deletions
frontend/package-lock.json
View file @ 74305be8
This diff is collapsed.
frontend/src/pages/StudentDashboard.js
View file @ 74305be8
......@@ -18,29 +18,23 @@ import ProfilePicture from "../assets/images/admin-user-img.jpg";
import status from "../helpers/greeting";
const SupplierDashboard = () => {
const StudentDashboard = () => {
const [error, setError] = useState("");
const [isLoading, setIsLoading] = useState(true);
const [orderDetails, setOrderDetails] = useState([]);
const [StudentSubjects, setStudentSubjects] = useState([]);
const [value, onChange] = useState(new Date());
const fields = [
"",
"Assignment",
"Subject",
"Subject Code",
];
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" }
]
{ ModuleCode: "IT40300", ModuleName: "SPM", assign: "Assignment 03" },
];
const renderOrderHead = (item, index) => <th key={index}>{item}</th>;
const renderOrderBody = (item, index) => (
<tr key={index}>
<td>{ }</td>
<td>{}</td>
<td>{item.assign}</td>
<td>{item.ModuleName}</td>
<td>{item.ModuleCode}</td>
......@@ -64,17 +58,17 @@ const SupplierDashboard = () => {
</tr>
);
const getAllOrders = async () => {
const getAllSubjects = async () => {
try {
const res = await axios.get("orders/supplier/my");
setOrderDetails(res.data.orders);
const res = await axios.get("/subjects");
setStudentSubjects(subjects);
setIsLoading(false);
} catch (err) {
console.log(err.response);
}
};
useEffect(() => getAllOrders(), []);
useEffect(() => getAllSubjects(), []);
return (
<div>
......@@ -91,16 +85,16 @@ const SupplierDashboard = () => {
<h3>
Today you have{" "}
{
orderDetails.filter(
(orderDetail) =>
orderDetail.DeliveryStatus === "pending"
StudentSubjects.filter(
(StudentSubject) =>
StudentSubject.stubjectstatus === "pending"
).length
}
{localStorage.setItem(
"notifications",
orderDetails.filter(
(orderDetail) =>
orderDetail.DeliveryStatus === "pending"
StudentSubjects.filter(
(StudentSubject) =>
StudentSubject.stubjectstatus === "pending"
).length
)}{" "}
Assignments to Complete
......@@ -140,18 +134,17 @@ const SupplierDashboard = () => {
<div className="card">
<div className="flex">
<h2 className="request-title">Assignments to complete</h2>
</div>
{/* {isLoading ? (
<Spinner />
) : orderDetails.length > 0 ? ( */}
<Table
limit="5"
headData={fields}
renderHead={(item, index) => renderOrderHead(item, index)}
bodyData={subjects}
renderBody={(item, index) => renderOrderBody(item, index)}
/>
<Table
limit="5"
headData={fields}
renderHead={(item, index) => renderOrderHead(item, index)}
bodyData={subjects}
renderBody={(item, index) => renderOrderBody(item, index)}
/>
{/* ) : (
<>
{setError("No Assignments found")}
......@@ -184,4 +177,4 @@ const SupplierDashboard = () => {
);
};
export default SupplierDashboard;
export default StudentDashboard;
frontend/src/pages/SubjectsStudent.js
View file @ 74305be8
......@@ -11,155 +11,44 @@ import Badge from "../components/badge/Badge";
import "../assets/css/Usercreate.css";
const ManageOrdersSupplier = () => {
const SubjectsStudent = () => {
const [error, setError] = useState("");
const [isLoading, setIsLoading] = useState(true);
const [orderDetails, setOrderDetails] = useState([]);
const fields = [
"",
"Module Code",
"Module Name",
"Year",
"",
"Actions",
];
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" }
]
{ ModuleCode: "IT40300", ModuleName: "SPM:", Year: "4th Year" },
];
const renderOrderHead = (item, index) => <th key={index}>{item}</th>;
const renderOrderBody = (item, index) => (
<tr key={index}>
<td>{ }</td>
<td>{}</td>
<td>{item.ModuleCode}</td>
<td>{item.ModuleName}</td>
<td>{item.Year}</td>
<td>{ }</td>
<td><Link to={`/auth/student/assignment`}>
<button className="view-btn">View</button>
</Link></td>
<td>{}</td>
<td>
<div className="row-user" style={{ paddingTop: "0" }}>
{item.DeliveryStatus === "pending" ? (
<div
style={{ cursor: "pointer" }}
onClick={() => {
if (
window.confirm(
"Are you sure to change order status as preparing?"
)
) {
changeDeliveryStatusAsPreparing(item._id);
}
}}
>
<Badge type="warning" content="Mark as preparing" />
</div>
) : item.DeliveryStatus === "preparing" ? (
<div
style={{ cursor: "pointer" }}
onClick={() => {
if (
window.confirm(
"Are you sure to change order status as delivering?"
)
) {
changeDeliveryStatusAsDelivering(item._id);
}
}}
>
<Badge type="primary" content="Mark as delivering" />
</div>
) : item.DeliveryStatus === "delivering" ? (
<div
style={{ cursor: "pointer" }}
onClick={() => {
if (
window.confirm(
"Are you sure to change order status as delivered?"
)
) {
changeDeliveryStatusAsDelivered(item._id);
}
}}
>
<Badge type="success" content="Mark as delivered" />
</div>
) : item.DeliveryStatus === "delivered" ? (
<div style={{ cursor: "pointer" }}>
<Link to={`/auth/supplier/deliveryreports/${item._id}`}>
<Badge type="normal" content="Send Delivery Report" />
</Link>
</div>
) : item.DeliveryStatus === "submitted" ? (
<div>
<Badge type="normal" content="Completed" />
</div>
) : (
""
)}
</div>
<Link to={`/auth/student/assignment`}>
<button className="view-btn">View</button>
</Link>
</td>
</tr>
);
const changeDeliveryStatusAsPreparing = async (id) => {
try {
const res = await axios.put(`orders/supplier/prepare/${id}`);
if (res.statusText === "OK") {
setIsLoading(true);
getAllOrders();
setError("");
window.alert("Delivery status changed as preparing");
window.location.reload();
setIsLoading(false);
}
} catch (err) {
console.log(err.response);
}
};
const changeDeliveryStatusAsDelivering = async (id) => {
try {
const res = await axios.put(`orders/supplier/deliver/${id}`);
if (res.statusText === "OK") {
getAllOrders();
setIsLoading(false);
window.alert("Delivery status changed as delivering");
window.location.reload();
}
} catch (err) {
console.log(err.response);
}
};
const changeDeliveryStatusAsDelivered = async (id) => {
try {
const res = await axios.put(`orders/supplier/delivered/${id}`);
if (res.statusText === "OK") {
getAllOrders();
window.alert("Delivery status changed as delivered");
setIsLoading(false);
window.location.reload();
}
} catch (err) {
console.log(err.response);
}
};
const getAllOrders = async () => {
const getAllSubjects = async () => {
try {
const res = await axios.get("orders/supplier");
setOrderDetails(res.data.orders);
const res = await axios.get("/subjects");
setSudentSubjects(res.data.orders);
setIsLoading(false);
} catch (err) {
console.log(err.response);
}
};
useEffect(() => getAllOrders(), []);
useEffect(() => getAllSubjects(), []);
return (
<div>
......@@ -193,4 +82,4 @@ const ManageOrdersSupplier = () => {
);
};
export default ManageOrdersSupplier;
export default SubjectsStudent;
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