diff --git a/atst/app.py b/atst/app.py index 17253d4a..1a98944d 100644 --- a/atst/app.py +++ b/atst/app.py @@ -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' ), diff --git a/atst/handlers/request.py b/atst/handlers/request.py index 6f8bfc1d..e69ec3f6 100644 --- a/atst/handlers/request.py +++ b/atst/handlers/request.py @@ -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) diff --git a/atst/handlers/request_new.py b/atst/handlers/request_new.py new file mode 100644 index 00000000..aa405e3a --- /dev/null +++ b/atst/handlers/request_new.py @@ -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 ) + diff --git a/templates/requests.html.to b/templates/requests.html.to index 6455ef6b..78519748 100644 --- a/templates/requests.html.to +++ b/templates/requests.html.to @@ -49,21 +49,6 @@
‹ All requests -

New Request

- - - -
- - {% block form %} - form goes here - {% end %} - {% block next %} - Save & Continue - {% end %} -
diff --git a/templates/requests/screen-1.html.to b/templates/requests/screen-1.html.to index 0011193e..80edc411 100644 --- a/templates/requests/screen-1.html.to +++ b/templates/requests/screen-1.html.to @@ -1,4 +1,4 @@ -{% extends '../requests.html.to' %} +{% extends '../requests_new.html.to' %} {% block form %}

Details of Use

@@ -158,7 +158,7 @@ - \ No newline at end of file + --> diff --git a/templates/requests/screen-2.html.to b/templates/requests/screen-2.html.to index 858d0e16..a6c67aaf 100644 --- a/templates/requests/screen-2.html.to +++ b/templates/requests/screen-2.html.to @@ -1,4 +1,4 @@ -{% extends '../requests.html.to' %} +{% extends '../requests_new.html.to' %} {% block form %} diff --git a/templates/requests/screen-3.html.to b/templates/requests/screen-3.html.to index 29c1b343..aed60b90 100644 --- a/templates/requests/screen-3.html.to +++ b/templates/requests/screen-3.html.to @@ -1,4 +1,4 @@ -{% extends '../requests.html.to' %} +{% extends '../requests_new.html.to' %} {% block form %}

Funding/Contracting

diff --git a/templates/requests/screen-4.html.to b/templates/requests/screen-4.html.to index bbecea24..1e864aee 100644 --- a/templates/requests/screen-4.html.to +++ b/templates/requests/screen-4.html.to @@ -1,4 +1,4 @@ -{% extends '../requests.html.to' %} +{% extends '../requests_new.html.to' %} {% block form %}

Readiness Survey

diff --git a/templates/requests/screen-5.html.to b/templates/requests/screen-5.html.to index bb34d7d0..f5298ed9 100644 --- a/templates/requests/screen-5.html.to +++ b/templates/requests/screen-5.html.to @@ -1,4 +1,4 @@ -{% extends '../requests.html.to' %} +{% extends '../requests_new.html.to' %} {% block form %}

Review & Submit

diff --git a/templates/requests_new.html.to b/templates/requests_new.html.to index c614c4bc..642bc129 100644 --- a/templates/requests_new.html.to +++ b/templates/requests_new.html.to @@ -4,7 +4,67 @@
+

Requests New Request

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Order IDRequest DateRequesterTotal AppsStatusActions
#36552612 New5/17/2018Friedrich Straat2PendingDownload
#8736291010/2/2017Pietro Quirinis1CompleteDownload
#299381721/7/2017Marina Borsetti1DeniedDownload
+ +

+
+ + ‹ All requests

New Request

+ + + +
+ + {% block form %} + form goes here + {% end %} + {% block next %} + Save & Continue + {% end %} +
+
{% end %}