From 62b05425e16f953c93b4b83333d974c73da124e2 Mon Sep 17 00:00:00 2001 From: Laury GvR Date: Fri, 19 May 2017 16:49:10 -0400 Subject: [PATCH] Field testing on event registration edit form --- models/admin/registrations/events.php | 67 ++++++++++++++++++------ views/admin/registrations/editEvent.html | 55 +++++++++++++++---- 2 files changed, 94 insertions(+), 28 deletions(-) diff --git a/models/admin/registrations/events.php b/models/admin/registrations/events.php index eaeb69f..d5b6972 100644 --- a/models/admin/registrations/events.php +++ b/models/admin/registrations/events.php @@ -102,14 +102,29 @@ class GlmMembersAdmin_registrations_events extends GlmDataRegistrationsRegEvent ///////////////////////////////////// - $haveRegistrations = false; - $registrations = false; - $haveRegistration = false; - $registrationId = false; - $registrationCart = false; - $option = 'list'; - $errorMsg = false; - $view = "events"; + $option = 'list'; + $numbRegistrations = 0; + $hasRegistrations = false; + $paging = true; + $prevStart = false; + $nextStart = false; + $start = 1; + $limit = 20; // Set to the number of listings per page + $fromDate = false; + $toDate = false; + $filterArchived = false; + $filterPending = false; + $registrations = false; + $view = 'events'; + $registration = false; + $haveRegistration = false; + $registrationUpdated = false; + $registrationUpdateError = false; + $registrationAdded = false; + $registrationAddError = false; + $namesList = false; + $numbDisplayed = false; + $lastDisplayed = false; // Load registrations support class require_once GLM_MEMBERS_REGISTRATIONS_PLUGIN_CLASS_PATH.'/registrationsSupport.php'; @@ -154,7 +169,7 @@ class GlmMembersAdmin_registrations_events extends GlmDataRegistrationsRegEvent $registration = $this->editEntry( $this->registrationID ); //echo '
$registration: ' . print_r( $registration, true ) . '
'; if ( $registration['status'] ) { - $haveAccount = true; + $haveRegistration = true; } //echo '
$registration: ' . print_r( $registration, true ) . '
'; @@ -171,7 +186,7 @@ class GlmMembersAdmin_registrations_events extends GlmDataRegistrationsRegEvent // Retrieve the Edit Entry again $registration = $this->editEntry( $this->registrationID ); if ( $registration['status'] ) { - $haveAccount = true; + $haveRegistration = true; } } else { $registrationUpdateError = true; @@ -180,7 +195,7 @@ class GlmMembersAdmin_registrations_events extends GlmDataRegistrationsRegEvent break; case 'delete': - $oldAccount = $this->deleteEntry( $this->registrationID, true ); + $oldRegistration = $this->deleteEntry( $this->registrationID, true ); $view = 'registration'; // Check registration and update holds @@ -236,16 +251,34 @@ class GlmMembersAdmin_registrations_events extends GlmDataRegistrationsRegEvent break; } -// echo "
". print_r($registrations, true) . "
"; + //echo "
". print_r($registration, true) . "
"; + // Compile template data $templateData = array( - 'haveRegistrations' => $haveRegistrations, - 'registrations' => $registrations, - 'haveRegistration' => $haveRegistration, - 'errorMsg' => $errorMsg, - 'option' => $option + 'hasRegistrations' => $hasRegistrations, + 'numRegistrations' => ($registrations) ? count($registrations) : 0, + 'registrations' => $registrations, + 'registration' => $registration, + 'limit' => $limit, + 'prevStart' => $prevStart, + 'nextStart' => $nextStart, + 'paging' => $paging, + 'fromDate' => $fromDate, + 'toDate' => $toDate, + 'filterArchived' => $filterArchived, + 'filterPending' => $filterPending, + 'registrationID' => $this->registrationID, + 'haveRegistration' => $haveRegistration, + 'registrationUpdated' => $registrationUpdated, + 'registrationUpdateError' => $registrationUpdateError, + 'option' => $option, + 'registrationAdded' => $registrationAdded, + 'registrationAddError' => $registrationAddError, + 'namesList' => $namesList, + 'numbDisplayed' => $numbDisplayed, + 'lastDisplayed' => $lastDisplayed, ); ///////////////////////////////////// diff --git a/views/admin/registrations/editEvent.html b/views/admin/registrations/editEvent.html index a94ec88..517ebf2 100644 --- a/views/admin/registrations/editEvent.html +++ b/views/admin/registrations/editEvent.html @@ -9,16 +9,16 @@ Here {if $option == 'edit' || $option == 'update'} *** Edit or Update *** +

Edit an event registration {else} *** Add new one*** +

Add a new event registration + {/if} +     + {if $registrationUpdated}Registration Updated{/if} + {if $registrationUpdateError}Registration Update Error{/if} + {if $registrationAdded}Registration Added{/if} + {if $registrationAddError}Registration Add Error{/if} +

+ + +
+ + {if $haveRegistration} + + + {else} + + {/if} + + + + + + + + + +
Event Name + + {if $registration.fieldFail.event_name}

{$registration.fieldFail.event_name}

{/if}
+
+
+ - {/if} {include file='admin/footer.html'} -- 2.17.1