Skip to content

Commit d3336d4

Browse files
committed
fix: corrected decimals in test data and date sorting
1 parent 60a447e commit d3336d4

3 files changed

Lines changed: 11 additions & 11 deletions

File tree

backend/data_tools/data/agreements_and_blin_data.json5

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17841,7 +17841,7 @@
1784117841
amount: 300000.0,
1784217842
status: "DRAFT",
1784317843
date_needed: "2026-01-15T14:00:00",
17844-
proc_shop_fee_percentage: 0.005,
17844+
proc_shop_fee_percentage: 0.5,
1784517845
procurement_action_id: 108,
1784617846
on_hold: false,
1784717847
certified: false,
@@ -17857,7 +17857,7 @@
1785717857
amount: 750000.0,
1785817858
status: "IN_EXECUTION",
1785917859
date_needed: "2026-03-15T14:00:00",
17860-
proc_shop_fee_percentage: 0.005,
17860+
proc_shop_fee_percentage: 0.5,
1786117861
procurement_action_id: 108,
1786217862
on_hold: false,
1786317863
certified: false,
@@ -17873,7 +17873,7 @@
1787317873
amount: 1250000.0,
1787417874
status: "IN_EXECUTION",
1787517875
date_needed: "2026-04-15T14:00:00",
17876-
proc_shop_fee_percentage: 0.005,
17876+
proc_shop_fee_percentage: 0.5,
1787717877
procurement_action_id: 108,
1787817878
on_hold: false,
1787917879
certified: false,
@@ -17923,7 +17923,7 @@
1792317923
amount: 150000.0,
1792417924
status: "DRAFT",
1792517925
date_needed: "2026-01-15T14:00:00",
17926-
proc_shop_fee_percentage: 0.048,
17926+
proc_shop_fee_percentage: 4.8,
1792717927
procurement_action_id: 110,
1792817928
on_hold: false,
1792917929
certified: false,
@@ -17939,7 +17939,7 @@
1793917939
amount: 400000.0,
1794017940
status: "IN_EXECUTION",
1794117941
date_needed: "2026-02-15T14:00:00",
17942-
proc_shop_fee_percentage: 0.048,
17942+
proc_shop_fee_percentage: 4.8,
1794317943
procurement_action_id: 110,
1794417944
on_hold: false,
1794517945
certified: false,
@@ -17955,7 +17955,7 @@
1795517955
amount: 600000.0,
1795617956
status: "IN_EXECUTION",
1795717957
date_needed: "2026-03-15T14:00:00",
17958-
proc_shop_fee_percentage: 0.048,
17958+
proc_shop_fee_percentage: 4.8,
1795917959
procurement_action_id: 110,
1796017960
on_hold: false,
1796117961
certified: false,
@@ -17971,7 +17971,7 @@
1797117971
amount: 800000.0,
1797217972
status: "IN_EXECUTION",
1797317973
date_needed: "2026-04-15T14:00:00",
17974-
proc_shop_fee_percentage: 0.048,
17974+
proc_shop_fee_percentage: 4.8,
1797517975
procurement_action_id: 110,
1797617976
on_hold: false,
1797717977
certified: false,
@@ -17987,7 +17987,7 @@
1798717987
amount: 1000000.0,
1798817988
status: "IN_EXECUTION",
1798917989
date_needed: "2026-05-15T14:00:00",
17990-
proc_shop_fee_percentage: 0.048,
17990+
proc_shop_fee_percentage: 4.8,
1799117991
procurement_action_id: 110,
1799217992
on_hold: false,
1799317993
certified: false,
@@ -18003,7 +18003,7 @@
1800318003
amount: 200000.0,
1800418004
status: "IN_EXECUTION",
1800518005
date_needed: "2026-06-15T14:00:00",
18006-
proc_shop_fee_percentage: 0.048,
18006+
proc_shop_fee_percentage: 4.8,
1800718007
procurement_action_id: 110,
1800818008
on_hold: false,
1800918009
certified: false,

frontend/src/hooks/use-sortable-data.hooks.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ const getBLIDiffComparableValue = (budgetLine, condition, totalFunding = 0) => {
4747
case tableSortCodes.budgetLineCodes.AGREEMENT_NAME:
4848
return budgetLine.agreement?.name ?? NO_DATA;
4949
case tableSortCodes.budgetLineCodes.OBLIGATE_BY:
50-
return new Date(budgetLine.date_needed);
50+
return budgetLine.date_needed ? new Date(budgetLine.date_needed) : new Date(0);
5151
case tableSortCodes.budgetLineCodes.FISCAL_YEAR:
5252
return budgetLine.fiscal_year ? budgetLine.fiscal_year : fiscalYearFromDate(budgetLine.date_needed);
5353
case tableSortCodes.budgetLineCodes.CAN_NUMBER:

frontend/src/pages/procurementDashboard/details/ProcurementDetailsTableRow.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ export const ProcurementDetailsTableRow = ({
6868
</Link>
6969
</td>
7070
<td data-cy="cor-name">{userNameById[agreement.project_officer_id] || ""}</td>
71-
<td data-cy="proc-shop">{agreement.procurement_shop.abbr || ""}</td>
71+
<td data-cy="proc-shop">{agreement.procurement_shop?.abbr || ""}</td>
7272
<td data-cy="total-executing">{convertToCurrency(totalExecuting)}</td>
7373
<td data-cy="target-date">
7474
{targetDateByAgreementId[agreement.id]

0 commit comments

Comments
 (0)