Merge branch 'master' of https://git-r3lab.uni.lu/piotr.atyjaszyk/scheduling-system

smash/web/templates/doctors/add.html

@@ -32,7 +32,6 @@
 	<form method="post" action="" class="form-horizontal">
 		{% csrf_token %}
 
-		{% for form in formset %}
 		<div class="box-body">
 			{% for field in form %}
 				<div class="form-group">
@@ -52,7 +51,6 @@
 				</div>
 			{% endfor %}
 		</div><!-- /.box-body -->
-		{% endfor %}
 
 		<div class="box-footer">
 			<div class="col-sm-6">

smash/web/templates/subjects/add.html

@@ -32,8 +32,6 @@
 	<form method="post" action="" class="form-horizontal">
 		{% csrf_token %}
 
-		{% for form in formset %}
-
 		<div class="box-body">
 			{% for field in form %}
 				<div class="form-group">
@@ -54,8 +52,6 @@
 			{% endfor %}
 		</div><!-- /.box-body -->
 
-		{% endfor %}
-
 		<div class="box-footer">
 			<div class="col-sm-6">
 				<button type="submit" class="btn btn-block btn-success">Add</button>

smash/web/templates/subjects/edit.html

@@ -66,8 +66,6 @@
 {% endblock %}
 
 
-
-
 {% endblock maincontent %}
 
 {% block scripts %}

smash/web/views.py

@@ -66,16 +66,15 @@ def subjects(request):
 
 
 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()
+	if request.method == 'POST':
+		form = SubjectAddForm(request.POST, request.FILES)
+		if form.is_valid():
+			form.save()
 			return redirect(subjects)
-    else:
-		formset = subjectFormSet(queryset=Subject.objects.none())
+	else:
+		form = SubjectAddForm()
 
-    return wrap_response(request, 'subjects/add.html', {'formset': formset})
+	return wrap_response(request, 'subjects/add.html', {'form': form})
 
 
 def subjectdet(request, id):
@@ -114,15 +113,16 @@ def doctors(request):
 
 
 def doctoradd(request):
-    WorkerFormSet = modelformset_factory(Worker , fields='__all__')
-    if request.method == 'POST':
-        formset = WorkerFormSet(request.POST, request.FILES)
-        if formset.is_valid():
-			formset.save()
+	if request.method == 'POST':
+		form = WorkerAddForm(request.POST, request.FILES)
+		if form.is_valid():
+			form.save()
 			return redirect(doctors)
-    else:
-		formset = WorkerFormSet(queryset=Worker.objects.none())
-    return wrap_response(request, 'doctors/add.html', {'formset': formset})
+	else:
+		form = WorkerAddForm()
+
+	return wrap_response(request, 'doctors/add.html', {'form': form})
+
 
 
 def doctoredit(request, id):