From 24ed943e79c0b42e95461a213914a862b415013e Mon Sep 17 00:00:00 2001 From: Chuck Scott Date: Tue, 2 Oct 2018 15:31:19 -0400 Subject: [PATCH] Updates to list of reqistrants in request dashboard. Also fixed a front-end link for the reg events list page where a link went nowhere. --- classes/data/dataAccount.php | 2 +- classes/data/dataRegRequest.php | 22 +++++++++++++ models/admin/registrations/requests.php | 4 +-- .../admin/registrations/accountDashboard.html | 2 +- .../admin/registrations/requestDashboard.html | 31 ++++++++++++++++++- views/front/registrations/list.html | 2 +- 6 files changed, 57 insertions(+), 6 deletions(-) diff --git a/classes/data/dataAccount.php b/classes/data/dataAccount.php index 3c0e01f..98609f1 100755 --- a/classes/data/dataAccount.php +++ b/classes/data/dataAccount.php @@ -673,7 +673,7 @@ class GlmDataRegistrationsAccount extends GlmDataAbstract require_once GLM_MEMBERS_REGISTRATIONS_PLUGIN_CLASS_PATH.'/data/dataRegRequestRegistrant.php'; $RegRequestRegistrant = new GlmDataRegistrationsRequestRegistrant($this->wpdb, $this->config); - $result_data['registrants'] = $RegRequestRegistrant-> getList('T.account = '.$result_data['id'], 'event_datetime'); + $result_data['registrants'] = $RegRequestRegistrant->getList('T.account = '.$result_data['id'], 'event_datetime'); $result_data['numb_registrants'] = is_array($result_data['registrants']) * count($result_data['registrants']); } diff --git a/classes/data/dataRegRequest.php b/classes/data/dataRegRequest.php index 5228eaa..c1e3a25 100755 --- a/classes/data/dataRegRequest.php +++ b/classes/data/dataRegRequest.php @@ -80,6 +80,18 @@ class GlmDataRegistrationsRegRequest extends GlmDataAbstract * @access public */ public $fields = false; + /** + * Get Registrants for the request flag + * + * If this is set then post-processing will include a list of the registrants + * for each request retrieved. + * + * This option is false by default and must be specifically set if it is desired. + * + * @var $getRegistrantslist + * @access public + */ + public $getRegistrantslist = false; /** * Constructor @@ -422,6 +434,16 @@ class GlmDataRegistrationsRegRequest extends GlmDataAbstract } + // If requested, get a list of the registrants + if (in_array($action, array('l', 'g')) && $this->getRegistrantslist) { + + require_once GLM_MEMBERS_REGISTRATIONS_PLUGIN_CLASS_PATH.'/data/dataRegRequestRegistrant.php'; + $RegRequestRegistrant = new GlmDataRegistrationsRequestRegistrant($this->wpdb, $this->config); + $result_data['registrants'] = $RegRequestRegistrant->getList('T.reg_request = '.$result_data['id'], 'lname, fname'); + $result_data['numb_registrants'] = is_array($result_data['registrants']) * count($result_data['registrants']); + + } + return $result_data; } diff --git a/models/admin/registrations/requests.php b/models/admin/registrations/requests.php index 48a83d9..47681cb 100755 --- a/models/admin/registrations/requests.php +++ b/models/admin/registrations/requests.php @@ -147,7 +147,7 @@ class GlmMembersAdmin_registrations_requests extends GlmDataRegistrationsRegRequ // If we have a request ID if ($requestID && $requestID > 0) { - // Try to check and get the request (cart) + // Try to get the request (cart) $cart = $regCartSupport->getRegistrationCart($requestID); // If there's no valid cart @@ -431,7 +431,7 @@ class GlmMembersAdmin_registrations_requests extends GlmDataRegistrationsRegRequ setcookie("glmMembersDatabaseRegistrationRequestID", $requestID, time()+86400); } - //echo "
".print_r($requests,1)."
"; + // echo "
".print_r($cart,1)."
"; // Compile template data $templateData = array( diff --git a/views/admin/registrations/accountDashboard.html b/views/admin/registrations/accountDashboard.html index 878a866..38976d7 100755 --- a/views/admin/registrations/accountDashboard.html +++ b/views/admin/registrations/accountDashboard.html @@ -99,7 +99,7 @@ {$terms.reg_term_event_cap} Level Rate - Requeest Status + Request Status Attending {foreach $account.registrants as $registrant} diff --git a/views/admin/registrations/requestDashboard.html b/views/admin/registrations/requestDashboard.html index 69d33e3..5fb67a9 100755 --- a/views/admin/registrations/requestDashboard.html +++ b/views/admin/registrations/requestDashboard.html @@ -145,7 +145,36 @@ - + +
+

Current List of {$terms.reg_term_attendee_plur_cap} for this Request

+ {assign var="i" value="0"} + + + + + + + + + {foreach $cart.events as $event} + {foreach $event.classes as $class} + {foreach $class.rates as $rate} + {foreach $rate.registrants as $registrant} + + + + + + + + {/foreach} + {/foreach} + {/foreach} + {/foreach} +
Name{$terms.reg_term_event_cap}LevelRateAttending
{$registrant.fname} {$registrant.lname}{$event.event_name}{$class.class_name}{$rate.rate_name}{if $registrant.not_attending.value}No{else}Yes{/if}
+
+
{if $cart.request.status.name != 'In Cart'} diff --git a/views/front/registrations/list.html b/views/front/registrations/list.html index ffe074f..1397f97 100755 --- a/views/front/registrations/list.html +++ b/views/front/registrations/list.html @@ -98,7 +98,7 @@ {/if}
- {$terms.reg_term_register_cap} for this {$terms.reg_term_event_cap} + {$terms.reg_term_register_cap} for this {$terms.reg_term_event_cap}
-- 2.17.1