From 1c760af665e388f921b770d9c5c3ded1fc11f626 Mon Sep 17 00:00:00 2001 From: Filipp Lepalaan Date: Tue, 19 Nov 2013 11:16:17 +0200 Subject: Switching machines --- apps/issues/views.py | 9 +++++++++ fixtures.json | 18 ++++++++++++++++++ motor/urls.py | 7 ++++--- templates/issues/index.html | 32 ++++++++++++++++++++++++++++++++ 4 files changed, 63 insertions(+), 3 deletions(-) create mode 100644 fixtures.json create mode 100644 templates/issues/index.html diff --git a/apps/issues/views.py b/apps/issues/views.py index ed60ed7..565bc6e 100644 --- a/apps/issues/views.py +++ b/apps/issues/views.py @@ -1,3 +1,5 @@ +import json +from django.shortcuts import render from django.views.generic.list import ListView from django.views.generic.edit import FormView, CreateView, UpdateView from apps.core.views import DefaultEditView, DefaultListView @@ -16,3 +18,10 @@ class IssueCreateView(CreateView): class IssueEditView(DefaultEditView): model = Issue + + +def list_issues(request, idx=0): + fh = open('fixtures.json', 'r') + data = json.loads(fh.read()) + question = data['questions'][int(idx)] + return render(request, "issues/index.html", question) diff --git a/fixtures.json b/fixtures.json new file mode 100644 index 0000000..11b6b79 --- /dev/null +++ b/fixtures.json @@ -0,0 +1,18 @@ +{ + "questions": [ + { + "pk": "1", + "order": "0", + "question": "Accidental damage?", + "choices": [{"pk": "1", "choice": "Yes"}, {"pk": "2", "choice": "No"}], + "required": "True" + }, + { + "pk": "2", + "order": "1", + "question": "Something else?", + "choices": [{"pk": "3", "choice": "Yes"}, {"pk": "4", "choice": "No"}], + "required": "True" + } + ] +} diff --git a/motor/urls.py b/motor/urls.py index 39822d7..9ec4845 100644 --- a/motor/urls.py +++ b/motor/urls.py @@ -6,6 +6,8 @@ from apps.issues.views import * urlpatterns = patterns( '', #url(r'^$', 'docs.views.index', name='docs-index'), + url(r'^$', list_issues, name='issues-index'), + url(r'^(\d+)/$', list_issues, name='issues-index'), url(r'^manage/$', LoginView.as_view(), name='core-login'), url(r'^manage/logout/$', logout, name='core-logout'), url(r'^manage/docs/$', ArticleListView.as_view(), name='core-list_docs'), @@ -20,8 +22,7 @@ urlpatterns = patterns( url(r'^manage/issues/$', IssueListView.as_view(), name='issues-list_issues'), url(r'^manage/issues/add/$', IssueCreateView.as_view(), name='issues-add_issue'), url(r'^manage/issues/(?P\d+)/$', IssueEditView.as_view(), name='issues-edit_issue'), - url(r'^terms/$', TemplateView.as_view(template_name="terms.html"), - {'title': 'ServoApp Terms of Service'}), + url(r'^terms/$', TemplateView.as_view(template_name="terms.html"), {'title': 'ServoApp Terms of Service'}), #(r'^admin/', include(admin.site.urls)), - url(r'^([\w\-]+)/$', 'docs.views.view_article', name='docs-view'), + #url(r'^([\w\-]+)/$', 'docs.views.view_article', name='docs-view'), ) diff --git a/templates/issues/index.html b/templates/issues/index.html new file mode 100644 index 0000000..15b341f --- /dev/null +++ b/templates/issues/index.html @@ -0,0 +1,32 @@ + + + + {{ title }} + + + + + + + + + + +

+ {% block main %} +

+ {% for i in choices %} + {{ i.choice }} + {% endfor %} +

{{ dump }}

+ {% endblock main %} +

+ + + + + + -- cgit v1.2.3

{{ question }}