diff --git a/Code/backend/PWMSBackend/Controllers/TECCommitteeController.cs b/Code/backend/PWMSBackend/Controllers/TECCommitteeController.cs
index 98b143ba..50f29c2f 100644
--- a/Code/backend/PWMSBackend/Controllers/TECCommitteeController.cs
+++ b/Code/backend/PWMSBackend/Controllers/TECCommitteeController.cs
@@ -329,7 +329,7 @@ from vendor in gj.DefaultIfEmpty()
Specification = input.Specification,
totalQuantity = input.totalQuantity,
expectedDeliveryDate = input.expectedDeliveryDate,
- bidinfo = vendor.bidInfo
+ bidInfo = vendor != null ? vendor.bidInfo : null
};
return Ok(result2);
diff --git a/Code/backend/PWMSBackend/Properties/launchSettings.json b/Code/backend/PWMSBackend/Properties/launchSettings.json
index 3df1907d..c7bfa74e 100644
--- a/Code/backend/PWMSBackend/Properties/launchSettings.json
+++ b/Code/backend/PWMSBackend/Properties/launchSettings.json
@@ -1,22 +1,14 @@
{
- "$schema": "https://json.schemastore.org/launchsettings.json",
- "iisSettings": {
- "windowsAuthentication": false,
- "anonymousAuthentication": true,
- "iisExpress": {
- "applicationUrl": "http://localhost:6254",
- "sslPort": 44366
- }
- },
"profiles": {
"PWMSBackend": {
"commandName": "Project",
"launchBrowser": true,
"launchUrl": "swagger",
- "applicationUrl": "https://localhost:7102;http://localhost:5219",
"environmentVariables": {
- "ASPNETCORE_ENVIRONMENT": "Development"
+ "ASPNETCORE_ENVIRONMENT": "Development",
+ "SENDGRID_API_KEY": "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"
},
+ "applicationUrl": "https://localhost:7102;http://localhost:5219",
"dotnetRunMessages": true
},
"IIS Express": {
@@ -27,5 +19,14 @@
"ASPNETCORE_ENVIRONMENT": "Development"
}
}
+ },
+ "$schema": "https://json.schemastore.org/launchsettings.json",
+ "iisSettings": {
+ "windowsAuthentication": false,
+ "anonymousAuthentication": true,
+ "iisExpress": {
+ "applicationUrl": "http://localhost:6254",
+ "sslPort": 44366
+ }
}
}
\ No newline at end of file
diff --git a/Code/backend/PWMSBackend/Uploads/Evidence_of_authorization/SPP00002_ITM00002.pdf b/Code/backend/PWMSBackend/Uploads/Evidence_of_authorization/SPP00002_ITM00002.pdf
new file mode 100644
index 00000000..8c8ac52a
Binary files /dev/null and b/Code/backend/PWMSBackend/Uploads/Evidence_of_authorization/SPP00002_ITM00002.pdf differ
diff --git a/Code/backend/PWMSBackend/Uploads/Evidence_of_authorization/SPP00002_ITM00007.pdf b/Code/backend/PWMSBackend/Uploads/Evidence_of_authorization/SPP00002_ITM00007.pdf
new file mode 100644
index 00000000..8c8ac52a
Binary files /dev/null and b/Code/backend/PWMSBackend/Uploads/Evidence_of_authorization/SPP00002_ITM00007.pdf differ
diff --git a/Code/backend/PWMSBackend/Uploads/Evidence_of_authorization/SPP00002_ITM00014.pdf b/Code/backend/PWMSBackend/Uploads/Evidence_of_authorization/SPP00002_ITM00014.pdf
new file mode 100644
index 00000000..8c8ac52a
Binary files /dev/null and b/Code/backend/PWMSBackend/Uploads/Evidence_of_authorization/SPP00002_ITM00014.pdf differ
diff --git a/Code/backend/PWMSBackend/Uploads/Evidence_of_authorization/SPP00003_ITM00003.pdf b/Code/backend/PWMSBackend/Uploads/Evidence_of_authorization/SPP00003_ITM00003.pdf
new file mode 100644
index 00000000..8c8ac52a
Binary files /dev/null and b/Code/backend/PWMSBackend/Uploads/Evidence_of_authorization/SPP00003_ITM00003.pdf differ
diff --git a/Code/backend/PWMSBackend/Uploads/Evidence_of_authorization/SPP00003_ITM00006.pdf b/Code/backend/PWMSBackend/Uploads/Evidence_of_authorization/SPP00003_ITM00006.pdf
new file mode 100644
index 00000000..8c8ac52a
Binary files /dev/null and b/Code/backend/PWMSBackend/Uploads/Evidence_of_authorization/SPP00003_ITM00006.pdf differ
diff --git a/Code/backend/PWMSBackend/Uploads/Evidence_of_authorization/SPP00003_ITM00010.pdf b/Code/backend/PWMSBackend/Uploads/Evidence_of_authorization/SPP00003_ITM00010.pdf
new file mode 100644
index 00000000..8c8ac52a
Binary files /dev/null and b/Code/backend/PWMSBackend/Uploads/Evidence_of_authorization/SPP00003_ITM00010.pdf differ
diff --git a/Code/backend/PWMSBackend/Uploads/Evidence_of_authorization/SPP00004_ITM00004.pdf b/Code/backend/PWMSBackend/Uploads/Evidence_of_authorization/SPP00004_ITM00004.pdf
new file mode 100644
index 00000000..8c8ac52a
Binary files /dev/null and b/Code/backend/PWMSBackend/Uploads/Evidence_of_authorization/SPP00004_ITM00004.pdf differ
diff --git a/Code/backend/PWMSBackend/Uploads/Evidence_of_authorization/SPP00004_ITM00014.pdf b/Code/backend/PWMSBackend/Uploads/Evidence_of_authorization/SPP00004_ITM00014.pdf
new file mode 100644
index 00000000..8c8ac52a
Binary files /dev/null and b/Code/backend/PWMSBackend/Uploads/Evidence_of_authorization/SPP00004_ITM00014.pdf differ
diff --git a/Code/backend/PWMSBackend/Uploads/Evidence_of_authorization/SPP00004_ITM00018.pdf b/Code/backend/PWMSBackend/Uploads/Evidence_of_authorization/SPP00004_ITM00018.pdf
new file mode 100644
index 00000000..8c8ac52a
Binary files /dev/null and b/Code/backend/PWMSBackend/Uploads/Evidence_of_authorization/SPP00004_ITM00018.pdf differ
diff --git a/Code/backend/PWMSBackend/Uploads/Evidence_of_authorization/SPP00005_ITM00005.pdf b/Code/backend/PWMSBackend/Uploads/Evidence_of_authorization/SPP00005_ITM00005.pdf
new file mode 100644
index 00000000..8c8ac52a
Binary files /dev/null and b/Code/backend/PWMSBackend/Uploads/Evidence_of_authorization/SPP00005_ITM00005.pdf differ
diff --git a/Code/backend/PWMSBackend/Uploads/Evidence_of_authorization/SPP00005_ITM00012.pdf b/Code/backend/PWMSBackend/Uploads/Evidence_of_authorization/SPP00005_ITM00012.pdf
new file mode 100644
index 00000000..8c8ac52a
Binary files /dev/null and b/Code/backend/PWMSBackend/Uploads/Evidence_of_authorization/SPP00005_ITM00012.pdf differ
diff --git a/Code/backend/PWMSBackend/Uploads/Evidence_of_authorization/SPP00005_ITM00016.pdf b/Code/backend/PWMSBackend/Uploads/Evidence_of_authorization/SPP00005_ITM00016.pdf
new file mode 100644
index 00000000..8c8ac52a
Binary files /dev/null and b/Code/backend/PWMSBackend/Uploads/Evidence_of_authorization/SPP00005_ITM00016.pdf differ
diff --git a/Code/frontend/src/pages/Assets Registry/AssetRegistry.js b/Code/frontend/src/pages/Assets Registry/AssetRegistry.js
index 513d2d93..dcf3ee32 100644
--- a/Code/frontend/src/pages/Assets Registry/AssetRegistry.js
+++ b/Code/frontend/src/pages/Assets Registry/AssetRegistry.js
@@ -1,7 +1,7 @@
import React from "react";
import styles from "./AssetRegistry.module.css";
import SideNavBar from "../../components/SideNavigationBar/SideNavBar";
-import { Button, IconButton, Paper, Stack, TextField } from "@mui/material";
+import { Button, IconButton, Paper, Stack, TextField,Tooltip } from "@mui/material";
import Table from "@mui/material/Table";
import TableBody from "@mui/material/TableBody";
import TableCell from "@mui/material/TableCell";
@@ -25,6 +25,26 @@ const columns = [
{ id: "UnitPrice", label: "Unit Price", Width: 300, align: "center" },
{ id: "TotalValue", label: "Total Value", Width: 300, align: "center" },
];
+
+function DisplayDate({ date }) {
+ const formattedDate = date?.substring(0, 10); // Extract only the date portion
+ return (
+
+
+
+ );
+}
+
function createData(
Date,
ItemID,
@@ -267,7 +287,9 @@ useEffect(() => {
tabIndex={-1}
key={index}
>
- {DateFormat(row.date)}
+
+
+
{row.itemId}
@@ -275,7 +297,19 @@ useEffect(() => {
{row.itemName}
- {row.specification}
+
+
+ {row.specification}
+
+
{row.quantityAvailable}
diff --git a/Code/frontend/src/pages/BidOpeningCommitee/ManageAuction/ManageAuction.js b/Code/frontend/src/pages/BidOpeningCommitee/ManageAuction/ManageAuction.js
index b5238eb8..6d057021 100644
--- a/Code/frontend/src/pages/BidOpeningCommitee/ManageAuction/ManageAuction.js
+++ b/Code/frontend/src/pages/BidOpeningCommitee/ManageAuction/ManageAuction.js
@@ -36,7 +36,7 @@ function ManageAuction() {
const [data, setData] = useState(null);
const[copyData,setCopyData]=useState(null);
- const committeeMemberId=user.id
+ const committeeMemberId=user ? user.id : "";
// console.log(employeeId)
useEffect(() => {
diff --git a/Code/frontend/src/pages/CoparateCommunicationDivision/PublishPaperAd/PublishPaperAd.js b/Code/frontend/src/pages/CoparateCommunicationDivision/PublishPaperAd/PublishPaperAd.js
index 69af5bdb..1267c2fc 100644
--- a/Code/frontend/src/pages/CoparateCommunicationDivision/PublishPaperAd/PublishPaperAd.js
+++ b/Code/frontend/src/pages/CoparateCommunicationDivision/PublishPaperAd/PublishPaperAd.js
@@ -199,9 +199,9 @@ function CreateSubProcurementPlan() {
{row.itemId}
{row.itemName}
- {row.totalQuantity}
+ {row.totalquantity}
-
+
{" "}
{
- {row.isBidOpeningCommitteeCreated ? (
-
-
+ ) : (
+
- Modify BidOpening
-
- Committee
-
-
+
+ Appoint BidOpening
+
+ Committee
+
+
+ )
) : (
{
- VendorSelectionVidIid(
+ handleSelect(
vendor.vendorId,
row.itemId
);
diff --git a/Code/frontend/src/pages/TEC Committee/Vendor Selection/VendorSelection.js b/Code/frontend/src/pages/TEC Committee/Vendor Selection/VendorSelection.js
index 80ddf339..7a8419e3 100644
--- a/Code/frontend/src/pages/TEC Committee/Vendor Selection/VendorSelection.js
+++ b/Code/frontend/src/pages/TEC Committee/Vendor Selection/VendorSelection.js
@@ -65,6 +65,8 @@ function VendorSelection() {
try {
const response = await GetVendorSelectionBidDetails();
const data = response;
+ console.log(data);
+ console.log(data[0].itemId);
setData(data);
} catch (error) {
console.log(error);
@@ -81,7 +83,7 @@ function VendorSelection() {
await VendorSelectionVidIid(vendorId, itemId);
window.location.reload(); // Refresh the page after updating the backend
};
-
+
return (
- row.bidinfo.map((vendor, vendorIndex) => (
+ row.bidInfo.map((vendor, vendorIndex) => (
{row.itemId}
{row.itemName}
{row.totalQuantity}
@@ -193,7 +195,7 @@ function VendorSelection() {
{DateFormat(row.expectedDeliveryDate)}
@@ -219,7 +221,7 @@ function VendorSelection() {
{
- VendorSelectionVidIid(
+ handleSelect(
vendor.vendorId,
row.itemId
);
@@ -228,7 +230,7 @@ function VendorSelection() {
}}
disabled={
vendor.bidStatus === "Selected" ||
- isAnyVendorSelected(row.bidinfo)
+ isAnyVendorSelected(row.bidInfo)
}
style={{
backgroundColor:
@@ -238,12 +240,12 @@ function VendorSelection() {
color: "#ffffff",
pointerEvents:
vendor.bidStatus === "Selected" ||
- isAnyVendorSelected(row.bidinfo)
+ isAnyVendorSelected(row.bidInfo)
? "none"
: "auto",
opacity:
vendor.bidStatus === "Selected" ||
- isAnyVendorSelected(row.bidinfo)
+ isAnyVendorSelected(row.bidInfo)
? "0.5"
: "1",
}}
diff --git a/Code/frontend/src/pages/Usermanage.js b/Code/frontend/src/pages/Usermanage.js
index 26ce7b0d..f02fba6e 100644
--- a/Code/frontend/src/pages/Usermanage.js
+++ b/Code/frontend/src/pages/Usermanage.js
@@ -39,7 +39,7 @@ const userTypes = {
},
{ displayName: "Auctions Scheduled", path: "auctions-end" },
{ displayName: "Internal Auditor Report Available", path: "internal-auditor-report-availble" },
- { displayName: "Approved Items from DG", path: "approved-items-from-dg", number: "10" },
+ { displayName: "DG Report Available", path: "create-purchase-order", number: "10" },
{ displayName: "Items Shipped By Vendors", path: "item-rejected-by-vendors", number: "10" },
{ displayName: "New Invoices Available", path: "new-invoices-available", number: "10" },
{
@@ -82,7 +82,7 @@ const userTypes = {
{ displayName: "Evaluate Master Procurement Plan", path: "evaluate-master-procurement-plan" },
{ displayName: "Send Letters to Vendors", path: "send-lettes-to-vendors" },
{ displayName: "View TEC Report", path: "view-tec-report" },
- { displayName: "View Minutes of Procurement Committee", path: "view-minutes-of-procurement-committee" },
+ { displayName: "View Minutes of Procurement Committee", path: "FinalizedMasterProcurementPlan" },
],
actionButtons: [
{ displayName: "New TEC Report", path: "view-tec-report"},
diff --git a/Code/frontend/src/pages/ViewGRN/ViewGRN.js b/Code/frontend/src/pages/ViewGRN/ViewGRN.js
index 7456cf83..c33d0502 100644
--- a/Code/frontend/src/pages/ViewGRN/ViewGRN.js
+++ b/Code/frontend/src/pages/ViewGRN/ViewGRN.js
@@ -24,8 +24,8 @@ const columns = [
{ id: "Action", label: "Action", Width: 200, align: "center" },
];
-// const vendorId = user ? user.id : "";
-const vendorId = "VEN00001";
+const vendorId = user ? user.id : "";
+// const vendorId = "VEN00001";
export default function ViewGRN() {
const [page, setPage] = React.useState(0);