From 8601797e0bfb87b333b6f6d702d7fcf8479c79fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?U=C4=9Fur=20Dindar?=
 <55401127+Tzesh@users.noreply.github.com>
Date: Wed, 9 Jun 2021 01:09:20 +0300
Subject: [PATCH] v1.01

---
 denpointment.py                 |  2 +-
 templates/appointments.html     | 10 ++++++++--
 templates/includes/_footer.html |  2 +-
 templates/includes/_navbar.html | 10 +++++-----
 templates/login.html            |  2 +-
 templates/register.html         |  2 +-
 6 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/denpointment.py b/denpointment.py
index fbc65b8..d989804 100644
--- a/denpointment.py
+++ b/denpointment.py
@@ -521,7 +521,7 @@ def book_an_appointment():
             flash(message="You have an upcoming appointment, you can get another appointment after that one.",
                   category="danger")
             cursor.close()
-            return redirect(url_for("book_an_appointment"))
+            return redirect(url_for("my_appointments"))
 
         query = """
         SELECT dentists.dentist_id, dentists.room_number, persons.first_name, persons.last_name
diff --git a/templates/appointments.html b/templates/appointments.html
index eef36bd..0b36dde 100644
--- a/templates/appointments.html
+++ b/templates/appointments.html
@@ -63,8 +63,14 @@ <h5>Past Treatments:</h5>
                             <td scope="row">{{ appointment.charge }}</td>
                             <td scope="row">{{ appointment.action }}</td>
                             <td scope="row">{{ appointment.complaint }}</td>
-                            <td scope="row"><a href="./treatment-medicines-{{ appointment.treatment_id }}"
-                                               class="btn btn-primary">Medicines</a></td>
+                            <td scope="row">
+                                {% if appointment.medicine_id %}
+                                    <a href="./treatment-medicines-{{ appointment.treatment_id }}"
+                                       class="btn btn-primary">Medicines</a>
+                                {% else %}
+                                    Not assigned
+                                {% endif %}
+                            </td>
                         {% endif %}
                     </tr>
                 {% endfor %}
diff --git a/templates/includes/_footer.html b/templates/includes/_footer.html
index a15f92d..f5e0e88 100644
--- a/templates/includes/_footer.html
+++ b/templates/includes/_footer.html
@@ -38,7 +38,7 @@ <h3>About project</h3>
         <div class="col-sm-12 col-xl-4 multi-collapse show" id="multiCollapse3">
             <div class="card card-body">
                 <h3>Designed by Tzesh</h3>
-                <p>Designed by <a href="https://www.ugurdindar.com" style="color: gray;">Uğur Dindar (Tzesh)</a></p>
+                <p>Designed by <a href="https://www.ugurdindar.com">Uğur Dindar (Tzesh)</a></p>
             </div>
         </div>
     </div>
diff --git a/templates/includes/_navbar.html b/templates/includes/_navbar.html
index 564447a..45d2d63 100644
--- a/templates/includes/_navbar.html
+++ b/templates/includes/_navbar.html
@@ -1,9 +1,9 @@
 <!-- Denpointment System
 github.com/Tzesh/Denpointment -->
 
-<nav class="navbar navbar-expand-lg navbar-light bg-white">
+<nav class="navbar navbar-expand-lg navbar-dark bg-dark">
     <div class="container-fluid">
-        <a class="navbar-brand" href="#">Denpointment</a>
+        <a class="navbar-brand" href="#"><i class="fas fa-tooth"></i> Denpointment</a>
         <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNavDropdown"
                 aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
             <span class="navbar-toggler-icon"></span>
@@ -18,7 +18,7 @@
                        data-bs-toggle="dropdown" aria-expanded="false">
                         Appointments
                     </a>
-                    <ul class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
+                    <ul class="dropdown-menu dropdown-menu-dark" aria-labelledby="navbarDropdownMenuLink">
                         <li><a class="dropdown-item" href="./book-an-appointment">Book an
                             appointment</a></li>
                         <li><a class="dropdown-item" href="./appointments">My Appointments</a></li>
@@ -30,7 +30,7 @@
                            data-bs-toggle="dropdown" aria-expanded="false">
                             Treatments
                         </a>
-                        <ul class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
+                        <ul class="dropdown-menu dropdown-menu-dark" aria-labelledby="navbarDropdownMenuLink">
                             <li><a class="dropdown-item" href="./upcoming-appointments">Upcoming appointments</a></li>
                             <li><a class="dropdown-item" href="./todays-appointments">Today's appointments</a></li>
                             <li><a class="dropdown-item" href="./past-treatments">Past treatments</a></li>
@@ -41,7 +41,7 @@
                            data-bs-toggle="dropdown" aria-expanded="false">
                             Statistics
                         </a>
-                        <ul class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
+                        <ul class="dropdown-menu dropdown-menu-dark" aria-labelledby="navbarDropdownMenuLink">
                             <li><a class="dropdown-item" href="./patient-statistics">Patients</a></li>
                             <li><a class="dropdown-item" href="./dentist-statistics">Dentists</a></li>
                         </ul>
diff --git a/templates/login.html b/templates/login.html
index 37de954..039071f 100644
--- a/templates/login.html
+++ b/templates/login.html
@@ -4,7 +4,7 @@
 {% extends "_outer_layout.html" %}
 {% block title %}Login{% endblock %}
 {% block section %}
-    <h1>Denpointment</h1>
+    <h1><i class="fas fa-tooth"></i> Denpointment</h1>
     <h4>Get your dentist appointment online!</h4>
 {% endblock %}
 {% block article %}
diff --git a/templates/register.html b/templates/register.html
index 424ad86..130c238 100644
--- a/templates/register.html
+++ b/templates/register.html
@@ -4,7 +4,7 @@
 {% extends "_outer_layout.html" %}
 {% block title %}Register{% endblock %}
 {% block section %}
-    <h1>Denpointment</h1>
+    <h1><i class="fas fa-tooth"></i> Denpointment</h1>
     <h4>Please fullfil the necessary information to register.</h4>
 {% endblock %}
 {% block article %}