EduploneTest/types EduploneTestingEnvironment.py,1.9,1.10

Update of /cvsroot/eduplone/EduploneTest/types
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29623/EduploneTest/types

Modified Files:
	EduploneTestingEnvironment.py 
Log Message:
Added test in new window feature + fixed testIsRunning method

Index: EduploneTestingEnvironment.py
===================================================================
RCS file: /cvsroot/eduplone/EduploneTest/types/EduploneTestingEnvironment.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** EduploneTestingEnvironment.py	10 Oct 2004 16:04:42 -0000	1.9
--- EduploneTestingEnvironment.py	12 Oct 2004 10:53:23 -0000	1.10
***************
*** 97,100 ****
--- 97,109 ----
      ),
      BooleanField(
+ 	'testinwindow',
+ 	default = 1,
+ 	widget = BooleanWidget(label = "Start test in a new window",
+ 			       label_msgid = "label_test_in_new_window",
+ 			       description = "Starts the test in a new browser window",
+ 			       description_msgid = "help_test_in_new_window",
+ 			       i18n_domain = "eduplone"),
+     ),
+     BooleanField(
          'showpoints',
          default = 0,
***************
*** 174,178 ****
          return self.users.view()
  
- 
      def sequence_getLast(self, currentQuestion):
          """ """
--- 183,186 ----
***************
*** 433,442 ****
  	    Returns 1 if the test is running, 0 if not.
  	    Uses start / stop times to evaluate.
  	"""
  	current_time = time()   ## time.time()
  	test_start_time = self.getStarttime().timeTime()
  	test_stop_time = self.getStoptime().timeTime()
! 
! 	if test_start_time < current_time < test_stop_time:
  	    return 1
  	else:
--- 441,457 ----
  	    Returns 1 if the test is running, 0 if not.
  	    Uses start / stop times to evaluate.
+ 	    Returns 1 if either start or stop time is not set.
  	"""
  	current_time = time()   ## time.time()
  	test_start_time = self.getStarttime().timeTime()
  	test_stop_time = self.getStoptime().timeTime()
! 	
! 	if test_start_time == None and current_time < test_stop_time:
! 	    return 1
! 	elif test_start_time < current_time and test_stop_time == None:
! 	    return 1
! 	elif test_start_time == None and test_stop_time == None:
! 	    return 1
! 	elif test_start_time < current_time < test_stop_time:
  	    return 1
  	else:



-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl