From 1bfa2f0db6500221512059f4bbb69c06723ea2bd Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Wed, 9 Aug 2017 15:48:35 -0400 Subject: [PATCH] Updating dashboards for pending events. List out the member name and link to their record. If there's one. And if not logged in as member contact. --- classes/data/dataEvents.php | 6 ++++-- models/admin/dashboard/events.php | 16 ++++++++++++--- models/admin/dashboard/index.php | 32 ++++++++++++++--------------- views/admin/dashboard/events.html | 8 ++++++++ views/admin/events/index.html | 34 ++++++++++++++++--------------- 5 files changed, 59 insertions(+), 37 deletions(-) diff --git a/classes/data/dataEvents.php b/classes/data/dataEvents.php index ef35bd8..5216567 100644 --- a/classes/data/dataEvents.php +++ b/classes/data/dataEvents.php @@ -880,8 +880,10 @@ class GlmDataEvents extends GlmDataAbstract $this->postCategories = false; $this->fields = array( - 'id' => $savedFields['id'], - 'name' => $savedFields['name'] + 'id' => $savedFields['id'], + 'name' => $savedFields['name'], + 'ref_dest' => $savedFields['ref_dest'], + 'ref_dest_id' => $savedFields['ref_dest_id'], ); $r = $this->getList($where); diff --git a/models/admin/dashboard/events.php b/models/admin/dashboard/events.php index a7474d0..47444eb 100644 --- a/models/admin/dashboard/events.php +++ b/models/admin/dashboard/events.php @@ -134,7 +134,7 @@ class GlmMembersAdmin_dashboard_events extends GlmDataEvents } } else { $events = $this->wpdb->get_results( - "SELECT E.id,E.name,E.status,E.approved,T1.start_time as start,T2.end_time as end + "SELECT E.id,E.name,E.ref_dest,T1.start_time as start,T2.end_time as end FROM " . GLM_MEMBERS_EVENTS_PLUGIN_DB_PREFIX . "events E, " . GLM_MEMBERS_EVENTS_PLUGIN_DB_PREFIX . "times T1, " . GLM_MEMBERS_EVENTS_PLUGIN_DB_PREFIX . "times T2 @@ -150,8 +150,18 @@ class GlmMembersAdmin_dashboard_events extends GlmDataEvents ); foreach ( $events as &$event ) { - // set the status - $event['status'] = $this->config['status'][$event['status']]; + // Set the Member Name + if ( $memberId = filter_var( $event['ref_dest'], FILTER_VALIDATE_INT) ) { + $memberName = $this->wpdb->get_var( + $this->wpdb->prepare( + "SELECT name + FROM " . GLM_MEMBERS_PLUGIN_DB_PREFIX . "members + WHERE id = %d", + $memberId + ) + ); + $event['member_name'] = $memberName; + } } } diff --git a/models/admin/dashboard/index.php b/models/admin/dashboard/index.php index 86902b1..0f33387 100644 --- a/models/admin/dashboard/index.php +++ b/models/admin/dashboard/index.php @@ -88,22 +88,22 @@ class GlmMembersAdmin_events_index extends GlmDataEvents public function modelAction($actionData = false) { - $memberID = false; + $memberID = false; $lockedToMember = false; - $lockedWhereT = 'true'; - $lockedWhere = 'true'; - $numbEvents = 0; - $numbPending = 0; - $namesList = false; + $lockedWhereT = 'true'; + $lockedWhere = 'true'; + $numbEvents = 0; + $numbPending = 0; + $namesList = false; $haveCategories = false; // Check if there's a logged in user who is locked to their own entity $lockedToMember = apply_filters('glm_members_locked_to_member_id', false); if ($lockedToMember) { - $memberID = $lockedToMember; + $memberID = $lockedToMember; $lockedToMember = $memberID; - $lockedWhereT = 'T.ref_type = '.$this->config['ref_type_numb']['Member'].' AND T.ref_dest = '.$memberID; - $lockedWhere = 'ref_type = '.$this->config['ref_type_numb']['Member'].' AND ref_dest = '.$memberID; + $lockedWhereT = 'T.ref_type = '.$this->config['ref_type_numb']['Member'].' AND T.ref_dest = '.$memberID; + $lockedWhere = 'ref_type = '.$this->config['ref_type_numb']['Member'].' AND ref_dest = '.$memberID; } // Check for required Event Categories @@ -138,18 +138,18 @@ class GlmMembersAdmin_events_index extends GlmDataEvents // Compile template data $templateData = array( 'lockedToMember' => $lockedToMember, - 'numbEvents' => $numbEvents, - 'pending' => $pending, - 'namesList' => $namesList, - 'numbPending' => $numbPending, + 'numbEvents' => $numbEvents, + 'pending' => $pending, + 'namesList' => $namesList, + 'numbPending' => $numbPending, 'haveCategories' => $haveCategories ); // Return status, any suggested view, and any data to controller return array( - 'status' => true, + 'status' => true, 'modelRedirect' => false, - 'view' => 'admin/events/index.html', - 'data' => $templateData + 'view' => 'admin/events/index.html', + 'data' => $templateData ); } diff --git a/views/admin/dashboard/events.html b/views/admin/dashboard/events.html index 89ff8da..70b4bb7 100644 --- a/views/admin/dashboard/events.html +++ b/views/admin/dashboard/events.html @@ -11,6 +11,7 @@ Name + {if !$memberID}Member{/if} Start End {if $memberID}Status @@ -25,6 +26,13 @@ {$event.name} + {if !$memberID} + + {if $event.ref_dest} + {$event.member_name} + {/if} + + {/if} {$event.start|date_format:"%m/%d/%Y"} {$event.end|date_format:"%m/%d/%Y"} {if $memberID}{$event.status} diff --git a/views/admin/events/index.html b/views/admin/events/index.html index 167eebc..b1809b0 100644 --- a/views/admin/events/index.html +++ b/views/admin/events/index.html @@ -1,9 +1,9 @@ {include file='admin/events/header.html'} - + {if apply_filters('glm_members_permit_admin_events_index_add_event', true)} Add A New Event {/if} - + - {/if} + {/if} {/if} - + {if $numbEvents == 0} -{/if} +{/if}
@@ -18,18 +18,18 @@ You do not have any Events Categories setup. Click here to add Event Categories.
 
You do not have any events listed. Click here to create your first event.
- + @@ -37,17 +37,18 @@ {if $pending}

 
Events Pending Review

- -
Number of Events Listed: {$numbEvents}
Number Pending: {$numbPending}
+ +
+ {if !$lockedToMember}{/if} {assign var="i" value="0"} {foreach $pending as $p} - {if $i++ is odd by 1} + {if $i++ is odd by 1} {else} @@ -55,6 +56,7 @@ + {if !$lockedToMember}{/if} {/foreach} @@ -64,13 +66,13 @@ {if $namesList} {/if} - + {include file='admin/footer.html'} -- 2.17.1
Event Name{$terms.term_member_cap}
{$p.name} {if $p.ref_dest_id}{$p.ref_dest}{/if}