Copy main branch commit 973b4c2 to hotfix

TACC · Sep 18, 2024 · 96a5fc2 · 96a5fc2
1 parent f6a119b
commit 96a5fc2
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/apcd-cms/src/apps/registrations/templates/submission_form/registration_form_body.html b/apcd-cms/src/apps/registrations/templates/submission_form/registration_form_body.html
@@ -4,6 +4,20 @@
     {% if r %}
         <input type="hidden" name="edit-registration-form" value>
         <input type="hidden" name="reg_id" value="{{r.reg_id}}">
+
+        {% if not renew %}
+            <label for="reg_status"> Registration Status </label>
+            <div class="field-wrapper select">
+                <select name="reg_status" class="choicefield" id="reg_status">
+                    {% for option in status_options %}
+                    {% if not forloop.first %}
+                        <option class="dropdown-text" {% if option == r.reg_status %}selected{% endif %}>{{ option }}</option>
+                    {% endif %}
+                    {% endfor %} 
+                </select>
+            </div>
+        {% endif %}
+
     {% endif %}
 
     <div class="form-errors" style="display: none"></div>

diff --git a/apcd-cms/src/apps/utils/apcd_database.py b/apcd-cms/src/apps/utils/apcd_database.py
@@ -261,6 +261,7 @@ def update_registration(form, reg_id):
         operation = """UPDATE registrations
             SET
             submitting_for_self = %s,
+            registration_status = %s,
             org_type = %s,
             business_name = %s,
             mail_address = %s,
@@ -273,6 +274,7 @@ def update_registration(form, reg_id):
         RETURNING registration_id"""
         values = (
             True if form['on-behalf-of'] == 'true' else False,
+            form['reg_status'],
             form['type'],
             _clean_value(form['business-name']),
             _clean_value(form['mailing-address']),