diff --git a/smash/web/forms.py b/smash/web/forms.py index d69a75ed2666c194553c5937744e9ed376876d9e..3e6530ef4e8ad88c53621499c6df099a5c0cfd91 100644 --- a/smash/web/forms.py +++ b/smash/web/forms.py @@ -1,7 +1,18 @@ from django import forms +from django.forms import ModelForm from .models import * -class SubjectAddForm(ModelForm) - class Meta +class SubjectAddForm(ModelForm): + class Meta: + model = Subject + fields = '__all__' + +class SubjectDetailForm(ModelForm): + class Meta: + model = Subject + fields = '__all__' + +class SubjectEditForm(ModelForm): + class Meta: model = Subject fields = '__all__' diff --git a/smash/web/templates/subjects/details.html b/smash/web/templates/subjects/details.html new file mode 100644 index 0000000000000000000000000000000000000000..2b0883657ce353939a789874d90d51bb80c0c10e --- /dev/null +++ b/smash/web/templates/subjects/details.html @@ -0,0 +1,54 @@ +{% 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 %} + +{% block title %}{{object_name}} Form{% endblock %} + +{% block content %} +<form method="post" action=""> + {{ formset.as_ul }} + {% csrf_token %} + + <a href="{% url 'web.views.subjects' %}" class="btn btn-block btn-default">Back</a> +</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 %} diff --git a/smash/web/templates/subjects/index.html b/smash/web/templates/subjects/index.html index 2544d62c587efd92e482fcc44a3b0799c7b5cfd9..7caa20d9a341c383c7927625a27ea3e66f01a816 100644 --- a/smash/web/templates/subjects/index.html +++ b/smash/web/templates/subjects/index.html @@ -57,7 +57,7 @@ </td> <td>{{ subject.get_subjectStatus_display }}</td> <td>12-10-2016</td> - <td><button type="button" class="btn btn-block btn-default">Details</button></td> + <td><a href="{% url 'web.views.subjectdet' subject.id %}" type="button" class="btn btn-block btn-default">Details</a></td> <td><button type="button" class="btn btn-block btn-default">Edit</button></td> <td><button type="button" class="btn btn-block btn-default">Delete</button></td> </tr> diff --git a/smash/web/urls.py b/smash/web/urls.py index 066b9ae4c55e40121a88dc5d3c2273a5fb6428ef..6012664f4faf7671f0615895fe60445d1457e41f 100644 --- a/smash/web/urls.py +++ b/smash/web/urls.py @@ -20,6 +20,7 @@ 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'subjects/details/(?P<ids>\d+)$', views.subjectdet, name='web.views.subjectdet'), 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'), diff --git a/smash/web/views.py b/smash/web/views.py index 98eb5fa72781d49f55bca56c32c537cb15327478..8c2a3f68cf5f15ad28d9c8227c315785b8d24602 100644 --- a/smash/web/views.py +++ b/smash/web/views.py @@ -3,6 +3,7 @@ from django.http import HttpResponse from django.template import loader from django.views import generic from .models import * +from .forms import * from django.forms import modelformset_factory from django.shortcuts import render # import auth @@ -62,6 +63,11 @@ def subjectadd(request): return render(request, 'subjects/add.html', {'formset': formset}) +def subjectdet(request, ids): + SubjectFormSet = modelformset_factory(Subject , fields='__all__') + formset = SubjectDetailForm(instance=Subject.objects.get(id=ids)) + return render(request, 'subjects/details.html', {'formset': formset}) + def doctors(request): doctors_list = Worker.objects.order_by('-lastName') template = loader.get_template("doctors/index.html")