Changeset d6c8f0 in indico

Timestamp:

07/29/11 15:34:28 (22 months ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

master, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

9d8047

Parents:

df7898

git-author:

Adrian Moennich <jerome.ernst.monnich@…> (07/06/11 10:18:12)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (07/29/11 15:34:28)

Message:

[IMP] Allow places limit for yesno fields

• fixes #809

Location:

indico/MaKaC

Files:

• registration.py (modified) (8 diffs)
• webinterface/pages/registrationForm.py (modified) (2 diffs)

indico/MaKaC/registration.py

@@ -1713 +1713 @@
             tmp= """%s  %s %s """%(tmp, price, currency)
         if self.getParent().getPlacesLimit():
-            tmp += """ (%s left)""" % (self.getParent().getNoPlacesLeft())
+            tmp += """&nbsp;<span style='color:green; font-style:italic;'>[%s place(s) left]</span>""" % (self.getParent().getNoPlacesLeft())
         tmp += """</td>"""
         if description:
@@ -1739 +1739 @@
     def _getSpecialOptionsHTML(self):
         html = FieldInputType._getSpecialOptionsHTML(self)
-        html += _("""<tr>
+        html += i18nformat("""<tr>
                   <td class="titleCellTD"><span class="titleCellFormat"> _("Places (0 for unlimited)")</span></td>
                   <td bgcolor="white" class="blacktext" width="100%%">
@@ -1787 +1787 @@
         elif v=="no":
             checkedNo="selected"
-        tmp = """%s <select id="%s" name="%s" %s><option value="">-- Choose a value --</option><option value="yes" %s>yes</option><option value="no" %s>no</option></select>%s""" % (caption, htmlName, htmlName, disable, checkedYes, checkedNo, param)
+        placesInfo = ""
+        if self.getParent().getPlacesLimit():
+            placesInfo = """&nbsp;[%s place(s) left]""" % (self.getParent().getNoPlacesLeft())
+            if v != "yes" and not self.getParent().hasAvailablePlaces():
+                checkedYes += " disabled"
+        tmp = """%s <select id="%s" name="%s" %s><option value="">-- Choose a value --</option><option value="yes" %s>yes%s</option><option value="no" %s>no</option></select>%s""" % (caption, htmlName, htmlName, disable, checkedYes, placesInfo, checkedNo, param)
         tmp= """ <td>%s</td><td align="right" align="bottom">"""%tmp
         if billable:
@@ -1821 +1826 @@
         item.setMandatory(self.getParent().isMandatory())
         item.setHTMLName(self.getHTMLName())
+
+    def _getSpecialOptionsHTML(self):
+        html = FieldInputType._getSpecialOptionsHTML(self)
+        html += i18nformat("""<tr>
+                  <td class="titleCellTD"><span class="titleCellFormat"> _("Places (0 for unlimited)")</span></td>
+                  <td bgcolor="white" class="blacktext" width="100%%">
+                    <input type="text" name="placesLimit" size="60" value=%s>
+                  </td>
+                </tr>""")%(self._parent.getPlacesLimit())
+        return html
 
 class RadioItem(Persistent):
@@ -2125 +2140 @@
 
         tmp = """%s""" % (caption)
-        tmp = [""" <td>%s</td><td align="right" align="bottom">""" % tmp]
-        tmp.append(""" </td> """)
+        tmp = [""" <td>%s</td><td align="right" align="bottom" colspan="2"></td>""" % tmp]
 
         counter = 0
@@ -2144 +2158 @@
             elif not value and val.getCaption() == self.getDefaultItem():
                 checked = "checked"
-            placesInfo = ""
-            if val.getPlacesLimit():
-                placesInfo = """&nbsp;(%s/%s left)""" % (val.getNoPlacesLeft(),val.getPlacesLimit())
-            tmp.append("""<tr><td></td><td><input type="radio" style="vertical-align:sub;" id="%s" name="%s" value="%s" %s %s> %s%s</td><td align="right" style="vertical-align: bottom;" >""" % (itemId, self.getHTMLName(), val.getId(), checked, disable, val.getCaption(), placesInfo))
+            tmp.append("""<tr><td></td><td><input type="radio" style="vertical-align:sub;" id="%s" name="%s" value="%s" %s %s> %s</td><td align="right" style="vertical-align: bottom;" >""" % (itemId, self.getHTMLName(), val.getId(), checked, disable, val.getCaption()))
             if val.isBillable():
                 tmp.append("""&nbsp;&nbsp;%s&nbsp;%s""" % (val.getPrice(), currency))
+            tmp.append("""</td><td align="right" style="vertical-align: bottom;" >""")
+            if val.getPlacesLimit():
+                tmp.append("""&nbsp;<span style='color:green; font-style:italic;'>[%s place(s) left]</span>""" % (val.getNoPlacesLeft()))
             tmp.append(""" </td></tr> """)
 
@@ -2204 +2218 @@
                 placesInfo = ""
                 if radioItem.getPlacesLimit():
-                    placesInfo = """&nbsp;(%s/%s left)""" % (radioItem.getNoPlacesLeft(),radioItem.getPlacesLimit())
+                    placesInfo = """&nbsp;[%s place(s) left]""" % (radioItem.getNoPlacesLeft())
 
                 disabled = ""
@@ -2666 +2680 @@
         if self.getPlacesLimit() > 0 :
             if self.getCurrentNoPlaces() >= self.getPlacesLimit():
-                raise FormValuesError( _("""The limit for the number of places is smaller than the current amount registered for this item. Please, set a higher limit."""))
+                raise FormValuesError( _("""The limit for the number of places is smaller than the current amount registered for this item."""))
             self._currentNoPlaces += 1
 

indico/MaKaC/webinterface/pages/registrationForm.py

@@ -1937 +1937 @@
                     placesLeft = ""
                     if atype.getNoPlacesLeft() > 0:
-                        placesLeft = " <font color='green'><i>[%s place(s) left]</i></font>"%atype.getNoPlacesLeft()
+                        placesLeft = " <span style='color:green; font-style:italic;'>[%s place(s) left]</span>"%atype.getNoPlacesLeft()
                     priceCol = ""
                     if atype.isBillable():
@@ -2028 +2028 @@
                 placesLeft = ""
                 if seItem.getPlacesLimit() > 0:
-                    placesLeft = " <font color='green'><i>[%s place(s) left]</i></font>"%seItem.getNoPlacesLeft()
+                    placesLeft = "<span style='color:green; font-style:italic;'>[%s place(s) left]</span>"%seItem.getNoPlacesLeft()
                 priceCol = ""
                 if seItem.isBillable():