Changeset 6633

Timestamp:

26 Aug 2011, 10:10:18 (13 years ago)

Author:

Henrik Bettermann

Message:

We don't need a factory for StudentsContainer?.

Add addStudent method which automatically creates subcontainers.

Add StudentStudyCourse? container class which holds the study course data and contains student study level objects for course registration.

Location:

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

Files:

• app.py (modified) (2 diffs)
• students/browser.py (modified) (1 diff)
• students/container.py (modified) (2 diffs)
• students/interfaces.py (modified) (2 diffs)
• students/studycourse.py (added)
• students/tests/test_container.py (modified) (2 diffs)
• students/tests/test_student.py (modified) (3 diffs)
• university/interfaces.py (modified) (1 diff)

main/waeup.sirp/trunk/src/waeup/sirp/app.py

@@ -2 +2 @@
 from hurry.file.interfaces import IFileRetrieval
 from zope.authentication.interfaces import IAuthentication
-from zope.component import createObject, getUtilitiesFor
+from zope.component import getUtilitiesFor
 from zope.component.interfaces import ObjectEvent
 from zope.pluggableauth import PluggableAuthentication
 from waeup.sirp.authentication import setup_authentication
 from waeup.sirp.datacenter import DataCenter
+from waeup.sirp.students.container import StudentsContainer
 from waeup.sirp.imagestorage import ImageStorageFileRetrieval, ImageStorage
 from waeup.sirp.interfaces import (
@@ -42 +43 @@
         self['datacenter'] = DataCenter()
         self['images'] = ImageStorage()
-        self['students'] = createObject(u'waeup.StudentsContainer')
+        self['students'] = StudentsContainer()
         self._createPlugins()
 

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

@@ -211 +211 @@
         student_id = self.request.form.get('form.student_id')
         student = createObject(u'waeup.Student')
+        student.student_id = student_id
         self.applyData(student, **data)
         #import pdb; pdb.set_trace()
         try:
-            self.context[student_id] = student
+            self.context.addStudent(student)
         except KeyError:
             self.flash('The student id chosen already exists.')

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

@@ -21 +21 @@
 from zope.component.interfaces import IFactory
 from zope.interface import implementedBy
-from waeup.sirp.students.interfaces import IStudentsContainer
+from waeup.sirp.students.interfaces import (
+    IStudentsContainer, IStudent)
+from waeup.sirp.students.studycourse import StudentStudyCourse
 
 class StudentsContainer(grok.Container):
@@ -35 +37 @@
     def clear(self, id=None, archive=True):
         raise NotImplementedError()
-    
-class StudentsContainerFactory(grok.GlobalUtility):
-    """A factory for students containers.
-    """
-    grok.implements(IFactory)
-    grok.name(u'waeup.StudentsContainer')
-    title = u"Create a new students container.",
-    description = u"This factory instantiates new students containers."
 
-    def __call__(self, *args, **kw):
-        return StudentsContainer()
-
-    def getInterfaces(self):
-        return implementedBy(StudentsContainer)
+    def addStudent(self, student):
+        """Add a student with subcontainers.
+        """
+        if not IStudent.providedBy(student):
+            raise TypeError('StudentsContainers contain only IStudent instances')
+        self[student.student_id] = student
+        studycourse = StudentStudyCourse()
+        self[student.student_id]['studycourse'] = studycourse
+        return

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

@@ -47 +47 @@
     """
 
+    def addStudent(faculty):
+        """Add an IStudent object and subcontainers.
+
+        """
+
     def archive(id=None):
         """Create on-dist archive of students.
@@ -76 +81 @@
         database.
         """
+
+class IStudentStudyCourse(IWAeUPObject):
+    """A container for student study levels.
+
+    """
+
+    certificate_code = schema.TextLine(
+        title = u'Certificate Code',
+        default = u'None',
+        required = True,
+        )

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

@@ -25 +25 @@
     )
 from waeup.sirp.students.container import (
-    StudentsContainer, StudentsContainerFactory,
+    StudentsContainer, 
     )
 from waeup.sirp.testing import FunctionalLayer
@@ -50 +50 @@
         self.assertRaises(
             NotImplementedError, container.clear)
-
-class StudentsContainerFactoryTest(FunctionalTestCase):
-
-    layer = FunctionalLayer
-
-    def setUp(self):
-        self.factory = StudentsContainerFactory()
-
-    def tearDown(self):
-        pass
-
-    def test_interfaces(self):
-        verifyClass(IFactory, StudentsContainerFactory)
-        verifyObject(IFactory, self.factory)
-
-    def test_factory(self):
-        obj = self.factory()
-        assert isinstance(obj, StudentsContainer)
-
-    def test_getInterfaces(self):
-        implemented_by = self.factory.getInterfaces()
-        assert implemented_by.isOrExtends(IStudentsContainer)

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

@@ -30 +30 @@
     Student, StudentFactory,
     )
+from waeup.sirp.students.studycourse import (
+    StudentStudyCourse,
+    )
 from waeup.sirp.students.interfaces import (
-    IStudent,
+    IStudent, IStudentStudyCourse,
     )
 from waeup.sirp.testing import FunctionalLayer
@@ -42 +45 @@
         super(StudentTest, self).setUp()
         self.student = Student()
+        self.studycourse = StudentStudyCourse()
         return
 
@@ -51 +55 @@
         verify.verifyClass(IStudent, Student)
         verify.verifyObject(IStudent, self.student)
+        verify.verifyClass(IStudentStudyCourse, StudentStudyCourse)
+        verify.verifyObject(IStudentStudyCourse, self.studycourse)
         return
 

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

@@ -62 +62 @@
         """Add an IFactulty object.
 
-        Returns the key, under which the object was stored.
         """
 class IDepartment(IWAeUPObject):