Changeset 8404

Timestamp:

9 May 2012, 22:34:42 (13 years ago)

Author:

Henrik Bettermann

Message:

Implement search page for applicants. Add fullname to applicants_catalog.
Plugins must be updated and /reindex?ctlg=applicants must be performed.

Tests will follow.

Rename ApplicantCatalog? to ApplicantsCatalog?. This does not affect persistent data.

Rename StudentIndexes? to StudentsCatalog?.

Add more localization.

Location:

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

Files:

• applicants/applicant.py (modified) (4 diffs)
• applicants/browser.py (modified) (3 diffs)
• applicants/browser_templates/applicantssearchpage.pt (added)
• applicants/viewlets.py (modified) (1 diff)
• students/browser.py (modified) (1 diff)
• students/catalog.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/applicants/applicant.py

@@ -20 +20 @@
 from cStringIO import StringIO
 from grok import index
+from hurry.query import Eq, Text
+from hurry.query.query import Query
 from zope.component import getUtility, createObject, getAdapter
 from zope.component.interfaces import IFactory
@@ -37 +39 @@
 from waeup.kofa.applicants.interfaces import IApplicant, IApplicantEdit
 from waeup.kofa.applicants.workflow import application_states_dict
+
+def search(query=None, searchtype=None, view=None):
+    if searchtype in ('fullname',):
+        results = Query().searchResults(
+            Text(('applicants_catalog', searchtype), query))
+    else:
+        results = Query().searchResults(
+            Eq(('applicants_catalog', searchtype), query))
+    return results
 
 class Applicant(grok.Container):
@@ -157 +168 @@
 Applicant = attrs_to_fields(Applicant)
 
-class ApplicantCatalog(grok.Indexes):
+class ApplicantsCatalog(grok.Indexes):
     """A catalog indexing :class:`Applicant` instances in the ZODB.
     """
@@ -164 +175 @@
     grok.context(IApplicant)
 
-    #access_code = index.Field(attribute='access_code')
+    fullname = index.Text(attribute='display_fullname')
     applicant_id = index.Field(attribute='applicant_id')
     reg_number = index.Field(attribute='reg_number')

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

@@ -36 +36 @@
     IApplicantRegisterUpdate
     )
+from waeup.kofa.applicants.applicant import search
 from waeup.kofa.applicants.workflow import INITIALIZED, STARTED, PAID, SUBMITTED
 from waeup.kofa.browser import (
@@ -68 +69 @@
     form_fields['description'].custom_widget = HTMLDisplayWidget
     label = _('Application Section')
+    search_button = _('Search')
     pnav = 3
 
@@ -83 +85 @@
             html = self.context.description_dict.get(portal_language,'')
         return html
+
+class ApplicantsSearchPage(KofaPage):
+    grok.context(IApplicantsRoot)
+    grok.name('search')
+    grok.require('waeup.viewApplication')
+    label = _('Search applicants')
+    search_button = _('Search')
+    pnav = 3
+
+    def update(self, *args, **kw):
+        datatable.need()
+        form = self.request.form
+        self.results = []
+        if 'searchterm' in form and form['searchterm']:
+            self.searchterm = form['searchterm']
+            self.searchtype = form['searchtype']
+        elif 'old_searchterm' in form:
+            self.searchterm = form['old_searchterm']
+            self.searchtype = form['old_searchtype']
+        else:
+            if 'search' in form:
+                self.flash(_('Empty search string'))
+            return
+        self.results = search(query=self.searchterm,
+            searchtype=self.searchtype, view=self)
+        if not self.results:
+            self.flash(_('No applicant found.'))
+        return
 
 class ApplicantsRootManageFormPage(KofaEditFormPage):

main/waeup.kofa/trunk/src/waeup/kofa/applicants/viewlets.py

@@ -82 +82 @@
         return self.view.application_url() + rel_link
 
+class SearchApplicantsActionButton(ManageActionButton):
+    grok.order(1)
+    grok.context(IApplicantsRoot)
+    grok.view(ApplicantsRootPage)
+    grok.require('waeup.viewApplication')
+    text = _('Search applicants')
+    icon = 'actionicon_search.png'
+    target = '@@search'
+
 class ManageApplicantsRootActionButton(ManageActionButton):
+    grok.order(2)
     grok.context(IApplicantsRoot)
     grok.view(ApplicantsRootPage)

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

@@ -189 +189 @@
                 self.searchterm = int(self.searchterm)
             except ValueError:
-                self.flash('Only year dates allowed (e.g. 2011).')
+                self.flash(_('Only year dates allowed (e.g. 2011).'))
                 return
         self.hitlist = search(query=self.searchterm,
             searchtype=self.searchtype, view=self)
         if not self.hitlist:
-            self.flash('No student found.')
+            self.flash(_('No student found.'))
         return
 

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

@@ -30 +30 @@
 from waeup.kofa.university.vocabularies import course_levels
 
-class StudentIndexes(grok.Indexes):
+class StudentsCatalog(grok.Indexes):
     """A catalog for students.
     """