Changeset 6818 for main/waeup.sirp/trunk

Timestamp:

27 Sep 2011, 08:00:33 (13 years ago)

Author:

Henrik Bettermann

Message:

Replace student's name attribute by fullname attributes to avoid confusion.

Location:

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

Files:

• browser/layout.py (modified) (1 diff)
• students/authentication.py (modified) (1 diff)
• students/browser.py (modified) (11 diffs)
• students/browser_templates/containerpage.pt (modified) (4 diffs)
• students/browser_templates/studentaddpage.pt (modified) (1 diff)
• students/catalog.py (modified) (3 diffs)
• students/interfaces.py (modified) (2 diffs)
• students/tests/test_authentication.py (modified) (1 diff)
• students/tests/test_browser.py (modified) (5 diffs)
• students/tests/test_catalog.py (modified) (2 diffs)

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

@@ -161 +161 @@
         """
         if IStudentNavigation.providedBy(self.context):
-            return self.context.getStudent().name
+            return self.context.getStudent().fullname
         return
 

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

@@ -52 +52 @@
     @property
     def title(self):
-        return self.context.name
+        return self.context.fullname
 
     @property

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

@@ -79 +79 @@
     title = u'Students'
 
+class StudentBreadcrumb(Breadcrumb):
+    """A breadcrumb for the student container.
+    """
+    grok.context(IStudent)
+
+    def title(self):
+        return self.context.fullname
+
 class SudyCourseBreadcrumb(Breadcrumb):
     """A breadcrumb for the student study course.
@@ -292 +300 @@
     @property
     def label(self):
-        return '%s: Base Data' % self.context.name
+        return '%s: Base Data' % self.context.fullname
 
     @property
@@ -393 +401 @@
     @property
     def label(self):
-        return '%s: Clearance Data' % self.context.name
+        return '%s: Clearance Data' % self.context.fullname
 
 class StudentClearanceManageActionButton(ManageActionButton):
@@ -437 +445 @@
     @property
     def label(self):
-        return '%s: Personal Data' % self.context.name
+        return '%s: Personal Data' % self.context.fullname
 
 class StudentPersonalManageActionButton(ManageActionButton):
@@ -476 +484 @@
     @property
     def label(self):
-        return '%s: Study Course' % self.context.__parent__.name
+        return '%s: Study Course' % self.context.__parent__.fullname
 
 class StudyCourseManageActionButton(ManageActionButton):
@@ -573 +581 @@
     def label(self):
         return '%s: Study Level %s' % (
-            self.context.getStudent().name,self.context.level_title)
+            self.context.getStudent().fullname,self.context.level_title)
 
     @property
@@ -707 +715 @@
     def label(self):
         return '%s: Course Ticket %s' % (
-            self.context.getStudent().name,self.context.code)
+            self.context.getStudent().fullname,self.context.code)
 
 class CourseTicketManageActionButton(ManageActionButton):
@@ -753 +761 @@
     @property
     def label(self):
-        return '%s: Payments' % self.context.__parent__.name
+        return '%s: Payments' % self.context.__parent__.fullname
 
 class AccommodationDisplayFormPage(WAeUPDisplayFormPage):
@@ -768 +776 @@
     @property
     def label(self):
-        return '%s: Accommodation Data' % self.context.__parent__.name
+        return '%s: Accommodation Data' % self.context.__parent__.fullname
 
 class StudentHistoryPage(WAeUPPage):
@@ -782 +790 @@
     @property
     def label(self):
-        return '%s: History' % self.context.name
+        return '%s: History' % self.context.fullname
 
 # Pages for students only
@@ -805 +813 @@
 
     def __init__(self, context):
-        self.name = context.name
+        self.name = context.fullname
         self.password_repeat = context.password
         self.context = context

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

@@ -9 +9 @@
   <select name="searchtype">
     <option value="student_id">with id</option>
-    <option value="name">with name</option>
+    <option value="fullname">with name</option>
     <option value="reg_number">with registration number</option>
     <option value="matric_number">with matriculation number</option>
@@ -23 +23 @@
     <input type="hidden" name="old_searchtype"
          tal:attributes="value view/searchtype" />
-    <table class="display dataTableManage">
+    <table class="display dataTable">
       <thead>
       <tr>
