arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-17 05:22:16 +00:00
Code Issues Projects Releases Wiki Activity

FEAT: Add conditional formatting to whole auth panel

Browse Source 
Matches the formatting on the button
This commit is contained in:
FreneticScribbler
2020-01-13 21:05:09 +00:00
parent 16b950c3b2
commit 3a25b85e95
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
RIGS/templates/RIGS/event_detail.html
View File

@@ -158,7 +158,15 @@
</div> </div>
{% if event.is_rig and event.internal %} {% if event.is_rig and event.internal %}
<div class="col-sm-12"> <div class="col-sm-12">
<div class="panel panel-default"> <div class="panel panel-default
{% if object.authorised %}
panel-success
{% elif event.authorisation and event.authorisation.amount != event.total and event.authorisation.last_edited_at > event.auth_request_at %}
panel-warning
{% elif event.auth_request_to %}
panel-info
{% endif %}
">
<div class="panel-heading">Client Authorisation</div> <div class="panel-heading">Client Authorisation</div>
<div class="panel-body"> <div class="panel-body">
<dl class="dl-horizontal col-sm-6"> <dl class="dl-horizontal col-sm-6">

2
RIGS/test_functional.py
View File

@@ -74,7 +74,7 @@ class UserRegistrationTest(LiveServerTestCase):
self.assertEqual(last_name.get_attribute('placeholder'), 'Last name') self.assertEqual(last_name.get_attribute('placeholder'), 'Last name')
initials = self.browser.find_element_by_id('id_initials') initials = self.browser.find_element_by_id('id_initials')
self.assertEqual(initials.get_attribute('placeholder'), 'Initials') self.assertEqual(initials.get_attribute('placeholder'), 'Initials')
# No longer required for new users # No longer required for new users
# phone = self.browser.find_element_by_id('id_phone') # phone = self.browser.find_element_by_id('id_phone')
# self.assertEqual(phone.get_attribute('placeholder'), 'Phone') # self.assertEqual(phone.get_attribute('placeholder'), 'Phone')