From 8d15a6cbeb8d7672ffb5c13eaa44600511da377a Mon Sep 17 00:00:00 2001
From: James Polley <jp@jamezpolley.com>
Date: Sun, 12 Nov 2017 13:07:55 +1100
Subject: [PATCH] Make talk audience and format visible to reviewers

* Audience is visible on review details, but not the list. Perhaps
  useful for cases where reviwer wishes to only review for a
  particular audience. This change adds audience to the list view.

* Format is not visible anywhere. This changes adds it to list and
  detail views for the reviewers.

This change also adds some buttons to control visibility of the new
columns.
---
 .../symposion/proposals/_proposal_fields.html |  9 +++++++
 .../symposion/reviews/_review_table.html      | 14 +++++++----
 .../templates/symposion/reviews/base.html     | 25 +++++++++++++++----
 3 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/pinaxcon/templates/symposion/proposals/_proposal_fields.html b/pinaxcon/templates/symposion/proposals/_proposal_fields.html
index dd9f4925..6db00dad 100644
--- a/pinaxcon/templates/symposion/proposals/_proposal_fields.html
+++ b/pinaxcon/templates/symposion/proposals/_proposal_fields.html
@@ -22,6 +22,15 @@
       </div>
     </div>
 
+    {% if proposal.talk_format %}
+    <div>
+      <label class="col-sm-2 col-lg-2">Talk Format</label>
+      <div class="col-sm-10 col-lg-10">
+          <p>{{ proposal.get_talk_format_display }}</p>
+      </div>
+    </div>
+    {% endif %}
+    
     {% if proposal.additional_speakers.all %}
       <div>
         <label class="col-sm-2 col-lg-2">Additional Speakers</label>
diff --git a/pinaxcon/templates/symposion/reviews/_review_table.html b/pinaxcon/templates/symposion/reviews/_review_table.html
index f3f2f3f8..bc0e6508 100644
--- a/pinaxcon/templates/symposion/reviews/_review_table.html
+++ b/pinaxcon/templates/symposion/reviews/_review_table.html
@@ -4,12 +4,14 @@
     <thead>
         <th>#</th>
         <th>{% trans "Speaker / Title" %}</th>
+        <th class="toggle">Audience</th>
+        <th class="toggle">Format</th>
         <th>{% trans "Votes" %}</th>
-        <th>{% trans "Score" %}</th>
-        <th>{% trans "+2" %}</th>
-        <th>{% trans "+1" %}</th>
-        <th>{% trans "-1" %}</th>
-        <th>{% trans "-2" %}</th>
+        <th class="toggle">{% trans "Score" %}</th>
+        <th class="votes">{% trans "+2" %}</th>
+        <th class="votes">{% trans "+1" %}</th>
+        <th class="votes">{% trans "-1" %}</th>
+        <th class="votes">{% trans "-2" %}</th>
         <th><a href="#" class="tip" title="{% trans "Your Rating" %}"><i class="fa fa-user"></i></a></th>
     </thead>
 
@@ -24,6 +26,8 @@
                         {{ proposal.title }}
                     </a>
                 </td>
+                <td>{{ proposal.get_target_audience_display }}</td>
+                <td>{{ proposal.get_talk_format_display }}</td>
                 <td>{{ proposal.total_votes }}</td>
                 <td>{{ proposal.score }}</td>
                 <td>{{ proposal.plus_two }}</td>
diff --git a/pinaxcon/templates/symposion/reviews/base.html b/pinaxcon/templates/symposion/reviews/base.html
index 50ed3ac9..7ea259c1 100644
--- a/pinaxcon/templates/symposion/reviews/base.html
+++ b/pinaxcon/templates/symposion/reviews/base.html
@@ -56,17 +56,32 @@
 </div></div></div>
 {% endblock %}
 {% block extra_script %}
-<link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/v/bs/jszip-2.5.0/dt-1.10.16/b-1.4.2/b-html5-1.4.2/b-print-1.4.2/r-2.2.0/datatables.min.css"/>
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
+<link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/v/bs/jszip-2.5.0/dt-1.10.16/b-1.4.2/b-colvis-1.4.2/b-flash-1.4.2/b-html5-1.4.2/b-print-1.4.2/cr-1.4.1/fc-3.2.3/fh-3.1.3/r-2.2.0/rg-1.0.2/datatables.min.css"/>
 <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
-<script type="text/javascript" src="https://cdn.datatables.net/v/bs/jszip-2.5.0/dt-1.10.16/b-1.4.2/b-html5-1.4.2/b-print-1.4.2/r-2.2.0/datatables.min.js"></script>
+<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
+<script type="text/javascript" src="https://cdn.datatables.net/v/bs/jszip-2.5.0/dt-1.10.16/b-1.4.2/b-colvis-1.4.2/b-html5-1.4.2/b-print-1.4.2/cr-1.4.1/fc-3.2.3/fh-3.1.3/r-2.2.0/rg-1.0.2/datatables.min.js"></script>
 <script type="text/javascript">
         $("table.table-reviews").dataTable({
             "dom": "<'row'<'col-md-3'l><'col-md-3'B><'col-md-4'f>r>t<'row'<'col-md-3'i><'col-md-5'p>>",
             "stateSave": true,
             "lengthMenu": [[10, 50, 100, -1], [10, 50, 100, "All"]],
             "pageLength": 100,
-            "buttons": [ "copy", "csv", "print"]
-        });
+            "colReorder": true,
+            "buttons": [ {
+              extend: 'collection',
+              text: 'Export',
+              buttons: ["copy", "csv", "print"]
+            },
+            { extend: 'collection',
+              text: 'Columns',
+              buttons: [
+                { extend: 'columnsToggle',
+                  columns: '.toggle' },
+                { extend: 'columnToggle',
+                  text: 'Vote details',
+                  columns: '.votes'
+                }
+              ]
+        }]});
     </script>
 {% endblock %}