Skip to content

Development kalana #229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kalanagunathilaka wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Development kalana #229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7507df
Final commit
kalanagunathilaka Jul 14, 2023
8dea405
Update launchSettings.json
kalanagunathilaka Jul 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Code/backend/PWMSBackend/Controllers/TECCommitteeController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
23 changes: 12 additions & 11 deletions Code/backend/PWMSBackend/Properties/launchSettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": {
Expand All @@ -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
}
}
}
Binary file added Code/backend/PWMSBackend/Uploads/Evidence_of_authorization/SPP00002_ITM00002.pdf
View file
Open in desktop
Binary file not shown.
Binary file added Code/backend/PWMSBackend/Uploads/Evidence_of_authorization/SPP00002_ITM00007.pdf
View file
Open in desktop
Binary file not shown.
Binary file added Code/backend/PWMSBackend/Uploads/Evidence_of_authorization/SPP00002_ITM00014.pdf
View file
Open in desktop
Binary file not shown.
Binary file added Code/backend/PWMSBackend/Uploads/Evidence_of_authorization/SPP00003_ITM00003.pdf
View file
Open in desktop
Binary file not shown.
Binary file added Code/backend/PWMSBackend/Uploads/Evidence_of_authorization/SPP00003_ITM00006.pdf
View file
Open in desktop
Binary file not shown.
Binary file added Code/backend/PWMSBackend/Uploads/Evidence_of_authorization/SPP00003_ITM00010.pdf
View file
Open in desktop
Binary file not shown.
Binary file added Code/backend/PWMSBackend/Uploads/Evidence_of_authorization/SPP00004_ITM00004.pdf
View file
Open in desktop
Binary file not shown.
Binary file added Code/backend/PWMSBackend/Uploads/Evidence_of_authorization/SPP00004_ITM00014.pdf
View file
Open in desktop
Binary file not shown.
Binary file added Code/backend/PWMSBackend/Uploads/Evidence_of_authorization/SPP00004_ITM00018.pdf
View file
Open in desktop
Binary file not shown.
Binary file added Code/backend/PWMSBackend/Uploads/Evidence_of_authorization/SPP00005_ITM00005.pdf
View file
Open in desktop
Binary file not shown.
Binary file added Code/backend/PWMSBackend/Uploads/Evidence_of_authorization/SPP00005_ITM00012.pdf
View file
Open in desktop
Binary file not shown.
Binary file added Code/backend/PWMSBackend/Uploads/Evidence_of_authorization/SPP00005_ITM00016.pdf
View file
Open in desktop
Binary file not shown.
40 changes: 37 additions & 3 deletions Code/frontend/src/pages/Assets Registry/AssetRegistry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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";
Expand All @@ -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 (
<Stack component="form" noValidate spacing={3} alignItems="center">
<TextField
id="date"
label="Minimum Expected Delivery Date"
type="date"
align="center"
value={formattedDate}
sx={{ width: 200, height: 50 }}
InputLabelProps={{
shrink: true,
}}
/>
</Stack>
);
}

