From a49c94cde83b6279cd2d9b780fb0f7c91fc637d7 Mon Sep 17 00:00:00 2001
From: Yung Han Khoe <yung@webgui-svn>
Date: Tue, 20 May 2008 11:49:34 +0000
Subject: [PATCH] More UserList sort options

---
 lib/WebGUI/Asset/Wobject/UserList.pm      | 22 +++++++++++++++++----
 lib/WebGUI/Help/Asset_UserList.pm         |  3 +++
 lib/WebGUI/i18n/English/Asset_UserList.pm | 24 +++++++++++++++++++++--
 3 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/lib/WebGUI/Asset/Wobject/UserList.pm b/lib/WebGUI/Asset/Wobject/UserList.pm
index 60a1a62c4..2af8291e0 100644
--- a/lib/WebGUI/Asset/Wobject/UserList.pm
+++ b/lib/WebGUI/Asset/Wobject/UserList.pm
@@ -253,6 +253,7 @@ sub prepareView {
 sub view {
 
 	my $self = shift;
+    my $form = $self->session->form;
 	my $i18n = WebGUI::International->new($self->session, "Asset_UserList");
 	my (%var, @users, @profileField_loop, @profileFields,@profileFieldNames);
 	my ($defaultPublicProfile, $defaultPublicEmail, $user, $sth, $sql, $profileField);
@@ -276,6 +277,14 @@ sub view {
 		push(@profileFieldNames, $profileField->{fieldName});
         unless($self->get("showOnlyVisibleAsNamed") && $profileField->{visible} != 1){
             $var{'profileField_'.$profileField->{fieldName}.'_label'} = $label;
+            my $sortByURL = '?orderBy='.$profileField->{fieldName};
+            if ($form->process('orderType') eq 'asc' && $form->process('orderBy') eq $profileField->{fieldName}){
+                $sortByURL .= ';orderType=desc';
+            }
+            else{
+                $sortByURL .= ';orderType=asc';
+            }
+            $var{'profileField_'.$profileField->{fieldName}.'_sortByURL'} = $sortByURL;
         }
 	}
     
@@ -292,9 +301,11 @@ sub view {
 	my $constraint;
 	if ($self->session->form->process('search')){
 		$constraint = "(".join(' or ', map {'userProfileData.'.$_->{fieldName}.' like "%'.$self->session->form->process('search').'%"'} @profileFields).")";	
-	}elsif ($self->session->form->process('searchExact')){
+	}
+    elsif ($self->session->form->process('searchExact')){
         $constraint = "(".join(' or ', map {'userProfileData.'.$_->{fieldName}.' like "'.$self->session->form->process('searchExact').'"'} @profileFields).")";
-    }else{
+    }
+    else{
     	my @profileSearchFields = ();
 	    my @profileSearchExactFields = ();
     	foreach my $profileField (@profileFields){
@@ -371,7 +382,8 @@ sub view {
 			    	push (@profileFieldValues, {
 				    	"profile_emailNotPublic"=>1,
     				});
-				}else{
+				}
+                else{
 					push (@profileFieldValues, {
     					"profile_value"=>$user->{$profileField->{fieldName}},
 					});
@@ -389,7 +401,8 @@ sub view {
 			$userProperties{"user_name"} = $user->{userName};
 			$userProperties{"user_profile_loop"} = \@profileFieldValues;
 			push(@users,\%userProperties);
-		}else{
+		}
+        else{
 			push(@users, {
 		    	"user_id"=>$user->{userId},
 			    "user_name"=>$user->{userName},
@@ -400,6 +413,7 @@ sub view {
 	foreach my $profileField (@profileFields){
 	push (@profileField_loop, {
 		"profileField_label"=>WebGUI::Operation::Shared::secureEval($self->session,$profileField->{label}),
+        "profileField_sortByURL"=>'?orderBy='.$profileField->{fieldName},
 		});
 	}
 	$var{numberOfProfileFields} = scalar(@profileFields);
diff --git a/lib/WebGUI/Help/Asset_UserList.pm b/lib/WebGUI/Help/Asset_UserList.pm
index 6a4bf956f..454d23113 100644
--- a/lib/WebGUI/Help/Asset_UserList.pm
+++ b/lib/WebGUI/Help/Asset_UserList.pm
@@ -27,9 +27,12 @@ our $HELP = {
             { 'name' => 'searchFormTypeSelect' },
             { 'name' => 'searchFormQuery_form' },
             { 'name' => 'numberOfProfileFields' },
+            { 'name' => 'profileField_PROFILEFIELDNAME_label' },
+            { 'name' => 'profileField_PROFILEFIELDNAME_sortByURL' },
             {   'name'      => 'profileField_loop',
                 'variables' => [
                     { 'name' => 'profileField_label' },
+                    { 'name' => 'profileField_sortByURL' },
                 ],
             },
             {   'name'      => 'alphabetSearch_loop',
diff --git a/lib/WebGUI/i18n/English/Asset_UserList.pm b/lib/WebGUI/i18n/English/Asset_UserList.pm
index a795676e1..b12403269 100644
--- a/lib/WebGUI/i18n/English/Asset_UserList.pm
+++ b/lib/WebGUI/i18n/English/Asset_UserList.pm
@@ -240,12 +240,32 @@ true for the 'email' profile field.|,
         },
 
         'profileField_loop' => {
-                message => q|A loop contining profile fields|,
+                message => q|A loop containing profile fields|,
                 lastUpdated => 1081514049
         },
 
         'profileField_label' => {
-                message => q|The label for a profile field|,
+                message => q|The label for this profile field|,
+                lastUpdated => 1081514049
+        },
+        
+
+        'profileField_sortByURL' => {
+                message => q|The URL to sort the UserList by this profile field. The default sort order
+is ascending. After clicking the sort by link for a profile field the sort order will be reversed.|,
+                lastUpdated => 1081514049
+        },
+
+        'profileField_PROFILEFIELDNAME_label' => {
+                message => q|The label for the profile field with fieldName PROFILEFIELDNAME. Example &lt;tmpl_var
+profileField_lastName_label&gt;. This tmpl_var exists outside of the profileField_loop.|,
+                lastUpdated => 1081514049
+        },
+
+        'profileField_PROFILEFIELDNAME_sortByURL' => {
+                message => q|The URL to sort the UserList by PROFILEFIELDNAME. Example &lt;tmpl_var
+profileField_lastName_sortByURL&gt;. This tmpl_var exists outside of the profileField_loop. The default sort order
+is ascending. After clicking the sort by link for a profile field the sort order will be reversed.|,
                 lastUpdated => 1081514049
         },