Skip to content
Snippets Groups Projects
Commit 43693355 authored by Piotr Matyjaszyk's avatar Piotr Matyjaszyk
Browse files

Daily, work on subject adding, some control

parent ec2a9089
No related branches found
No related tags found
No related merge requests found
{% extends "_base.html" %}
{% load static %}
{% block styles %}
{{ block.super }}
<!-- DataTables -->
<link rel="stylesheet" href="{% static 'AdminLTE/plugins/datatables/dataTables.bootstrap.css' %}">
{% endblock styles %}
{% block page_title %}'newsubject'{% endblock page_title %}
{% block page_header %}New subject{% endblock page_header %}
{% block page_description %}adding{% endblock page_description %}
{% block breadcrumb %}
<li><a href="#"><i class="fa fa-dashboard"></i> Dashboard</a></li>
<li class="active">Workers</li>
{% endblock breadcrumb %}
{% 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>
{% endblock %}
{% endblock maincontent %}
{% block scripts %}
{{ block.super }}
<script src="{% static 'AdminLTE/plugins/datatables/jquery.dataTables.min.js' %}"></script>
<script src="{% static 'AdminLTE/plugins/datatables/dataTables.bootstrap.min.js' %}"></script>
<script>
$(function () {
$('#table').DataTable({
"paging": true,
"lengthChange": false,
"searching": true,
"ordering": true,
"info": true,
"autoWidth": false
});
});
</script>
{% endblock scripts %}
......@@ -20,7 +20,7 @@
<div>
<a class="btn btn-app">
<i class="fa fa-plus"></i> Add new subject
<a href="{% url 'web.views.subjectadd' %}"><i class="fa fa-plus"></i> Add new subject
</a>
</div>
......
......@@ -19,6 +19,7 @@ from web import views
urlpatterns = [
url(r'assignments$', views.assignments, name='web.views.assignments'),
url(r'subjects$', views.subjects, name='web.views.subjects'),
url(r'subjects/add$', views.subjectadd, name='web.views.subjectadd'),
url(r'doctors$', views.doctors, name='web.views.doctors'),
url(r'equipment_and_rooms$', views.equipment_and_rooms, name='web.views.equipment_and_rooms'),
url(r'equipment_and_rooms/eqdef$', views.equipment_def, name='web.views.equipment_def'),
......
......@@ -9,7 +9,7 @@ import auth
def index(request):
if request.user.is_authenticated():
return redirect(assignments)
return redirect(login)
return redirect(login)
def login(request):
......@@ -18,21 +18,21 @@ def login(request):
}
if request.GET and request.GET.get('error'):
context['state'] = request.GET.get('error')
if request.method == "POST" and request.POST:
state = auth.do_login(request)
if state == True:
return redirect(assignments)
else:
return redirect('/login?error=' + state[1])
return render(request, "login.html", context)
def logout(request):
state = auth.do_logout(request)
return render(request, "login.html", {'state': state})
def assignments(request):
template = loader.get_template("assignments/index.html")
......@@ -49,6 +49,11 @@ def subjects(request):
return HttpResponse(template.render(context,request))
def subjectadd(request,CreateView):
template = loader.get_template("subjects/add.html")
model = Subject
return HttpResponse(template.render(model,request))
def doctors(request):
doctors_list = Worker.objects.order_by('-lastName')
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment