From 15bf6674a36582d2ae736bfec651239884b9cab5 Mon Sep 17 00:00:00 2001
From: Harald Eilertsen <haraldei@anduin.net>
Date: Sat, 4 Sep 2021 20:56:59 +0200
Subject: Move the concerts table and edit form out of AdminPage.

Currently the AdminPage is still responsible for updating changes to any
of the concerts, but I'd like to get that into their respective classes
too. That way the AdminPage will just be a simple class to handle the
layout of the page, while all the specific functionality is in their
own classes.

This is also the first step to be able to reuse the concerts table on
the public end of the site.
---
 includes/admin/views/_concerts_table.php    | 199 +++++++++++++++++++++
 includes/admin/views/_edit_concert_form.php |  82 +++++++++
 includes/admin/views/giglog_admin_page.php  | 258 ++--------------------------
 3 files changed, 291 insertions(+), 248 deletions(-)
 create mode 100644 includes/admin/views/_concerts_table.php
 create mode 100644 includes/admin/views/_edit_concert_form.php

diff --git a/includes/admin/views/_concerts_table.php b/includes/admin/views/_concerts_table.php
new file mode 100644
index 0000000..37459a3
--- /dev/null
+++ b/includes/admin/views/_concerts_table.php
@@ -0,0 +1,199 @@
+<?php
+// SPDX-FileCopyrightText: 2021 Andrea Chirulescu <andrea.chirulescu@gmail.com>
+// SPDX-FileCopyrightText: 2021 Harald Eilertsen <haraldei@anduin.net>
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+if (!class_exists("GiglogAdmin_ConcertsTable"))
+{
+    class GiglogAdmin_ConcertsTable
+    {
+        const STATUS_LABELS = [
+            '',
+            'Accred Requested',
+            'Photo Approved',
+            'Text Approved',
+            'Photo and Text Approved',
+            'Rejected'
+        ];
+
+        private string $username;
+
+        public function __construct() {
+            $this->username = wp_get_current_user()->user_login;
+        }
+
+        public function render(): string
+        {
+            return $this->render_filters()
+                . $this->render_concerts_table();
+        }
+
+        private function render_concerts_table() : string
+        {
+            $content = '<table class="assignit">';
+            //    $content .= '</tr><th>CITY</th><th>ID</th><th>BAND</th><th>VENUE</th><th>DATE</th></tr>';
+
+            $content .= '<tr class="assignithrow">
+                <th>CITY</th><th>NAME</th><th>VENUE</th><th>DATE</th><th> </th>
+                <th>PHOTO1</th><th>PHOTO2</th><th>TEXT1</th><th>TEXT2</th>
+                <th>STATUS</th>';
+                if (current_user_can('administrator'))
+                $content .=  '<th>AdminOptions</th>';
+                $content .= '</tr>';
+
+            $filter = [];
+
+            // Use the submitted "city" if any. Otherwise, use the default/static value.
+            $cty = filter_input( INPUT_POST, 'selectcity', FILTER_SANITIZE_SPECIAL_CHARS );
+            if ($cty) $filter['city'] = $cty;
+
+            $venue = filter_input( INPUT_POST, 'selectvenue', FILTER_SANITIZE_SPECIAL_CHARS );
+            if ($venue) $filter['venue_id'] = $venue;
+
+            $concerts = GiglogAdmin_Concert::find_concerts($filter);
+
+            $lastType = '';
+
+            foreach ( $concerts AS $concert ) {
+                $content .= '<tr class="assignitr">';
+
+                if ($lastType != '' && $lastType !=  $concert->venue()->city()) {
+                    $content .= '<td>' . $concert->city() . '</td></tr><tr>';
+                }
+
+                if  ($lastType == '' ) {
+                    $content .= '<td>' . $concert->venue()->city() . '</td></tr><tr>';
+                }
+                // Modify these to match the database structure
+                //     $content .= '<td>' . $row->id. '</td>';
+                $content .= '<td></td>';
+                $content .= '<td>' . $concert->cname() . '</td>';
+                $content .= '<td>' . $concert->venue()->name() . '</td>';
+                $fdate =  strtotime($concert->cdate());
+                $newformat = date('d.M.Y',$fdate);
+
+                //$content .= DATE_FORMAT($fdate,'%d.%b.%Y');
+                $content .= '<td>' . $newformat . '</td>';
+                $content .= '<td>' . $this->mark_new_concert($concert) . '</td>';
+
+                $content .= '<td>' . $this->assign_role_for_user_form('photo1', $concert) . '</td>';
+                $content .= '<td>' . $this->assign_role_for_user_form('photo2', $concert) . '</td>';
+                $content .= '<td>' . $this->assign_role_for_user_form('rev1', $concert) . '</td>';
+                $content .= '<td>' . $this->assign_role_for_user_form('rev2', $concert) . '</td>';
+
+                $content .= '<td>' . self::STATUS_LABELS[$concert->status()] . '</td>';
+
+                if (current_user_can('administrator')) {
+                    $content .=
+                        '<td  class="adminbuttons">'
+                        . $this->adminactions($concert)
+                        . '</td>';
+                }
+                $content .= '</tr>';
+                $lastType = $concert->venue()->city();
+            }
+            $content .= '</table>';
+
+            // return the table
+            return $content;
+        }
+
+        private function render_filters() : string
+        {
+            $cty = filter_input(INPUT_POST, 'selectcity', FILTER_SANITIZE_SPECIAL_CHARS);
+
+            $select = '<form method="POST" action="">FILTER DATA:';
+            $select .= \EternalTerror\ViewHelpers\select_field(
+                "selectcity",
+                array_map(fn($city) => [$city, $city], GiglogAdmin_Venue::all_cities()),
+                $cty,
+                "Select city...");
+
+
+            if ( !empty($cty) ) {
+                //second drop down for venue
+                $select .= \EternalTerror\ViewHelpers\select_field(
+                    "selectvenue",
+                    array_map(
+                        fn($venue) => [$venue->id(), $venue->name()],
+                        GiglogAdmin_Venue::venues_in_city($cty)
+                    ),
+                    filter_input(INPUT_POST, 'selectvenue', FILTER_SANITIZE_SPECIAL_CHARS),
+                    "Select venue...");
+            }
+            //option to select own concerts only
+            $select .= '<input  class="ownconc" type="checkbox" value="1"';
+                if(isset($_POST['my_checkbox'])) $select .=' checked="checked" ';
+            $select.=' name="my_checkbox">Show own concerts only</input>';
+
+            $select .= '<input type="submit" value="APPLY"></form>';
+
+            return $select;
+        }
+
+        private function adminactions( GiglogAdmin_Concert $concert ) : string
+        {
+            return
+                '<form method="POST" action="">'
+                . '<input type="hidden" name="cid" value="' . $concert->id() .  '" />'
+                . \EternalTerror\ViewHelpers\select_field(
+                    'selectstatus',
+                    array_map(fn($i) => [ $i, self::STATUS_LABELS[$i] ], range(1, count(self::STATUS_LABELS) - 1)),
+                    $concert->status())
+                . '<input type="submit" value="SetStatus">'
+                . '<input type="submit" name ="edit" value="EDIT">'
+                . '</form>';
+        }
+
+        /**
+         * Display a mark on the concert if it is new.
+         * I.e. imported/created within the last ten days.
+         *
+         * @return null|string
+         */
+        private function mark_new_concert(GiglogAdmin_Concert $concert) : string
+        {
+            $now = new DateTime();
+            $new_entry = $now->diff($concert->created())->days <= 10;
+            if ($new_entry) {
+                return '<span style="color:green">NEW</span>';
+            }
+            else {
+                return '';
+            }
+        }
+
+        private function assign_role_for_user_form(string $role, GiglogAdmin_Concert $concert) : ?string
+        {
+            $roles = $concert->roles();
+            $assigned_user = array_key_exists($role, $roles) ? $roles[$role] : NULL;
+
+            //first check if current slot is taken by current user
+            if ( $assigned_user == $this->username ) {
+                $f = '<form class="unassignit" method="POST" action="">'
+                    . '  <input type="hidden" name="cid" value="' . $concert->id() . '" />'
+                    . '  <input type="hidden" name="pid" value="' . $role . '" />'
+                    . '  <input type="submit" name="unassignitem" value="Your"/>'
+                    . '</form>';
+            }
+            elseif ( $assigned_user ) { //check if slot is taken by another user
+                $f = '<span class="takenby">Taken</span>'
+                    . '<div class="takenby">Taken by ' . $assigned_user . '</div>';
+            }
+            elseif ( array_search($this->username, $roles) ) {
+                // other slots for this concert are taken by user
+                $f = '<span class="taken_by_self">-</span>';
+            }
+            else { //not taken by anyone
+                $f = '<form method="POST" action="">'
+                    . '  <input type="hidden" name="cid" value="' . $concert->id() . '" />'
+                    . '  <input type="hidden" name="pid" value="' . $role. '" />'
+                    . '  <input  type="submit" name="assignitem" value=""/>'
+                    . '</form>';
+            }
+
+            return $f;
+        }
+    }
+}
diff --git a/includes/admin/views/_edit_concert_form.php b/includes/admin/views/_edit_concert_form.php
new file mode 100644
index 0000000..32ca762
--- /dev/null
+++ b/includes/admin/views/_edit_concert_form.php
@@ -0,0 +1,82 @@
+<?php
+// SPDX-FileCopyrightText: 2021 Andrea Chirulescu <andrea.chirulescu@gmail.com>
+// SPDX-FileCopyrightText: 2021 Harald Eilertsen <haraldei@anduin.net>
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+if (!class_exists("GiglogAdmin_EditConcertForm"))
+{
+    class GiglogAdmin_EditConcertForm
+    {
+        private function get_venue_selector( ?GiglogAdmin_Venue $invenue ): string
+        {
+            return \EternalTerror\ViewHelpers\select_field(
+                "selectvenueadmin",
+                array_map(fn($venue) => [$venue->id(), $venue->name()], GiglogAdmin_Venue::all_venues()),
+                $invenue ? $invenue->id() : null);
+        }
+
+
+        private function user_dropdown_for_role( GiglogAdmin_Concert $concert, string $role): string
+        {
+            $users = array_map(
+                fn($usr) => $usr->user_login,
+                get_users( array( 'fields' => array( 'user_login' ) ) ) );
+
+            $roles = $concert->roles();
+
+            $current_user = array_key_exists($role, $roles) ? $roles[$role] : NULL;
+
+            return \EternalTerror\ViewHelpers\select_field(
+                $role,
+                array_map( fn($user) => [ $user, $user ], $users ),
+                $current_user);
+        }
+
+
+
+        public function render() : string
+        {
+            $cid = filter_input(INPUT_POST, "cid");
+            $editing = filter_input(INPUT_POST, "edit") == "EDIT";
+
+            if ($editing && !empty($cid))   //A bit overdoing with the checks if concert ID is empty both here and in find_cid. But based on that, things are NULL or not. Better ideas?
+                $c = GiglogAdmin_Concert::get($cid);
+            else
+                $c = new GiglogAdmin_Concert((object)[]);
+
+            $content='<div><h3>Form to create/edit concerts and venues</h3><br></div><div class="editform"><div class="concertform">';
+            $content.='<form method="POST" action="" class="concert" >'
+                .'<div class="concertitems"><strong>CONCERT DETAILS</strong><br><br><fieldset>'
+                .'<input type="hidden" name="pid" value="' .$c->id(). '" />'
+                .'<label for="cname">Concert Name:</label><textarea id="cname" name="cname" value="'.$c->cname().'">'.$c->cname().'</textarea><br>'
+                .'<label for="venue">Venue:</label>' . $this->get_venue_selector($c->venue()) . '<br>'
+                .'<label for="cdate">Date:</label><input type="date" id="cdate" name="cdate" value="'.$c->cdate().'"><br>'
+                .'<label for="ticket">Tickets:</label><input type="text" id="ticket" name="ticket" value="'.$c->tickets().'"><br>'
+                    .'<label for="eventurl">Event link:</label><input type="text" id="eventurl" name="eventurl" value="'.$c->eventlink().'"><br>'
+                .'</fieldset>';
+            // actions differ if we update or create a concert, hence two buttons needed
+            if ($editing)
+                $content.='<p><input type="submit" name="editconcert" value="Edit Concert"></p>';
+            else
+                $content.='<p><input type="submit" name="newconcert" value="Create New Concert"></p>';
+
+            $content.='</div>';
+
+            $content.='<div class="useritems"><strong>ASSIGNMENT DETAILS</strong><br><br><fieldset>'
+                .'<label for="photo1">Photo1:</label>'.$this->user_dropdown_for_role($c,'photo1').'<br>'
+                .'<label for="photo2">Photo2:</label>'.$this->user_dropdown_for_role($c,'photo2').'<br>'
+                .'<label for="rev1">Text1:</label>'.$this->user_dropdown_for_role($c,'rev1').'<br>'
+                .'<label for="rev2">Text2:</label>'.$this->user_dropdown_for_role($c,'rev2').'<br>';
+
+            $content.='<fieldset></div></form></div>';
+            $content.='<div class="venueform"><form method="POST" action="" class="venue" ><strong>VENUE DETAILS</strong><br><br>'
+                .'<fieldset><label for="venue">Venue Name:</label><input type="text" id="venuename" name="venuename"><br>'
+                .'<label for="eventurl">Venue City:</label><input type="text" id="venuecity" name="venuecity"><br>'
+                .'<p><input type="submit" name="newvenue" value="Create New Venue"></p>'
+                .'<fieldset></form></div>';
+            $content.='</div>';
+            return $content;
+        }
+    }
+}
diff --git a/includes/admin/views/giglog_admin_page.php b/includes/admin/views/giglog_admin_page.php
index dfea3fd..89ca490 100644
--- a/includes/admin/views/giglog_admin_page.php
+++ b/includes/admin/views/giglog_admin_page.php
@@ -7,10 +7,11 @@
 
 if ( !class_exists( 'GiglogAdmin_AdminPage' ) ) {
     require_once __DIR__ . '/../../venue.php';
+    require_once __DIR__ . '/_concerts_table.php';
+    require_once __DIR__ . '/_edit_concert_form.php';
 
-    class GiglogAdmin_AdminPage {
-        private string $username;
-
+    class GiglogAdmin_AdminPage
+    {
         const STATUS_LABELS = [
             '',
             'Accred Requested',
@@ -20,19 +21,15 @@ if ( !class_exists( 'GiglogAdmin_AdminPage' ) ) {
             'Rejected'
         ];
 
-        public function __construct()
-        {
-            $this->username = wp_get_current_user()->user_login;
-        }
-
         public static function render_html() : void
         {
             $page = new self();
             $page->render_page();
         }
 
-        public function render_page() : void
+        private function render_page() : void
         {
+            $concerts = new GiglogAdmin_ConcertsTable();
             ?>
             <div class="wrap">
                 <h1>Giglog Admin</h1>
@@ -51,219 +48,15 @@ if ( !class_exists( 'GiglogAdmin_AdminPage' ) ) {
                 what the accreditation status is. You will get personal message if this
                 is really close to the concert date.</p>
 
-                <p><?php echo $this->get_filters() ?></p>
-                <p><?php echo $this->get_concerts() ?></p>
+                <p><?php echo $concerts->render() ?></p>
             </div>
             <?php
-            if (current_user_can('administrator'))
-                echo(GiglogAdmin_AdminPage::editforms());  //not sure why it doesn't show without the echo?
-        }
-
-        private function get_venue_selector( ?GiglogAdmin_Venue $invenue ): string
-        {
-            return \EternalTerror\ViewHelpers\select_field(
-                "selectvenueadmin",
-                array_map(fn($venue) => [$venue->id(), $venue->name()], GiglogAdmin_Venue::all_venues()),
-                $invenue ? $invenue->id() : null);
-        }
-
-
-        private function user_dropdown_for_role( GiglogAdmin_Concert $concert, string $role): string
-        {
-            $users = array_map(
-                fn($usr) => $usr->user_login,
-                get_users( array( 'fields' => array( 'user_login' ) ) ) );
-
-            $roles = $concert->roles();
-
-            $current_user = array_key_exists($role, $roles) ? $roles[$role] : NULL;
-
-            return \EternalTerror\ViewHelpers\select_field(
-                $role,
-                array_map( fn($user) => [ $user, $user ], $users ),
-                $current_user);
-        }
-
-
-        private function get_filters() : string
-        {
-            $cty = filter_input(INPUT_POST, 'selectcity', FILTER_SANITIZE_SPECIAL_CHARS);
-
-            $select = '<form method="POST" action="">FILTER DATA:';
-            $select .= \EternalTerror\ViewHelpers\select_field(
-                "selectcity",
-                array_map(fn($city) => [$city, $city], GiglogAdmin_Venue::all_cities()),
-                $cty,
-                "Select city...");
-
-
-            if ( !empty($cty) ) {
-                //second drop down for venue
-                $select .= \EternalTerror\ViewHelpers\select_field(
-                    "selectvenue",
-                    array_map(
-                        fn($venue) => [$venue->id(), $venue->name()],
-                        GiglogAdmin_Venue::venues_in_city($cty)
-                    ),
-                    filter_input(INPUT_POST, 'selectvenue', FILTER_SANITIZE_SPECIAL_CHARS),
-                    "Select venue...");
+            if (current_user_can('administrator')) {
+                $form = new GiglogAdmin_EditConcertForm();
+                echo $form->render();
             }
-            //option to select own concerts only
-            $select .= '<input  class="ownconc" type="checkbox" value="1"';
-                if(isset($_POST['my_checkbox'])) $select .=' checked="checked" ';
-            $select.=' name="my_checkbox">Show own concerts only</input>';
-
-            $select .= '<input type="submit" value="APPLY"></form>';
-
-            return $select;
         }
 
-        private function editforms(): string
-        {
-            $cid = filter_input(INPUT_POST, "cid");
-            $editing = filter_input(INPUT_POST, "edit") == "EDIT";
-
-            if ($editing && !empty($cid))   //A bit overdoing with the checks if concert ID is empty both here and in find_cid. But based on that, things are NULL or not. Better ideas?
-                $c = GiglogAdmin_Concert::get($cid);
-            else
-                $c = new GiglogAdmin_Concert((object)[]);
-
-            $content='<div><h3>Form to create/edit concerts and venues</h3><br></div><div class="editform"><div class="concertform">';
-            $content.='<form method="POST" action="" class="concert" >'
-                .'<div class="concertitems"><strong>CONCERT DETAILS</strong><br><br><fieldset>'
-                .'<input type="hidden" name="pid" value="' .$c->id(). '" />'
-                .'<label for="cname">Concert Name:</label><textarea id="cname" name="cname" value="'.$c->cname().'">'.$c->cname().'</textarea><br>'
-                .'<label for="venue">Venue:</label>' . $this->get_venue_selector($c->venue()) . '<br>'
-                .'<label for="cdate">Date:</label><input type="date" id="cdate" name="cdate" value="'.$c->cdate().'"><br>'
-                .'<label for="ticket">Tickets:</label><input type="text" id="ticket" name="ticket" value="'.$c->tickets().'"><br>'
-                    .'<label for="eventurl">Event link:</label><input type="text" id="eventurl" name="eventurl" value="'.$c->eventlink().'"><br>'
-                .'</fieldset>';
-            // actions differ if we update or create a concert, hence two buttons needed
-            if ($editing)
-                $content.='<p><input type="submit" name="editconcert" value="Edit Concert"></p>';
-            else
-                $content.='<p><input type="submit" name="newconcert" value="Create New Concert"></p>';
-
-            $content.='</div>';
-
-            $content.='<div class="useritems"><strong>ASSIGNMENT DETAILS</strong><br><br><fieldset>'
-                .'<label for="photo1">Photo1:</label>'.$this->user_dropdown_for_role($c,'photo1').'<br>'
-                .'<label for="photo2">Photo2:</label>'.$this->user_dropdown_for_role($c,'photo2').'<br>'
-                .'<label for="rev1">Text1:</label>'.$this->user_dropdown_for_role($c,'rev1').'<br>'
-                .'<label for="rev2">Text2:</label>'.$this->user_dropdown_for_role($c,'rev2').'<br>';
-
-            $content.='<fieldset></div></form></div>';
-            $content.='<div class="venueform"><form method="POST" action="" class="venue" ><strong>VENUE DETAILS</strong><br><br>'
-                .'<fieldset><label for="venue">Venue Name:</label><input type="text" id="venuename" name="venuename"><br>'
-                .'<label for="eventurl">Venue City:</label><input type="text" id="venuecity" name="venuecity"><br>'
-                .'<p><input type="submit" name="newvenue" value="Create New Venue"></p>'
-                .'<fieldset></form></div>';
-            $content.='</div>';
-            return $content;
-        }
-
-        private function adminactions( GiglogAdmin_Concert $concert ) : string
-        {
-            return
-                '<form method="POST" action="">'
-                . '<input type="hidden" name="cid" value="' . $concert->id() .  '" />'
-                . \EternalTerror\ViewHelpers\select_field(
-                    'selectstatus',
-                    array_map(fn($i) => [ $i, self::STATUS_LABELS[$i] ], range(1, count(self::STATUS_LABELS) - 1)),
-                    $concert->status())
-                . '<input type="submit" value="SetStatus">'
-                . '<input type="submit" name ="edit" value="EDIT">'
-                . '</form>';
-        }
-
-        //function to calculate if the concert has been added in the past 10 days or before that and show a green NEW for the newest rows
-        /**
-         * @return null|string
-         */
-        private function getpublishstatus(GiglogAdmin_Concert $concert) : string
-        {
-            $now = new DateTime();
-            $new_entry = $now->diff($concert->created())->days <= 10;
-            if ($new_entry) {
-                return '<span style="color:green">NEW</span>';
-            }
-            else {
-                return '';
-            }
-        }
-
-
-        private function get_concerts(): string
-        {
-            $content = '<table class="assignit">';
-            //    $content .= '</tr><th>CITY</th><th>ID</th><th>BAND</th><th>VENUE</th><th>DATE</th></tr>';
-
-            $content .= '<tr class="assignithrow">
-                <th>CITY</th><th>NAME</th><th>VENUE</th><th>DATE</th><th> </th>
-                <th>PHOTO1</th><th>PHOTO2</th><th>TEXT1</th><th>TEXT2</th>
-                <th>STATUS</th>';
-                if (current_user_can('administrator'))
-                $content .=  '<th>AdminOptions</th>';
-                $content .= '</tr>';
-
-            $filter = [];
-
-            // Use the submitted "city" if any. Otherwise, use the default/static value.
-            $cty = filter_input( INPUT_POST, 'selectcity', FILTER_SANITIZE_SPECIAL_CHARS );
-            if ($cty) $filter['city'] = $cty;
-
-            $venue = filter_input( INPUT_POST, 'selectvenue', FILTER_SANITIZE_SPECIAL_CHARS );
-            if ($venue) $filter['venue_id'] = $venue;
-
-            $concerts = GiglogAdmin_Concert::find_concerts($filter);
-
-            $lastType = '';
-
-            foreach ( $concerts AS $concert ) {
-                $content .= '<tr class="assignitr">';
-
-                if ($lastType != '' && $lastType !=  $concert->venue()->city()) {
-                    $content .= '<td>' . $concert->city() . '</td></tr><tr>';
-                }
-
-                if  ($lastType == '' ) {
-                    $content .= '<td>' . $concert->venue()->city() . '</td></tr><tr>';
-                }
-                // Modify these to match the database structure
-                //     $content .= '<td>' . $row->id. '</td>';
-                $content .= '<td></td>';
-                $content .= '<td>' . $concert->cname() . '</td>';
-                $content .= '<td>' . $concert->venue()->name() . '</td>';
-                $fdate =  strtotime($concert->cdate());
-                $newformat = date('d.M.Y',$fdate);
-
-                //$content .= DATE_FORMAT($fdate,'%d.%b.%Y');
-                $content .= '<td>' . $newformat . '</td>';
-                $content .= '<td>' . $this->getpublishstatus($concert) . '</td>';
-
-                $content .= '<td>' . $this->assign_role_for_user_form('photo1', $concert) . '</td>';
-                $content .= '<td>' . $this->assign_role_for_user_form('photo2', $concert) . '</td>';
-                $content .= '<td>' . $this->assign_role_for_user_form('rev1', $concert) . '</td>';
-                $content .= '<td>' . $this->assign_role_for_user_form('rev2', $concert) . '</td>';
-
-                $content .= '<td>' . self::STATUS_LABELS[$concert->status()] . '</td>';
-
-                if (current_user_can('administrator')) {
-                    $content .=
-                        '<td  class="adminbuttons">'
-                        . $this->adminactions($concert)
-                        . '</td>';
-                }
-                $content .= '</tr>';
-                $lastType = $concert->venue()->city();
-            }
-            $content .= '</table>';
-
-            // return the table
-            return $content;
-        }
-
-
         /**
          * @return void
          */
@@ -397,37 +190,6 @@ if ( !class_exists( 'GiglogAdmin_AdminPage' ) ) {
             wp_mail( $to, $subject, $body, $headers );
         }
 
-        private function assign_role_for_user_form(string $role, GiglogAdmin_Concert $concert) : ?string
-        {
-            $roles = $concert->roles();
-            $assigned_user = array_key_exists($role, $roles) ? $roles[$role] : NULL;
-
-            //first check if current slot is taken by current user
-            if ( $assigned_user == $this->username ) {
-                $f = '<form class="unassignit" method="POST" action="">'
-                    . '  <input type="hidden" name="cid" value="' . $concert->id() . '" />'
-                    . '  <input type="hidden" name="pid" value="' . $role . '" />'
-                    . '  <input type="submit" name="unassignitem" value="Your"/>'
-                    . '</form>';
-            }
-            elseif ( $assigned_user ) { //check if slot is taken by another user
-                $f = '<span class="takenby">Taken</span>'
-                    . '<div class="takenby">Taken by ' . $assigned_user . '</div>';
-            }
-            elseif ( array_search($this->username, $roles) ) {
-                // other slots for this concert are taken by user
-                $f = '<span class="taken_by_self">-</span>';
-            }
-            else { //not taken by anyone
-                $f = '<form method="POST" action="">'
-                    . '  <input type="hidden" name="cid" value="' . $concert->id() . '" />'
-                    . '  <input type="hidden" name="pid" value="' . $role. '" />'
-                    . '  <input  type="submit" name="assignitem" value=""/>'
-                    . '</form>';
-            }
-
-            return $f;
-        }
     }
 }
 ?>
-- 
cgit v1.2.3


From 20a05190275d3dce43061fad1d30f3d4847c8f1f Mon Sep 17 00:00:00 2001
From: Harald Eilertsen <haraldei@anduin.net>
Date: Sat, 4 Sep 2021 21:00:28 +0200
Subject: Drop extra query for venue_id in concert queries.

It's not required since the id is in the concerts table too. That's what
links them together.
---
 includes/concert.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/concert.php b/includes/concert.php
index a533679..29de015 100644
--- a/includes/concert.php
+++ b/includes/concert.php
@@ -31,7 +31,7 @@ if ( !class_exists('GiglogAdmin_Concert') ) {
         public const STATUS_REJECTED = 5;
 
         private const BASE_QUERY =
-            'SELECT wpg_concerts.*, wpg_venues.id as venue_id, wpg_venues.wpgvenue_name wpg_venues_wpgvenue_city '
+            'SELECT wpg_concerts.*, wpg_venues.wpgvenue_name wpg_venues_wpgvenue_city '
             . 'FROM wpg_concerts '
             . 'LEFT JOIN wpg_venues ON wpg_concerts.venue = wpg_venues.id ';
 
-- 
cgit v1.2.3