From 9db626c1642c6eaee86dad860dbb8282c19a9de2 Mon Sep 17 00:00:00 2001
From: Victoria Earl <kitsuta@gmail.com>
Date: Wed, 9 Aug 2023 22:06:43 -0400
Subject: [PATCH] Fix updating admin accounts Fixes some issues with updating
 admin accounts, and updates the look of the admin accounts page to better fit
 Bootstrap 5. Also fixes an issue with getting attendee age groups. Also also
 makes some mass updates throughout the admin section to get more Bootstrap 5
 stuff working.

---
 uber/config.py                                |  2 +-
 uber/forms/__init__.py                        |  1 +
 uber/models/attendee.py                       |  6 +-
 uber/site_sections/accounts.py                |  4 +-
 uber/templates/accounts/access_groups.html    |  8 +--
 uber/templates/accounts/index.html            | 64 ++++++++++---------
 uber/templates/art_show_admin/form.html       |  6 +-
 .../art_show_common/art_pieces_form.html      |  2 +-
 uber/templates/attractions/events.html        |  4 +-
 uber/templates/attractions_admin/event.html   |  2 +-
 uber/templates/attractions_admin/form.html    |  2 +-
 uber/templates/attractions_macros.html        |  4 +-
 uber/templates/marketplace_admin/form.html    |  6 +-
 .../panels_admin/panel_feedback.html          |  2 +-
 .../promo_codes/generate_promo_codes.html     |  2 +-
 uber/templates/promo_codes/index.html         |  2 +-
 uber/templates/registration/index_base.html   |  2 +-
 .../registration/promo_code_group_form.html   |  4 +-
 18 files changed, 63 insertions(+), 60 deletions(-)

diff --git a/uber/config.py b/uber/config.py
index 7f5c5b58f..9bdf31cf4 100644
--- a/uber/config.py
+++ b/uber/config.py
@@ -568,7 +568,7 @@ def PREREG_AGE_GROUP_OPTS(self):
     
     @property
     def NOW_OR_AT_CON(self):
-        return c.EPOCH.date() if date.today().date() <= c.EPOCH.date() else uber.utils.localized_now().date()
+        return c.EPOCH.date() if date.today() <= c.EPOCH.date() else uber.utils.localized_now().date()
 
     @property
     def AT_OR_POST_CON(self):
diff --git a/uber/forms/__init__.py b/uber/forms/__init__.py
index 678231207..31cfbf591 100644
--- a/uber/forms/__init__.py
+++ b/uber/forms/__init__.py
@@ -342,3 +342,4 @@ def getlist(self, arg):
 
 
 from uber.forms.attendee import *  # noqa: F401,E402,F403
+from uber.forms.group import *  # noqa: F401,E402,F403
\ No newline at end of file
diff --git a/uber/models/attendee.py b/uber/models/attendee.py
index 0c410f925..24f223901 100644
--- a/uber/models/attendee.py
+++ b/uber/models/attendee.py
@@ -633,6 +633,7 @@ def times_printed(cls):
     def age_now_or_at_con(self):
         if not self.birthdate:
             return None
+
         return get_age_from_birthday(self.birthdate, c.NOW_OR_AT_CON)
         
     @presave_adjustment
@@ -856,10 +857,7 @@ def age_discount(self):
 
     @property
     def age_group_conf(self):
-        if self.birthdate:
-            return get_age_conf_from_birthday(self.birthdate, c.NOW_OR_AT_CON)
-
-        return c.AGE_GROUP_CONFIGS[int(self.age_group or c.AGE_UNKNOWN)]
+        return get_age_conf_from_birthday(self.birthdate, c.NOW_OR_AT_CON)
 
     @property
     def total_cost(self):
diff --git a/uber/site_sections/accounts.py b/uber/site_sections/accounts.py
index 45691a70c..d499991bc 100644
--- a/uber/site_sections/accounts.py
+++ b/uber/site_sections/accounts.py
@@ -51,8 +51,7 @@ def index(self, session, message=''):
     def update(self, session, password='', message='', **params):
         if not params.get('attendee_id', '') and params.get('id', 'None') == 'None':
             message = "Please select an attendee to create an admin account for."
-        attendee = session.attendee(params['attendee_id'])
-
+        
         if not message:
             account = session.admin_account(params)
 
@@ -72,6 +71,7 @@ def update(self, session, password='', message='', **params):
             message = message or check(account)
         if not message:
             message = 'Account settings uploaded'
+            attendee = session.attendee(account.attendee_id)  # dumb temporary hack, will fix later with tests
             account.attendee = attendee
             session.add(account)
             if account.is_new and not c.AT_OR_POST_CON:
diff --git a/uber/templates/accounts/access_groups.html b/uber/templates/accounts/access_groups.html
index 2607cdb84..ae42181b8 100644
--- a/uber/templates/accounts/access_groups.html
+++ b/uber/templates/accounts/access_groups.html
@@ -162,10 +162,10 @@ <h3 class="card-title">Access Groups</h3>
               </td>
               <td>{{ section|replace('_', ' ')|title }}</td>
               <td>
-                <select class="form-control select_access" id="{{ section }}_access" name="{{ section }}_access">{{ options(c.ACCESS_GROUP_WRITE_LEVEL_OPTS,access_group.access) }}</select>
+                <select class="form-select select_access" id="{{ section }}_access" name="{{ section }}_access">{{ options(c.ACCESS_GROUP_WRITE_LEVEL_OPTS,access_group.access) }}</select>
               </td>
               <td>
-                <select class="form-control select_read_only_access" id="{{ section }}_read_only_access" name="{{ section }}_read_only_access">{{ options(c.ACCESS_GROUP_READ_LEVEL_OPTS,access_group.read_only_access) }}</select>
+                <select class="form-select select_read_only_access" id="{{ section }}_read_only_access" name="{{ section }}_read_only_access">{{ options(c.ACCESS_GROUP_READ_LEVEL_OPTS,access_group.read_only_access) }}</select>
               </td>
             </tr>
             {% for page in c.ADMIN_PAGES[section] %}
@@ -173,10 +173,10 @@ <h3 class="card-title">Access Groups</h3>
                 <td></td>
                 <td><span class="col-sm-offset-1">{{ page }}</span></td>
                 <td>
-                  <select class="form-control select_access" id="{{ section }}_{{ page }}_access" name="{{ section }}_{{ page }}_access">{{ options(c.ACCESS_GROUP_WRITE_LEVEL_OPTS,access_group.access) }}</select>
+                  <select class="form-select select_access" id="{{ section }}_{{ page }}_access" name="{{ section }}_{{ page }}_access">{{ options(c.ACCESS_GROUP_WRITE_LEVEL_OPTS,access_group.access) }}</select>
                 </td>
                 <td>
-                  <select class="form-control select_read_only_access" id="{{ section }}_{{ page }}_read_only_access" name="{{ section }}_{{ page }}_read_only_access">{{ options(c.ACCESS_GROUP_READ_LEVEL_OPTS,access_group.read_only_access) }}</select>
+                  <select class="form-select select_read_only_access" id="{{ section }}_{{ page }}_read_only_access" name="{{ section }}_{{ page }}_read_only_access">{{ options(c.ACCESS_GROUP_READ_LEVEL_OPTS,access_group.read_only_access) }}</select>
                 </td>
               </tr>
             {% endfor %}
diff --git a/uber/templates/accounts/index.html b/uber/templates/accounts/index.html
index 760f2a00e..01ef9b7db 100644
--- a/uber/templates/accounts/index.html
+++ b/uber/templates/accounts/index.html
@@ -10,45 +10,49 @@
 
 <div class="card">
   <div class="card-header">
-    <h3 class="card-title">New Account</h3>
+    <span class="card-title">New Account</span>
   </div>
   <div class="card-body">
-    <form id="new_admin" method="post" action="update" onsubmit="return check_passwords()" role="form" class="form-inline">
+    <form id="new_admin" method="post" action="update" onsubmit="return check_passwords()" role="form">
       <input type="hidden" name="id" value="None" />
       {{ csrf_token() }}
-      <div class="form-group">
-        <label for="attendee_id" class="sr-only">Attendee</label>
-        <select class="form-control" id="attendee_id" name="attendee_id">
-            <option value="" selected="selected">Select an attendee</option>
-            {{ options(all_attendees) }}
-        </select>
-      </div>
-      <div class="form-group">
-        <label for="password" class="sr-only">Password</label>
-        <div class="input-group">
-          <input type="password" class="form-control" id="password" name="password" placeholder="Password"
-            {% if not c.AT_OR_POST_CON %}disabled{% endif %}>
-           {% if not c.AT_OR_POST_CON %}
-           <span class="input-group-addon"><i class="fa fa-ban-circle"></i></span>
-           {% endif %}
+      <div class="row mb-sm-2">
+        <div class="col-12 col-sm-6">
+          <label for="attendee_id" class="visually-hidden">Attendee</label>
+          <select class="form-select" id="attendee_id" name="attendee_id">
+              <option value="" selected="selected">Select an attendee</option>
+              {{ options(all_attendees) }}
+          </select>
+        </div>
+        <div class="col-12 col-sm-6">
+          {{ macros.checkgroup_opts(
+              'access_groups_ids',
+              c.ACCESS_GROUP_OPTS,
+              include_empty_hidden=True) }}
         </div>
-        <input type="password" class="form-control" id="check-password" name="check-password" placeholder="Re-enter Password"
-               {% if not c.AT_OR_POST_CON %}disabled{% endif %}>
       </div>
-      <div class="form-group">
-        {{ macros.checkgroup_opts(
-            'access_groups_ids',
-            c.ACCESS_GROUP_OPTS,
-            include_empty_hidden=True) }}
+      <div class="row">
+        {% if c.AT_OR_POST_CON %}
+        <div class="col-6 col-sm-3">
+          <label for="password" class="visually-hidden">Password</label>
+            <input type="password" class="form-control" id="password" name="password" placeholder="Password">
+        </div>
+        <div class="col-6 col-sm-3">
+          <label for="password" class="visually-hidden">Confirm Password</label>
+          <input type="password" class="form-control" id="check-password" name="check-password" placeholder="Re-enter Password">
+        </div>
+        {% endif %}
+        <div class="col-12 col-sm-6 {% if not c.AT_OR_POST_CON %}offset-sm-6{% endif %}">
+          <button type="submit" class="btn btn-outline-primary">Create Account</button>
+        </div>
       </div>
-      <button type="submit" class="btn btn-outline-secondary">Create Account</button>
     </form>
   </div>
 </div>
-
+<br/>
 <div class="card">
   <div class="card-header">
-    <h3 class="card-title">Existing Accounts</h3>
+    <span class="card-title">Existing Accounts</span>
   </div>
   <div class="card-body">
     <table class="table table-striped datatable">
@@ -72,12 +76,12 @@ <h3 class="card-title">Existing Accounts</h3>
             <form class="form update-form" method="post" action="update">
               <input type="hidden" name="id" value="{{ account.id }}" />
               {{ csrf_token() }}
+              {{ account.access_groups_ids }}
               <div class="form-group">
                 {{ macros.checkgroup_opts(
                   'access_groups_ids',
                   c.ACCESS_GROUP_OPTS,
-                  defaults=account.access_groups_ids,
-                  include_empty_hidden=True) }}
+                  defaults=account.access_groups_ids) }}
               </div>
             </form>
             {% if account.attendee.assigned_depts %}
@@ -90,7 +94,7 @@ <h3 class="card-title">Existing Accounts</h3>
           </td>
           <td class="text-nowrap">
             <button type="submit" class="btn btn-sm btn-primary update-button">
-              <i class="fa fa-ok"></i>
+              <i class="fa fa-check"></i>
             </button>
             <form class="form delete-form" method="post" action="delete">
               {{ csrf_token() }}
