From 48abfee72a444a50351211257fcdbf6fa9640fc3 Mon Sep 17 00:00:00 2001
From: Jacek Lebioda <jacek.lebioda.001@student.uni.lu>
Date: Thu, 12 Jan 2017 21:25:38 +0100
Subject: [PATCH] More visual improvements
---
smash/web/templates/_base.html | 2 +-
smash/web/templates/doctors/add.html | 56 ++++++++++++++++++++++-----
smash/web/templates/doctors/edit.html | 55 +++++++++++++++++++++-----
smash/web/views.py | 14 +++----
todos.txt | 16 ++++++++
5 files changed, 115 insertions(+), 28 deletions(-)
create mode 100644 todos.txt
diff --git a/smash/web/templates/_base.html b/smash/web/templates/_base.html
index 64775a74..b105fb84 100644
--- a/smash/web/templates/_base.html
+++ b/smash/web/templates/_base.html
@@ -265,7 +265,7 @@ desired effect
</a>
</li>
- <li data-desc="doctors">
+ <li data-desc="workers">
<a href="{% url 'web.views.doctors' %}">
<i class="fa fa-user-md"></i>
<span>Workers</span>
diff --git a/smash/web/templates/doctors/add.html b/smash/web/templates/doctors/add.html
index 29cdbdbf..d04bef46 100644
--- a/smash/web/templates/doctors/add.html
+++ b/smash/web/templates/doctors/add.html
@@ -7,9 +7,11 @@
<link rel="stylesheet" href="{% static 'AdminLTE/plugins/datatables/dataTables.bootstrap.css' %}">
{% endblock styles %}
-{% block page_title %}'newworker'{% endblock page_title %}
+{% block page_title %}'workers'{% endblock page_title %}
{% block page_header %}New worker{% endblock page_header %}
-{% block page_description %}adding{% endblock page_description %}
+{% block page_description %}{% endblock page_description %}
+
+{% block title %} - Add new worker{% endblock %}
{% block breadcrumb %}
{% include "doctors/breadcrumb.html" %}
@@ -17,17 +19,51 @@
{% block maincontent %}
-{% block title %}{{object_name}} Form{% endblock %}
-
{% block content %}
-<form method="post" action="">
- {{ formset.as_ul }}
- {% csrf_token %}
+<div class="box box-info">
+ <div class="box-header with-border">
+ <a href="{% url 'web.views.doctors' %}" class="btn btn-block btn-default">Go back (without change)</a>
+ </div>
+
+ {% comment %} <div class="box-header with-border">
+ <h3 class="box-title">Add new worker</h3>
+ </div>{% endcomment %}
+
+ <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">
+ <label for="{# TODO #}" class="col-sm-2 control-label">
+ {{ field.label }}
+ </label>
+
+ <div class="col-sm-10">
+ {{ field }}
+ </div>
+ {% if field.help_text %}
+ <span class="help-block">
+ {{ field.help_text }}
+ </span>
+ {% endif %}
+ </div>
+ {% endfor %}
+ </div><!-- /.box-body -->
+ {% endfor %}
- <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>
+ <div class="box-footer">
+ <div class="col-sm-6">
+ <button type="submit" class="btn btn-block btn-success">Add</button>
+ </div>
+ <div class="col-sm-6">
+ <a href="{% url 'web.views.doctors' %}" class="btn btn-block btn-default">Cancel</a>
+ </div>
+ </div><!-- /.box-footer -->
+ </form>
+</div>
{% endblock %}
diff --git a/smash/web/templates/doctors/edit.html b/smash/web/templates/doctors/edit.html
index b1929a55..fa775366 100644
--- a/smash/web/templates/doctors/edit.html
+++ b/smash/web/templates/doctors/edit.html
@@ -7,9 +7,11 @@
<link rel="stylesheet" href="{% static 'AdminLTE/plugins/datatables/dataTables.bootstrap.css' %}">
{% endblock styles %}
-{% block page_title %}'editworker'{% endblock page_title %}
+{% block page_title %}'workers'{% endblock page_title %}
{% block page_header %}Edit worker{% endblock page_header %}
-{% block page_description %}editing{% endblock page_description %}
+{% block page_description %}{% endblock page_description %}
+
+{% block title %} - Edit worker information{% endblock %}
{% block breadcrumb %}
{% include "doctors/breadcrumb.html" %}
@@ -17,16 +19,49 @@
{% block maincontent %}
-{% block title %}{{object_name}} Form{% endblock %}
-
{% block content %}
-<form method="post" action="">
- {{ formset.as_ul }}
- {% csrf_token %}
+<div class="box box-info">
+ <div class="box-header with-border">
+ <a href="{% url 'web.views.doctors' %}" class="btn btn-block btn-default">Go back (without change)</a>
+ </div>
+
+ {% comment %} <div class="box-header with-border">
+ <h3 class="box-title">Details of worker</h3>
+ </div>{% endcomment %}
+
+ <form method="post" action="" class="form-horizontal">
+ {% csrf_token %}
+
+ <div class="box-body">
+ {% for field in form %}
+ <div class="form-group">
+ <label for="{# TODO #}" class="col-sm-2 control-label">
+ {{ field.label }}
+ </label>
+
+ <div class="col-sm-10">
+ {{ field }}
+ </div>
+
+ {% if field.help_text %}
+ <span class="help-block">
+ {{ field.help_text }}
+ </span>
+ {% endif %}
+ </div>
+ {% endfor %}
+ </div><!-- /.box-body -->
- <button type="submit" class="btn btn-block btn-success">Save</button>
- <a href="{% url 'web.views.doctors' %}" class="btn btn-block btn-default">Cancel</a>
-</form>
+ <div class="box-footer">
+ <div class="col-sm-6">
+ <button type="submit" class="btn btn-block btn-success">Save</button>
+ </div>
+ <div class="col-sm-6">
+ <a href="{% url 'web.views.doctors' %}" class="btn btn-block btn-default">Cancel</a>
+ </div>
+ </div><!-- /.box-footer -->
+ </form>
+</div>
{% endblock %}
diff --git a/smash/web/views.py b/smash/web/views.py
index 9e5ae6b1..453c49a2 100644
--- a/smash/web/views.py
+++ b/smash/web/views.py
@@ -129,19 +129,19 @@ def doctoradd(request):
def doctoredit(request, ids):
if request.method == 'POST':
- formset = WorkerEditForm(request.POST, request.FILES, instance=Worker.objects.get(id=ids))
- if formset.is_valid():
- formset.save()
+ form = WorkerEditForm(request.POST, request.FILES, instance=Worker.objects.get(id=ids))
+ if form.is_valid():
+ form.save()
return redirect(doctors)
else:
- formset = WorkerEditForm(instance=Worker.objects.get(id=ids))
- return wrap_response(request, 'doctors/edit.html', {'formset': formset})
+ form = WorkerEditForm(instance=Worker.objects.get(id=ids))
+ return wrap_response(request, 'doctors/edit.html', {'form': form})
def doctordetails(request, ids):
- formset = WorkerDetailForm(instance=Worker.objects.get(id=ids))
+ form = WorkerDetailForm(instance=Worker.objects.get(id=ids))
- return wrap_response(request, 'doctors/details.html', {'formset': formset})
+ return wrap_response(request, 'doctors/details.html', {'form': form})
def doctoravail(request, ids):
diff --git a/todos.txt b/todos.txt
new file mode 100644
index 00000000..f99595ce
--- /dev/null
+++ b/todos.txt
@@ -0,0 +1,16 @@
+* TODO List
+
+** Important
+ - models.py - add verbose_name to all models
+ - forms.py - specify, which fields should be visible (for example, while adding new/editing workers, why would one see appointments?)
+ - implement `on leave` button
+ - what about possible sunday in availabilities?
+ - make some names sound/look more pythonic
+
+** Visual
+ - all html forms - make them more "bootstrap'y"
+ - nieedytowalne pola w detalach
+
+** Possible improvements
+- breadcrumbs - make them stack (multiple template inheritance?)
+- label for's => give them correct html id's (all html forms)
\ No newline at end of file
--
GitLab