-
Notifications
You must be signed in to change notification settings - Fork 61
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
Enable detail view of reservations #97
Enable detail view of reservations #97
Conversation
…f reservation details
FYI, the only changes I made that could interact/interfere with other parts of the code were in |
That was quick! Now for my (very detailed) feedback:
I thought about it a bit, and I think I have an idea on how to make this work. I basically want to have a popup template, and be able to use either the full page or the popup template based on a given request parameter. i.e. I realize this is slightly outside of the scope of this feature, but if you are open to it, here is what I propose:
If realize it's a lot, so it's also totally fine if you just do 1) and I'll do the rest. |
…f dictionary values
3559dd1
to
fc29dc5
Compare
Implemented using query parameter `popup_view`; which if true, will format things as modal and use the new base/popup.html template. If the parameter is not given or false, the template will use the "standalone" format and return a full featured page extended from the base.html template
Ok, I believe I've implemented everything you suggested, as well as changing how the reservation question groups are implemented in the template (I did it using a There are two remaining issues/things I wanted to point out:
|
adding the "data-dismiss" attribute on the buttons takes care of the issue with the new popup not appearing. for the large popup, I'll take care of it. I would prefer it only be large for this, since all error messages etc. look a bit silly in the big version |
Ok, cool. Let me know if you need any changes from me. You should be able to push to my branch directly, I think |
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.
alright if you can address those things that should do it.
I'll fix the popup size separately
thanks! sorry this got a bit crazy
Oh, I see your comments now. I'll take care of those shortly |
most of them can be pushed directly from the suggestions. |
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.
These were addressed in a separate commit (I didn't feel comfortable with knowing how to do it directly from Github, so sorry if that messed up the code-review process)
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.
all good, thanks for being accommodating!!
Note: we may need to tweak the NEMO implementation depending on the final implementation of usnistgov/NEMO#97 Also still need to modify XSLT to match
Resolves #96
Todo:
data_input.items|get_item:key
(requiring{% load custom_tags_and_filters %}
get_item
to ensure they're in the same order as the first loopSome remaining questions:
modal-dialog
class is set in the base template, and so that has to be changed intemplates/base.html
to make all modalsmodal-lg
(unless we could make this a parameter somehow)@rptmat57 I'm sure there's a million things I could have done better, but this seems to be working for me. I'm more than happy to take any criticism or modifications. I think I got the title/project change and cancellation working too, although I may have hosed things up there, so I'd be happy for a review.
I'm not sure if there's any testing or anything that needs to be done. I didn't see formal tests defined in the project, but I may have missed something.
Here's what it looks like as staff or the user owning the reservation:
And as a different user: