Changeset 6626 for main

Timestamp:

25 Aug 2011, 12:01:37 (13 years ago)

Author:

Henrik Bettermann

Message:

Add students_catalog and search facilities.

Location:

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

Files:

• browser.py (modified) (8 diffs)
• browser_templates/studentscontainermanagepage.pt (added)
• browser_templates/studentscontainerpage.pt (modified) (1 diff)
• catalog.py (added)
• tests/test_browser.py (modified) (3 diffs)
• tests/test_catalog.py (added)

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

@@ -45 +45 @@
 from waeup.sirp.browser.resources import datepicker, tabs, datatable
 from waeup.sirp.browser.viewlets import (
-    ManageActionButton, PrimaryNavTab, LeftSidebarLink
+    ManageActionButton, PrimaryNavTab, LeftSidebarLink, AddActionButton,
     )
 from waeup.sirp.image.browser.widget import (
@@ -67 +67 @@
     Student,
     )
+from waeup.sirp.students.catalog import search
 
 class StudentsTab(PrimaryNavTab):
@@ -84 +85 @@
         return self.view.application_url('students')
 
-class StudentsContainerPage(WAeUPDisplayFormPage):
-    """The standard view for regular student containers.
+class StudentsContainerPage(WAeUPPage):
+    """The standard view for student containers.
     """
     grok.context(IStudentsContainer)
@@ -92 +93 @@
     grok.template('studentscontainerpage')
 
-    form_fields = grok.AutoFields(IStudentsContainer)
-    #form_fields['description'].custom_widget = ReSTDisplayWidget
-
     @property
     def title(self):
@@ -103 +101 @@
         return self.title
 
-class StudentssContainerManageActionButton(ManageActionButton):
+    def update(self, *args, **kw):
+        datatable.need()
+        form = self.request.form
+        self.hitlist = []
+        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.hitlist = search(query=self.searchterm,
+            searchtype=self.searchtype, view=self)
+        if not self.hitlist:
+            self.flash('No student found.')
+        return
+
+class StudentsContainerManageActionButton(ManageActionButton):
     grok.order(1)
     grok.context(IStudentsContainer)
@@ -110 +128 @@
     text = 'Manage students'
 
-class StudentsContainerManagePage(WAeUPDisplayFormPage):
-    """The standard view for regular student containers.
+
+class StudentsContainerManagePage(WAeUPPage):
+    """The manage page for student containers.
     """
     grok.context(IStudentsContainer)
     grok.name('manage')
     grok.require('waeup.manageStudents')
-    grok.template('studentscontainerpage')
-
-    form_fields = grok.AutoFields(IStudentsContainer)
+    grok.template('studentscontainermanagepage')
 
     @property
@@ -128 +145 @@
         return self.title
 
-    @grok.action('Add student', validator=NullValidator)
-    def addStudent(self, **data):
-        self.redirect(self.url(self.context, 'addstudent'))
+    def update(self, *args, **kw):
+        datatable.need()
+        form = self.request.form
+        self.hitlist = []
+        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
+        #import pdb; pdb.set_trace()
+        if not 'entries' in form:
+            self.hitlist = search(query=self.searchterm,
+                searchtype=self.searchtype, view=self)
+            if not self.hitlist:
+                self.flash('No student found.')
+            return
+        entries = form['entries']
+        if isinstance(entries, basestring):
+            entries = [entries]
+        deleted = []
+        for entry in entries:
+            if 'remove' in form:
+                del self.context[entry]
+                deleted.append(entry)
+        self.hitlist = search(query=self.searchterm,
+            searchtype=self.searchtype, view=self)
+        if len(deleted):
+            self.flash('Successfully removed: %s' % ', '.join(deleted))
         return
+
+class StudentsContainerAddActionButton(AddActionButton):
+    grok.order(1)
+    grok.context(IStudentsContainer)
+    grok.view(StudentsContainerManagePage)
+    grok.require('waeup.manageStudents')
+    text = 'Add student'
+    target = 'addstudent'
 
 class StudentAddFormPage(WAeUPAddFormPage):
@@ -155 +210 @@
             self.flash('The student id chosen already exists.')
             return
+        self.flash('Student record created.')
         self.redirect(self.url(self.context[student_id], 'index'))
         return

main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/studentscontainerpage.pt

@@ -1 +1 @@
 <h2 tal:content="view/label">Title</h2>
