Changeset 6959 for main/waeup.sirp/trunk/src/waeup

Timestamp:

27 Oct 2011, 10:22:32 (13 years ago)

Author:

Henrik Bettermann

Message:

Add pagetemplates and extend logging.

Location:

main/waeup.sirp/trunk/src/waeup/sirp/hostels

Files:

• browser.py (modified) (8 diffs)
• browser_templates (added)
• browser_templates/containermanagepage.pt (added)
• browser_templates/containerpage.pt (added)
• browser_templates/primarynavtab.pt (added)
• container.py (modified) (1 diff)
• interfaces.py (modified) (2 diffs)

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

@@ -21 +21 @@
 from zope.component import createObject
 from waeup.sirp.browser import (
-    WAeUPPage, WAeUPEditFormPage, WAeUPAddFormPage, WAeUPDisplayFormPage)
+    WAeUPPage, WAeUPEditFormPage, WAeUPAddFormPage, WAeUPDisplayFormPage,
+    NullValidator)
 from waeup.sirp.browser.breadcrumbs import Breadcrumb
-from waeup.sirp.browser.resources import datepicker, datatable, tabs
+from waeup.sirp.browser.resources import datepicker, datatable, tabs, toggleall
 from waeup.sirp.browser.viewlets import (
     ManageActionButton, PrimaryNavTab, AddActionButton)
@@ -30 +31 @@
     FriendlyDateWidget, FriendlyDateDisplayWidget,
     FriendlyDatetimeDisplayWidget)
-from waeup.sirp.browser.resources import toggleall
+from waeup.sirp.browser.pages import delSubobjects
 from waeup.sirp.authentication import get_principal_role_manager
 from waeup.sirp.hostels.container import HostelsContainer
@@ -82 +83 @@
     grok.context(IHostel)
 
+    def title(self):
+        return self.context.hostel_name
+
 class HostelsContainerPage(WAeUPDisplayFormPage):
     """The standard view for hostels containers.
@@ -88 +92 @@
     grok.name('index')
     grok.require('waeup.viewHostels')
-    #grok.template('containerpage')
+    grok.template('containerpage')
     label = 'Accommodation Section'
-    title = 'Accommodation'
+    title = 'Hostels'
     pnav = 5
 
@@ -106 +110 @@
     grok.name('manage')
     grok.require('waeup.manageHostels')
-    #grok.template('containermanagepage')
-    pnav = 5
-    title = 'Accommodation'
+    grok.template('containermanagepage')
+    pnav = 5
+    title = 'Hostels'
     label = 'Manage accommodation section'
 
-class HostelsContainerAddActionButton(AddActionButton):
-    grok.order(1)
-    grok.context(IHostelsContainer)
-    grok.view(HostelsContainerManagePage)
-    grok.require('waeup.manageHostels')
-    text = 'Add hostel'
-    target = 'addhostel'
+    # It's quite dangerous to remove entire hostels with its content (beds).
+    # Thus, this removed should be combined with an archiving function.
+    @grok.action('Remove selected')
+    def delHostels(self, **data):
+        form = self.request.form
+        if form.has_key('val_id'):
+            deleted = []
+            child_id = form['val_id']
+            child_id = [child_id]
+            for id in child_id:
+                deleted.append(id)
+            write_log_message(self, 'deleted: % s' % ', '.join(deleted))
+        delSubobjects(self, redirect='@@manage', tab='2')
+        return
+
+    @grok.action('Add hostel', validator=NullValidator)
+    def addSubunit(self, **data):
+        self.redirect(self.url(self.context, 'addhostel'))
+        return
 
 class HostelAddFormPage(WAeUPAddFormPage):
@@ -127 +143 @@
     grok.template('hosteladdpage')
     form_fields = grok.AutoFields(IHostel)
-    title = 'Accommodation'
+    title = 'Hostels'
     label = 'Add hostel'
     pnav = 5
@@ -138 +154 @@
         self.context.addHostel(hostel)
         self.flash('Hostel created.')
+        write_log_message(self, 'added: % s' % data['hostel_name'])
         self.redirect(self.url(self.context[hostel.hostel_id], 'index'))
         return
@@ -174 +191 @@
     form_fields = grok.AutoFields(IHostel).omit('hostel_id')
     #grok.template('hostelmanagepage')
-    label = 'Manage hostel data'
+    label = 'Manage hostel'
     pnav = 5
 

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

@@ -62 +62 @@
                 user, ob_class, target, comment))
         return
+
+    def loggerInfo(self, ob_class, comment=None):
+        target = self.__name__
+        return self.logger_info(ob_class,target,comment)

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

@@ -34 +34 @@
         title = u'Hall Name',
         required = True,
-        default = u'hostel_1',
+        default = u'Hall 1',
         )
 
@@ -43 +43 @@
         )
 
-    nr_of_floors = schema.Int(
-        title = u'Number of Floors',
+    floors_per_block = schema.Int(
+        title = u'Floors per Block',
         required = True,
         default = 3,