From 258094a46273f152beb5c27bc2e80f3f9b4969dd Mon Sep 17 00:00:00 2001
From: "piotr.atyjaszyk" <piotrmk1@gmail.com>
Date: Wed, 14 Dec 2016 12:35:22 +0100
Subject: [PATCH] simple working subject adding, button fix at subjects list
---
smash/web/forms.py | 7 +++++++
smash/web/templates/subjects/add.html | 19 ++++++++++++-------
smash/web/templates/subjects/index.html | 6 +++---
smash/web/views.py | 17 ++++++++++++-----
4 files changed, 34 insertions(+), 15 deletions(-)
create mode 100644 smash/web/forms.py
diff --git a/smash/web/forms.py b/smash/web/forms.py
new file mode 100644
index 00000000..d69a75ed
--- /dev/null
+++ b/smash/web/forms.py
@@ -0,0 +1,7 @@
+from django import forms
+from .models import *
+
+class SubjectAddForm(ModelForm)
+ class Meta
+ model = Subject
+ fields = '__all__'
diff --git a/smash/web/templates/subjects/add.html b/smash/web/templates/subjects/add.html
index c8f5de44..c08af0aa 100644
--- a/smash/web/templates/subjects/add.html
+++ b/smash/web/templates/subjects/add.html
@@ -18,18 +18,23 @@
{% block maincontent %}
-%TODO: add adding
-
{% block title %}{{object_name}} Form{% endblock %}
{% block content %}
-<form action="" method="post">{% csrf_token %}
-<table>
-{{form}}
-</table>
-<input type="submit" value="Save {{object_name}}"/></form>
+<form method="post" action="">
+ {{ formset.as_ul }}
+ {% csrf_token %}
+
+
+ <button type="submit" class="btn btn-block btn-success">Add</button>
+
+ <a href="{% url 'web.views.subjects' %}" class="btn btn-block btn-default">Cancel</a>
+</form>
{% endblock %}
+
+
+
{% endblock maincontent %}
{% block scripts %}
diff --git a/smash/web/templates/subjects/index.html b/smash/web/templates/subjects/index.html
index 659c315d..2544d62c 100644
--- a/smash/web/templates/subjects/index.html
+++ b/smash/web/templates/subjects/index.html
@@ -19,9 +19,9 @@
{% block maincontent %}
<div>
- <a class="btn btn-app">
- <a href="{% url 'web.views.subjectadd' %}"><i class="fa fa-plus"></i> Add new subject
- </a>
+ <a href="{% url 'web.views.subjectadd' %}" class="btn btn-app">
+ <i class="fa fa-plus"></i>
+ Add new subject</a>
</div>
<div class="box-body">
diff --git a/smash/web/views.py b/smash/web/views.py
index dc6ac302..98eb5fa7 100644
--- a/smash/web/views.py
+++ b/smash/web/views.py
@@ -3,7 +3,9 @@ from django.http import HttpResponse
from django.template import loader
from django.views import generic
from .models import *
-import auth
+from django.forms import modelformset_factory
+from django.shortcuts import render
+# import auth
# Create your views here.
def index(request):
@@ -49,11 +51,16 @@ def subjects(request):
return HttpResponse(template.render(context,request))
-def subjectadd(request,CreateView):
- template = loader.get_template("subjects/add.html")
- model = Subject
+def subjectadd(request):
+ SubjectFormSet = modelformset_factory(Subject , fields='__all__')
+ if request.method == 'POST':
+ formset = SubjectFormSet(request.POST, request.FILES)
+ if formset.is_valid():
+ formset.save()
+ else:
+ formset = SubjectFormSet(queryset=Subject.objects.none())
+ return render(request, 'subjects/add.html', {'formset': formset})
- return HttpResponse(template.render(model,request))
def doctors(request):
doctors_list = Worker.objects.order_by('-lastName')
--
GitLab