+<form method="POST">
 
-<form method="POST">
-<table class="zebra" tal:condition="layout/isAuthenticated">
-  <tbody>
-    <tal:block repeat="widget view/widgets">
-      <tr>
-        <td class="fieldname">
-          <tal:block replace="python:widget.label"/>:
-        </td>
-        <td class="field">
-          <tal:block tal:replace="structure widget" />
-        </td>
-      </tr>
-    </tal:block>
-      <tr>
-        <td>
-            <div class="actionButtons" tal:condition="view/availableActions">
-                <span tal:repeat="action view/actions" tal:omit-tag="">
-                    <input tal:replace="structure action/render"/>
-                </span>
-            </div>
-        </td>
-      </tr>
-  </tbody>
-</table>
+<br />
+
+  <input type="submit" name="search" value="Search" />
+  for students
+
+  <select name="searchtype">
+    <option value="student_id">with id</option>
+    <option value="name">with name</option>
+  </select>
+
+  <input type="text" name="searchterm" />
+
+  <p>&nbsp;</p>
+  <div tal:condition="view/hitlist">
+    <h3>Search Results</h3>
+    <input type="hidden" name="old_searchterm"
+         tal:attributes="value view/searchterm" />
+    <input type="hidden" name="old_searchtype"
+         tal:attributes="value view/searchtype" />
+    <table class="display dataTableManage">
+      <thead>
+        <tr>
+          <th>Student Id</th><th>Name</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr tal:repeat="item view/hitlist">
+          <td tal:content="item/student_id">A123456</td>
+          <td tal:content="item/name">Bob</td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
 </form>

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

@@ -73 +73 @@
         self.container_path = 'http://localhost/app/students'
         self.manage_container_path = self.container_path + '/@@manage'
-        self.add_student_path = self.container_path + '/@@add'
+        self.add_student_path = self.container_path + '/addstudent'
 
         # Populate university
@@ -121 +121 @@
         return
 
-    def test_add_students(self):
-        # Managers can add students
+    def test_add_search_delete_students(self):
+        # Managers can add search and remove students
         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
-        self.add_student_path = self.container_path + '/addstudent'
-        self.container_manage_path = self.container_path + '/@@manage'
-        self.browser.open(self.container_manage_path)
-        self.browser.getControl("Add student").click()
+        self.browser.open(self.manage_container_path)
+        self.browser.getLink("Add student").click()
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.assertEqual(self.browser.url, self.add_student_path)
@@ -133 +131 @@
         self.browser.getControl(name="form.name").value = 'Bob Tester'
         self.browser.getControl("Create student record").click()
+        self.assertTrue('Student record created' in self.browser.contents)
+
+        self.browser.open(self.container_path)
+        self.browser.getControl("Search").click()
+        self.assertTrue('Empty search string' in self.browser.contents)
+        self.browser.getControl(name="searchtype").value = ['student_id']
+        self.browser.getControl(name="searchterm").value = 'A123456'
+        self.browser.getControl("Search").click()
+        self.assertTrue('Bob Tester' in self.browser.contents)
+        # The old searchterm will be used again
+        self.browser.getControl("Search").click()
+        self.assertTrue('Bob Tester' in self.browser.contents)
+
+        self.browser.open(self.manage_container_path)
+        self.browser.getControl("Search").click()
+        self.assertTrue('Empty search string' in self.browser.contents)
+        self.browser.getControl(name="searchtype").value = ['name']
+        self.browser.getControl(name="searchterm").value = 'Bob Tester'
+        self.browser.getControl("Search").click()
+        self.assertTrue('A123456' in self.browser.contents)
+        ctrl = self.browser.getControl(name='entries')
+        ctrl.getControl(value='A123456').selected = True
+        self.browser.getControl("Remove selected", index=0).click()
+        self.assertTrue('Successfully removed' in self.browser.contents)
+        self.browser.getControl(name="searchtype").value = ['student_id']
+        self.browser.getControl(name="searchterm").value = 'A123456'
+        self.browser.getControl("Search").click()
+        self.assertTrue('No student found' in self.browser.contents)
+
+        self.browser.open(self.container_path)
+        self.browser.getControl(name="searchtype").value = ['student_id']
+        self.browser.getControl(name="searchterm").value = 'A123456'
+        self.browser.getControl("Search").click()
+        self.assertTrue('No student found' in self.browser.contents)
+