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 - -
+ +
+ ) ) : (