Changeset bc613d in indico

Timestamp:

02/22/11 16:02:16 (2 years ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, v0.97-series, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 4c7d4152dff271ba5df5a8606605969cab454080

Children:

d6a4a9

Parents:

0186b2

git-author:

Adrian Moennich <jerome.ernst.monnich@…> (02/21/11 15:38:11)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (02/22/11 16:02:16)

Message:

[IMP] Make number fields in regform billable

• fixes #665

Location:

indico/MaKaC

Files:

• registration.py (modified) (8 diffs)
• webinterface/rh/registrationFormModif.py (modified) (1 diff)

indico/MaKaC/registration.py

@@ -1455 +1455 @@
         FieldInputType.__init__(self, field)
         self._length = ''
+        self._minValue = 0
 
     def _getModifHTML(self,item, registrant):
@@ -1485 +1486 @@
         else:
             length = 'size="6"'
-        tmp = """&nbsp;<input type="text" id="%s" name="%s" value="%s" %s %s />&nbsp;&nbsp;%s %s""" % (htmlName, htmlName, v, disable, length, caption, param)
+        onkeyup = ""
+        if billable:
+            onkeyup = """
+                onkeyup="$E('subtotal-%s').dom.innerHTML = ((isNaN(parseInt(this.value, 10)) || parseInt(this.value, 10) < 0) ? 0 : parseInt(this.value, 10)) * %s;"
+            """ % (htmlName, price)
+        tmp = """&nbsp;<input type="text" id="%s" name="%s" value="%s" %s %s %s />&nbsp;&nbsp;%s %s""" % (htmlName, htmlName, v, onkeyup, disable, length, caption, param)
         tmp= """ <td>%s</td><td align="right" align="bottom">"""%tmp
         if billable:
-            tmp= """%s&nbsp;&nbsp;%s&nbsp;&nbsp;%s</td> """%(tmp,price,currency)
+            subTotal = (float(price)*int(v) or 0)
+            tmp= """%s&nbsp;&nbsp;%s&nbsp;&nbsp;%s (Total: <span id="subtotal-%s">%s</span>&nbsp;%s)</td> """%(tmp,price,currency,htmlName,subTotal,currency)
         else:
             tmp= """%s </td> """%tmp
@@ -1511 +1518 @@
         else:
             quantity = int(v)
+        if quantity < self.getMinValue():
+            raise FormValuesError( _("The field \"%s\" needs to be filled with a number greater than or equal to %d.")%(self.getParent().getCaption(), self.getMinValue()))
         item.setQuantity(quantity)
         item.setValue(quantity)
@@ -1520 +1529 @@
 
     def _getSpecialOptionsHTML(self):
+        price = self._parent.getPrice()
+        billable = self._parent.isBillable()
+        checked=""
+        if billable:
+            checked="checked=\"checked\""
+
         return _("""
+        <tr>
+          <td class="titleCellTD"><span class="titleCellFormat">_("Min. value")</span></td>
+          <td bgcolor="white" class="blacktext" width="100%%">
+              <input type="text" name="minValue" value="%s" />
+          </td>
+        </tr>
         <tr>
           <td class="titleCellTD"><span class="titleCellFormat">_("Size in chars")</span></td>
@@ -1526 +1547 @@
               <input type="text" name="length" value="%s" />
           </td>
-        </tr>""" % self.getLength())
+        </tr>
+        <tr>
+          <td class="titleCellTD"><span class="titleCellFormat">Is Billable</span></td>
+          <td bgcolor="white" class="blacktext" width="100%%">
+            <input type="checkbox" name="billable" size="60" %s> _("(uncheck if it is not billable)")
+          </td>
+        </tr>
+        <tr>
+          <td class="titleCellTD"><span class="titleCellFormat"> _("Price (multiplied with entered number)")</span></td>
+          <td bgcolor="white" class="blacktext" width="100%%">
+            <input type="text" name="price" size="60" value=%s>
+          </td>
+        </tr>""" % (self.getMinValue(), self.getLength(), checked, price))
 
     def clone(self, gf):
         ni = FieldInputType.clone(self, gf)
         ni.setLength(self.getLength())
+        ni.setMinValue(self.getMinValue())
         return ni
 
@@ -1536 +1570 @@
         d = {}
         d["length"] = self.getLength()
+        d["minValue"] = self.getMinValue()
         return d
 
@@ -1541 +1576 @@
         if data.has_key("length"):
             self.setLength(data.get("length"))
+        if data.has_key("minValue"):
+            self.setMinValue(int(data.get("minValue") or 0))
 
     def getLength(self):
@@ -1551 +1588 @@
     def setLength(self, value):
         self._length = value
+
+    def getMinValue(self):
+        try:
+            if self._minValue: pass
+        except AttributeError:
+            self._minValue = 0
+        return self._minValue
+
+    def setMinValue(self, value):
+        self._minValue = value
 
 class LabelInput(FieldInputType):

indico/MaKaC/webinterface/rh/registrationFormModif.py

@@ -700 +700 @@
         if params.has_key('length'):
             self._input.setLength(params.get('length'))
+        if params.has_key('minValue'):
+            self._input.setMinValue(params.get('minValue'))
         if params.has_key('numberOfRows'):
             self._input.setNumberOfRows(params.get('numberOfRows'))