Changeset 6189 for main

Timestamp:

22 May 2011, 08:32:37 (13 years ago)

Author:

Henrik Bettermann

Message:

Select application_category for applicants containers.

Implement removal of applicants.

Location:

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

Files:

• applicants/browser.py (modified) (1 diff)
• applicants/interfaces.py (modified) (2 diffs)
• university/interfaces.py (modified) (2 diffs)
• university/vocabularies.py (modified) (1 diff)

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

@@ -327 +327 @@
     @grok.action('Remove selected')
     def delApplicant(self, **data):
-        return self.flash('Removal of applicants is not yet implemented!')
+        form = self.request.form
+        if form.has_key('val_id'):
+            child_id = form['val_id']
+        else:
+            self.flash('No applicant selected!')
+            self.redirect(self.url(self.context, '@@manage')+'#tab-2')
+            return
+        if not isinstance(child_id, list):
+            child_id = [child_id]
+        deleted = []
+        for id in child_id:
+            try:
+                del self.context[id]
+                deleted.append(id)
+            except:
+                self.flash('Could not delete %s: %s: %s' % (
+                        id, sys.exc_info()[0], sys.exc_info()[1]))
+        if len(deleted):
+            self.flash('Successfully removed: %s' % ', '.join(deleted))
+        self.redirect(self.url(self.context, u'@@manage')+'#tab-2')
+        return
 
     @grok.action('Add applicant', validator=NullValidator)

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

@@ -35 +35 @@
 from waeup.sirp.image.image import WAeUPImageFile
 from waeup.sirp.interfaces import IWAeUPObject, SimpleWAeUPVocabulary
+from waeup.sirp.university.vocabularies import application_categories
 
 
@@ -207 +208 @@
         )
 
+    application_category = schema.Choice(
+        title = u'Category for the grouping of study courses',
+        required = True,
+        default = None,
+        source = application_categories,
+        )
+
     description = schema.Text(
         title = u'Human readable description in reST format',

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

@@ -8 +8 @@
     course_levels,
     semester,
-    application_category, 
+    application_categories,
     study_mode,
     inst_types,
@@ -221 +221 @@
     application_category = schema.Choice(
         title = u'Application Category',
-        vocabulary = application_category,
+        vocabulary = application_categories,
         default = u'basic',
         required = True,

main/waeup.sirp/trunk/src/waeup/sirp/university/vocabularies.py

@@ -39 +39 @@
     )
 
-application_category = SimpleWAeUPVocabulary(
+application_categories = SimpleWAeUPVocabulary(
     ('--',''),
     ('PUME, PDE, PCE, PRENCE','basic'),