Changeset 158 for trunk/web

Timestamp:

06/22/05 10:59:35 (18 years ago)

Author:

bastiaans

Message:

toga/search.php:

• Removed debug printf

toga/search.php:

• Will now maintain filter order in header

Location:

trunk/web/addons/toga

Files:

• index.php (modified) (2 diffs)
• search.php (modified) (1 diff)

trunk/web/addons/toga/index.php

@@ -24 +24 @@
 if( !isset($sortorder) ) $sortorder = "asc";
 if( !isset($sortby) ) $sortby = "id";
-if( isset($queue) && ($queue!='')) $filter[queue]=$queue;
-if( isset($state) && ($state!='')) $filter[state]=$state;
-if( isset($user) && ($user!='')) $filter[user]=$user;
-if( isset($id) && ($id!='')) $filter[id]=$id;
+
+$myfilter_fields = explode( ",", $filterorder );
+
+// Fill filter array in order they were picked by user
+foreach( $myfilter_fields as $myfilter ) {
+
+        switch( $myfilter ) {
+
+                case "queue":
+                        $filter[queue]=$queue;
+                        break;
+                case "state":
+                        $filter[state]=$state;
+                        break;
+                case "user":
+                        $filter[user]=$user;
+                        break;
+                case "id":
+                        $filter[id]=$id;
+                        break;
+        }
+}
+
+//if( isset($queue) && ($queue!='')) $filter[queue]=$queue;
+//if( isset($state) && ($state!='')) $filter[state]=$state;
+//if( isset($user) && ($user!='')) $filter[user]=$user;
+//if( isset($id) && ($id!='')) $filter[id]=$id;
 
 function makeHeader() {
@@ -164 +187 @@
                         $temp_ct = 0;
                         $n_filter = $filter;
+                        $my_filterorder = "";
+                        $my_filters = array_keys( $filter );
 
                         foreach( $n_filter as $n_filtername=>$n_filterval ) {
 
-                                if( $temp_ct < $my_ct )
+                                if( $temp_ct < $my_ct ) {
                                         $href .= "&". $n_filtername . "=" . $n_filterval;
+
+                                        if( $my_filterorder == "" )
+                                                $my_filterorder = $my_filters[$temp_ct];
+                                        else
+                                                $my_filterorder .= "," . $my_filters[$temp_ct];
+                                }
 
                                 $temp_ct++;
                         }
-                        $href .= "\">";
+                        $href .= "&filterorder=$my_filterorder\">";
 
                         if( $my_ct < $filter_nr )

trunk/web/addons/toga/search.php

@@ -35 +35 @@
 
                         $pstop_epoch = datetimeToEpoch( $period_stop );
-                        printf( "pstop_epoch = %s pstart_epoch = %s\n", $pstop_epoch, $pstart_epoch );
+                        //printf( "pstop_epoch = %s pstart_epoch = %s\n", $pstop_epoch, $pstart_epoch );
 
                         if( $pstart_epoch > $pstop_epoch ) {