Changeset 3571 for waeup/branches

Timestamp:

14 Jul 2008, 21:36:49 (16 years ago)

Author:

hraban

Message:

getting close to a working stub :-)

Location:

waeup/branches/hraban/src/waeup

Files:

• app.py (modified) (1 diff)
• basecontainer.py (modified) (4 diffs)
• basecontainer_templates/edit_form.pt (modified) (1 diff)
• baseitem.py (modified) (3 diffs)
• catalog.py (modified) (3 diffs)
• catalog_templates/studentsearch.pt (modified) (2 diffs)
• hostel/hostel.py (modified) (1 diff)
• hostel/hostelcontainer.py (modified) (1 diff)
• hostel/interfaces.py (modified) (2 diffs)
• setup (deleted)
• students/interfaces.py (modified) (2 diffs)
• students/student.py (modified) (2 diffs)
• students/studentcontainer.py (modified) (3 diffs)
• university/course.py (modified) (1 diff)
• university/department.py (modified) (1 diff)
• university/facultycontainer.py (modified) (1 diff)
• university/interfaces.py (modified) (1 diff)

waeup/branches/hraban/src/waeup/app.py

@@ -2 +2 @@
 #from zope.interface import Interface
 from waeup.interfaces import IUniversity
-from setup import app_setup
 from waeup.viewlets import MainArea
 from basecontainer import BaseContainer
+from waeup.hostel import hostelcontainer
+from waeup.university import facultycontainer
+from waeup.students import studentcontainer
 
 class University(grok.Application, BaseContainer):
     grok.implements(IUniversity)
+    id = 'base'
+    name = u'University'
 
     def __init__(self, **kw):
         super(University, self).__init__(**kw)
         self.__dict__.update(kw)
-        app_setup.setup(self)
+        
+        sc = studentcontainer.StudentContainer()
+        self["students"] = sc        
+    
+        hc = hostelcontainer.HostelContainer()
+        self["hostels"] = hc
+    
+        fc = facultycontainer.FacultyContainer()
+        self["faculties"] = fc
 
 #class Content(grok.Viewlet):

waeup/branches/hraban/src/waeup/basecontainer.py

@@ +1 @@
+# -*- coding: utf-8 -*-
 import grok
 import os
@@ -10 +11 @@
     base methods attached to it
     """
-    grok.implements(IBaseContainer)
-    id = 'base'
-    name = u"BaseContainer"
+    #grok.implements(IBaseContainer)
+    #id = 'base'
+    #name = u"BaseContainer"
     childClass = None
     specialActions = []
@@ -31 +32 @@
     template = grok.PageTemplate(filename=os.path.join('basecontainer_templates', 'edit_form.pt'))
 
-    def update(self):
+    def __init__(self, context, request):
+        super(AddForm, self).__init__(context, request)
         self.form_fields = grok.AutoFields(self.context.childClass)
-        grok.AddForm.update(self)
 
     @grok.action('Add item')
     def add(self, **data):
         obj = self.context.childClass(**data)
-        try:
-            id = data['id'].lower()
-            self.context[id] = obj
-        except Exception, ex:
-            print ex
-            print data
-            raise ex
-        self.redirect(self.url('.'))
+        id = data['id'].lower()
+        self.context[id] = obj # schlägt fehlt bei nicht-Container-Objekten (not iterable)
+        self.redirect(self.url('@@index'))
 
 class EditForm(grok.EditForm):
     template = grok.PageTemplate(filename=os.path.join('basecontainer_templates', 'edit_form.pt'))
-   
-    def update(self):
-        self.form_fields = grok.AutoFields(self.context)
-        grok.EditForm.update(self)
+    #form_fields = grok.AutoFields(BaseContainer)
+
+    def __init__(self, context, request):
+        super(EditForm, self).__init__(context, request)
+        self.form_fields = grok.AutoFields(self.context.__class__)
         
     def handle_edit_action(self, **data):
@@ -74 +71 @@
 class EditViewlet(grok.Viewlet):
     grok.viewletmanager(vw.MainArea)
-    grok.context(IBaseContainer)
+    #grok.context(IBaseContainer)
     grok.view(vw.Edit)
     #grok.name('edit')

waeup/branches/hraban/src/waeup/basecontainer_templates/edit_form.pt

@@ -17 +17 @@
     </div>
     -->
-        <div tal:content="context"></div>
     <div class="form-fields">
         <tal:block repeat="widget view/widgets">

waeup/branches/hraban/src/waeup/baseitem.py

@@ -10 +10 @@
     Base item
     """
-    grok.implements(IBaseItem)
+    #grok.implements(IBaseItem)
     
     def __init__(self, **kwargs):
@@ -26 +26 @@
     template = grok.PageTemplate(filename=os.path.join('basecontainer_templates', 'edit_form.pt'))
 
-    def update(self):
-        self.form_fields = grok.AutoFields(self.context.childClass)
-        grok.AddForm.update(self)
+    def __init__(self, context, request):
+        super(AddForm, self).__init__(context, request)
+        self.form_fields = grok.AutoFields(self.context-__class__) #.childClass)
 
     @grok.action('Add item')
     def add(self, **data):
-        obj = self.context.childClass(**data)
+        obj = self.context.__class__(**data) #.childClass(**data)
         id = data['id'].lower()
         self.context[id] = obj
@@ -40 +40 @@
     template = grok.PageTemplate(filename=os.path.join('basecontainer_templates', 'edit_form.pt'))
    
-    def update(self):
-        self.form_fields = grok.AutoFields(self.context)
-        grok.EditForm.update(self)
-        
+    def __init__(self, context, request):
+        super(EditForm, self).__init__(context, request)
+        self.form_fields = grok.AutoFields(self.context.__class__)
+       
     def handle_edit_action(self, **data):
         grok.EditForm.handle_edit_action(self, **data)
-        self.redirect(self.url('..'))
+        self.redirect(self.url('@@index'))
 
 class AddViewlet(grok.Viewlet):

waeup/branches/hraban/src/waeup/catalog.py

@@ -1 @@
-import sys
-import csv
-import random
-from datetime import datetime
-import os
 import grok, grok.index
 from hurry.query.query import Query, Text
 from hurry.query import Eq
 from waeup.app import University
-from waeup.students.interfaces import IStudent
+from waeup.students.interfaces import IStudent, IStudentContainer
 from waeup.students.student import Student
 from waeup.viewlets import MainArea, LeftSidebar
@@ -15 +10 @@
      grok.site(University)
      grok.name('students_catalog')
-     grok.context(IStudent)
+     grok.context(IStudentContainer)
 
      name = grok.index.Field(attribute='name')
@@ -21 +16 @@
 
 class StudentSearch(grok.Viewlet):
-    grok.context(IStudent)
+    grok.context(IStudentContainer)
     grok.viewletmanager(LeftSidebar)
     #grok.view(Student)
+    grok.order(3)
 
     def update(self, query=None):

waeup/branches/hraban/src/waeup/catalog_templates/studentsearch.pt

@@ -7 +7 @@
     <input type="submit" value="Search" />
   </form>
+  <!--
   <ul>
   <li tal:repeat="item view/search_result"
@@ -12 +13 @@
   </li>
   </ul>
+  -->
 </div>

waeup/branches/hraban/src/waeup/hostel/hostel.py

@@ -9 +9 @@
     grok.implements(IHostel)
     name = u'Hostel'
-    #childClass = ?
-
-
-#class Add(base.AddViewlet):
-#    grok.context(IHostel)
-#
-#class Edit(base.EditViewlet):
-#    grok.context(IHostel)
-#
-#class EditForm(base.EditForm):
-#    pass
-#
-#class AddForm(base.AddForm):
-#    pass

waeup/branches/hraban/src/waeup/hostel/hostelcontainer.py

@@ -1 +1 @@
 import grok
-from waeup.interfaces import IBaseContainer
+from waeup.hostel.interfaces import IHostelContainer
 from waeup.basecontainer import BaseContainer
 from hostel import Hostel
 
 class HostelContainer(BaseContainer):
-    grok.implements(IBaseContainer)
+    grok.implements(IHostelContainer)
+    id = 'hostels'
     name = u"Hostels"
     childClass = Hostel

waeup/branches/hraban/src/waeup/hostel/interfaces.py

@@ -4 +4 @@
 import re
 from zope import schema
-from waeup.interfaces import IBaseContainer
+from waeup.interfaces import IBaseItem, IBaseContainer
 
