Feature/review and secretary pages redesign #688
Conversation
EdoStorm96
force-pushed
the
feature/review_and_secretary_pages_redesign
branch
from
24799cb to
4c29c77
Compare
There was a problem hiding this comment.
Good progress on the redesign.
- I've renamed to stepper block on fetc_form_base to sidebar, as it can be used to accomodate other things, like the review detail sidebar.
- I've simplified the buttons block, to make overriding buttons a lot easier.
These are excellent changes
| @@ -1,4 +1,4 @@ | |||
| {% extends "base/fetc_base.html" %} | |||
| div{% extends "base/fetc_form_base.html" %} | |||
There was a problem hiding this comment.
This div ain't right
Also changing the base has removed the sidebar from this view. Or at least I think this is the change that did that. Could you reinsert the review_detail_sidebar?
We could have an intermediate fetc_review_base.html that just inserts that sidebar by default. But also kind of overkill
There was a problem hiding this comment.
Never mind, I checked it and it seems there was never a sidebar on this page. It just feels like it's missing because of the new empty space.
I think it would be nice if the review detail sidebar was on this page, like with the discontinue form. Makes it easier to confirm you're dealing with the right proposal.
| @@ -85,7 +85,7 @@ def get_available_decision(self): | |||
| user = self.user | |||
| review = self.review | |||
|
|
|||
| if review.stage in (review.Stages.COMMISSION, review.Stages.SUPERVISOR): | |||
| if review.stage not in (Review.Stages.COMMISSION, Review.Stages.SUPERVISOR): | |||
There was a problem hiding this comment.
This change is correct I think!
| Review.Stages.CLOSING, | ||
| Review.Stages.CLOSED, |
There was a problem hiding this comment.
The blame history of this logic is a mess, lol. How did continuations get in here? This should have been caught by someone.
Well, it's been caught now at least. Good find.
In my opinion, this action should be available to the secretary in the following stages:
- Assignment (obviously)
- Commission
- Closing
- This stage is automatically reached when all opinions have been gathered. But it happens often enough that the secretary wants to add another reviewer before making the final call, so this action should still be available in that stage.
As it stands now, this action will be available in the supervisor stage, which I don't think is right. Could result in weird behaviour if the secretary accidentally adds or removes someone in that stage.
| {% block form-buttons %} | ||
| {% include "base/form_buttons.html" %} | ||
| {% endblock %} | ||
| {% block form-buttons %} |
There was a problem hiding this comment.
I think something went wrong when merging. This template now has two {% block form-buttons %} (see below, line 42) which causes an error.
EdoStorm96
force-pushed
the
feature/review_and_secretary_pages_redesign
branch
from
287118b to
97c953a
Compare
So, here I've restyled a lot of the remaining (form) pages. Mostly relating to the review process and secretary side. This is mostly self explanatory, however, I did make some minor design changes:
I am unsure if there are pages leftover that still need a redesign. Let me know if you can think of any.