Changeset 2912 for WAeUP_SRP/base

Timestamp:

10 Dec 2007, 20:11:24 (17 years ago)

Author:

Henrik Bettermann

Message:

layout changes

Location:

WAeUP_SRP/base

Files:

• Students.py (modified) (7 diffs)
• skins/waeup_student/reserve_accommodation.py (modified) (1 diff)

WAeUP_SRP/base/Students.py

@@ -219 +219 @@
                 continue
             try:
-                icl = int(old_current_level)                
+                icl = int(old_current_level)
                 if icl == int(old_current_level) and old_study_course == new_study_course:
                     em = 'Already transferred'
@@ -594 +594 @@
         """compose title"""
         content = self.getContent()
+        session_str = self.portal_vocabularies.sessions.get(content.session)
         #return "Accommodation Data for %s %s" % (content.firstname,content.lastname)
-        return "Accommodation Data for Session %s" % content.session
+        return "Accommodation Data for Session %s" % session_str
 
 
@@ -618 +619 @@
     def Title(self):
         """compose title"""
-        content = self.getContent()
+        #content = self.getContent()
         #return "Personal Data for %s %s" % (content.firstname,content.lastname)
         return "Personal Data"
@@ -643 +644 @@
     def Title(self):
         """compose title"""
-        content = self.getContent()
+        #content = self.getContent()
         #return "Clearance/Eligibility Record for %s %s" % (content.firstname,content.lastname)
         return "Clearance/Eligibility Record"
@@ -715 +716 @@
     def Title(self):
         """compose title"""
-        content = self.getContent()
+        #content = self.getContent()
         return "Study Course"
 
@@ -750 +751 @@
 ###)
 
-class StudentPume(CPSDocument): ###(
-    """
-    WAeUP Student container for the various student data
-    """
-    meta_type = 'StudentPume'
-    portal_type = meta_type
-    security = ClassSecurityInfo()
-
-    security.declareProtected(View,"Title")
-    def Title(self):
-        """compose title"""
-        return "PUME Results"
-
-
-InitializeClass(StudentPume)
-
-def addStudentPume(container, id, REQUEST=None, **kw):
-    """Add a Students PUME data."""
-    ob = StudentPume(id, **kw)
-    return CPSBase_adder(container, ob, REQUEST=REQUEST)
-###)
-
-##class StudentSemester(CPSDocument): ###(
-##    """
-##    WAeUP StudentSemester containing the courses and students
-##    """
-##    meta_type = 'StudentSemester'
-##    portal_type = meta_type
-##    security = ClassSecurityInfo()
-##
-##InitializeClass(StudentSemester)
-##
-##def addStudentSemester(container, id, REQUEST=None, **kw):
-##    """Add a StudentSemester."""
-##    ob = StudentSemester(id, **kw)
-##    return CPSBase_adder(container, ob, REQUEST=REQUEST)
-##
-#####)
-
-##class Semester(CPSDocument): ###(
-##    """
-##    WAeUP Semester containing the courses and students
-##    """
-##    meta_type = 'Semester'
-##    portal_type = meta_type
-##    security = ClassSecurityInfo()
-##
-##InitializeClass(Semester)
-##
-##def addSemester(container, id, REQUEST=None, **kw):
-##    """Add a Semester."""
-##    ob = Semester(id, **kw)
-##    return CPSBase_adder(container, ob, REQUEST=REQUEST)
-##
-#####)
 
 class StudentCourseResult(CPSDocument): ###(
@@ -839 +785 @@
 ###)
 
+class StudentPume(CPSDocument): ###(
+    """
+    WAeUP Student container for the various student data
+    """
+    meta_type = 'StudentPume'
+    portal_type = meta_type
+    security = ClassSecurityInfo()
+
+    security.declareProtected(View,"Title")
+    def Title(self):
+        """compose title"""
+        return "PUME Results"
+
+
+InitializeClass(StudentPume)
+
+def addStudentPume(container, id, REQUEST=None, **kw):
+    """Add a Students PUME data."""
+    ob = StudentPume(id, **kw)
+    return CPSBase_adder(container, ob, REQUEST=REQUEST)
+
+
+
 # Backward Compatibility StudyLevel
 

WAeUP_SRP/base/skins/waeup_student/reserve_accommodation.py

@@ -40 +40 @@
 acco_id = info['acco_id']
 #session = info['session'][1]
-session = info['session']
-#session = acco_id[-4:]
+session = info['session'][0]
+
 validate = REQUEST.has_key("cpsdocument_create_button")
 if info.has_key('acco') and info['acco']: