[Sguil-cvs] sguil/client/lib report.tcl,1.27,1.28

[Steve H. <sha...@us...>]

Update of /cvsroot/sguil/sguil/client/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28407

Modified Files:
	report.tcl 
Log Message:
Error message and return if no sensors selected.  To be nice to people, the build report button is disbaled until at least one sensor check box is twiddled.  Someone could still manage to select no sensors if they twiddle a checkbox, activating the build button and then un-twiddle the checkbox.  They deserve an error for being too click happy. -srh


Index: report.tcl
===================================================================
RCS file: /cvsroot/sguil/sguil/client/lib/report.tcl,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** report.tcl	2 Dec 2004 15:56:47 -0000	1.27
--- report.tcl	2 Dec 2004 16:37:13 -0000	1.28
***************
*** 279,283 ****
      foreach sensorName $abMonitorList {
  	if { $i < 5 } {
! 	    $currentBox add $sensorName -text [string totitle $sensorName] -selectcolor darkred -activebackground lightblue -width 12
  	    incr i
  	} else {
--- 279,285 ----
      foreach sensorName $abMonitorList {
  	if { $i < 5 } {
! 	    $currentBox add $sensorName -text [string totitle $sensorName] -selectcolor darkred \
! 		    -activebackground lightblue -width 12 \
! 		    -command "$phbReport.buttonBox buttonconfigure 0 -state normal"
  	    incr i
  	} else {
***************
*** 286,290 ****
  	    set currentBox [checkbox $sensorFrame.subBox$boxNumber -orient horizontal -borderwidth 0 -background lightblue]
  	    lappend sbList $currentBox
! 	    $currentBox add $sensorName -text [string totitle $sensorName] -selectcolor darkred -activebackground lightblue -width 12
  	    set i 1
  	}
--- 288,294 ----
  	    set currentBox [checkbox $sensorFrame.subBox$boxNumber -orient horizontal -borderwidth 0 -background lightblue]
  	    lappend sbList $currentBox
! 	    $currentBox add $sensorName -text [string totitle $sensorName] -selectcolor darkred \
! 		    -activebackground lightblue -width 12 \
! 		    -command "$phbReport.buttonBox buttonconfigure 0 -state normal"
  	    set i 1
  	}
***************
*** 292,296 ****
      }
      pack $currentBox -side top -anchor w -pady 0 
!     set selectAll [button $sensorFrame.selectAll -text "Select All" -command "ReportSelectAll"]
      pack $selectAll -side top -fill x -pady 0
      set timestampLabelFrame [frame $phbReport.timestampLabelFrame]
--- 296,301 ----
      }
      pack $currentBox -side top -anchor w -pady 0 
!     set selectAll [button $sensorFrame.selectAll -text "Select All" \
! 	    -command "$phbReport.buttonBox buttonconfigure 0 -state normal; ReportSelectAll"]
      pack $selectAll -side top -fill x -pady 0
      set timestampLabelFrame [frame $phbReport.timestampLabelFrame]
***************
*** 325,329 ****
      
      set buttonBox [buttonbox $phbReport.buttonBox]
!       $buttonBox add build  -text "Build Report" -command "set RETURN_FLAG 1"
        $buttonBox add cancel -text "Cancel" -command "set RETURN_FLAG 0"
      pack $sensorFrame $timestampLabelFrame $timestampFrame $reportFrame $buttonBox -expand 1 -fill x
--- 330,334 ----
      
      set buttonBox [buttonbox $phbReport.buttonBox]
!       $buttonBox add build  -state disabled -text "Build Report" -command "set RETURN_FLAG 1"
        $buttonBox add cancel -text "Cancel" -command "set RETURN_FLAG 0"
      pack $sensorFrame $timestampLabelFrame $timestampFrame $reportFrame $buttonBox -expand 1 -fill x
***************
*** 357,364 ****
  	    }
  	}
  	set datetimestart "[clock format [$dateStart get -clicks] -f "%Y-%m-%d"] [$timeStart get]"
  	set datetimeend "[clock format [$dateEnd get -clicks] -f "%Y-%m-%d"] [$timeEnd get]"
! #	puts $datetimestart 
! #	puts $datetimeend
  	destroy $phbReport
  	BuildPHBReport $sensors $datetimestart $datetimeend sName sDesc sType sSql sFields
--- 362,372 ----
  	    }
  	}
+ 	if {$sensors == ""} {
+ 	    ErrorMessage "Error.  You need to select at least one sensor"
+ 	    return
+ 	}
  	set datetimestart "[clock format [$dateStart get -clicks] -f "%Y-%m-%d"] [$timeStart get]"
  	set datetimeend "[clock format [$dateEnd get -clicks] -f "%Y-%m-%d"] [$timeEnd get]"
! 
  	destroy $phbReport
  	BuildPHBReport $sensors $datetimestart $datetimeend sName sDesc sType sSql sFields