-class IHostel(IBaseContainer):
+class IHostel(IBaseItem):
     """Representation of a hostel (AKA hall).
     """
@@ -21 +21 @@
         )
 
+class IHostelContainer(IBaseContainer):
+    pass

waeup/branches/hraban/src/waeup/students/interfaces.py

@@ -4 +4 @@
 import re
 from zope import schema
-from waeup.interfaces import IBaseItem
+from zope.interface import Interface
+from waeup.interfaces import IBaseItem, IBaseContainer
 
-class IStudent(IBaseItem):
+class IStudentContainer(IBaseContainer):
+    pass
+
+class IStudent(Interface):
     """Representation of a student.
     """
+    id = schema.ASCIILine(
+        title = u'Student ID',
+        default = '',
+        required = True,
+        constraint=(re.compile("^([A-Z]\d{6})?$").match)
+        )
     entry_mode = schema.ASCIILine( # Choice?
         title = u'Entry Mode',
@@ -39 +49 @@
         min = 0,
         max = 600
-        )
-    id = schema.ASCIILine(
-        title = u'Student ID',
-        default = '',
-        required = False,
-        constraint=(re.compile("^([A-Z]\d{6})?$").match)
         )
     lga = schema.TextLine(

waeup/branches/hraban/src/waeup/students/student.py

@@ -21 +21 @@
     name = u'Student'
 
-    #TODO: REFACTOR TO SCHEMA
     fields = [   "entry_mode",
                  "end_level",
@@ -50 +49 @@
 
 
-class Add(base.AddViewlet):
-    grok.context(IStudent)
-
-class Edit(base.EditViewlet):
-    grok.context(IStudent)
+#class AddViewlet(base.AddViewlet):
+#    grok.context(IStudent)
+#
+#class EditEditViewlet(base.EditViewlet):
+#    grok.context(IStudent)

waeup/branches/hraban/src/waeup/students/studentcontainer.py

@@ -1 +1 @@
 import grok
 import os
-from waeup.interfaces import IBaseContainer
+#from waeup.interfaces import IBaseContainer
 import waeup.basecontainer as base
-from student import Student, fromCsv
+from waeup.students.student import Student, fromCsv
+from waeup.students.interfaces import IStudentContainer
 from waeup.utils import importexport as csv
 
@@ -11 +12 @@
     The node containing the student models
     """
+    grok.implements(IStudentContainer)
+    id = 'students'
     name = u"Students"
     childClass = Student
@@ -42 +45 @@
         return "yeah %s" % t[0]
 
+#class AddForm(base.AddForm):
+#    form_fields = grok.AutoFields(Student)
+#
+#class EditForm(base.EditForm):
+#    form_fields = grok.AutoFields(Student)
 
-class Edit(base.EditViewlet):
-    grok.context(IBaseContainer)
+
+#class Edit(base.EditViewlet):
+#    grok.context(IStudentContainer)
+#
+#
+#class Add(base.AddViewlet):
+#    grok.context(IStudentContainer)

waeup/branches/hraban/src/waeup/university/course.py

@@ -3 +3 @@
 from waeup.university.interfaces import ICourse
 
-class Department(base.BaseItem):
+class Course(grok.Model):
     grok.implements(ICourse)
     name = u'Course'

waeup/branches/hraban/src/waeup/university/department.py

@@ -9 +9 @@
     name = u'Department'
 
-class Add(base.AddViewlet):
-    grok.context(IDepartment)
+#class Add(base.AddViewlet):
+#    grok.context(IDepartment)
 
 

waeup/branches/hraban/src/waeup/university/facultycontainer.py

@@ -1 +1 @@
 import grok
 from waeup.basecontainer import BaseContainer
+from waeup.interfaces import IBaseContainer
 from waeup.university.interfaces import IFaculty
 from waeup.university.faculty import Faculty
 
 class FacultyContainer(BaseContainer):
-    #grok.implements(IBaseContainer)
+    grok.implements(IBaseContainer)
+    id = 'faculties'
     name = u'Faculties'
     childClass = Faculty

waeup/branches/hraban/src/waeup/university/interfaces.py

@@ -4 +4 @@
 from waeup.interfaces import IBaseContainer
 
-class IFaculty(IBaseContainer):
+class IFaculty(grok.interfaces.IContainer):
     """Representation of a university faculty.
     """