From 88244b19533163564098057c75952deffc7dc13e Mon Sep 17 00:00:00 2001 From: AndreaChirulescu Date: Sat, 4 Sep 2021 21:36:25 +0200 Subject: Fixed a call to city() method in concert.php It needed ->venue->city Added order by concert date in concert list --- includes/admin/views/giglog_admin_page.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'includes/admin') diff --git a/includes/admin/views/giglog_admin_page.php b/includes/admin/views/giglog_admin_page.php index dfea3fd..ce0031c 100644 --- a/includes/admin/views/giglog_admin_page.php +++ b/includes/admin/views/giglog_admin_page.php @@ -223,7 +223,7 @@ if ( !class_exists( 'GiglogAdmin_AdminPage' ) ) { $content .= ''; if ($lastType != '' && $lastType != $concert->venue()->city()) { - $content .= '' . $concert->city() . ''; + $content .= '' . $concert->venue()->city() . ''; } if ($lastType == '' ) { -- cgit v1.2.3 From 98909040a8dff9fb77f9e0a9acd0b9ce81236335 Mon Sep 17 00:00:00 2001 From: AndreaChirulescu Date: Sun, 5 Sep 2021 15:03:09 +0200 Subject: Fixed filter by your concerts Added CSS and extra fromatting to table --- includes/admin/views/giglog_admin_page.php | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'includes/admin') diff --git a/includes/admin/views/giglog_admin_page.php b/includes/admin/views/giglog_admin_page.php index ce0031c..fedfa6c 100644 --- a/includes/admin/views/giglog_admin_page.php +++ b/includes/admin/views/giglog_admin_page.php @@ -110,8 +110,8 @@ if ( !class_exists( 'GiglogAdmin_AdminPage' ) ) { } //option to select own concerts only $select .= 'user_login; + $concerts = GiglogAdmin_Concert::find_concerts($filter); $lastType = ''; @@ -223,15 +226,15 @@ if ( !class_exists( 'GiglogAdmin_AdminPage' ) ) { $content .= ''; if ($lastType != '' && $lastType != $concert->venue()->city()) { - $content .= '' . $concert->venue()->city() . ''; + $content .= '' . $concert->venue()->city() . ''; } if ($lastType == '' ) { - $content .= '' . $concert->venue()->city() . ''; + $content .= '' . $concert->venue()->city() . ''; } // Modify these to match the database structure // $content .= '' . $row->id. ''; - $content .= ''; + $content .= '

'; $content .= '' . $concert->cname() . ''; $content .= '' . $concert->venue()->name() . ''; $fdate = strtotime($concert->cdate()); @@ -239,12 +242,12 @@ if ( !class_exists( 'GiglogAdmin_AdminPage' ) ) { //$content .= DATE_FORMAT($fdate,'%d.%b.%Y'); $content .= '' . $newformat . ''; - $content .= '' . $this->getpublishstatus($concert) . ''; + $content .= '' . $this->getpublishstatus($concert) . ''; - $content .= '' . $this->assign_role_for_user_form('photo1', $concert) . ''; - $content .= '' . $this->assign_role_for_user_form('photo2', $concert) . ''; - $content .= '' . $this->assign_role_for_user_form('rev1', $concert) . ''; - $content .= '' . $this->assign_role_for_user_form('rev2', $concert) . ''; + $content .= '' . $this->assign_role_for_user_form('photo1', $concert) . ''; + $content .= '' . $this->assign_role_for_user_form('photo2', $concert) . ''; + $content .= '' . $this->assign_role_for_user_form('rev1', $concert) . ''; + $content .= '' . $this->assign_role_for_user_form('rev2', $concert) . ''; $content .= '' . self::STATUS_LABELS[$concert->status()] . ''; @@ -407,7 +410,7 @@ if ( !class_exists( 'GiglogAdmin_AdminPage' ) ) { $f = '
' . ' ' . ' ' - . ' ' + . ' ' . '
'; } elseif ( $assigned_user ) { //check if slot is taken by another user -- cgit v1.2.3 From aa688626d52d4e7fd3df16dc620cf96697c3f95a Mon Sep 17 00:00:00 2001 From: AndreaChirulescu Date: Sun, 5 Sep 2021 16:23:36 +0200 Subject: Re-added the changes for looks, and city/venue selector --- includes/admin/views/_concerts_table.php | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'includes/admin') diff --git a/includes/admin/views/_concerts_table.php b/includes/admin/views/_concerts_table.php index 37459a3..aba8c5c 100644 --- a/includes/admin/views/_concerts_table.php +++ b/includes/admin/views/_concerts_table.php @@ -51,6 +51,9 @@ if (!class_exists("GiglogAdmin_ConcertsTable")) $venue = filter_input( INPUT_POST, 'selectvenue', FILTER_SANITIZE_SPECIAL_CHARS ); if ($venue) $filter['venue_id'] = $venue; + if(isset($_POST['ownconcerts']) && $_POST['ownconcerts'] == '1') + $filter['currentuser'] = wp_get_current_user()->user_login; + $concerts = GiglogAdmin_Concert::find_concerts($filter); $lastType = ''; @@ -59,15 +62,15 @@ if (!class_exists("GiglogAdmin_ConcertsTable")) $content .= ''; if ($lastType != '' && $lastType != $concert->venue()->city()) { - $content .= '' . $concert->city() . ''; + $content .= '' . $concert->venue->city() . ''; } if ($lastType == '' ) { - $content .= '' . $concert->venue()->city() . ''; + $content .= '' . $concert->venue()->city() . ''; } // Modify these to match the database structure // $content .= '' . $row->id. ''; - $content .= ''; + $content .= '

'; $content .= '' . $concert->cname() . ''; $content .= '' . $concert->venue()->name() . ''; $fdate = strtotime($concert->cdate()); @@ -75,12 +78,12 @@ if (!class_exists("GiglogAdmin_ConcertsTable")) //$content .= DATE_FORMAT($fdate,'%d.%b.%Y'); $content .= '' . $newformat . ''; - $content .= '' . $this->mark_new_concert($concert) . ''; + $content .= '' . $this->mark_new_concert($concert) . ''; - $content .= '' . $this->assign_role_for_user_form('photo1', $concert) . ''; - $content .= '' . $this->assign_role_for_user_form('photo2', $concert) . ''; - $content .= '' . $this->assign_role_for_user_form('rev1', $concert) . ''; - $content .= '' . $this->assign_role_for_user_form('rev2', $concert) . ''; + $content .= '' . $this->assign_role_for_user_form('photo1', $concert) . ''; + $content .= ' class="assigneduser">' . $this->assign_role_for_user_form('photo2', $concert) . ''; + $content .= '' . $this->assign_role_for_user_form('rev1', $concert) . ''; + $content .= '' . $this->assign_role_for_user_form('rev2', $concert) . ''; $content .= '' . self::STATUS_LABELS[$concert->status()] . ''; @@ -124,8 +127,8 @@ if (!class_exists("GiglogAdmin_ConcertsTable")) } //option to select own concerts only $select .= '' . ' ' - . ' ' + . ' ' . ''; } elseif ( $assigned_user ) { //check if slot is taken by another user -- cgit v1.2.3