Changeset 12634 for main

Timestamp:

27 Feb 2015, 21:56:34 (10 years ago)

Author:

Henrik Bettermann

Message:

Show validity period on contract pages and slips.

Location:

main/waeup.ikoba/trunk/src/waeup/ikoba

Files:

• browser/layout.py (modified) (2 diffs)
• customers/browser.py (modified) (2 diffs)
• customers/browser_templates/contractpage.pt (modified) (1 diff)
• customers/tests/test_browser.py (modified) (1 diff)
• customers/utils.py (modified) (2 diffs)
• utils/helpers.py (modified) (3 diffs)

main/waeup.ikoba/trunk/src/waeup/ikoba/browser/layout.py

@@ -34 +34 @@
 from waeup.ikoba.interfaces import IIkobaObject, IUserAccount, IIkobaUtils
 from waeup.ikoba.interfaces import MessageFactory as _
-from waeup.ikoba.utils.helpers import to_timezone
+from waeup.ikoba.utils.helpers import to_timezone, format_date
 from waeup.ikoba.authentication import get_principal_role_manager
 from waeup.ikoba.browser.interfaces import ICustomerNavigationBase
@@ -284 +284 @@
 
     def formatDate(self,dateobj):
-        if isinstance(dateobj, date):
-            return dateobj.strftime("%d/%m/%Y")
-        else:
-            return None
+        return format_date(dateobj, self.request)
             
     def formatTZDate(self,datetimeobj):

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/browser.py

@@ -51 +51 @@
 from waeup.ikoba.mandates.mandate import PasswordMandate
 from waeup.ikoba.widgets.hrefwidget import HREFDisplayWidget
-from waeup.ikoba.utils.helpers import get_current_principal, to_timezone, now
+from waeup.ikoba.utils.helpers import (
+    get_current_principal, to_timezone, now, format_date)
 from waeup.ikoba.customers.interfaces import (
     ICustomer, ICustomersContainer, ICustomerRequestPW, ICustomersUtils,
@@ -1593 +1594 @@
 
     @property
+    def validity_period(self):
+        if self.context.valid_from or self.context.valid_to:
+            return "%s - %s" % (format_date(self.context.valid_from, self.request),
+                                format_date(self.context.valid_to, self.request))
+        return
+
+    @property
     def label(self):
         portal_language = getUtility(IIkobaUtils).PORTAL_LANGUAGE

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/browser_templates/contractpage.pt

@@ -26 +26 @@
     </tr>
     <tal:widgets content="structure provider:widgets" />
+    <tr>
+      <td i18n:translate="" class="fieldname">
+        Validity Period:
+      </td>
+      <td>
+        <span tal:content="python: layout.formatDate(context.valid_from)">
+          VALIDFROM
+        </span> -
+        <span tal:content="python: layout.formatDate(context.valid_to)">
+          VALIDTO
+        </span>
+      </td>
+    </tr>
   </tbody>
 </table>

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/test_browser.py

@@ -1444 +1444 @@
         self.contract.product_object = self.product
         self.contract.tc_dict = {'en': u'<strong>Hello world</strong>'}
+        self.contract.valid_from = date(2015, 12, 4)
+        self.contract.valid_to = 'anything'
         self.contract.title = u'Contract Title'
         self.browser.open(self.customer_path + '/contracts/CON1')

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/utils.py

@@ -410 +410 @@
                 data.extend(creator.fromStringList(customer.history.messages))
 
+        # Insert validity period
+        if getattr(view, 'validity_period', None):
+            vp_translation = trans(_('Validity Period'), portal_language)
+            data.append(Paragraph(vp_translation, HEADING_STYLE))
+            vp = view.validity_period
+            data.append(Paragraph(vp, NOTE_STYLE))
+
         # Insert content tables (optionally on second page)
-        if hasattr(view, 'tabletitle'):
+        if getattr(view, 'tabletitle', None):
             for i in range(len(view.tabletitle)):
                 if tabledata[i] and tableheader[i]:
@@ -422 +429 @@
 
         # Insert terms and conditions
-        if hasattr(view, 'terms_and_conditions'):
+        if getattr(view, 'terms_and_conditions', None):
             tc_translation = trans(_('Terms and Conditions'), portal_language)
             data.append(Paragraph(tc_translation, HEADING_STYLE))

main/waeup.ikoba/trunk/src/waeup/ikoba/utils/helpers.py

@@ -30 +30 @@
 from cStringIO import StringIO
 from docutils.core import publish_string
+from zope.i18n import translate
 from zope.component import getUtility
 from zope.component.interfaces import IFactory
@@ -40 +41 @@
 from zope.pluggableauth.interfaces import IAuthenticatorPlugin
 from zope.formlib.widget import renderElement
+from waeup.ikoba.interfaces import MessageFactory as _
 
 BUFSIZE = 8 * 1024
@@ -859 +861 @@
                 contents=ReST2HTML(text))
     return elements
+
+def format_date(dateobj, request):
+    if isinstance(dateobj, datetime.date):
+        return dateobj.strftime("%d/%m/%Y")
+    else:
+        return translate(_('indefinite'), context=request)