From 8f78f92071bffd6c22601e2fefb516e49acc0733 Mon Sep 17 00:00:00 2001
From: Roy Johnson <roy.l.johnson@gmail.com>
Date: Fri, 21 Apr 2006 19:32:22 +0000
Subject: [PATCH] Added some info messages to the search screen to improve
 usability.  Allowed events to have a price of zero.

---
 .../wgtemplate_default_ems_search.tmpl        |  7 ++--
 .../Asset/Wobject/EventManagementSystem.pm    | 39 +++++++++++++++++--
 2 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_ems_search.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_ems_search.tmpl
index e2e9f8240..d8bf7ede5 100644
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_ems_search.tmpl
+++ b/docs/upgrades/templates-6.99.0/wgtemplate_default_ems_search.tmpl
@@ -115,7 +115,8 @@
 <br /><br />
 
 <tmpl_if managePrereqs><p><tmpl_var managePrereqsMessage></p><tmpl_var prereqForm.header></tmpl_if>
-
+<p><tmpl_var message></p>
+<p>Your search returned <tmpl_var numberOfSearchResults> results.</p>
 <table width="100%" border="0" cellpadding="8" cellspacing="0" style="border-top:solid gray 2px;border-bottom:solid gray 2px;">
 <tr>
 <tmpl_if managePrereqs><th>&nbsp;</th></tmpl_if>
@@ -143,9 +144,7 @@
 </table>
 <tmpl_if managePrereqs><tmpl_var prereqForm.submit><tmpl_var prereqForm.footer></tmpl_if>
 
-<tmpl_var paginateBar>
-	
-	
+<tmpl_var paginateBar>	
 ~~~
 <style type="text/css">
 tr.oddRow td {
diff --git a/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm b/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm
index b86d3de22..5a98d4799 100644
--- a/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm
+++ b/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm
@@ -1369,7 +1369,7 @@ sub validateEditEventForm {
   $errors = $self->checkRequiredFields(\%requiredFields);
   
   #Check price greater than zero
-  if ($self->session->form->get("price") <= 0) {
+  if ($self->session->form->get("price") < 0) {
       push (@{$errors}, {
       	type      => "general",
         message   => $i18n->get("price must be greater than zero"),
@@ -2634,7 +2634,7 @@ sub www_search {
 				       WebGUI::Form::hidden($self->session,{name => "eventToAssignPrereqTo", value => $eventToAssignPrereqTo});
 	$var{isAdvSearch} = $self->session->form->get('advSearch');
 	$var{'search.formFooter'} = WebGUI::Form::formFooter($self->session);
-	$var{'search.formSubmit'} = WebGUI::Form::submit($self->session, {value=>$i18n->get('filter')});
+	$var{'search.formSubmit'} = WebGUI::Form::submit($self->session, {name=>"filter",value=>$i18n->get('filter')});
 	my $searchUrl = $self->getUrl("a=1");  #a=1 is a hack to get the ? appended to the url in the right place.  This param/value does nothing.
 	my $formVars = $self->session->form->paramsHashRef();
 	foreach ($self->session->form->param) {
@@ -2677,7 +2677,9 @@ sub www_search {
 	}
 	#$self->session->errorHandler->warn("<pre>".Dumper(@results)."</pre>");
 	$sth->finish;
-	@results = () unless ( (scalar(@results) <= 50) || ($self->session->form->get("advSearch") || $self->session->form->get("searchKeywords")));	
+	my $maxResultsForInitialDisplay = 1;
+	my $numSearchResults = scalar(@results);
+	@results = () unless ( ($numSearchResults <= $maxResultsForInitialDisplay) || ($self->session->form->get("advSearch") || $self->session->form->get("searchKeywords")));	
 	$p->setDataByArrayRef(\@results);
 	my $eventData = $p->getPageData;
 	my @events;
@@ -2754,6 +2756,37 @@ sub www_search {
 	else {
 		$var{'canManageEvents'} = 0;
 	}
+	my $message;
+	my $subSearchFlag = $self->session->form->get("subSearch") || ($self->session->form->get("func"));
+	my $advSearchFlag = $self->session->form->get("advSearch");
+	my $basicSearchFlag = $self->session->form->get("searchKeywords");
+	my $managePrereqsFlag = $var{'managePrereqs'};
+	my $paginationFlag = $self->session->form->get("pn");# || ($self->get("paginateAfter") < $numSearchResults);
+	my $hasSearchedFlag = ($self->session->form->get("filter"));
+	
+	#Determine type of search results we're displaying
+	if ($subSearchFlag && !$managePrereqsFlag && ($numSearchResults <= $maxResultsForInitialDisplay || $paginationFlag || $hasSearchedFlag)) {
+		if ($self->canEdit) { #Admin manage sub events small resultset
+			$message = "You may manage the events below.  You can narrow the list of events displayed using the basic or advanced filter options above.";
+		} else { #User sub events small resultset
+			$message = "You may also choose from the following sub-events.  You can narrow the list of sub-events by using the basic or advanced filter options above.";
+		}
+	} elsif ($subSearchFlag && $numSearchResults > $maxResultsForInitialDisplay && !$managePrereqsFlag && !$paginationFlag) {
+		if ($self->canEdit) { #Admin manage sub events large resultset
+			$message = "You may manage the events below.  Due to the large number of sub-events available none are currently displayed, please narrow the results using the basic or advanced filter options above.";   
+		} else { #User sub events large resultset
+			$message = "You may also choose from the following sub-events.  Due to the large number of sub-events available none are currently displayed, please narrow the results using the basic or advanced filter options above.";
+		}
+
+	} elsif ($managePrereqsFlag && ($numSearchResults <= $maxResultsForInitialDisplay || $paginationFlag || $hasSearchedFlag)) {
+		$message = "You can narrow the list of prerequisites displayed using the basic or advanced filter options above.";
+	} elsif ($managePrereqsFlag && $numSearchResults > $maxResultsForInitialDisplay && !$paginationFlag) {
+		$message = "Due to the large number of prerequisites available none are currently displayed, please narrow the results using the basic or advanced filter options above."
+	}
+
+	$var{'message'} = $message;
+	$var{'numberOfSearchResults'} = $numSearchResults;
+
 	$p->appendTemplateVars(\%var);
 	$self->buildMenu(\%var);
 	$var{'ems.wobject.dir'} = $self->session->config->get("extrasURL")."/wobject/EventManagementSystem";