Changeset 8685 for main/waeup.kofa/trunk

Timestamp:

12 Jun 2012, 07:17:01 (13 years ago)

Author:

Henrik Bettermann

Message:

Add hostel allocation start end end date attributes to hostels.

Move hostel allocation parameters from configuration to hostels. AccommodationOfficer? must be able to edit these parameters.

Location:

main/waeup.kofa/trunk/src/waeup/kofa

Files:

• browser/static/waeup-base.css (modified) (1 diff)
• hostels/browser.py (modified) (5 diffs)
• hostels/browser_templates/containermanagepage.pt (modified) (1 diff)
• hostels/browser_templates/containerpage.pt (modified) (1 diff)
• hostels/container.py (modified) (2 diffs)
• hostels/hostel.py (modified) (1 diff)
• hostels/interfaces.py (modified) (2 diffs)
• hostels/tests.py (modified) (1 diff)
• hostels/vocabularies.py (modified) (1 diff)
• interfaces.py (modified) (1 diff)
• students/browser.py (modified) (1 diff)
• students/tests/test_browser.py (modified) (2 diffs)
• students/utils.py (modified) (2 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/browser/static/waeup-base.css

@@ -232 +232 @@
 }
 
-.ordered-selection-field {
-}
+table .ordered-selection-field select {
+  width: 250px;
+}

main/waeup.kofa/trunk/src/waeup/kofa/hostels/browser.py

@@ -38 +38 @@
 from waeup.kofa.hostels.interfaces import (
     IHostelsContainer, IHostel, IBed, IBedAllocateStudent)
+from waeup.kofa.widgets.datewidget import FriendlyDatetimeDisplayWidget
 
 def write_log_message(view, message):
@@ -105 +106 @@
     label = _('Accommodation Section')
     pnav = 5
+    form_fields = grok.AutoFields(IHostelsContainer)
+    form_fields[
+        'startdate'].custom_widget = FriendlyDatetimeDisplayWidget('le')
+    form_fields[
+        'enddate'].custom_widget = FriendlyDatetimeDisplayWidget('le')
 
 class HostelsContainerManageActionButton(ManageActionButton):
@@ -113 +119 @@
     text = _('Manage accommodation section')
 
-class HostelsContainerManagePage(KofaDisplayFormPage):
+class HostelsContainerManagePage(KofaEditFormPage):
     """The manage page for hostel containers.
     """
@@ -122 +128 @@
     pnav = 5
     label = _('Manage accommodation section')
+    form_fields = grok.AutoFields(IHostelsContainer)
+    taboneactions = [_('Save')]
+    tabtwoactions = [_('Add hostel'), _('Remove selected')]
 
     def update(self):
+        tabs.need()
+        self.tab1 = self.tab2 = self.tab3 = self.tab4 = ''
+        qs = self.request.get('QUERY_STRING', '')
+        if not qs:
+            qs = 'tab1'
+        setattr(self, qs, 'active')
         warning.need()
+        datatable.need()
         return super(HostelsContainerManagePage, self).update()
 
@@ -146 +162 @@
     def addSubunit(self, **data):
         self.redirect(self.url(self.context, 'addhostel'))
+        return
+
+    @action(_('Save'), style='primary')
+    def save(self, **data):
+        self.applyData(self.context, **data)
+        self.flash(_('Settings have been saved.'))
         return
 

main/waeup.kofa/trunk/src/waeup/kofa/hostels/browser_templates/containermanagepage.pt

@@ -2 +2 @@
     i18n:domain="waeup.kofa"
     method="POST" enctype="multipart/form-data">
