quickly implement index page / new form distinction for requests

This commit is contained in:
dcorrigan 2018-05-30 11:18:45 -04:00
parent 5667aedce4
commit 9d4b618070
10 changed files with 103 additions and 48 deletions

View File

@ -1,6 +1,7 @@
import tornado.web
from atst.handlers.main import MainHandler
from atst.handlers.request import Request
from atst.handlers.request_new import RequestNew
from atst.home import home
from tornado.web import url
@ -10,8 +11,8 @@ def make_app(**kwargs):
url( r"/home", MainHandler, {'page': 'home'}, name='home' ),
url( r"/accounts", MainHandler, {'page': 'accounts'}, name='accounts' ),
url( r"/requests", Request, {'page': 'requests'}, name='requests' ),
url( r"/requests/new", Request, {'page': 'requests_new'}, name='request_new' ),
url( r"/requests/([0-9])", Request, {'page': 'requests'}, name='request_form' ),
url( r"/requests/new", RequestNew, {'page': 'requests_new'}, name='request_new' ),
url( r"/requests/new/([0-9])", RequestNew, {'page': 'requests_new'}, name='request_form' ),
url( r"/users", MainHandler, {'page': 'users'}, name='users' ),
url( r"/reports", MainHandler, {'page': 'reports'}, name='reports' ),
url( r"/calculator", MainHandler, {'page': 'calculator'}, name='calculator' ),

View File

@ -1,31 +1,9 @@
from atst.handler import BaseHandler
class Request(BaseHandler):
screens = [
{ 'title' : 'Details of Use',
'subitems' : [
{'title' : 'Application Details',
'id' : 'application-details'},
{'title' : 'Computation',
'id' : 'computation' },
{'title' : 'Storage',
'id' : 'storage' },
{'title' : 'Usage',
'id' : 'usage' },
]},
{ 'title' : 'Organizational Info', },
{ 'title' : 'Funding/Contracting', },
{ 'title' : 'Readiness Survey', },
{ 'title' : 'Review & Submit', }
]
def initialize(self, page):
self.page = page
def get(self, screen = 1):
self.render( 'requests/screen-%d.html.to' % int(screen),
page = self.page,
screens = self.screens,
current = int(screen),
next_screen = int(screen) + 1 )
def get(self):
self.render('requests.html.to', page = self.page)

View File

@ -0,0 +1,31 @@
from atst.handler import BaseHandler
class RequestNew(BaseHandler):
screens = [
{ 'title' : 'Details of Use',
'subitems' : [
{'title' : 'Application Details',
'id' : 'application-details'},
{'title' : 'Computation',
'id' : 'computation' },
{'title' : 'Storage',
'id' : 'storage' },
{'title' : 'Usage',
'id' : 'usage' },
]},
{ 'title' : 'Organizational Info', },
{ 'title' : 'Funding/Contracting', },
{ 'title' : 'Readiness Survey', },
{ 'title' : 'Review & Submit', }
]
def initialize(self, page):
self.page = page
def get(self, screen = 1):
self.render( 'requests/screen-%d.html.to' % int(screen),
page = self.page,
screens = self.screens,
current = int(screen),
next_screen = int(screen) + 1 )

View File

@ -49,21 +49,6 @@
<hr>
<a class="href="/requests">&#8249; All requests</a>
<h1>New Request</h1>
<aside class="usa-width-one-fourth usa-layout-docs-sidenav">
{% include 'requests/sidebar.html.to' %}
</aside>
<div class="usa-width-three-fourths usa-layout-docs-main_content">
{% block form %}
form goes here
{% end %}
{% block next %}
<a class='usa-button usa-button-primary' href='{{ reverse_url('request_form',next_screen) }}'>Save &amp; Continue</a>
{% end %}
</div>
</main>

View File

@ -1,4 +1,4 @@
{% extends '../requests.html.to' %}
{% extends '../requests_new.html.to' %}
{% block form %}
<h2>Details of Use</h2>
@ -158,7 +158,7 @@
<!--
<!--
<div class="usa-width-three-fourths usa-layout-docs-main_content">
<h2 id="details-of-use">Details of Use</h2>
<p class="usa-font-lead">
@ -166,4 +166,4 @@
</p>
-->
-->

View File

@ -1,4 +1,4 @@
{% extends '../requests.html.to' %}
{% extends '../requests_new.html.to' %}
{% block form %}

View File

@ -1,4 +1,4 @@
{% extends '../requests.html.to' %}
{% extends '../requests_new.html.to' %}
{% block form %}
<h2>Funding/Contracting</h2>

View File

@ -1,4 +1,4 @@
{% extends '../requests.html.to' %}
{% extends '../requests_new.html.to' %}
{% block form %}
<h2>Readiness Survey</h2>

View File

@ -1,4 +1,4 @@
{% extends '../requests.html.to' %}
{% extends '../requests_new.html.to' %}
{% block form %}
<h2>Review &amp; Submit</h2>

View File

@ -4,7 +4,67 @@
<main class="usa-section usa-content" id="main-content">
<h1>Requests <a class="usa-button usa-button-secondary">New Request</a></h1>
<table class="usa-table-borderless" width="100%">
<thead>
<tr>
<th scope="col">Order ID</th>
<th scope="col">Request Date</th>
<th scope="col">Requester</th>
<th scope="col">Total Apps</th>
<th scope="col">Status</th>
<th scope="col">Actions</th>
</tr>
</thead>
<tbody>
<tr>
<th scope="row"><a href="#">#36552612</a> <span class="usa-label">New</span></th>
<td>5/17/2018</td>
<td>Friedrich Straat</td>
<td>2</td>
<td>Pending</td>
<td><a href="">Download</a></td>
</tr>
<tr>
<th scope="row"><a href="">#87362910</a></th>
<td>10/2/2017</td>
<td>Pietro Quirinis</td>
<td>1</td>
<td>Complete</td>
<td><a href="">Download</a></td>
</tr>
<tr>
<th scope="row"><a href="">#29938172</a></th>
<td>1/7/2017</td>
<td>Marina Borsetti</td>
<td>1</td>
<td>Denied</td>
<td><a href="">Download</a></td>
</tr>
</tbody>
</table>
<br><br>
<hr>
<a class="href="/requests">&#8249; All requests</a>
<h1>New Request</h1>
<aside class="usa-width-one-fourth usa-layout-docs-sidenav">
{% include 'requests/sidebar.html.to' %}
</aside>
<div class="usa-width-three-fourths usa-layout-docs-main_content">
{% block form %}
form goes here
{% end %}
{% block next %}
<a class='usa-button usa-button-primary' href='{{ reverse_url('request_form',next_screen) }}'>Save &amp; Continue</a>
{% end %}
</div>
</main>
{% end %}