diff --git a/smash/web/templates/doctors/availability_index.html b/smash/web/templates/doctors/availability_index.html index 151db64f981dd2f5d11af4191e5afcd3f13d2f8f..88372127fd36b4b112f927b398ccd66cb6f5110c 100644 --- a/smash/web/templates/doctors/availability_index.html +++ b/smash/web/templates/doctors/availability_index.html @@ -261,6 +261,42 @@ {% endif %} </div> + <div> + <h3>Sunday</h3> + + <div class="new-availability"> + <a href="#" class="btn btn-app"> + <i class="fa fa-plus"></i> + Add new avaibility</a> + </div> + + {% if avsun %} + <table id="tabmon" class="table table-bordered table-striped"> + <thead> + <tr> + <th>No.</th> + <th>From</th> + <th>Until</th> + <th>Remove</th> + </tr> + </thead> + <tbody> + {% for record in avsun %} + <tr> + <td> {{forloop.counter}} </td> + <td> {{record.available_from}} </td> + <td> {{record.available_till}} </td> + <td><a href="{% url 'web.views.doctor_availability_delete' id record.id %}" type="button" class="btn btn-block btn-default">Delete</a></td> + </tr> + {% endfor %} + </tbody> + </table> + + {% else %} + <p>No avaibilities on Sunday.</p> + {% endif %} + </div> + </div> {% endblock maincontent %} diff --git a/smash/web/templates/subjects/visitdetails.html b/smash/web/templates/subjects/visitdetails.html index 242800698fa6f83d413d7db7942a305c25143157..20380b9dabc5f8d4e24145a8f8b4e417e9ae4a50 100644 --- a/smash/web/templates/subjects/visitdetails.html +++ b/smash/web/templates/subjects/visitdetails.html @@ -36,7 +36,7 @@ {% if element.2 %}(Finished) {% else %}(Not finished) {% endif %} - <a href="{% url 'web.views.visit_details' element.3 %}"><font color="#D3D3D3">Details >>></font></a> + <a href="{% url 'web.views.visit_details' element.3 %}"><font color="#D3D3D3">Details >>></font></a> </h5> </div> <div class="box-footer"> @@ -83,8 +83,8 @@ <td>{{ app.datetime_when | time:"H:i" }}</td> <td>{{ app.length }}</td> <td> - {% if app.flying_team %}{{ app.worker_assigned.first_name }} {{app.worker_assigned.last_name}} - {% else %} {{ app.flying_team }} + {% if app.flying_team %} Flying team + {% else %} {{ app.worker_assigned.first_name }} {{app.worker_assigned.last_name}} {% endif %} </td> <td> diff --git a/smash/web/views.py b/smash/web/views.py index 9eb3f02750426a6448b51577822483373c2dd602..3231d94541b5b4b70924c1f6e0e4ac136569deb3 100644 --- a/smash/web/views.py +++ b/smash/web/views.py @@ -152,6 +152,7 @@ def subject_visit_details(request, id): endlist = [] for vis in visits: assign = vis.appointment_set.all() + print assign finished = vis.is_finished visid = vis.id visform = VisitDetailForm(instance=vis) @@ -209,6 +210,7 @@ def doctor_availability(request, doctor_id): avthu = avall.filter(day_number=4) avfri = avall.filter(day_number=5) avsat = avall.filter(day_number=6) + avsun = avall.filter(day_number=7) context = { 'avmon': avmon, @@ -217,6 +219,7 @@ def doctor_availability(request, doctor_id): 'avthu': avthu, 'avfri': avfri, 'avsat': avsat, + 'avsun': avsun, 'id': doctor_id }