Solved merge conflicts

4 files changed, 95 insertions, 9 deletions

diff --git a/workshop_app/templates/workshop_app/base.html b/workshop_app/templates/workshop_app/base.html
index e8b9329..398c38b 100644
--- a/workshop_app/templates/workshop_app/base.html
+++ b/workshop_app/templates/workshop_app/base.html
@@ -43,7 +43,7 @@
             <ul class="navbar-nav mr-auto">
                 {% if request.user.profile.position == 'coordinator' %}
                     <li class="nav-item">
-                        <a class="nav-link" href="{% url 'workshop_status_instructor' %}">Workshop Status</a>
+                        <a class="nav-link" href="{% url 'workshop_status_coordinator' %}">Workshop Status</a>
                     </li>
                     <li class="nav-item">
                         <a class="nav-link" href="{% url 'propose_workshop' %}">Propose Workshop</a>
@@ -91,7 +91,7 @@
     </nav>
 {% endblock %}
 
-<div class="content">
+<div class="container-fluid" style="margin-bottom: 44px">
     {% block content %}
         <h1>Base Template Content. Please override me</h1>
     {% endblock %}
diff --git a/workshop_app/templates/workshop_app/workshop_details.html b/workshop_app/templates/workshop_app/workshop_details.html
new file mode 100644
index 0000000..388b204
--- /dev/null
+++ b/workshop_app/templates/workshop_app/workshop_details.html
@@ -0,0 +1,86 @@
+{% extends 'workshop_app/base.html' %}
+
+{% block title %}
+    View Workshop details
+{% endblock %}
+
+{% block content %}
+    <div class="container">
+        <table class="table table-bordered">
+            <tr>
+                <th><label for="id_first_name">Workshop Type :</label></th>
+                <td><label for="id_first_name"><a
+                        href="{% url 'workshop_type_details' workshop.workshop_type_id %}">{{ workshop.workshop_type }}</a></label>
+                </td>
+            </tr>
+            <tr>
+                <th><label for="id_last_name">Date :</label></th>
+                <td><label for="id_last_name">{{ workshop.date }}</label></td>
+            </tr>
+            <tr>
+                <th><label for="id_email">Coordinator :</label></th>
+                <td><label for="id_email"><a
+                        href="{% url 'view_profile' workshop.coordinator_id %}">{{ workshop.coordinator }}</a></label>
+                </td>
+            </tr>
+            {% if workshop.status %}
+                <tr>
+                    <th><label for="id_institute">Status :</label></th>
+                    <td><span class="badge badge-success">{{ workshop.get_status }}</span></td>
+                </tr>
+                <tr>
+                    <th><label for="id_phone_number">Instructor :</label></th>
+                    <td><label for="id_email"><a
+                            href="{% url 'view_profile' workshop.instructor_id %}">{{ workshop.instructor }}</a></label>
+                    </td>
+                </tr>
+            {% else %}
+                <tr>
+                    <th><label for="id_institute">Status :</label></th>
+                    <td><span class="badge badge-warning">{{ workshop.get_status }}</span></td>
+                </tr>
+            {% endif %}
+        </table>
+        <br>
+        <div class="container">
+            <h2 class="text-center">Comments</h2>
+            <br>
+            {% for comment in workshop_comments %}
+                <div class="card my-2">
+                    <div class="card-header">
+                        <div class="row">
+                            <div class="ml-3 font-weight-bold"><a
+                                    href="{% url 'view_profile' comment.author_id %}">{{ comment.author }}</a></div>
+                            {% if not comment.public %}
+                                <div class="ml-1"><span class="badge badge-dark">Hidden</span></div>
+                            {% endif %}
+                            <div class="ml-3 text-muted">{{ comment.created_date }}</div>
+                        </div>
+                    </div>
+                    <div class="card-body">
+                        <p>{{ comment.comment }}</p>
+                    </div>
+                </div>
+            {% endfor %}
+            <br><br>
+            <div class="card mt-2 mb-5">
+                <form method="post">
+                    <div class="card-header">
+                        <div class="row">
+                            <div class="mx-3 font-weight-bold">Post a comment</div>
+                            {% if request.user.profile.position == 'instructor' %}
+                                <div class="ml-5">{{ form.public }} Public</div>
+                                <div class="ml-1 text-muted">(Non-public comments are visible only to instructors)</div>
+                            {% endif %}
+                        </div>
+                    </div>
+                    <div class="card-body">
+                        {{ form.comment }}
+                    </div>
+                    <button type="submit" class="float-right btn btn-primary btn-md m-2">Post</button>
+                </form>
+            </div>
+        </div>
+    </div>
+
+{% endblock %}
\ No newline at end of file
diff --git a/workshop_app/templates/workshop_app/workshop_status_coordinator.html b/workshop_app/templates/workshop_app/workshop_status_coordinator.html
index 00e28b3..e1c790a 100644
--- a/workshop_app/templates/workshop_app/workshop_status_coordinator.html
+++ b/workshop_app/templates/workshop_app/workshop_status_coordinator.html
@@ -33,8 +33,8 @@
             <table class="table table-striped">
                 <thead>
                 <tr>