-  <table>
-    <thead>
-      <tr>
-        <th>&nbsp;
-        </th>
-        <th i18n:translate="">Id
-        </th>
-        <th i18n:translate="">Name
-        </th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr tal:repeat="hostel context/values"> <td>
-          <input type="checkbox" name="val_id" tal:attributes="value hostel/hostel_id" /> </td> <td>
-          <a tal:attributes="href python: view.url(hostel)" tal:content="hostel/__name__"> ID</a> </td> <td>
-          <span tal:content="hostel/hostel_name">ID
-          </span> </td>
-      </tr>
-    </tbody>
-  </table>
-  <div tal:condition="view/availableActions">
-    <span tal:repeat="action view/actions" tal:omit-tag="">
-      <input tal:replace="structure action/render"/>
-    </span>
+
+
+  <ul class="tabs" data-tabs="tabs">
+    <li tal:attributes="class view/tab1">
+    <a href="#tab-1">
+      <span i18n:translate="">Settings
+      </span></a>
+    </li>
+    <li tal:attributes="class view/tab2">
+    <a href="#tab-2" i18n:translate="">Hostels</a>
+    </li>
+  </ul>
+
+  <div class="tab-content">
+    <div id="tab-1" tal:attributes="class view/tab1">
+      <table class="form-table">
+        <tbody>
+          <tal:widgets content="structure provider:widgets" />
+        </tbody>
+      </table>
+      <div tal:condition="view/availableActions">
+        <span tal:repeat="action view/actions" tal:omit-tag="">
+          <input tal:condition="python:action.label in view.taboneactions"
+            tal:replace="structure action/render"/>
+        </span>
+      </div>
+    </div>
+    <div id="tab-2" tal:attributes="class view/tab2"> <br />
+      <table class="display dataTableManage">
+        <thead>
+          <tr>
+            <th>&nbsp;
+            </th>
+            <th i18n:translate="">Id
+            </th>
+            <th i18n:translate="">Name
+            </th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr tal:repeat="hostel context/values"> <td>
+              <input type="checkbox" name="val_id" tal:attributes="value hostel/hostel_id" /> </td> <td>
+              <a tal:attributes="href python: view.url(hostel)" tal:content="hostel/__name__"> ID</a> </td> <td>
+              <span tal:content="hostel/hostel_name">ID
+              </span> </td>
+          </tr>
+        </tbody>
+      </table>
+      <div tal:condition="view/availableActions">
+        <span tal:repeat="action view/actions" tal:omit-tag="">
+          <input tal:condition="python:action.label in view.tabtwoactions"
+            tal:replace="structure action/render"/>
+        </span>
+      </div>
+    </div>
   </div>
 </form>

main/waeup.kofa/trunk/src/waeup/kofa/hostels/browser_templates/containerpage.pt

@@ -1 @@
-<div i18n:domain="waeup.kofa"
-   i18n:translate="" tal:condition="python: not len(context.keys())">
-There no subobjects registered yet.
-</div>
+<table class="form-table" i18n:domain="waeup.kofa">
+  <tbody>
+    <tal:block repeat="widget view/widgets">
+      <tr>
+        <td class="fieldname">
+          <span tal:content="widget/label">LABEL</span>:
+        </td>
+        <td>
+          <span tal:content="structure widget">
+            <input type="text" />
+          </span>
+        </td>
+      </tr>
+    </tal:block>
+  </tbody>
+</table>
 
 <table i18n:domain="waeup.kofa">

main/waeup.kofa/trunk/src/waeup/kofa/hostels/container.py

@@ -22 +22 @@
 from waeup.kofa.hostels.interfaces import IHostelsContainer, IHostel
 from waeup.kofa.utils.logger import Logger
+from waeup.kofa.utils.helpers import attrs_to_fields
 
 class HostelsContainer(grok.Container, Logger):
@@ -61 +62 @@
         target = self.__name__
         return self.logger_info(ob_class,target,comment)
+
+HostelsContainer = attrs_to_fields(HostelsContainer)

main/waeup.kofa/trunk/src/waeup/kofa/hostels/hostel.py

