Changeset 6806 for main/waeup.sirp/trunk/src

Timestamp:

20 Sep 2011, 14:11:34 (13 years ago)

Author:

Henrik Bettermann

Message:

Implement AddStudyLevelFormPage? for students which add the current study level including course tickets. The page can only be called in state 'school fee paid'.

Location:

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

Files:

• browser/static/waeup-base.css (modified) (1 diff)
• students/browser.py (modified) (2 diffs)
• students/browser_templates/studycoursepage.pt (modified) (1 diff)
• students/browser_templates/studyleveladdpage.pt (added)
• students/browser_templates/studylevelmanagepage.pt (modified) (2 diffs)
• students/browser_templates/studylevelpage.pt (modified) (2 diffs)
• students/interfaces.py (modified) (2 diffs)
• students/studylevel.py (modified) (1 diff)

main/waeup.sirp/trunk/src/waeup/sirp/browser/static/waeup-base.css

@@ -70 +70 @@
 
 .studentmenu {
-  text-align: center;
+  text-align: right;
   line-height: 2;
 }

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

@@ -486 +486 @@
     target = 'manage'
 
+class AddStudyLevelActionButton(AddActionButton):
+    grok.order(1)
+    grok.context(IStudentStudyCourse)
+    grok.view(StudyCourseDisplayFormPage)
+    grok.require('waeup.handleStudent')
+    text = 'Add course list'
+    target = 'add'
+
+    @property
+    def target_url(self):
+        student = self.view.context.getStudent()
+        condition1 = student.state != 'school fee paid'
+        condition2 = str(student['studycourse'].current_level) in \
+            self.view.context.keys()
+        if condition1 or condition2:
+            return ''
+        return self.view.url(self.view.context, self.target)
+
 class StudyCourseManageFormPage(WAeUPEditFormPage):
     """ Page to edit the student study course data
@@ -1002 +1020 @@
         self.redirect(self.url(self.context))
         return
+
+class AddStudyLevelFormPage(WAeUPEditFormPage):
+    """ Page for students to add current study levels
+    """
+    grok.context(IStudentStudyCourse)
+    grok.name('add')
+    grok.require('waeup.handleStudent')
+    grok.template('studyleveladdpage')
+    form_fields = grok.AutoFields(IStudentStudyCourse)
+    title = 'Study Course'
+    pnav = 4
+
+    @property
+    def label(self):
+        studylevelsource = StudyLevelSource().factory
+        code = self.context.current_level
+        title = studylevelsource.getTitle(self.context, code)
+        return 'Add current level %s' % title
+
+    def emitLockMessage(self):
+        self.flash('The requested form is locked (read-only).')
+        self.redirect(self.url(self.context))
+        return
+
+    def update(self):
+        if self.context.getStudent().state != 'school fee paid':
+            self.emitLockMessage()
+            return
+        super(AddStudyLevelFormPage, self).update()
+        return
+
+    @grok.action('Create course list now')
+    def addStudyLevel(self, **data):
+        studylevel = StudentStudyLevel()
+        studylevel.level = self.context.current_level
+        studylevel.level_session = self.context.current_session
+        try:
+            self.context.addStudentStudyLevel(
+                self.context.certificate,studylevel)
+        except KeyError:
+            self.flash('This level exists.')
+        self.redirect(self.url(self.context))
+        return

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

@@ -44 +44 @@
 
 <div tal:condition="python: not len(context.keys())">
-There no levels registered yet.
+There are no levels registered yet.
 </div>

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

@@ -69 +69 @@
       <th>Mandatory</th>
       <th>Score</th>
-      <th>Automatic</th>
+      <th>Auto</th>
     </tr>
   </thead>
@@ -87 +87 @@
       <td tal:content="value/core_or_elective">MANDATORY</td>
       <td tal:content="value/score">SCORE</td>
-      <td tal:content="value/automatic">AUTOMATIC</td>
+      <td tal:content="value/automatic">AUTO</td>
     </tr>
   </tbody>

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

@@ -43 +43 @@
       <th>Mandatory</th>
       <th>Score</th>
-      <th>Automatic</th>
+      <th>Auto</th>
     </tr>
   </thead>
@@ -57 +57 @@
       <td tal:content="value/core_or_elective">MANDATORY</td>
       <td tal:content="value/score">SCORE</td>
-      <td tal:content="value/automatic">AUTOMATIC</td>
+      <td tal:content="value/automatic">AUTO</td>
     </tr>
   </tbody>

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

@@ -238 +238 @@
     faculty = Attribute('faculty of the original course')
     department = Attribute('department of the original course')
-    automatic = Attribute('automatical creation of ticket')
 
     core_or_elective = schema.Bool(
@@ -254 +253 @@
         )
 
+    automatic = schema.Bool(
+        title = u'Automatical Creation',
+        default = False,
+        required = False,
+        readonly = True,
+        )
+
 class ICourseTicketAdd(ICourseTicket):
     """An interface for adding course tickets

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

@@ -74 +74 @@
         super(CourseTicket, self).__init__()
         self.code = None
-        self.automatic = None
         self.title = None
         self.faculty = None