@@ -29 +29 @@
         <th>Registration Number</th>
         <th>Matriculation Number</th>
-        <th>Name</th>
+        <th>Fullname</th>
       </tr>
       </thead>
@@ -43 +43 @@
           <span tal:content="item/matric_number">9999999</span></a>
         </td>
-        <td tal:content="item/name">Bob</td>
+        <td tal:content="item/fullname">Bob</td>
       </tr>
       </tbody>

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

@@ -7 +7 @@
     <tbody>
       <tr>
-        <td><label for="form.name">Full Name:</label></td>
+        <td><label for="form.fullname">Full Name:</label></td>
         <td>
-         <input name="form.name" type="text" size="30" maxlength="30"
+         <input name="form.fullname" type="text" size="30" maxlength="30"
                 value="" />
         </td>

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

@@ -18 +18 @@
 
     student_id = index.Field(attribute='student_id')
-    name = index.Text(attribute='name')
+    fullname = index.Text(attribute='fullname')
     reg_number = index.Field(attribute='reg_number')
     matric_number = index.Field(attribute='matric_number')
@@ -34 +34 @@
         self.url = view.url(context)
         self.student_id = context.student_id
-        self.name = context.name
+        self.fullname = context.fullname
         self.reg_number = context.reg_number
         self.matric_number = context.matric_number
@@ -41 +41 @@
 def search(query=None, searchtype=None, view=None):
     hitlist = []
-    if searchtype in ('name',):
+    if searchtype in ('fullname',):
         results = Query().searchResults(
             Text(('students_catalog', searchtype), query))

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

@@ -103 +103 @@
         )
 
-    name = schema.TextLine(
+    fullname = schema.TextLine(
         title = u'Full Name',
-        default = u'Nobody',
+        default = None,
         required = True,
         )
@@ -111 +111 @@
     reg_number = TextLineChoice(
         title = u'Registration Number',
-        #default = u'',
+        default = None,
         required = True,
         readonly = False,

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

@@ -65 +65 @@
 class FakeStudent(object):
     student_id = 'test_stud'
-    name = 'Test User'
+    fullname = 'Test User'
     password = None
 

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

@@ -69 +69 @@
         setSite(app)
 
-        # Add student with subobjects (done by addStudent)
+        # Add student with subobjects
         student = Student()
-        student.name = u'Anna Tester'
+        student.fullname = u'Anna Tester'
         student.reg_number = u'123'
         student.matric_number = u'234'
@@ -186 +186 @@
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.assertEqual(self.browser.url, self.add_student_path)
-        self.browser.getControl(name="form.name").value = 'Bob Tester'
+        self.browser.getControl(name="form.fullname").value = 'Bob Tester'
         self.browser.getControl("Create student record").click()
         self.assertTrue('Student record created' in self.browser.contents)
@@ -213 +213 @@
         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="searchtype").value = ['fullname']
         self.browser.getControl(name="searchterm").value = 'Anna Tester'
         self.browser.getControl("Search").click()
@@ -255 +255 @@
         # Managers can edit base data and fire transitions
         self.browser.getControl(name="transition").value = ['admit']
-        self.browser.getControl(name="form.name").value = 'John Tester'
+        self.browser.getControl(name="form.fullname").value = 'John Tester'
         self.browser.getControl(name="form.reg_number").value = '345'
         self.browser.getControl(name="password").value = 'secret'
@@ -429 +429 @@
         student = Student()
         student.reg_number = u'123456'
-        student.name = u'Klaus Tester'
+        student.fullname = u'Klaus Tester'
         test_student_id = self.app['students'].addStudent(student)
         setpassword_path = 'http://localhost/app/setpassword'

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

@@ -44 +44 @@
         # Create students
         student = Student()
-        student.name = u'Bob Tester'
+        student.fullname = u'Bob Tester'
         student.student_id = u'A123456'
         self.app['students'][student.student_id] = student
@@ -74 +74 @@
         # We can find a certain name
         cat = queryUtility(ICatalog, name='students_catalog')
-        results = cat.searchResults(name='Bob Tester')
+        results = cat.searchResults(fullname='Bob Tester')
         results = [x for x in results] # Turn results generator into list
         assert len(results) == 1