@@ -202 +202 @@
             notify(grok.ObjectModifiedEvent(self))
             accommodation_session = grok.getSite()[
-                'configuration'].accommodation_session
+                'hostels'].accommodation_session
             try:
                 bedticket = grok.getSite()['students'][old_owner][

main/waeup.kofa/trunk/src/waeup/kofa/hostels/interfaces.py

@@ -16 +16 @@
 ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ##
+from datetime import datetime
 from zope.interface import invariant, Invalid
 from zope import schema
-from waeup.kofa.interfaces import IKofaObject
+from waeup.kofa.interfaces import (
+    IKofaObject, academic_sessions_vocab, registration_states_vocab)
 from waeup.kofa.interfaces import MessageFactory as _
 from waeup.kofa.hostels.vocabularies import (
@@ -27 +29 @@
 
     """
+
+    startdate = schema.Datetime(
+        title = _(u'Hostel Allocation Start Date'),
+        required = False,
+        description = _('Example:') + u'2011-12-01 18:30:00+01:00',
+        )
+
+    enddate = schema.Datetime(
+        title = _(u'Hostel Allocation Closing Date'),
+        required = False,
+        description = _('Example:') + u'2011-12-31 23:59:59+01:00',
+        )
+
+    accommodation_session = schema.Choice(
+        title = _(u'Booking Session'),
+        source = academic_sessions_vocab,
+        default = datetime.now().year,
+        required = False,
+        readonly = False,
+        )
+
+    accommodation_states = schema.List(
+        title = _(u'Allowed States'),
+        value_type = schema.Choice(
+            vocabulary = registration_states_vocab,
+            ),
+        default = [],
+        )
 
 class IHostel(IKofaObject):

main/waeup.kofa/trunk/src/waeup/kofa/hostels/tests.py

@@ -124 +124 @@
 
         # Set accommodation_session
-        self.app['configuration'].accommodation_session = 2004
+        self.app['hostels'].accommodation_session = 2004
 
         # Create a hostel

main/waeup.kofa/trunk/src/waeup/kofa/hostels/vocabularies.py

@@ -33 +33 @@
     def acco_students(self, context):
         catalog = getUtility(ICatalog, name='students_catalog')
-        accommodation_session = getSite()['configuration'].accommodation_session
+        accommodation_session = getSite()['hostels'].accommodation_session
         students = catalog.searchResults(current_session=(
             accommodation_session,accommodation_session))

main/waeup.kofa/trunk/src/waeup/kofa/interfaces.py

@@ -516 +516 @@
         )
 
-    accommodation_session = schema.Choice(
-        title = _(u'Accommodation Booking Session'),
-        source = academic_sessions_vocab,
-        default = datetime.now().year,
-        required = False,
-        readonly = False,
-        )
-
-    accommodation_states = schema.List(
-        title = _(u'Allowed States for Accommodation Booking'),
-        value_type = schema.Choice(
-            vocabulary = registration_states_vocab,
-            ),
-        default = [],
-        )
-
     name_admin = schema.TextLine(
         title = _(u'Name of Administrator'),

main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py

@@ -1055 +1055 @@
         if p_category == 'bed_allocation' and student[
             'studycourse'].current_session != grok.getSite()[
-            'configuration'].accommodation_session:
+            'hostels'].accommodation_session:
                 self.flash(
                     _('Your current session does not match ' + \

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py

@@ -172 +172 @@
 
         # Configure university
-        self.app['configuration'].accommodation_states = ['admitted']
-        self.app['configuration'].accommodation_session = 2004
+        self.app['hostels'].accommodation_states = ['admitted']
+        self.app['hostels'].accommodation_session = 2004
         self.app['configuration'].carry_over = True
         configuration = createObject('waeup.SessionConfiguration')
@@ -1601 +1601 @@
         self.browser.getControl(name="form.p_category").value = ['bed_allocation']
         # If student is not in accommodation session, payment cannot be processed
-        self.app['configuration'].accommodation_session = 2011
+        self.app['hostels'].accommodation_session = 2011
         self.browser.getControl("Create ticket").click()
         self.assertMatches('...Your current session does not match...',
                            self.browser.contents)
-        self.app['configuration'].accommodation_session = 2004
+        self.app['hostels'].accommodation_session = 2004
         self.browser.getControl("Add online payment ticket").click()
         self.browser.getControl(name="form.p_category").value = ['bed_allocation']

main/waeup.kofa/trunk/src/waeup/kofa/students/utils.py

@@ -320 +320 @@
         d = {}
         d['error'] = u''
-        site_configuration = grok.getSite()['configuration']
-        d['booking_session'] = site_configuration.accommodation_session
-        d['allowed_states'] = site_configuration.accommodation_states
+        hostels = grok.getSite()['hostels']
+        d['booking_session'] = hostels.accommodation_session
+        d['allowed_states'] = hostels.accommodation_states
         # Determine bed type
         studycourse = student['studycourse']
@@ -331 +331 @@
             return
         end_level = certificate.end_level
-        if entry_session == grok.getSite()[
-            'configuration'].accommodation_session:
+        if entry_session == grok.getSite()['hostels'].accommodation_session:
             bt = 'fr'
         elif current_level >= end_level: