Changeset d9fa47 in indico

Timestamp:

06/07/10 16:44:15 (3 years ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, new-webex, v0.97-series, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, b8c30da8ebdbdcbd675a873997cc3e95f567de49, 4287315ec967a3da168d83963c14001db8487d53

Children:

c51c01, 16a6b5

Parents:

ad240b

Message:

[FIX] Problem with dates in reg form

Location:

indico/MaKaC

Files:

• common/utils.py (modified) (1 diff)
• registration.py (modified) (1 diff)
• webinterface/pages/registrants.py (modified) (1 diff)
• webinterface/pages/registrationForm.py (modified) (115 diffs)

indico/MaKaC/common/utils.py

@@ -96 +96 @@
     [ day, month, year ] = str.split("-")
 
-    return datetime(int(year),months[month],int(day))
+    if months.has_key(month):
+        month = months[month]
+    else:
+        month = int(month)
+    return datetime(int(year),month,int(day))
 
 def getTextColorFromBackgroundColor(bgcolor):

indico/MaKaC/registration.py

@@ -3239 +3239 @@
                 raise FormValuesError( _("Departure date cannot be empty."))
             if ad is not None and dd is not None:
-                ad = stringToDate(ad)
-                dd = stringToDate(dd)
+                ad = map(lambda x: int(x), ad.split("-"))
+                ad = datetime(ad[2], ad[1], ad[0])
+                dd = map(lambda x: int(x), dd.split("-"))
+                dd = datetime(dd[2], dd[1], dd[0])
                 if ad > dd:
                     raise FormValuesError( _("Arrival date has to be earlier than departure date"))

indico/MaKaC/webinterface/pages/registrants.py

@@ -1557 +1557 @@
             html.append("""
                         <option value=%s %s>%s</option>
-                        """%(quoteattr(str(date.strftime("%d-%B-%Y"))), selected, date.strftime("%d-%B-%Y")))
+                        """%(quoteattr(str(date.strftime("%d-%m-%Y"))), selected, date.strftime("%d-%B-%Y")))
         html.append("</select>")
         return "".join(html)

indico/MaKaC/webinterface/pages/registrationForm.py

@@ -42 +42 @@
     def _createTabCtrl(self):
         self._tabCtrl = wcomponents.TabControl()
-        
+
         self._tabRegFormSetup = self._tabCtrl.newTab( "regformsetup", _("Setup"), \
                 urlHandlers.UHConfModifRegForm.getURL( self._conf ) )
@@ -51 +51 @@
         self._tabEPay = self._tabCtrl.newTab( "epay", _("e-payment"), \
                 urlHandlers.UHConfModifEPayment.getURL( self._conf ) )
-        
+
         self._setActiveTab()
-        
+
         if not self._conf.hasEnabledSection("regForm"):
             self._tabRegFormSetup.disable()
@@ -61 +61 @@
         if not self._conf.hasEnabledSection("epay"):
             self._tabEPay.disable()
-            
+
     def _getPageContent(self, params):
         self._createTabCtrl()
         return wcomponents.WTabControl( self._tabCtrl, self._getAW() ).getHTML( self._getTabContent( params ) )
-    
+
     def _getTabContent(self, params):
         return "nothing"
-        
+
     def _setActiveSideMenuItem(self):
         self._regFormMenuItem.setActive()
-    
+
     def _setActiveTab(self):
         pass
-        
+
 class WPConfModifRegFormPreview( WPConfModifRegFormBase ):
     def _setActiveTab( self ):
-        self._tabRegistrationPreview.setActive()   
+        self._tabRegistrationPreview.setActive()
 
     def _getTabContent( self, params ):
@@ -92 +92 @@
 
 class WConfModifRegForm( wcomponents.WTemplated ):
-    
+
     def __init__( self, conference ):
         self._conf = conference
@@ -143 +143 @@
                         </tr>
                         """%(pdfield.getName(), switch) )
-                
+
         html.insert(0, """<table>""")
         html.append("</table>")
@@ -191 +191 @@
     def _getStatusesHTML(self):
         regForm=self._conf.getRegistrationForm()
-        html=[]        
+        html=[]
         for st in regForm.getStatusesList():
             urlStatus = urlHandlers.UHConfModifRegFormStatusModif.getURL(self._conf)
@@ -277 +277 @@
 
 class WPConfModifRegFormDataModification( WPConfModifRegFormBase ):
-    
+
     def _getTabContent( self, params ):
         wc = WConfModifRegFormDataModification(self._conf)
@@ -283 +283 @@
 
 class WConfModifRegFormDataModification( wcomponents.WTemplated ):
-    
+
     def __init__( self, conference ):
         self._conf = conference
@@ -330 +330 @@
 
 class WPConfModifRegFormSectionsBase(WPConfModifRegFormBase):
-    
+
     def _setActiveSideMenuItem(self):
         self._regFormMenuItem.setActive(True)
@@ -339 +339 @@
         html = wcomponents.WTabControl( self._tabCtrl, self._getAW() ).getHTML( self._getTabContent( params ) )
         return banner+html
-    
+
 class WPConfModifRegFormSessionsBase(WPConfModifRegFormSectionsBase):
-    
+
     def __init__( self, rh, conference ):
         WPConfModifRegFormSectionsBase.__init__(self, rh, conference)
-        self._targetSection = self._conf.getRegistrationForm().getSessionsForm() 
+        self._targetSection = self._conf.getRegistrationForm().getSessionsForm()
 
     def _createTabCtrl( self ):
@@ -354 +354 @@
 #            wf.customiseTabCtrl( self._tabCtrl )
         self._setActiveTab()
-        
+
 #    def _applyFrame( self, body ):
 #        frame = WRegFormSessionsModifFrame( self._conf, self._getAW() )
@@ -369 +369 @@
 
 #class WRegFormSessionsModifFrame(wcomponents.WTemplated):
-#    
+#
 #    def __init__(self, conf, aw):
 #        self._conf = conf
 #        self._aw = aw
 #        self._sessions = self._conf.getRegistrationForm().getSessionsForm()
-#    
+#
 #    def getHTML( self, body, **params ):
 #        params["body"] = body
 #        return wcomponents.WTemplated.getHTML( self, params )
-#    
+#
 #    def getVars( self ):
 #        vars = wcomponents.WTemplated.getVars( self )
@@ -391 +391 @@
 #        wc = wcomponents.WConferenceModifFrame(self._conf, self._aw)
 #        return wc
-#        
+#
 #    def getIntermediateVTabPixels( self ):
 #        wc = self.getOwnerComponent()
 #        return 7 + wc.getIntermediateVTabPixels()
-#        
+#
 #    def getTitleTabPixels( self ):
 #        wc = self.getOwnerComponent()
 #        return wc.getTitleTabPixels() - 7
-#    
+#
 #    def getCloseHeaderTags( self ):
 #        wc = self.getOwnerComponent()
@@ -405 +405 @@
 
 class WPConfModifRegFormSessions( WPConfModifRegFormSessionsBase ):
-    
+
     def _getTabContent( self, params ):
         wc = WConfModifRegFormSessions(self._conf)
@@ -415 +415 @@
 
 class WConfModifRegFormSessions( wcomponents.WTemplated ):
-    
+
     def __init__( self, conference ):
         self._conf = conference
@@ -450 +450 @@
 
 class WPConfModifRegFormSessionsDataModif( WPConfModifRegFormSessionsBase ):
-    
+
     def _getTabContent( self, params ):
         wc = WConfModifRegFormSessionsDataModif(self._conf)
@@ -458 +458 @@
 
 class WConfModifRegFormSessionsDataModif( wcomponents.WTemplated ):
-    
+
     def __init__( self, conference ):
         self._conf = conference
@@ -485 +485 @@
 
 class WPConfModifRegFormSessionsAdd( WPConfModifRegFormSessionsBase ):
-    
+
     def _getTabContent( self, params ):
         wc = WConfModifRegFormSessionsAdd(self._conf)
@@ -496 +496 @@
     def __init__( self, conference ):
         self._conf = conference
-    
+
     def _getSessionsHTML(self, sessions):
         html = []
@@ -519 +519 @@
 
 class WPConfModifRegFormAccommodationBase(WPConfModifRegFormSectionsBase):
-    
+
     def __init__( self, rh, conference ):
         WPConfModifRegFormSectionsBase.__init__(self, rh, conference)
@@ -540 +540 @@
 
 #class WRegFormAccommodationModifFrame(wcomponents.WTemplated):
-#    
+#
 #    def __init__(self, conf, aw):
 #        self._conf = conf
 #        self._aw = aw
 #        self._accommodation = self._conf.getRegistrationForm().getAccommodationForm()
-#    
+#
 #    def getHTML( self, body, **params ):
 #        params["body"] = body
 #        return wcomponents.WTemplated.getHTML( self, params )
-#    
+#
 #    def getVars( self ):
 #        vars = wcomponents.WTemplated.getVars( self )
@@ -562 +562 @@
 #        wc = wcomponents.WConferenceModifFrame(self._conf, self._aw)
 #        return wc
-#        
+#
 #    def getIntermediateVTabPixels( self ):
 #        wc = self.getOwnerComponent()
 #        return 7 + wc.getIntermediateVTabPixels()
-#        
+#
 #    def getTitleTabPixels( self ):
 #        wc = self.getOwnerComponent()
 #        return wc.getTitleTabPixels() - 7
-#    
+#
 #    def getCloseHeaderTags( self ):
 #        wc = self.getOwnerComponent()
@@ -576 +576 @@
 
 class WPConfModifRegFormAccommodation( WPConfModifRegFormAccommodationBase ):
-    
+
     def _getTabContent( self, params ):
         wc = WConfModifRegFormAccommodation(self._conf)
@@ -587 +587 @@
 
 class WConfModifRegFormAccommodation( wcomponents.WTemplated ):
-    
+
     def __init__( self, conference ):
         self._conf = conference
@@ -621 +621 @@
 
 class WPConfModifRegFormAccommodationDataModif( WPConfModifRegFormAccommodationBase ):
-    
+
     def _getTabContent( self, params ):
         wc = WConfModifRegFormAccommodationDataModif(self._conf)
@@ -629 +629 @@
 
 class WConfModifRegFormAccommodationDataModif( wcomponents.WTemplated ):
-    
+
     def __init__( self, conference ):
         self._conf = conference
@@ -646 +646 @@
 
 class WPConfModifRegFormAccommodationTypeAdd( WPConfModifRegFormAccommodationBase ):
-    
+
     def _getTabContent( self, params ):
         wc = WConfModifRegFormAccommodationTypeAdd()
@@ -661 +661 @@
         WPConfModifRegFormAccommodationBase.__init__(self, rh, conf)
         self._accoType = accoType
-    
+
     def _getTabContent( self, params ):
         wc = WConfModifRegFormAccommodationTypeModify(self._accoType)
@@ -672 +672 @@
     def __init__(self, accoType):
         self._accoType = accoType
-    
+
     def getVars( self ):
         vars = wcomponents.WTemplated.getVars(self)
@@ -683 +683 @@
 
 class WPConfRemoveAccommodationType(WPConfModifRegFormAccommodationBase):
-    
+
     def __init__(self, rh, conf, accoTypeIds, accommodationTypes):
         WPConfModifRegFormAccommodationBase.__init__(self, rh, conf)
@@ -689 +689 @@
         if self._rh.getWebFactory() is not None:
             self._eventType=self._rh.getWebFactory().getId()
-        
+
         self._accoTypeIds = accoTypeIds
         self._accommodationTypes = []
@@ -695 +695 @@
         for at in accommodationTypes :
             self._accommodationTypes.append("<li>%s</li>"%at)
-    
+
     def _setActiveTab( self ):
         self._tabMain.setActive()
-    
+
     def _getTabContent( self, params ):
         msg =  _("""
         <font size="+2"> _("Are you sure that you want to DELETE this accomodation")? <br><table><tr><td align="left"><ul>%s</ul></td></tr></table></font><br>
-        ( _("Note that if you delete this accomodation, registrants who applied for it 
+        ( _("Note that if you delete this accomodation, registrants who applied for it
         will lose their accomodation info") )
               """)%("".join(self._accommodationTypes))
@@ -712 +712 @@
 
 class WPConfModifRegFormFurtherInformationBase(WPConfModifRegFormSectionsBase):
-    
+
     def __init__( self, rh, conference ):
         WPConfModifRegFormSectionsBase.__init__(self, rh, conference)
@@ -733 +733 @@
 
 #class WRegFormFurtherInformationModifFrame(wcomponents.WTemplated):
-#    
+#
 #    def __init__(self, conf, aw):
 #        self._conf = conf
 #        self._aw = aw
 #        self._furtherInformation = self._conf.getRegistrationForm().getFurtherInformationForm()
-#    
+#
 #    def getHTML( self, body, **params ):
 #        params["body"] = body
 #        return wcomponents.WTemplated.getHTML( self, params )
-#    
+#
 #    def getVars( self ):
 #        vars = wcomponents.WTemplated.getVars( self )
@@ -755 +755 @@
 #        wc = wcomponents.WConferenceModifFrame(self._conf, self._aw)
 #        return wc
-#        
+#
 #    def getIntermediateVTabPixels( self ):
 #        wc = self.getOwnerComponent()
 #        return 7 + wc.getIntermediateVTabPixels()
-#        
+#
 #    def getTitleTabPixels( self ):
 #        wc = self.getOwnerComponent()
 #        return wc.getTitleTabPixels() - 7
-#    
+#
 #    def getCloseHeaderTags( self ):
 #        wc = self.getOwnerComponent()
@@ -769 +769 @@
 
 class WPConfModifRegFormFurtherInformation( WPConfModifRegFormFurtherInformationBase ):
-    
+
     def _getTabContent( self, params ):
         wc = WConfModifRegFormFurtherInformation(self._conf)
@@ -778 +778 @@
 
 class WConfModifRegFormFurtherInformation( wcomponents.WTemplated ):
-    
+
     def __init__( self, conference ):
         self._conf = conference
@@ -791 +791 @@
 
 class WPConfModifRegFormFurtherInformationDataModif( WPConfModifRegFormFurtherInformationBase ):
-    
+
     def _getTabContent( self, params ):
         wc = WConfModifRegFormFurtherInformationDataModif(self._conf)
@@ -799 +799 @@
 
 class WConfModifRegFormFurtherInformationDataModif( wcomponents.WTemplated ):
-    
+
     def __init__( self, conference ):
         self._conf = conference
@@ -812 +812 @@
 
 class WPConfModifRegFormReasonParticipationBase(WPConfModifRegFormSectionsBase):
-    
+
     def __init__( self, rh, conference ):
         WPConfModifRegFormSectionsBase.__init__(self, rh, conference)
@@ -833 +833 @@
 
 #class WRegFormReasonParticipationModifFrame(wcomponents.WTemplated):
-#    
+#
 #    def __init__(self, conf, aw):
 #        self._conf = conf
 #        self._aw = aw
 #        self._reasonParticipation = self._conf.getRegistrationForm().getReasonParticipationForm()
-#    
+#
 #    def getHTML( self, body, **params ):
 #        params["body"] = body
 #        return wcomponents.WTemplated.getHTML( self, params )
-#    
+#
 #    def getVars( self ):
 #        vars = wcomponents.WTemplated.getVars( self )
@@ -855 +855 @@
 #        wc = wcomponents.WConferenceModifFrame(self._conf, self._aw)
 #        return wc
-#        
+#
 #    def getIntermediateVTabPixels( self ):
 #        wc = self.getOwnerComponent()
 #        return 7 + wc.getIntermediateVTabPixels()
-#        
+#
 #    def getTitleTabPixels( self ):
 #        wc = self.getOwnerComponent()
 #        return wc.getTitleTabPixels() - 7
-#    
+#
 #    def getCloseHeaderTags( self ):
 #        wc = self.getOwnerComponent()
@@ -869 +869 @@
 
 class WPConfModifRegFormReasonParticipation( WPConfModifRegFormReasonParticipationBase ):
-    
+
     def _getTabContent( self, params ):
         wc = WConfModifRegFormReasonParticipation(self._conf)
@@ -878 +878 @@
 
 class WConfModifRegFormReasonParticipation( wcomponents.WTemplated ):
-    
+
     def __init__( self, conference ):
         self._conf = conference
@@ -891 +891 @@
 
 class WPConfModifRegFormReasonParticipationDataModif( WPConfModifRegFormReasonParticipationBase ):
-    
+
     def _getTabContent( self, params ):
         wc = WConfModifRegFormReasonParticipationDataModif(self._conf)
@@ -899 +899 @@
 
 class WConfModifRegFormReasonParticipationDataModif( wcomponents.WTemplated ):
-    
+
     def __init__( self, conference ):
         self._conf = conference
@@ -912 +912 @@
 
 class WPConfModifRegFormSocialEventBase(WPConfModifRegFormSectionsBase):
-    
+
     def __init__( self, rh, conference ):
         WPConfModifRegFormSectionsBase.__init__(self, rh, conference)
@@ -933 +933 @@
 
 #class WRegFormSocialEventModifFrame(wcomponents.WTemplated):
-#    
+#
 #    def __init__(self, conf, aw):
 #        self._conf = conf
 #        self._aw = aw
 #        self._socialEvent = self._conf.getRegistrationForm().getSocialEventForm()
-#    
+#
 #    def getHTML( self, body, **params ):
 #        params["body"] = body
 #        return wcomponents.WTemplated.getHTML( self, params )
-#    
+#
 #    def getVars( self ):
 #        vars = wcomponents.WTemplated.getVars( self )
@@ -955 +955 @@
 #        wc = wcomponents.WConferenceModifFrame(self._conf, self._aw)
 #        return wc
-#        
+#
 #    def getIntermediateVTabPixels( self ):
 #        wc = self.getOwnerComponent()
 #        return 7 + wc.getIntermediateVTabPixels()
-#        
+#
 #    def getTitleTabPixels( self ):
 #        wc = self.getOwnerComponent()
 #        return wc.getTitleTabPixels() - 7
-#    
+#
 #    def getCloseHeaderTags( self ):
 #        wc = self.getOwnerComponent()
@@ -969 +969 @@
 
 class WPConfModifRegFormSocialEvent( WPConfModifRegFormSocialEventBase ):
-    
+
     def _getTabContent( self, params ):
         wc = WConfModifRegFormSocialEvent(self._conf)
@@ -980 +980 @@
 
 class WConfModifRegFormSocialEvent( wcomponents.WTemplated ):
-    
+
     def __init__( self, conference ):
         self._conf = conference
@@ -1014 +1014 @@
 
 class WPConfModifRegFormSocialEventDataModif( WPConfModifRegFormSocialEventBase ):
-    
+
     def _getTabContent( self, params ):
         wc = WConfModifRegFormSocialEventDataModif(self._conf)
@@ -1022 +1022 @@
 
 class WConfModifRegFormSocialEventDataModif( wcomponents.WTemplated ):
-    
+
     def __init__( self, conference ):
         self._conf = conference
@@ -1037 +1037 @@
 
 class WPConfModifRegFormSocialEventAdd( WPConfModifRegFormSocialEventBase ):
-    
+
     def _getTabContent( self, params ):
         wc = WConfModifRegFormSocialEventAdd()
@@ -1052 +1052 @@
         WPConfModifRegFormSocialEventBase.__init__(self, rh, conf)
         self._socialEventItem = socialEventItem
-    
+
     def _getTabContent( self, params ):
         wc = WConfModifRegFormSocialEventItemModify(self._socialEventItem)
@@ -1063 +1063 @@
     def __init__(self, socialEventItem):
         self._socialEventItem = socialEventItem
-    
+
     def getVars( self ):
         vars = wcomponents.WTemplated.getVars(self)
@@ -1078 +1078 @@
 
 class WPConfRemoveSocialEvent(WPConfModifRegFormSocialEventBase):
-    
+
     def __init__(self, rh, conf, socialEventIds, eventNames):
         WPConfModifRegFormSocialEventBase.__init__(self, rh, conf)
@@ -1088 +1088 @@
         if self._rh.getWebFactory() is not None:
             self._eventType=self._rh.getWebFactory().getId()
-    
+
     def _setActiveTab( self ):
         self._tabMain.setActive()
-    
+
     def _getTabContent( self, params ):
         msg =  _("""
         <font size="+2"> _("Are you sure that you want to DELETE this social event")? <br><table><tr><td align="left"><ul>%s</ul></td></tr></table></font><br>
-        ( _("Note that if you delete this social event, registrants who applied for it 
+        ( _("Note that if you delete this social event, registrants who applied for it
         will lose their social event info") )
               """)%("".join(self._eventNames))
@@ -1105 +1105 @@
 
 class WPConfModifRegFormStatusesRemConfirm(WPConfModifRegFormBase):
-    
+
     def __init__(self,rh,target, stids):
         WPConfModifRegFormBase.__init__(self, rh, target)
         self._statusesIds=stids
-    
+
     def _getTabContent(self,params):
         wc=wcomponents.WConfirmation()
@@ -1127 +1127 @@
 
 class WPConfModifRegFormGeneralSectionRemConfirm(WPConfModifRegFormBase):
-    
+
     def __init__(self,rh,target, gss):
         WPConfModifRegFormBase.__init__(self, rh, target)
         self._generalSections=gss
-    
+
     def _getTabContent(self,params):
         wc=wcomponents.WConfirmation()
@@ -1170 +1170 @@
 
 class WRegFormGeneralSectionModifFrame(wcomponents.WTemplated):
-    
+
     def __init__(self, gs, aw):
         self._conf = gs.getConference()
         self._aw = aw
         self._generalSection = gs
-    
+
     def getHTML( self, body, **params ):
         params["body"] = body
         return wcomponents.WTemplated.getHTML( self, params )
-    
+
     def getVars( self ):
         vars = wcomponents.WTemplated.getVars( self )
@@ -1192 +1192 @@
         wc = wcomponents.WConferenceModifFrame(self._conf, self._aw)
         return wc
-        
+
     def getIntermediateVTabPixels( self ):
         wc = self.getOwnerComponent()
         return 7 + wc.getIntermediateVTabPixels()
-        
+
     def getTitleTabPixels( self ):
         wc = self.getOwnerComponent()
         return wc.getTitleTabPixels() - 7
-    
+
     def getCloseHeaderTags( self ):
         wc = self.getOwnerComponent()
@@ -1206 +1206 @@
 
 class WPConfModifRegFormGeneralSection( WPConfModifRegFormGeneralSectionBase ):
-    
+
     def _getTabContent( self, params ):
         wc = WConfModifRegFormGeneralSection(self._generalSectionForm)
@@ -1217 +1217 @@
 
 class WConfModifRegFormGeneralSection( wcomponents.WTemplated ):
-    
+
     def __init__( self, gs ):
         self._conf = gs.getConference()
@@ -1235 +1235 @@
                 spec =  _(""" %s, _("mandatory") """)%spec
             if f.isBillable():
-                spec =  _(""" %s , _("Billable") = %s """)%(spec,self.htmlText(f.getPrice()))            
-                
+                spec =  _(""" %s , _("Billable") = %s """)%(spec,self.htmlText(f.getPrice()))
+
             spec = " %s)</b>"%spec
-         
+
             #
             # add the selection box here for sorting...
@@ -1251 +1251 @@
             selbox += """
                 </select>"""
-             
+
             html.append("""<tr>
                                 <td align="left" style="padding-left:10px">%s<input type="checkbox" name="fieldsIds" value="%s"><a href=%s>%s</a>%s</td>
@@ -1269 +1269 @@
 
 class WPConfModifRegFormGeneralSectionDataModif( WPConfModifRegFormGeneralSectionBase ):
-    
+
     def _getTabContent( self, params ):
         wc = WConfModifRegFormGeneralSectionDataModif(self._generalSectionForm)
@@ -1277 +1277 @@
 
 class WConfModifRegFormGeneralSectionDataModif( wcomponents.WTemplated ):
-    
+
     def __init__( self, generalSectionForm ):
         self._generalSectionForm = generalSectionForm
@@ -1288 +1288 @@
 
 class WPConfModifRegFormGeneralSectionFieldAdd( WPConfModifRegFormGeneralSectionBase ):
-    
+
     def __init__(self, rh, section, tmpField):
         WPConfModifRegFormGeneralSectionBase.__init__(self, rh, section)
         self._tmpField=tmpField
-    
+
     def _getTabContent( self, params ):
         wc = WConfModifRegFormGeneralSectionFieldEdit(self._tmpField)
@@ -1300 +1300 @@
 
 class WConfModifRegFormGeneralSectionFieldEdit( wcomponents.WTemplated ):
-    
+
     def __init__( self, generalField=None):
         self._generalField = generalField
@@ -1324 +1324 @@
         vars["mandatory"] =  """ checked="checked" """
         #vars["billable"]= """ checked="checked" """
-        #vars["price"]=""                
+        #vars["price"]=""
         if self._generalField is not None:
             vars["caption"] = quoteattr(self._generalField.getCaption())
@@ -1331 +1331 @@
                 vars["mandatory"] =  ""
             #if not self._generalField.isBillable():
-            #    vars["billable"] =  ""                       
+            #    vars["billable"] =  ""
         vars["inputtypes"]=self._getFieldTypesHTML()
         vars["specialOptions"]=""
@@ -1344 +1344 @@
         self._sectionField=field
         self._tmpField=tmpField
-    
+
     def _getTabContent( self, params ):
         wc = WConfModifRegFormGeneralSectionFieldEdit(self._tmpField)
@@ -1352 +1352 @@
 
 class WPConfModifRegFormGeneralSectionFieldRemConfirm(WPConfModifRegFormGeneralSectionBase):
-    
+
     def __init__(self,rh,gs, fields):
         WPConfModifRegFormGeneralSectionBase.__init__(self, rh, gs)
         self._fields=fields
-    
+
     def _getTabContent(self,params):
         wc=wcomponents.WConfirmation()
@@ -1380 +1380 @@
         self._status=st
         self._tempStatus=tmpst
-    
+
     def _getTabContent( self, params ):
         wc = WConfModifRegFormStatusModif(self._status, self._tempStatus)
         p = {
-             
+
              'postURL': quoteattr(str(urlHandlers.UHConfModifRegFormStatusPerformModif.getURL( self._status )))
             }
@@ -1390 +1390 @@
 
 class WConfModifRegFormStatusModif( wcomponents.WTemplated ):
-    
+
     def __init__( self, st, tmpst ):
         self._conf = st.getConference()
@@ -1427 +1427 @@
         return wc.getHTML(pars)
 
-    def _defineSectionMenu( self ): 
+    def _defineSectionMenu( self ):
         conferences.WPConferenceDefaultDisplayBase._defineSectionMenu(self)
         self._sectionMenu.setCurrentItem(self._regFormOpt)
@@ -1468 +1468 @@
         vars["announcement"] = regForm.getAnnouncement()
         vars["title"] = regForm.getTitle()
-        vars["usersLimit"] = "" 
+        vars["usersLimit"] = ""
         if regForm.getUsersLimit() > 0:
             vars["usersLimit"] =  _("""
@@ -1485 +1485 @@
                                 """ )%regForm.getContactInfo()
         return vars
-    
+
 class WPRegistrationFormDisplay( conferences.WPConferenceDefaultDisplayBase ):
     navigationEntry = navigation.NERegistrationFormDisplay
@@ -1494 +1494 @@
         return wc.getHTML(pars)
 
-    def _defineSectionMenu( self ): 
+    def _defineSectionMenu( self ):
         conferences.WPConferenceDefaultDisplayBase._defineSectionMenu(self)
         self._sectionMenu.setCurrentItem(self._newRegFormOpt)
@@ -1503 +1503 @@
         self._currentUser = user
         self._conf = conf
-    
+
     def _getWComp(self, sect):
         if sect == self._conf.getRegistrationForm().getReasonParticipationForm():
@@ -1519 +1519 @@
             return WConfRegFormSocialEventDisplay(self._conf, self._currentUser)
         return WConfRegFormGeneralSectionDisplay(sect, self._currentUser)
-    
+
     def _getOtherSectionsHTML(self):
         regForm=self._conf.getRegistrationForm()
@@ -1557 +1557 @@
 
 class WConfRegFormGeneralSectionDisplay(wcomponents.WTemplated):
-    
+
     def __init__(self, gs, currentUser):
         self._generalSection = gs
@@ -1591 +1591 @@
         vars["fields"]=self._getFieldsHTML(miscGroup)
         return vars
-        
+
 class WConfRegFormPersonalDataDisplay(wcomponents.WTemplated):
 
@@ -1623 +1623 @@
                     inputHTML += """<option value="%s" %s>%s</option>"""%(ck, selected, CountryHolder().getCountryById(ck))
                 inputHTML = """<select name="%s">%s</select>"""%(item.getId(), inputHTML)
-                
+
         else:
             inputHTML = """<input type="%s" name="%s" size="40" value="%s">"""%(item.getInput(), item.getId(), value)
@@ -1654 +1654 @@
 
 class WConfRegFormReasonParticipationDisplay(wcomponents.WTemplated):
-    
+
     def __init__(self, conf, currentUser):
         self._conf = conf
@@ -1764 +1764 @@
 
 class WConfRegFormAccommodationDisplay(wcomponents.WTemplated):
-    
+
     def __init__(self, conf, currentUser):
         self._conf = conf
@@ -1795 +1795 @@
             html.append("""
                         <option value=%s %s>%s</option>
-                        """%(quoteattr(str(date.strftime("%d-%B-%Y"))), selected, date.strftime("%d-%B-%Y")))
+                        """%(quoteattr(str(date.strftime("%d-%m-%Y"))), selected, date.strftime("%d-%B-%Y")))
         html.append("</select>")
         return "".join(html)
@@ -1813 +1813 @@
                                         <td align="left" style="padding-left:10px"><input type="radio" name="accommodationType" value="%s" %s>%s%s</td>
                                     </tr>
-                                """%(atype.getId(), selected, atype.getCaption(), placesLeft ) )  
+                                """%(atype.getId(), selected, atype.getCaption(), placesLeft ) )
                 else:
                     html.append("""<tr>
@@ -1831 +1831 @@
                         """)%(currentAccoType.getCaption() ) )
         return "".join(html)
-        
+
 
     def getVars(self):
@@ -1856 +1856 @@
 
 class WConfRegFormSocialEventDisplay(wcomponents.WTemplated):
-    
+
     def __init__(self, conf, currentUser):
         self._conf = conf
@@ -1886 +1886 @@
                 placesLeft = ""
                 if seItem.getPlacesLimit() > 0:
-                    placesLeft = " <font color='green'><i>[%s place(s) left]</i></font>"%seItem.getNoPlacesLeft()    
+                    placesLeft = " <font color='green'><i>[%s place(s) left]</i></font>"%seItem.getNoPlacesLeft()
                 inputType="checkbox"
                 if self._socialEvent.getSelectionTypeId() == "unique":
                     inputType="radio"
                 html.append("""<tr>
-                                    <td align="left" nowrap style="padding-left:10px"><input type="%s" name="socialEvents" value="%s" %s>%s&nbsp;&nbsp; 
+                                    <td align="left" nowrap style="padding-left:10px"><input type="%s" name="socialEvents" value="%s" %s>%s&nbsp;&nbsp;
                                     </td>
                                     <td width="100%%" align="left">
@@ -1916 +1916 @@
                             """%(se.getCaption(), cancelledReason ) )
         return "".join(html)
-        
+
 
     def getVars(self):
@@ -1931 +1931 @@
 
 class WConfRegFormFurtherInformationDisplay(wcomponents.WTemplated):
-    
+
     def __init__(self, conf):
         self._conf = conf
@@ -1948 +1948 @@
         return wc.getHTML()
 
-    def _defineSectionMenu( self ): 
+    def _defineSectionMenu( self ):
         conferences.WPConferenceDefaultDisplayBase._defineSectionMenu(self)
         self._sectionMenu.setCurrentItem(self._regFormOpt)
@@ -1962 +1962 @@
         return wc.getHTML()
 
-    def _defineSectionMenu( self ): 
+    def _defineSectionMenu( self ):
         conferences.WPConferenceDefaultDisplayBase._defineSectionMenu(self)
         self._sectionMenu.setCurrentItem(self._regFormOpt)
@@ -1982 +1982 @@
         return wc.getHTML()
 
-    def _defineSectionMenu( self ): 
+    def _defineSectionMenu( self ):
         conferences.WPConferenceDefaultDisplayBase._defineSectionMenu(self)
         self._sectionMenu.setCurrentItem(self._regFormOpt)
 
-        
-        
+
+
 class WConfRegistrationFormCreationDone(wcomponents.WTemplated):
 
@@ -2135 +2135 @@
                     <tr>
                       <td style="color:black"><b>%s</b></td>
-                      <td bgcolor="white" class="blacktext">%s</td> 
+                      <td bgcolor="white" class="blacktext">%s</td>
                     </tr>
                     <tr>
@@ -2201 +2201 @@
         html.append("</table>")
         return "".join(html)
-        
-    def _getMiscInfoItemsHTMLBilllable(self, gsf,total):  
+
+    def _getMiscInfoItemsHTMLBilllable(self, gsf,total):
         regForm = self._conf.getRegistrationForm()
         miscGroup=self._registrant.getMiscellaneousGroupById(gsf.getId())
@@ -2220 +2220 @@
                         #caption=miscItem.getValue()
                         value=miscItem.getValue()
-                        price=string.atof(miscItem.getPrice())   
+                        price=string.atof(miscItem.getPrice())
                         quantity=miscItem.getQuantity()
-                        total["value"]+=price*quantity            
+                        total["value"]+=price*quantity
                 if value != "":
                     value=":%s"%value
-                if(quantity>0):    
+                if(quantity>0):
                     html.append("""
                             <tr>
@@ -2234 +2234 @@
                             </tr>
                             """%(quantity,gsf.getTitle(),caption,value,price,price*quantity,currency) )
-        return "".join(html)                
-        
+        return "".join(html)
+
 
     def _getMiscellaneousInfoHTML(self, gsf):
@@ -2266 +2266 @@
                                 <td style="color:black;padding-right:10px" nowrap ><b>_("Unit Price")</b></td>
                                 <td style="color:black"><b> _("Cost")</b></td>
