Pushing changes to github to handle Dean's allocation approval in part

response with comments and SU approavl count

Author: rkc7h

app/templates/confirm_explanation.html

@@ -0,0 +1,67 @@
+{% extends "base_email.html" %} {% block content %}
+<p
+  style="font-family: sans-serif; font-size: 16px; font-weight: bold; margin: 0; Margin-bottom: 15px;"
+>
+  {{ confirmation_str }}
+</p>
+<form
+  action="{{ confirm_part_approve_url }}"
+  method="post"
+  id="allocation-form"
+  accept-charset="UTF-8"
+>
+  <table border="0" cellpadding="0" cellspacing="5">
+    <tbody>
+      <tr>
+        <td>
+          <div class="col form-item form-type-textfield form-group">
+            <label
+              >Total approved SUs
+              <span class="form-required" title="This field is required."
+                >*</span
+              ></label
+            >
+            <input
+              required="required"
+              type="number"
+              id="su-request-approved-by-dean"
+              name="su-request-approved-by-dean"
+              value=""
+              size="20"
+              maxlength="20"
+            />
+          </div>
+          <div class="spacer-20"></div>
+          <div class="form-item form-type-textarea form-group">
+            <p style="font-size:85%;font-color:#bbb;">
+              In the box below, please briefly explain why this allocation
+              request is only approved in part (optional).
+            </p>
+            <div class="form-textarea-wrapper resizable">
+              <textarea
+                required="required"
+                class="form-control form-textarea required"
+                id="deans-explanation"
+                name="deans-explanation"
+                cols="60"
+                rows="12"
+              ></textarea>
+            </div>
+          </div>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <button
+            style="align: center; display: inline-block; width: 180px; color: #0a0a0a; background-color: #f37209; border: solid 1px #42BD41; border-radius: 5px; box-sizing: border-box; cursor: pointer; text-decoration: none; font-size: 10px; font-weight: bold; margin: 0; padding: 10px 20px; text-transform: capitalize; border-color: #FCE903;"
+            id="submit"
+            type="submit"
+          >
+            Submit Confirmation
+          </button>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+</form>
+{% endblock %}

app/views.py

@@ -163,18 +163,32 @@ def hpc_allocation_request():
                      'request: {}'.format(str(ex))]))
 
 
-@app.route('/rest/confirm-hpc-allocation-request/<token>/', methods=['GET'])
-@limiter.limit("6 per hour")
-@limiter.limit("1 per minute")
+@app.route('/rest/confirm-hpc-allocation-request/<token>/', methods=['GET', 'POST'])
+@limiter.limit("12 per hour")
+@limiter.limit("4 per minute")
 def confirm_hpc_allocation_request(token):
     try:
         for salt_str in ALLOC_APPROVE_CONFIRM_TYPES:
             sig_okay, ticket_id = URLSafeTimedSerializer(
                 app.config["MAIL_SECRET_KEY"]
             ).loads_unsafe(token, salt=salt_str, max_age=1209600)
             if (sig_okay):
+                if(salt_str == ALLOC_APPROVE_CONFIRM_TYPES[2] and request.environ['REQUEST_METHOD'] == 'GET'):
+                    return render_template(
+                        'confirm_explanation.html',
+                        logo_url=RC_SMALL_LOGO_URL,
+                        confirmation_str='{} confirmation form'.format(
+                            salt_str),
+                        confirm_approve_url=request.base_url,
+                    )
+                comment_list = [
+                    'Confirmation received from sponsor: ', salt_str.upper()]
+                if(salt_str == ALLOC_APPROVE_CONFIRM_TYPES[2] and request.environ['REQUEST_METHOD'] == 'POST'):
+                    comment_list = comment_list + ['\n\nSUs approved by sponsor: ', request.form['su-request-approved-by-dean'],
+                                                   '\n\nExplanation: ', request.form['deans-explanation']]
+
                 response = json.loads(JiraServiceHandler(
-                    app).addTicketComment(ticket_id, ''.join(['Confirmation received from sponsor: ', salt_str])))
+                    app).addTicketComment(ticket_id, ''.join(comment_list)))
                 if ('errorMessage' in response
                     and response['errorMessage'] is not None
                         and response['errorMessage'] != ''):