function createData(
Date,
ItemID,
Expand Down Expand Up @@ -267,15 +287,29 @@ useEffect(() => {
tabIndex={-1}
key={index}
>
<TableCell align="center">{DateFormat(row.date)}</TableCell>
<TableCell align="center">
<DisplayDate date={row.date} />
</TableCell>
<TableCell align="center">
{row.itemId}
</TableCell>
<TableCell align="center">
{row.itemName}
</TableCell>
<TableCell align="center">
{row.specification}
<Tooltip title={row.specification}>
<span
style={{
display: "inline-block",
maxWidth: "150px",
overflow: "hidden",
textOverflow: "ellipsis",
whiteSpace: "nowrap",
}}
>
{row.specification}
</span>
</Tooltip>
</TableCell>
<TableCell align="center">
{row.quantityAvailable}
Expand Down
2 changes: 1 addition & 1 deletion Code/frontend/src/pages/BidOpeningCommitee/ManageAuction/ManageAuction.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(() => {
Expand Down
6 changes: 3 additions & 3 deletions Code/frontend/src/pages/CoparateCommunicationDivision/PublishPaperAd/PublishPaperAd.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,9 +199,9 @@ function CreateSubProcurementPlan() {
<TableCell align="center">{row.itemId}</TableCell>
<TableCell align="center">{row.itemName}</TableCell>
<TableCell align="center">
{row.totalQuantity}
{row.totalquantity}
</TableCell>
<TableCell>
<TableCell align="center">
{" "}
{
<Routerlink
Expand All @@ -226,7 +226,7 @@ function CreateSubProcurementPlan() {
<TablePagination
rowsPerPageOptions={[10, 25, 50, 100]}
component="div"
count={rows.length}
count={data ? data.length : 0}
rowsPerPage={rowsPerPage}
page={page}
onPageChange={handleChangePage}
Expand Down
56 changes: 36 additions & 20 deletions .../pages/Procurement Officer/ViewMasterProcurementPlanProc/ViewMasterProcurementPlanProc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ function ViewMasterProcurementPlanProc() {

const data = response;
SetData(data);
console.log(data);
console.log(data);
} catch (error) {
console.log(error);
}
Expand Down Expand Up @@ -211,27 +211,43 @@ function ViewMasterProcurementPlanProc() {
)}
</TableCell>
<TableCell align="center">
{row.isBidOpeningCommitteeCreated ? (
<Routerlink
to={`/create-modify-bidopeningC/${row.mppId}`}
>
<Button
className={styles.ViewButton}
variant="contained"
sx={{
borderRadius: 8,
px: { xs: 2, md: 5 },
backgroundColor: "#227C70",
":hover": {
{row.isTecCommitteCreated ? (
row.isBidOpeningCommitteeCreated ? (
<Routerlink
to={`/create-modify-bidopeningC/${row.mppId}`}
>
<Button
className={styles.ViewButton}
variant="contained"
sx={{
borderRadius: 8,
px: { xs: 2, md: 5 },
backgroundColor: "#227C70",
},
}}
":hover": {
backgroundColor: "#227C70",
},
}}
>
Modify BidOpening
<br />
Committee
</Button>
</Routerlink>
) : (
<Routerlink
to={`/create-modify-bidopeningC/${row.mppId}`}
>
Modify BidOpening
<br />
Committee
</Button>
</Routerlink>
<Button
className={styles.ViewButton}
variant="contained"
sx={{ borderRadius: 8, px: { xs: 2, md: 5 } }}
>
Appoint BidOpening
<br />
Committee
</Button>
</Routerlink>
)
) : (
<Button
className={styles.ViewButton}
Expand Down
2 changes: 1 addition & 1 deletion Code/frontend/src/pages/TEC Committee/Revise Vendor Selection/ReviseVendorSelection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ function ReviseVendorSelection() {
<Button
variant="contained"
onClick={(event) => {
VendorSelectionVidIid(
handleSelect(
vendor.vendorId,
row.itemId
);
Expand Down
24 changes: 13 additions & 11 deletions Code/frontend/src/pages/TEC Committee/Vendor Selection/VendorSelection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -81,7 +83,7 @@ function VendorSelection() {
await VendorSelectionVidIid(vendorId, itemId);
window.location.reload(); // Refresh the page after updating the backend
};

return (
<div>
<Container
Expand Down Expand Up @@ -143,7 +145,7 @@ function VendorSelection() {
page * rowsPerPage + rowsPerPage
)
.map((row, index) =>
row.bidinfo.map((vendor, vendorIndex) => (
row.bidInfo.map((vendor, vendorIndex) => (
<TableRow
hover
role="checkbox"
Expand All @@ -157,25 +159,25 @@ function VendorSelection() {
{vendorIndex === 0 && (
<>
<TableCell
rowSpan={row.bidinfo.length}
rowSpan={row.bidInfo.length}
align="center"
>
{row.itemId}
</TableCell>
<TableCell
rowSpan={row.bidinfo.length}
rowSpan={row.bidInfo.length}
align="center"
>
{row.itemName}
</TableCell>
<TableCell
rowSpan={row.bidinfo.length}
rowSpan={row.bidInfo.length}
align="center"
>
{row.totalQuantity}
</TableCell>
<TableCell
rowSpan={row.bidinfo.length}
rowSpan={row.bidInfo.length}
align="center"
>
<Tooltip title={row.specification}>
Expand All @@ -193,7 +195,7 @@ function VendorSelection() {
</Tooltip>
</TableCell>
<TableCell
rowSpan={row.bidinfo.length}
rowSpan={row.bidInfo.length}
align="center"
>
{DateFormat(row.expectedDeliveryDate)}
Expand All @@ -219,7 +221,7 @@ function VendorSelection() {
<Button
variant="contained"
onClick={(event) => {
VendorSelectionVidIid(
handleSelect(
vendor.vendorId,
row.itemId
);
Expand All @@ -228,7 +230,7 @@ function VendorSelection() {
}}
disabled={
vendor.bidStatus === "Selected" ||
isAnyVendorSelected(row.bidinfo)
isAnyVendorSelected(row.bidInfo)
}
style={{
backgroundColor:
Expand All @@ -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",
}}
Expand Down
4 changes: 2 additions & 2 deletions Code/frontend/src/pages/Usermanage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" },
{
Expand Down Expand Up @@ -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"},
Expand Down
4 changes: 2 additions & 2 deletions Code/frontend/src/pages/ViewGRN/ViewGRN.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down