-
Notifications
You must be signed in to change notification settings - Fork 39
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.
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
Separate SOW & PAF form editing #4261
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a good change, it was a bit of a hack having them merged in the first place.
Found some minor issues.
How will the SOW now fit in to the approval workflow?
@@ -168,6 +167,7 @@ | |||
&__actions { | |||
display: flex; | |||
align-items: center; | |||
margin-left: auto; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please use margin-inline-start
instead.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ping
@@ -44,12 +44,13 @@ | |||
PAF_REQUIRED_CHANGES, | |||
PAF_WAITING_APPROVAL, | |||
PAF_WAITING_ASSIGNEE, | |||
PROJECT_SUBMIT_PAF, | |||
PROJECT_SUBMIT_PF, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As a machine name we use "PAF" everywhere so I think it is best to stick with that.
I do not mind changing it to "PF" or "PROJECT_FORM" etc. but it should be done everywhere.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ping
<div class="card card--solid"> | ||
{% if object.sow.output_answers %} | ||
<div class="rich-text rich-text--answers"> | ||
<div class="simplified__paf_answers"> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This class was removed in #4196.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are not the "rich-text rich-text--answers" ok to use? We use them in most other places when we render streamfields.
all that left is getting these tests passing - a bit of a battle because my flag uses the project's hypha/hypha/apply/projects/forms/project.py Lines 137 to 143 in acdbea3
|
@wes-otf How vital is the test? We could remove it. |
@frjo Yeah that sounds good - I don't think it's vital as it'd really just be checking if |
grabbed some final bugs but should be ready to be deployed to test now @frjo |
36f699c
to
a80262c
Compare
@wes-otf When I download a SOW at http://apply.hypha.test:9001/apply/projects/4/sow/ no fields are added to the exports. I guess something changes regarding getting the fields? When I test the main branch locally it seems to work as it should. |
12ea3d5
to
b218be1
Compare
@frjo great catch! my logic was copy & pasted, checking |
Deploying the latest to test now. |
Can confirm that the bug in sow exports are now fixed. Looks all good to me. |
@frjo thanks for testing - I think it's ready to go then! I did more testing on my end too and didn't see anything |
Fixes #4204. Moves the SOW out into it's own form when editing. This also removes the
user_has_updated_details
attribute in favor of using a property for both the project form & SOW that checks the field_data on the respective form. This allows for tracking of the project form & SOW independently.Also a few small aesthetic changes bundled in, like margin additions & hiding of submission attachments sidebar when there's none.
Screenshots
appearance when first creating a project

appearance after editing both forms

Test Steps
Project documents
.