Changeset 157 for trunk/web

Timestamp:

06/22/05 10:20:07 (18 years ago)

Author:

bastiaans

Message:

toga/search.php:

• Added checks for graph timeperiod

toga/templates/search.tpl:

• Changed place of error_msg

Location:

trunk/web/addons/toga

Files:

• search.php (modified) (7 diffs)
• templates/search.tpl (modified) (2 diffs)

trunk/web/addons/toga/search.php

@@ -5 +5 @@
 function validateFormInput() {
         global $clustername, $tpl, $id, $user, $name, $start_from_time, $start_to_time, $queue;
-        global $end_from_time, $end_to_time;
+        global $end_from_time, $end_to_time, $period_start, $period_stop;
 
         $error = 0;
+        $error_msg = "<FONT COLOR=\"red\"><B>";
+        $show_msg = 0;
 
         $none_set = 0;
@@ -13 +15 @@
         if( $id == '' and $user == '' and $name == '' and $start_from_time == '' and $start_to_time == '' and $queue == '' and $end_from_time == '' and $end_to_time == '') {
                 $error = 1;
-                $error_msg = "<FONT COLOR=\"red\"><B>No search criteria set!</B></FONT>";
+                $show_msg = 1;
+                $error_msg .= "No search criteria set!";
         }
 
@@ -19 +22 @@
 
                 $error = 1;
-                $error_msg = "<FONT COLOR=\"red\"><B>Id must be a number</B></FONT>";
+                $show_msg = 1;
+                $error_msg .= "Id must be a number";
         }
 
+        //printf( "period_start = %s period_stop = %s\n", $period_start, $period_stop );
+
+        if( !$error and $period_start != '' ) {
+                //printf( "period_start = %s period_stop = %s\n", $period_start, $period_stop );
+                $pstart_epoch = datetimeToEpoch( $period_start );
+                //printf( "period_start = %s period_stop = %s\n", $period_start, $period_stop );
+                if( $period_stop != '' ) {
+
+                        $pstop_epoch = datetimeToEpoch( $period_stop );
+                        printf( "pstop_epoch = %s pstart_epoch = %s\n", $pstop_epoch, $pstart_epoch );
+
+                        if( $pstart_epoch > $pstop_epoch ) {
+
+                                $show_msg = 1;
+                                $error_msg .= "Graph timeperiod reset: start date/time can't be later than end";
+                                $period_stop = '';
+                                $period_start = '';
+                        } else if( $pstop_epoch == $pstart_epoch ) {
+
+                                $show_msg = 1;
+                                $error_msg .= "Graph timeperiod reset: start and end date/time can't be the same";
+                                $period_stop = '';
+                                $period_start = '';
+                        }
+                }
+        }
+
+        $error_msg .= "</B></FONT>";
         // doe checks en set error en error_msg in case shit
 
-        if( $error) {
+        if( $show_msg )
                 $tpl->assign( "form_error_msg", $error_msg );
-                return 0;
-        } else {
-                return 1;
-        }
+
+        return ($error ? 0 : 1 );
 }
 
@@ -108 +138 @@
 function datetimeToEpoch( $datetime ) {
 
+        //printf("datetime = %s\n", $datetime );
         $datetime_fields = explode( ' ', $datetime );
 
@@ -119 +150 @@
         $years = $date_fields[2];
 
+        //printf( "days = %s months = %s years = %s\n", $days, $months, $years );
+
         $time_fields = explode( ':', $time );
 
@@ -125 +158 @@
         $seconds = $time_fields[2];
 
+        //printf( "hours = %s minutes = %s seconds = %s\n", $hours, $minutes, $seconds );
+
         $timestamp = mktime( $hours, $minutes, $seconds, $months, $days, $years );
+
+        //printf( "timestamp = %s\n", $timestamp );
 
         return $timestamp;
@@ -271 +308 @@
                                 //printf("start = %s stop = %s\n", $start, $stop );
 
-                                if( !$period_start ) // Add an additional 5 minutes before
+                                if( !$period_start ) // Add an extra 10% to graphstart
                                         $period_start = intval( $job_start - (intval( $runningtime * 0.10 ) ) );
                                 else
                                         $period_start = datetimeToEpoch( $period_start );
 
-                                if( !$period_stop ) // Add an additional 5 minutes after
+                                if( !$period_stop ) // Add an extra 10% to graphend
                                         $period_stop = intval( $job_stop + (intval( $runningtime * 0.10 ) ) );
                                 else

trunk/web/addons/toga/templates/search.tpl

@@ -194 +194 @@
   <TD></TD>
   <TD></TD>
-  <TD>{form_error_msg}</TD>
+  <TD></TD>
   <TD>
   <INPUT TYPE="submit" VALUE="Search archive" onClick="setSearchTimestamps();">
@@ -202 +202 @@
 
 </TABLE>
-<BR><BR>
+{form_error_msg}<BR><BR>
 <!-- START BLOCK : search_results -->