Changeset 3527 for waeup/trunk

Timestamp:

30 Jun 2008, 15:30:23 (16 years ago)

Author:

adiwidjaja

Message:

Base management structures.

Location:

waeup/trunk/src/waeup

Files:

• basecontainer.py (modified) (1 diff)
• basecontainer_templates (added)
• basecontainer_templates/add.pt (added)
• basecontainer_templates/index.pt (added)
• catalog.py (modified) (1 diff)
• hostel/hostel.py (modified) (1 diff)
• hostel/hostelcontainer.py (modified) (1 diff)
• students/student.py (modified) (2 diffs)
• students/studentcontainer.py (modified) (2 diffs)
• students/studentcontainer_templates (added)
• students/studentcontainer_templates/add.ptx (added)
• templates (added)
• university/facultycontainer.py (modified) (1 diff)
• utils (added)
• utils/__init__.py (added)
• utils/csv.py (added)

waeup/trunk/src/waeup/basecontainer.py

@@ -6 +6 @@
     base methods and templates attached to it
     """
+    
+    name = u"BaseContainer"
+    childClass = None
+    
+class Index(grok.View):
+    """
+    Base view
+    """
+    
+class Add(grok.AddForm):
+    #form_fields = grok.AutoFields(self.context.childClass)
+#DOESN'T WORK    grok.template("../basecontainer_templates/add.pt")
+
+    def update(self):
+        self.form_fields = grok.AutoFields(self.context.childClass)
+        grok.AddForm.update(self)
+
+    @grok.action('Add Item')
+    def addItem(self, name, *args, **kw):
+        item = self.context.childClass(name=name)
+        self.context[name] = item
+        self.redirect(self.url(item))

waeup/trunk/src/waeup/catalog.py

@@ -35 +35 @@
         return result
     
-class ImportStudents(grok.View):
-    grok.context(University)
-
-    def render(self):
-        t = [0]
-        src = os.path.join(os.path.dirname(__file__), 'tests',
-                           'results2.csv')
-        inputfile = file(src, "r")
-        num = 0
-        headers, rows = readFile(inputfile)
-        for i in rows:
-             s = Student(i)
-             self.context[str(num)] = s
-             num += 1
-        return "%s new Students added in %s" % (num, t[0])
-
-class ListView(grok.View):
-    grok.context(University)
-
-    def render(self):
-        result = []
-        for s in self.context.values():
-            result.append(getattr(s,'name', 'Error'+str(type(s))))
-        return "\n".join(result)
-
-class ExportStudents(grok.View):
-    grok.context(University)
-    
-    def render(self):
-        t = [0]
-        result = []
-        for s in self.context.values():
-             result.append(s.getCsv())
-        writeFile(result)
-        return "yeah %s" % t[0]
-        
-
-def readFile(f):
-    """read a CSV file"""
-    headers = []
-    rows = []
-    f = csv.reader(f)
-    headers = f.next()
-    for line in f:
-        rows.append(line)
-    return (headers, rows)
-
-def writeFile(data):
-    writer = csv.writer(open("export.csv", "wb"))
-    writer.writerows(data)
-

waeup/trunk/src/waeup/hostel/hostel.py

@@ +1 @@
+import grok
+
+class Hostel(grok.Model):
+    pass

waeup/trunk/src/waeup/hostel/hostelcontainer.py

@@ -1 +1 @@
 from waeup.basecontainer import BaseContainer
+from hostel import Hostel
 
 class HostelContainer(BaseContainer):
     name = u"Hostels"
+    childClass = Hostel

waeup/trunk/src/waeup/students/student.py

@@ -8 +8 @@
     grok.implements(IStudent)
 
-    def __init__(self, a):
+    def __init__(self, name):
         """
         TODO: REFACTOR TO IMPORT METHOD
@@ -34 +34 @@
 
         """
+        self.name = name
+        
+    def fromCsv(self, a):
         self.entry_mode, self.end_level, self.name, self.jamb_reg_no, self.level, self.id, self.lga, self.entry_session, self.matric_no, self.sex, self.phone, self.session, self.course, self.mode, self.faculty, self.department, self.verdict, self.review_state,  self.perm_address, self.email = a
 

waeup/trunk/src/waeup/students/studentcontainer.py

@@ -2 +2 @@
 
 from waeup.basecontainer import BaseContainer
+from student import Student
+from waeup.utils import csv
 
 class StudentContainer(BaseContainer):
@@ -8 +10 @@
     """
     name = u"Students"
+    childClass = Student
+    
+
+class Import(grok.View):
+    def render(self):
+        t = [0]
+        src = os.path.join(os.path.dirname(__file__), 'tests',
+                           'results2.csv')
+        inputfile = file(src, "r")
+        num = 0
+        headers, rows = csv.readFile(inputfile)
+        for i in rows:
+             s = Student(i)
+             self.context[str(num)] = s
+             num += 1
+        return "%s new Students added in %s" % (num, t[0])
+
+class Export(grok.View):    
+    def render(self):
+        t = [0]
+        result = []
+        for s in self.context.values():
+             result.append(s.getCsv())
+        csv.writeFile(result)
+        return "yeah %s" % t[0]

waeup/trunk/src/waeup/university/facultycontainer.py

@@ -2 +2 @@
 from waeup.basecontainer import BaseContainer
 from interfaces import IFaculty
+from faculty import Faculty
 
 class FacultyContainer(BaseContainer):
     
     name = u'Faculties'
-
-class AddFaculty(grok.AddForm):
-    form_fields = grok.AutoFields(IFaculty)
-
-    @grok.action('Add Faculty')
-    def addFaculty(self, name, *args, **kw):
-        new_fac = Faculty(name=name)
-        self.context[name] = new_fac
-        self.redirect(self.url(new_fac))
+    childClass = Faculty