EduploneTest/types EduploneFillGap.py,1.13,1.14 EduploneFillGapAnswer.py,1.5,1.6 EduploneTestMemberFolder.py,1.7,1.8 EduploneTestingEnvironment.py,1.30,1.31

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

Modified Files:
	EduploneFillGap.py EduploneFillGapAnswer.py 
	EduploneTestMemberFolder.py EduploneTestingEnvironment.py 
Log Message:
not just there yet with fillgap-printview...

Index: EduploneFillGap.py
===================================================================
RCS file: /cvsroot/eduplone/EduploneTest/types/EduploneFillGap.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** EduploneFillGap.py	7 Jan 2005 21:06:51 -0000	1.13
--- EduploneFillGap.py	27 Jan 2005 00:05:41 -0000	1.14
***************
*** 114,124 ****
  			    if elem.strip()[:5] == "<gap=" and elem.strip()[-1] == ">":
  				gap_id = re.match(r"<gap=(.*)>", elem).group(1)
! 				dropdown_list = []
  				items_to_render = ""
! 				for s in self[gap_id].getCorrectAnswer():
! 				    dropdown_list.append(s)
! 				for s in self[gap_id].getChallenges():
! 				    dropdown_list.append(s)
! 				dropdown_list.sort()
  				for s in dropdown_list:
  				    sel = ""
--- 114,121 ----
  			    if elem.strip()[:5] == "<gap=" and elem.strip()[-1] == ">":
  				gap_id = re.match(r"<gap=(.*)>", elem).group(1)
! 				
! 				dropdown_list = self[gap_id].getAllChallenges()
  				items_to_render = ""
! 				
  				for s in dropdown_list:
  				    sel = ""
***************
*** 143,147 ****
  		    for i, elem in enumerate(self.getText_to_render().replace("\n", "\n ").split(" ")):
  			if elem.strip()[:5] == "<gap=" and elem.strip()[-1] == ">":
! 			    print i, elem
  			    gap_id = re.match(r'<gap=(.*)>', elem).group(1)
  			    word_to_render = colored_gap % self[gap_id].getCorrectAnswer()[0]
--- 140,144 ----
  		    for i, elem in enumerate(self.getText_to_render().replace("\n", "\n ").split(" ")):
  			if elem.strip()[:5] == "<gap=" and elem.strip()[-1] == ">":
! 			    #print i, elem
  			    gap_id = re.match(r'<gap=(.*)>', elem).group(1)
  			    word_to_render = colored_gap % self[gap_id].getCorrectAnswer()[0]
***************
*** 160,167 ****
  			    word_to_render = colored_gap % self[gap_id].getCorrectAnswer()[0]
  			    rendered_text += "%s " % word_to_render
! 			    print 5, elem
  			else:
  			    rendered_text += "%s " % elem
! 			    print 6, elem
  			    
  			if len(elem) != 0 and elem[-1] == "\n":
--- 157,164 ----
  			    word_to_render = colored_gap % self[gap_id].getCorrectAnswer()[0]
  			    rendered_text += "%s " % word_to_render
! 			    #print 5, elem
  			else:
  			    rendered_text += "%s " % elem
! 			    #print 6, elem
  			    
  			if len(elem) != 0 and elem[-1] == "\n":

Index: EduploneTestingEnvironment.py
===================================================================
RCS file: /cvsroot/eduplone/EduploneTest/types/EduploneTestingEnvironment.py,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** EduploneTestingEnvironment.py	10 Jan 2005 15:41:25 -0000	1.30
--- EduploneTestingEnvironment.py	27 Jan 2005 00:05:41 -0000	1.31
***************
*** 460,465 ****
              del REQUEST.form['qId']
              if user in self['users'].objectIds():  # diese abfrage ueber vorhandene Funktionen loesen! ist die berhaupt noetig?
-                 print 'ÄÄÄÄÄÄÄÄÄÄÄÄÄ'
-                 print REQUEST
                  self.users[user]._saveQuestionAnswers(user, questionid, REQUEST.form)
  
--- 460,463 ----

Index: EduploneFillGapAnswer.py
===================================================================
RCS file: /cvsroot/eduplone/EduploneTest/types/EduploneFillGapAnswer.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** EduploneFillGapAnswer.py	5 Jan 2005 00:36:37 -0000	1.5
--- EduploneFillGapAnswer.py	27 Jan 2005 00:05:41 -0000	1.6
***************
*** 66,71 ****
      def base_view(self, REQUEST):
          """ """
! 	return self.aq_parent.eduplone_fillgap_edit()
  		    
!     
  registerType(EduploneFillGapAnswer)
--- 66,83 ----
      def base_view(self, REQUEST):
          """ """
!         return self.aq_parent.eduplone_fillgap_edit()
  		    
!     def getAllChallenges(self):
!         """ """
!         dropdown_list = []
!         for s in self.getCorrectAnswer():
!             dropdown_list.append(s)
!         for s in self.getChallenges():
!             dropdown_list.append(s)
!         
!         dropdown_list.sort()
!         return dropdown_list
!         
!         
!         
  registerType(EduploneFillGapAnswer)

Index: EduploneTestMemberFolder.py
===================================================================
RCS file: /cvsroot/eduplone/EduploneTest/types/EduploneTestMemberFolder.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** EduploneTestMemberFolder.py	3 Jan 2005 14:46:07 -0000	1.7
--- EduploneTestMemberFolder.py	27 Jan 2005 00:05:41 -0000	1.8
***************
*** 121,125 ****
  		self.getCurrentUser().changeOrCreateUsers(users = [str(self.getCurrentUser())], roles=roles, default_password='123', REQUEST=self.REQUEST)
  
! 	    print self.getCurrentUser().getRoles()	
  
              # if user is not in user folder, add him
--- 121,125 ----
  		self.getCurrentUser().changeOrCreateUsers(users = [str(self.getCurrentUser())], roles=roles, default_password='123', REQUEST=self.REQUEST)
  
! 	    #print self.getCurrentUser().getRoles()	
  
              # if user is not in user folder, add him



-------------------------------------------------------
This SF.Net email is sponsored by: IntelliVIEW -- Interactive Reporting
Tool for open source databases. Create drag-&-drop reports. Save time
by over 75%! Publish reports on the web. Export to DOC, XLS, RTF, etc.
Download a FREE copy at http://www.intelliview.com/go/osdn_nl