diff --git a/uber/templates/art_show_admin/form.html b/uber/templates/art_show_admin/form.html
index d6e977096..43ab6906a 100644
--- a/uber/templates/art_show_admin/form.html
+++ b/uber/templates/art_show_admin/form.html
@@ -31,7 +31,7 @@ <h2>Art Show Application Form{% if app.attendee %} for {{ app.attendee|form_link
       <div class="form-group">
         <label for="attendee" class="col-sm-3 control-label">Attendee</label>
         <div class="col-sm-6">
-          <select class="form-control" id="attendee_id" name="attendee_id" required="true">
+          <select class="form-select" id="attendee_id" name="attendee_id" required="true">
             <option value="" selected="selected">Select an attendee</option>
             {{ options(all_attendees, attendee_id) }}
           </select>
@@ -41,7 +41,7 @@ <h2>Art Show Application Form{% if app.attendee %} for {{ app.attendee|form_link
       <div class="form-group">
         <label for="attendee" class="col-sm-3 control-label">Attendee Badge Status</label>
         <div class="col-sm-6">
-          <select class="form-control" id="badge_status" name="badge_status">
+          <select class="form-select" id="badge_status" name="badge_status">
             {{ options(c.BADGE_STATUS_OPTS, app.attendee.badge_status) }}
           </select>
         </div>
@@ -51,7 +51,7 @@ <h2>Art Show Application Form{% if app.attendee %} for {{ app.attendee|form_link
       <div class="form-group">
         <label for="status" class="col-sm-3 control-label">Application Status</label>
         <div class="col-sm-6">
-          <select class="form-control" name="status">
+          <select class="form-select" name="status">
             {{ options(c.ART_SHOW_STATUS_OPTS, app.status) }}
           </select>
         </div>
diff --git a/uber/templates/art_show_common/art_pieces_form.html b/uber/templates/art_show_common/art_pieces_form.html
index cf595499f..0342b1cfd 100644
--- a/uber/templates/art_show_common/art_pieces_form.html
+++ b/uber/templates/art_show_common/art_pieces_form.html
@@ -209,7 +209,7 @@ <h3 class="card-title">Art Show Pieces</h3>
           <select name="status" class="form-control">
             {{ options(c.ART_PIECE_STATUS_OPTS, piece.status) }}
           </select>
-            <button type="submit" class="btn btn-primary status_button"><i class="fa fa-ok"></i></button>
+            <button type="submit" class="btn btn-primary status_button"><i class="fa fa-check"></i></button>
             <br/><label class="checkbox-label optional-field">
               <input type="checkbox" name="voice_auctioned" value="1"{% if piece.voice_auctioned %} checked{% endif %} />
               This piece went to voice auction.
diff --git a/uber/templates/attractions/events.html b/uber/templates/attractions/events.html
index 6123d59e0..56e58c731 100644
--- a/uber/templates/attractions/events.html
+++ b/uber/templates/attractions/events.html
@@ -330,7 +330,7 @@ <h4 class="modal-title">
         </div>
         <div class="modal-footer">
           <button class="btn btn-success btn-lg btn-xl">
-              <i class="fa fa-ok"></i> Sign up
+              <i class="fa fa-check"></i> Sign up
           </button>
           <button class="btn btn-outline-secondary btn-lg btn-xl" data-bs-dismiss="modal">Nevermind</button>
         </div>
@@ -430,7 +430,7 @@ <h2 id="{{ day }}">{{ day }}</h2>
                 data-event-start-time="{{ event.start_time_label }}">
               <div class="hover-btn-title">
                 <button class="btn btn-success btn-next btn-next-sm pull-right">
-                  <i class="fa fa-ok"></i>
+                  <i class="fa fa-check"></i>
                 </button>
                 <h2><span class="bling-icon"></span> {{ event.time_span_label }}</h2>
                 <em class="text-nowrap">{{ event.duration_label }}</em>
diff --git a/uber/templates/attractions_admin/event.html b/uber/templates/attractions_admin/event.html
index 17c25aa67..deaf8c271 100644
--- a/uber/templates/attractions_admin/event.html
+++ b/uber/templates/attractions_admin/event.html
@@ -194,7 +194,7 @@ <h2 class="event-title">
         <button type="submit" name="save_another_0" class="btn btn-primary">Save & Add Another</button>
         <button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
           <span class="caret"></span>
-          <span class="sr-only">Toggle Dropdown</span>
+          <span class="visually-hidden">Toggle Dropdown</span>
         </button>
         <ul class="dropdown-menu">
           <li><a href="#"><input type="submit" name="save_another_300" value="After 5 minute break"></a></li>
diff --git a/uber/templates/attractions_admin/form.html b/uber/templates/attractions_admin/form.html
index acd13be8a..72f009195 100644
--- a/uber/templates/attractions_admin/form.html
+++ b/uber/templates/attractions_admin/form.html
@@ -825,7 +825,7 @@ <h3 class="feature-title">
                       <div class="room-col">
                         <div class="room-title">
                           {% if can_admin_attraction -%}
-                            <select class="form-control" data-feature-id="{{ feature.id }}" data-initial-value="{{ location }}">
+                            <select class="form-select" data-feature-id="{{ feature.id }}" data-initial-value="{{ location }}">
                               {% if used_location_opts %}
                                 {{ options(used_location_opts, location) }}
                                 <option disabled="disabled">––––––––––</option>
diff --git a/uber/templates/attractions_macros.html b/uber/templates/attractions_macros.html
index ee7d3f792..53ca0255f 100644
--- a/uber/templates/attractions_macros.html
+++ b/uber/templates/attractions_macros.html
@@ -40,7 +40,7 @@
           </div>
           <div class="col-xs-6" style="padding-left: 8px;">
             <button class="btn btn-lg btn-success" style="width: 100%">
-              <i class="fa fa-ok"></i> Sign up
+              <i class="fa fa-check"></i> Sign up
             </button>
           </div>
         </div>
@@ -55,7 +55,7 @@
                 <i class="fa fa-remove"></i>
               </button>
               <button class="btn btn-lg btn-success">
-                <i class="fa fa-ok"></i>
+                <i class="fa fa-check"></i>
               </button>
             </div>
           </div>
diff --git a/uber/templates/marketplace_admin/form.html b/uber/templates/marketplace_admin/form.html
index d02b06cf5..659e16583 100644
--- a/uber/templates/marketplace_admin/form.html
+++ b/uber/templates/marketplace_admin/form.html
@@ -30,7 +30,7 @@ <h2>Marketplace Application Form{% if app.attendee %} for {{ app.attendee|form_l
       <div class="form-group">
         <label for="attendee" class="col-sm-3 control-label">Attendee</label>
         <div class="col-sm-6">
-          <select class="form-control" id="attendee_id" name="attendee_id" required="true">
+          <select class="form-select" id="attendee_id" name="attendee_id" required="true">
             <option value="" selected="selected">Select an attendee</option>
             {{ options(all_attendees, attendee_id) }}
           </select>
@@ -40,7 +40,7 @@ <h2>Marketplace Application Form{% if app.attendee %} for {{ app.attendee|form_l
       <div class="form-group">
         <label for="attendee" class="col-sm-3 control-label">Attendee Badge Status</label>
         <div class="col-sm-6">
-          <select class="form-control" id="badge_status" name="badge_status">
+          <select class="form-select" id="badge_status" name="badge_status">
             {{ options(c.BADGE_STATUS_OPTS, app.attendee.badge_status) }}
           </select>
         </div>
@@ -50,7 +50,7 @@ <h2>Marketplace Application Form{% if app.attendee %} for {{ app.attendee|form_l
       <div class="form-group">
         <label for="status" class="col-sm-3 control-label">Application Status</label>
         <div class="col-sm-6">
-          <select class="form-control" name="status">
+          <select class="form-select" name="status">
             {{ options(c.MARKETPLACE_STATUS_OPTS, app.status) }}
           </select>
         </div>
diff --git a/uber/templates/panels_admin/panel_feedback.html b/uber/templates/panels_admin/panel_feedback.html
index e09d518bf..a7b8b0b1f 100644
--- a/uber/templates/panels_admin/panel_feedback.html
+++ b/uber/templates/panels_admin/panel_feedback.html
@@ -23,7 +23,7 @@ <h2>Feedback for {{ event.name }}</h2>
         <div class="form-group">
             <label class="col-sm-2 control-label">Rating:</label>
             <div class="col-sm-6">
-                <select class="form-control" name="rating">
+                <select class="form-select" name="rating">
                     {{ options(c.PANEL_FEEDBACK_OPTS, feedback.rating) }}
                 </select>
             </div>
diff --git a/uber/templates/promo_codes/generate_promo_codes.html b/uber/templates/promo_codes/generate_promo_codes.html
index 1d189cc4c..9682e6bec 100644
--- a/uber/templates/promo_codes/generate_promo_codes.html
+++ b/uber/templates/promo_codes/generate_promo_codes.html
@@ -319,7 +319,7 @@ <h1>
 
     <div id="discount-group" class="form-group">
       <label class="col-sm-3 control-label">
-        <select class="form-control width-auto" name="discount_type" onchange="onDiscountTypeChanged()">
+        <select class="form-select width-auto" name="discount_type" onchange="onDiscountTypeChanged()">
           {{ options(c.PROMO_CODE_DISCOUNT_TYPE_OPTS, discount_type) }}
         </select>
         <div class="help-block discount-type-desc">
diff --git a/uber/templates/promo_codes/index.html b/uber/templates/promo_codes/index.html
index eb94445ce..218c1fd1c 100644
--- a/uber/templates/promo_codes/index.html
+++ b/uber/templates/promo_codes/index.html
@@ -135,7 +135,7 @@ <h4 class="modal-title" id="title-delete-unused">Delete all unused promo codes?<
             {{ csrf_token() }}
             <input type="hidden" name="id" value="{{ promo_code.id }}" />
             <button type="submit" class="btn btn-sm btn-primary update-button">
-              <i class="fa fa-ok"></i>
+              <i class="fa fa-check"></i>
             </button>
           </form>
           <form method="post" action="delete_promo_codes">
diff --git a/uber/templates/registration/index_base.html b/uber/templates/registration/index_base.html
index 6e64c0ef8..4bb22e76f 100644
--- a/uber/templates/registration/index_base.html
+++ b/uber/templates/registration/index_base.html
@@ -82,7 +82,7 @@
         </style>
         <a href="#set-reg-station" class="btn btn-outline-secondary" data-bs-toggle="collapse">Set At-Door Reg Station</a>
         <span id="set-reg-station" class="collapse">
-        <label class="sr-only" for="reg_station">Reg Station #</label>
+        <label class="visually-hidden" for="reg_station">Reg Station #</label>
         <input class="form-control" id="reg_station" name="reg_station" placeholder="Reg Station #" value="{{ reg_station }}">
         <button type="submit" class="btn btn-primary">Save</button>
         </span>
diff --git a/uber/templates/registration/promo_code_group_form.html b/uber/templates/registration/promo_code_group_form.html
index 068b952f2..4b1b06fe4 100644
--- a/uber/templates/registration/promo_code_group_form.html
+++ b/uber/templates/registration/promo_code_group_form.html
@@ -78,7 +78,7 @@ <h3>Group Info for "{{ group.name }}"</h3>
         <div class="form-group">
           <label for="attendee" class="col-sm-3 control-label">Buyer</label>
           <div class="col-sm-6">
-            <select class="form-control" id="attendee_id" name="buyer_id" required="required" onChange="setBuyerLink()">
+            <select class="form-select" id="attendee_id" name="buyer_id" required="required" onChange="setBuyerLink()">
               <option value="" selected="selected">Select an attendee</option>
               <option value="None">Create new attendee</option>
               {{ options(all_attendees, buyer_id) }}
@@ -103,7 +103,7 @@ <h3>Group Info for "{{ group.name }}"</h3>
         <div class="form-group">
           <label class="col-sm-3 control-label">Badges{% if not group.is_new %} to Add{% endif %}</label>
           <div class="col-sm-6">
-            <select class="form-control" name="badges">
+            <select class="form-select" name="badges">
               {{ int_options(0, 100, badges) }}
             </select>
           </div>