-                            </tr>                        
+                            </tr>
                         """))
             for gsf in self._registrant.getMiscellaneousGroupList():
-                    html.append("""<tr>%s</tr>"""%(self._getMiscInfoItemsHTMLBilllable(gsf,total))) 
-    
+                    html.append("""<tr>%s</tr>"""%(self._getMiscInfoItemsHTMLBilllable(gsf,total)))
+
             url=urlHandlers.UHConfRegistrationFormconfirmBooking.getURL(self._registrant)
-            url.addParam("registrantId", self._registrant.getId())              
-            url.addParam("confId", self._conf.getId())       
-    
+            url.addParam("registrantId", self._registrant.getId())
+            url.addParam("confId", self._conf.getId())
+
             condChecking=""
             if modPay.hasPaymentConditions():
@@ -2285 +2285 @@
                                     <td><br></td>
                                 </tr>"""%str(urlHandlers.UHConfRegistrationFormConditions.getURL(self._conf))
-    
+
             html.append( _("""
                             <tr>&nbsp;</tr>
@@ -2297 +2297 @@
                             <tr>
                               <table width="100%%">
-                                
+
                                 <tr><td>&nbsp;</td></tr>
                                 %s
@@ -2309 +2309 @@
                             """)%(total["value"],regForm.getCurrency(),url,condChecking))
         return "".join(html)
-            
+
     def _getPDInfoHTML(self):
         personalData = self._conf.getRegistrationForm().getPersonalData()
@@ -2349 +2349 @@
                             </tr>""" % (fieldTitle,fieldValue)
         return html
-    
+
     def _getFormSections(self):
         sects = []
@@ -2379 +2379 @@
         vars["paymentInfo"]  = self._getPaymentInfo()
         vars["epaymentAnnounce"] = ""
-        if self._conf.hasEnabledSection("epay") and self._conf.getModPay().isActivated() and self._registrant.doPay():         
+        if self._conf.hasEnabledSection("epay") and self._conf.getModPay().isActivated() and self._registrant.doPay():
             vars["epaymentAnnounce"] = """<br><font color="black">Please proceed to the <b>payment of your order</b> (by using the "Next" button down this page). You will then receive the payment details.</font>"""
         return vars
@@ -2394 +2394 @@
         return wc.getHTML()
 
-    def _defineSectionMenu( self ): 
+    def _defineSectionMenu( self ):
         conferences.WPConferenceDefaultDisplayBase._defineSectionMenu(self)
-        self._sectionMenu.setCurrentItem(self._regFormOpt)        
-        
+        self._sectionMenu.setCurrentItem(self._regFormOpt)
+
 class WRegistrationFormconfirmBooking(wcomponents.WTemplated):
     def __init__( self, registrant ):
         self._registrant = registrant
-        self._conf = self._registrant.getConference()  
+        self._conf = self._registrant.getConference()
         self.modPay = self._conf.getModPay()
-    
+
     def _getModPayHTML(self):
         forms=""
         html=[]
-        
+
         regForm = self._conf.getRegistrationForm()
         for m in self.modPay.getSortedModPay():
@@ -2415 +2415 @@
                 <td></td>
                 <td><b>%s</b></td>
-                %s                   
+                %s
                 </tr>
                 """%(m.getTitle(),m.getFormHTML(self._registrant.getTotal(),regForm.getCurrency(),self._conf,self._registrant))
         #forms=forms+"</table>"
-            
+
         if forms:
             html.append( _("""
@@ -2432 +2432 @@
                 """)%"".join(forms))
         return "".join(html)
-                
+
     def getVars( self ):
         vars = wcomponents.WTemplated.getVars( self )
@@ -2455 +2455 @@
         return wc.getHTML(p)
 
-    def _defineSectionMenu( self ): 
+    def _defineSectionMenu( self ):
         conferences.WPConferenceDefaultDisplayBase._defineSectionMenu(self)
         self._sectionMenu.setCurrentItem(self._newRegFormOpt)
@@ -2479 +2479 @@
         return wc.getHTML(pars)
 
-    def _defineSectionMenu( self ): 
+    def _defineSectionMenu( self ):
         conferences.WPConferenceDefaultDisplayBase._defineSectionMenu(self)
         self._sectionMenu.setCurrentItem(self._viewRegFormOpt)
@@ -2498 +2498 @@
         return wc.getHTML()
 
-    def _defineSectionMenu( self ): 
+    def _defineSectionMenu( self ):
         conferences.WPConferenceDefaultDisplayBase._defineSectionMenu(self)
         self._sectionMenu.setCurrentItem(self._regFormOpt)
@@ -2519 +2519 @@
         return wc.getHTML()
 
-    def _defineSectionMenu( self ): 
+    def _defineSectionMenu( self ):
         conferences.WPConferenceDefaultDisplayBase._defineSectionMenu(self)
         self._sectionMenu.setCurrentItem(self._regFormOpt)
@@ -2542 +2542 @@
         vars["endDate"] = self._conf.getRegistrationForm().getEndRegistrationDate().strftime("%A %d %B %Y")
         return vars
-    
+
 class WPRegistrationFormConditions(WPBase):