Skip to content

Commit

Permalink
Merge pull request #20 from GunpreetAhuja/dirty
Browse files Browse the repository at this point in the history
Lab Report templates and views combined and verified
  • Loading branch information
piyushparkash committed Jun 28, 2014
2 parents bbd0226 + 4c0425d commit 168bdcd
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 9 deletions.
6 changes: 6 additions & 0 deletions src/librehatti/print/urls.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
from django.conf.urls import url, patterns

urlpatterns = patterns('librehatti.print.views',
url(r'^addmaterial/', 'add_material'),

)
4 changes: 0 additions & 4 deletions src/librehatti/print/views.py

This file was deleted.

1 change: 1 addition & 0 deletions src/librehatti/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@
url(r'^$', 'librehatti.catalog.views.index'),
url(r'^catalog/', include('librehatti.catalog.urls')),
url(r'^useraccounts/', include('useraccounts.urls')),
url(r'^print/', include('librehatti.print.urls')),
url(r'^admin/', include(admin.site.urls)),
) + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
10 changes: 5 additions & 5 deletions src/templates/print/form.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
<title>Lab Reports</title>
</head>
<body>
<form action='{% url 'reports:add_dept' %}' method='post'>
{% csrf_token %}
<form action='' method='POST'>
{% csrf_token %}
<b>Material:</b>
<select>
{% for name in forms.material_name %}
<option value="{{name}}" > </option>
<select name = 'material'>
{% for i in material_name %}
<option value={{i.name}} name={{i.name}} >{{i.name}} </option>
{% endfor %}
</select>
<p><b>Time span:</b></p>
Expand Down

0 comments on commit 168bdcd

Please sign in to comment.