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 ++++++++++++++----------- includes/concert.php | 4 ++++ includes/css/main.css | 16 ++++++++++++++++ 3 files changed, 34 insertions(+), 11 deletions(-) (limited to 'includes') 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 diff --git a/includes/concert.php b/includes/concert.php index 8210b2d..f4d7e6b 100644 --- a/includes/concert.php +++ b/includes/concert.php @@ -217,6 +217,10 @@ if ( !class_exists('GiglogAdmin_Concert') ) { array_push($where, 'wpg_venues.id = ' . $wpdb->prepare('%s', $filter["venue_id"])); } + if ( isset( $filter["currentuser"] ) ) { + array_push($where , 'wpgconcert_roles like "%'.$filter["currentuser"].'%"'); + } + if ( ! empty( $where ) ) { $query .= 'WHERE ' . implode(' and ', $where); } diff --git a/includes/css/main.css b/includes/css/main.css index 1cbc906..c28ae76 100644 --- a/includes/css/main.css +++ b/includes/css/main.css @@ -77,6 +77,7 @@ span.takenbyself padding: none !important; font-size: small; vertical-align: center; + border-collapse:collapse; } table.assignit @@ -84,6 +85,7 @@ table.assignit { white-space: nowrap; overflow: hidden; + border-collapse:collapse; } input[name="unassignitem"] @@ -162,3 +164,17 @@ input[name="unassignitem"] { height: auto; } + + tr.assignitr:nth-child(even){ + background: #CCC + } + +tr.assignitr { + min-height: 120%; + } + + .assigneduser, .publishstatus + { + text-align: center; + + } -- cgit v1.2.3