5137.1 requisition line edit + UI updates to line columns #5254

roxy-dao · 2024-10-30T00:03:44Z

Part 1 of #5137

👩🏻‍💻 What does this PR do?

Returns the reason node in Requisition line to get reason to display in the detail view columns
Add all the new 'inputtable' columns to the insert and update response requisition line columns
Displays the columns in the requisition detail view

🧪 Testing

Create a program requisition (since you still can't add lines unless you do it through api)
See new columns

📃 Documentation

Part of an epic: documentation will be completed for the feature as a whole
No documentation required: no user facing changes or a bug fix which isn't a change in behaviour
These areas should be updated or checked:
1.
2.

…o-line-columns

github-actions · 2024-10-30T00:08:17Z

Bundle size difference

Comparing this PR to main

Old size	New size	Diff
4.88 MB	4.88 MB	2.54 KB (0.05%)

roxy-dao · 2024-10-30T00:04:11Z

client/packages/requisitions/src/ResponseRequisition/DetailView/columns.ts

-    {
+  ];
+
+  if (!programName) {


Their SOH only shows up for requisitions which aren't programs

client/packages/requisitions/src/ResponseRequisition/DetailView/columns.ts

roxy-dao · 2024-10-30T00:05:34Z

client/packages/requisitions/src/ResponseRequisition/DetailView/columns.ts

+    });
+  }
+  columnDefinitions.push(
+    // TODO: Global pref to show/hide the next columns


Putting a TODO reminder for global prefs

roxy-dao · 2024-10-30T00:06:46Z

server/service/src/requisition_line/response_requisition_line/insert/generate.rs

+    let suggested_quantity = generate_suggested_quantity(GenerateSuggestedQuantity {
+        average_monthly_consumption: average_monthly_consumption.unwrap_or(0.0),
+        available_stock_on_hand: stock_on_hand.unwrap_or(0.0),
+        min_months_of_stock: requisition_row.min_months_of_stock,
+        max_months_of_stock: requisition_row.max_months_of_stock,
+    });


Getting suggested quantity if we have the data to calculate it

roxy-dao · 2024-10-30T00:07:29Z

server/service/src/requisition_line/response_requisition_line/insert/generate.rs

-    new_requisition_line.comment = comment.or(new_requisition_line.comment);
-
-    Ok(new_requisition_line)
+    RequisitionLineRow {


Was using wrong method to generate the new requisition line on insert... should just be all from input since this method should only be used for inserting manual requisitions

roxy-dao · 2024-10-30T00:08:02Z

server/service/src/requisition_line/response_requisition_line/update.rs

+        if existing_requisition_row.linked_requisition_id.is_none() {
+            u.available_stock_on_hand = updated_stock_on_hand.unwrap_or(0.0);
+            u.average_monthly_consumption =
+                updated_average_monthly_consumption.unwrap_or(u.average_monthly_consumption);
+        }


We shouldn't be overwriting calculated values....

roxy-dao · 2024-10-30T00:09:08Z

server/graphql/requisition_line/src/mutations/response_requisition_line/update.rs

@@ -18,9 +18,18 @@ use service::{
 pub struct UpdateInput {
    pub id: String,
    pub supply_quantity: Option<f64>,
-    pub requested_quantity: Option<f64>,
-    pub their_stock_on_hand: Option<f64>,


idk why I renamed... maybe better to keep this name as it's clearer?

fergie-nz · 2024-10-30T03:43:55Z

client/packages/common/src/intl/locales/en/common.json

@@ -154,6 +154,8 @@
  "description.fc-line-total": "Foreign currency line total",
  "description.fc-sell-price": "Foreign currency sell price per pack",
  "description.forecast-quantity": "Forecast Quantity to Reach Target",
+  "description.initial-stock-on-hand": "Stock on hand on the first day of the program period",
+  "description.available-stock": "The customer's initial stock on hand + incoming stock + inventory adjustments - outgoing stock", 


I found this tricky to understand

server/service/src/item/item.rs

Chris-Petty · 2024-10-30T03:14:55Z

client/packages/requisitions/src/ResponseRequisition/DetailView/columns.ts

+  const { programName, linkedRequisition } = useResponse.document.fields([
+    'programName',
+    'linkedRequisition',
+  ]);


Just curious, does this effectively grab the details from the cache? Though what if the cached result for the document doesn't have these fields 🤔 I guess if it's v smart it'll requery making gql including these additional fields and all the fields that are currently in the cache?

If you dunno and it isn't obvious you can just wonder with me :D

From my understanding, it makes an api call and then memorises the result with useCallback. It does throw an error if the key isn't in the result 👀

Chris-Petty · 2024-10-30T03:29:44Z

client/packages/requisitions/src/ResponseRequisition/DetailView/columns.ts

+        const incomingStock = rowData.incomingUnits + rowData.additionInUnits;
+        const outgoingStock = rowData.lossInUnits + rowData.outgoingUnits;
+
+        return stockOnHand + incomingStock - outgoingStock;


Similar to the previous commment on using itemStats, I think this will break their available units? itemStats is their available units, so doing additional incoming/outgoing arithmatic will misreport what stock they have now (or more importantly at the end of the period) right?

I'm still confused by adding the movements to the availableStockOnHand, shouldn't it be:
availableStockOnHand = intialStockOnHand + incomingStock - outgoingStock

not:

availableStockOnHand = availableStockOnHand + incomingStock - outgoingStock?

client/packages/requisitions/src/ResponseRequisition/DetailView/columns.ts

Chris-Petty · 2024-10-30T03:48:02Z

client/packages/requisitions/src/ResponseRequisition/DetailView/columns.ts

+              .averageMonthlyConsumption ?? 0)
+          : rowData.averageMonthlyConsumption;
+
+        return averageMonthlyConsumption !== 0


Nice no divide by 0. Tangentially... if a site has 0 AMC then maybe their MOS should be infinity lol

Chris-Petty · 2024-10-30T03:52:55Z

client/packages/requisitions/src/ResponseRequisition/DetailView/columns.ts

+        const averageMonthlyConsumption = linkedRequisition
+          ? (rowData.linkedRequisitionLine?.itemStats
+              .averageMonthlyConsumption ?? 0)
+          : rowData.averageMonthlyConsumption;
+


Similar to other itemStats ones, I don't think the values should move around depending on what day you looked. @mark-prins?

client/packages/requisitions/src/ResponseRequisition/DetailView/columns.ts

client/packages/common/src/intl/locales/en/common.json

Chris-Petty

Just the one check on the available column calculation

Chris-Petty · 2024-11-03T23:20:47Z

client/packages/requisitions/src/ResponseRequisition/DetailView/columns.ts

+        const incomingStock = rowData.incomingUnits + rowData.additionInUnits;
+        const outgoingStock = rowData.lossInUnits + rowData.outgoingUnits;
+
+        return stockOnHand + incomingStock - outgoingStock;


I'm still confused by adding the movements to the availableStockOnHand, shouldn't it be:
availableStockOnHand = intialStockOnHand + incomingStock - outgoingStock

not:

availableStockOnHand = availableStockOnHand + incomingStock - outgoingStock?

Chris-Petty

leshgoo

…o-line-columns

roxy-dao added 13 commits October 25, 2024 15:26

Reason option loader

888c82b

Add AMC and reason to requisition node

208ad3c

Expose available stock on hand

dfe3d12

Merge branch 'develop' into 5137-Requisition-line-edit-+-UI-updates-t…

ed4ad8b

…o-line-columns

Don't update available_soh if there is a linked requisition

97a94b2

Item check returning item

d5ee226

New fields for inserting response requisition line

9e95fab

New requisition fields for update response requisition line

f1a0bf7

Expose new requisition line fields

cb59d69

Display new requisition columns in response requisition

782602c

Merge branch 'develop' into 5137-Requisition-line-edit-+-UI-updates-t…

6396af9

…o-line-columns

Remove console log

4208187

Refactor calculation to be easier to read

316a92c

github-actions bot added enhancement New feature or request Team Ruru 🦉 Roxy, Ferg, Noel feature: manual requisition labels Oct 30, 2024

roxy-dao commented Oct 30, 2024

View reviewed changes

roxy-dao requested a review from Chris-Petty October 30, 2024 00:51

Chris-Petty self-assigned this Oct 30, 2024

fergie-nz reviewed Oct 30, 2024

View reviewed changes

Chris-Petty requested changes Oct 30, 2024

View reviewed changes

roxy-dao added 2 commits October 31, 2024 11:26

Rename function

1be65da

Use requisition line stats instead of itemStats

1e77115

roxy-dao requested a review from Chris-Petty October 30, 2024 23:05

Opps

b21f7cc

Chris-Petty reviewed Oct 31, 2024

View reviewed changes

client/packages/common/src/intl/locales/en/common.json Outdated Show resolved Hide resolved

Rephrase

f04d14f

roxy-dao requested a review from Chris-Petty October 31, 2024 18:30

Chris-Petty requested changes Nov 3, 2024

View reviewed changes

Change available SOH -> initial

84b2eed

roxy-dao requested a review from Chris-Petty November 4, 2024 02:20

Chris-Petty approved these changes Nov 4, 2024

View reviewed changes

Merge branch 'develop' into 5137-Requisition-line-edit-+-UI-updates-t…

e11f861

…o-line-columns

roxy-dao merged commit 5ecf2f8 into develop Nov 4, 2024
4 of 5 checks passed

roxy-dao deleted the 5137-Requisition-line-edit-+-UI-updates-to-line-columns branch November 4, 2024 03:26

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

5137.1 requisition line edit + UI updates to line columns #5254

5137.1 requisition line edit + UI updates to line columns #5254

roxy-dao commented Oct 30, 2024

github-actions bot commented Oct 30, 2024 •

edited

Loading

roxy-dao Oct 30, 2024

roxy-dao Oct 30, 2024

roxy-dao Oct 30, 2024

roxy-dao Oct 30, 2024

roxy-dao Oct 30, 2024

roxy-dao Oct 30, 2024

fergie-nz Oct 30, 2024

Chris-Petty Oct 30, 2024

roxy-dao Oct 30, 2024 •

edited

Loading

Chris-Petty Oct 30, 2024

Chris-Petty Nov 3, 2024

Chris-Petty Oct 30, 2024

Chris-Petty Oct 30, 2024

Chris-Petty left a comment

Chris-Petty Nov 3, 2024

Chris-Petty left a comment

5137.1 requisition line edit + UI updates to line columns #5254

5137.1 requisition line edit + UI updates to line columns #5254

Conversation

roxy-dao commented Oct 30, 2024

👩🏻‍💻 What does this PR do?

🧪 Testing

📃 Documentation

github-actions bot commented Oct 30, 2024 • edited Loading

Bundle size difference

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

roxy-dao Oct 30, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Chris-Petty left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Chris-Petty left a comment

Choose a reason for hiding this comment

github-actions bot commented Oct 30, 2024 •

edited

Loading

roxy-dao Oct 30, 2024 •

edited

Loading