Fix: 1773 milestone calculated and adjusted fields #1805
Conversation
Sepehr-Sobhani
changed the title
There was a problem hiding this comment.
- On the view page, if the calculated values aren't calculated yet, there's nothing (I think we should see "This field cannot be calculated due to lack of information now".
Form:
View:
2. I couldn't get Holdback Amount This Milestone to calculate even though as far as I can tell from the tooltip, all the required info was filled out: https://www.loom.com/share/5b03056bc6e54993a23f6f7bbd1e94a9 was missing the report received date
This is what happens in dev, which doesn't look quite right either: https://www.loom.com/share/0ca0e5b9451142fa954a182b9cb7095a
-
This seemed totally unrelated to your PR so I made a separate ticket: https://app.zenhub.com/workspaces/climate-action-secretariat-60ca4121764d710011481ca2/issues/gh/bcgov/cas-cif/1813
-
When first creating a project, on the summary page I don't see the adjusted/calculated labels, and the calculated values that aren't calculated show up $0.00 instead of "This field cannot be calculated due to lack of information now."
| <style jsx>{` | ||
| div.adjustedValue { | ||
| .readOnlyAdjustableCalculatedValueWidgetWrapper { | ||
| display: flex; | ||
| } | ||
| div.better { | ||
| .adjustedValue { | ||
| display: flex; |
There was a problem hiding this comment.
I remember talking about this in another PR, so might not be possible, but is there a way to get the calculated and adjusted values on top of each other instead of beside each other?
| adjustedNetAmount: 89, | ||
| adjustedGrossAmount: 67, | ||
| adjustedHoldbackAmount: 91, | ||
| it("Displays diffs of the data fields that were updated and shows latest committed values", () => { |
There was a problem hiding this comment.
This one and the following one are just moving variables around? (Hard to see if there's a real diff in here)
There was a problem hiding this comment.
You're right this one is hard to follow. Just to clarify, this commit is all about moving variables around to make the test a bit more readable and close to what we do in other tests: 113b773
Sepehr-Sobhani
force-pushed
the
1773-fix-milestone-calculated-and-adjusted-fields
branch
from
e1f0189
to
1ab16bd
Compare
| <div className={`${uiSchema["ui:classNames"] ?? "definition-container"}`}> | ||
| {displayLabel && ( |
There was a problem hiding this comment.
This is a great solution, nice work! I think it could be simplified to something like:
```<div className={ uiSchema.calculatedValueFormContextProperty ? "adjustable-calculated-value-widget":"definition-container"}`}>
Then any calculated field will get the style without us having to remember to add classnames to the uiSchema
There was a problem hiding this comment.
Great suggestion 🤩
| .adjustedValue { | ||
| display: flex; | ||
| flex-basis: 100%; | ||
| padding-top: 0.5em; |
There was a problem hiding this comment.
Overall the new styling is a huge improvement so I'd be comfortable approving this as-is, but I did come across some extra spacing when the adjusted value is filled out if you want to keep tweaking:
Might be, going to re-run the e2e again. |
Sepehr-Sobhani
deleted the
1773-fix-milestone-calculated-and-adjusted-fields
branch
ZH CARD 1773
AND
ZH CARD 1183