From 819ce48e41114a8556605e0aa8925a9f9eb76ae5 Mon Sep 17 00:00:00 2001
From: richard-dds <richard-ctr@friends.dds.mil>
Date: Tue, 19 Jun 2018 15:44:51 -0400
Subject: [PATCH] Implement the rest of the request form

---
 atst/forms/request.py               |  6 ++++++
 templates/requests/screen-1.html.to | 28 ++++++++++++----------------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/atst/forms/request.py b/atst/forms/request.py
index 18ce5195..eae0e0a9 100644
--- a/atst/forms/request.py
+++ b/atst/forms/request.py
@@ -31,6 +31,12 @@ class RequestForm(Form):
                      ('both', 'Both') ])
     number_of_cores = IntegerField('Number of cores', validators=[Required()])
     total_ram = IntegerField('Total RAM', validators=[Required()])
+    object_storage = IntegerField('Total object storage', validators=[Required()])
+    server_storage = IntegerField('Total server storage', validators=[Required()])
+    total_active_users = IntegerField('Total active users', validators=[Required()])
+    total_peak_users = IntegerField('Total peak users', validators=[Required()])
+    total_requests = IntegerField('Total requests', validators=[Required()])
+    total_environments = IntegerField('Total environments', validators=[Required()])
 
     # this is just an example validation; obviously this is wrong.
     def validate_total_ram(self,field):
diff --git a/templates/requests/screen-1.html.to b/templates/requests/screen-1.html.to
index caa6e5b8..5c9149fc 100644
--- a/templates/requests/screen-1.html.to
+++ b/templates/requests/screen-1.html.to
@@ -92,29 +92,25 @@
   <h4 id="application-storage">Storage</h4>
   <p>The particulars of your body copy will be determined by the topic of your page. Regardless of topic, it’s a good practice to follow the inverted pyramid structure when writing copy: Begin with the information that’s most important to your users and then present information of less importance.</p>
 
-  <label for="">Object storage</label>
-  <input id="" name="" type="text" placeholder="Total object storage">
-
-  <label for="">Server storage</label>
-  <input id="" name="" type="text" placeholder="Total server storage">
-
+  {{ f.object_storage.label }}
+  {{ f.object_storage(placeholder="Total object storage") }}
 
+  {{ f.server_storage.label }}
+  {{ f.server_storage(placeholder="Total server storage") }}
 
   <!-- Application Usage -->
   <h4 id="application-usage">Estimated Application Storage</h4>
   <p>The particulars of your body copy will be determined by the topic of your page. Regardless of topic, it’s a good practice to follow the inverted pyramid structure when writing copy: Begin with the information that’s most important to your users and then present information of less importance.</p>
 
-  <label for="">Expected active users</label>
-  <input id="" name="" type="text" placeholder="Total active users">
+  {{ f.total_active_users.label }}
+  {{ f.total_active_users(placeholder="Total active users") }}
 
-  <label for="">Expected peak concurrent users</label>
-  <input id="" name="" type="text" placeholder="Total peak users">
-
-  <label for="">Expected requests per minute</label>
-  <input id="" name="" type="text" placeholder="Total requests">
-
-  <label for="">Number of application environments</label>
-  <input id="" name="" type="text" placeholder="Total number of environments">
+  {{ f.total_peak_users.label }}
+  {{ f.total_peak_users(placeholder="Total peak users") }}
 
+  {{ f.total_requests.label }}
+  {{ f.total_requests(placeholder="Total requests") }}
 
+  {{ f.total_environments.label }}
+  {{ f.total_environments(placeholder="Total number of environments") }}
 {% end %}