-                    <th>Instructor Name</th>
                     <th>Workshop Name</th>
+                    <th>Instructor Name</th>
                     <th>Workshop Day</th>
                     <th>Status</th>
                 </tr>
@@ -44,8 +44,8 @@
                     <tbody>
                     <tr>
                         {% if workshop.status %}
+                            <td><a href="{% url 'workshop_details' workshop.id %}" >{{ workshop.workshop_type |capfirst }}</a></td>
                             <td>{{ workshop.instructor.get_full_name }}</td>
-                            <td>{{ workshop.workshop_type |capfirst }}</td>
                             <td>{{ workshop.date | date }}</td>
                             <td><span class="badge badge-success">{{ workshop.get_status }}</span></td>
                         {% endif %}
@@ -73,7 +73,7 @@
                     <tbody>
                     <tr>
                         {% if not workshop.status and workshop.tnc_accepted %}
-                            <td>{{ workshop.workshop_type }}</td>
+                            <td><a href="{% url 'workshop_details' workshop.id %}" >{{ workshop.workshop_type |capfirst }}</a></td>
                             <td>{{ workshop.date | date }}</td>
                             <td><span class="badge badge-warning">{{ workshop.get_status }}</span></td>
                         {% endif %}
diff --git a/workshop_app/templates/workshop_app/workshop_status_instructor.html b/workshop_app/templates/workshop_app/workshop_status_instructor.html
index ef64a70..8657b8d 100644
--- a/workshop_app/templates/workshop_app/workshop_status_instructor.html
+++ b/workshop_app/templates/workshop_app/workshop_status_instructor.html
@@ -42,9 +42,9 @@
             <table class="table table-striped">
                 <thead>
                 <tr>
+                    <th>Workshop Name</th>
                     <th>Coordinator Name</th>
                     <th>Institute</th>
-                    <th>Workshop Name</th>
                     <th>Workshop Day</th>
                     <th>Status</th>
                 </tr>
@@ -53,12 +53,12 @@
                     <tbody>
                     <tr>
                         {% if workshop.status %}
+                            <td><a href="{% url 'workshop_details' workshop.id %}" >{{ workshop.workshop_type |capfirst }}</a></td>
                             <td>
                                 <a href="{% url 'view_profile' workshop.coordinator.profile.user.id %}">
                                     {{ workshop.coordinator.get_full_name }}</a>
                             </td>
                             <td>{{ workshop.coordinator.profile.institute }}</td>
-                            <td>{{ workshop.workshop_type |capfirst }}</td>
                             <td>{{ workshop.date | date }}
 
                                 {% if workshop.date > today %}
@@ -97,9 +97,9 @@
             <table class="table table-striped">
                 <thead>
                 <tr>
+                    <th>Workshop Name</th>
                     <th>Coordinator Name</th>
                     <th>Institute</th>
-                    <th>Workshop Name</th>
                     <th>Workshop Day</th>
                     <th>Status</th>
                     <th>Action</th>
@@ -110,12 +110,12 @@
                     <tbody>
                     <tr>
                         {% if not workshop.status and workshop.tnc_accepted %}
+                            <td><a href="{% url 'workshop_details' workshop.id %}" >{{ workshop.workshop_type |capfirst }}</a></td>
                             <td>
                                 <a href="{% url 'view_profile' workshop.coordinator.profile.user.id %}">
                                     {{ workshop.coordinator.get_full_name }}</a>
                             </td>
                             <td>{{ workshop.coordinator.profile.institute }}</td>
-                            <td>{{ workshop.workshop_type }}</td>
                             <td>{{ workshop.date | date }}</td>
                             <td><span class="badge badge-warning">{{ workshop.get_status }}</span></td>
                             <td>