Changeset 6802


Ignore:
Timestamp:
20 Sep 2011, 06:37:25 (13 years ago)
Author:
Henrik Bettermann
Message:

We don't need to store the level of a course ticket but a boolean value if the ticket has been created automatically (due creation of the entire course list) or manually.

Location:
main/waeup.sirp/trunk/src/waeup/sirp/students
Files:
6 edited

Legend:

Unmodified
Added
Removed

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

    r6800 r6802  
    661661        course = data['course']
    662662        ticket.core_or_elective = data['core_or_elective']
    663         ticket.level = self.context.level
     663        ticket.automatic = False
    664664        ticket.code = course.code
    665665        ticket.title = course.title

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

    r6795 r6802  
    6262    <tr>
    6363      <th>&nbsp;</th>
    64       <th>Level</th>
    65       <th>Course Code</th>
    66       <th>Course Title</th>
     64      <th>Code</th>
     65      <th>Title</th>
    6766      <th>Department</th>
    6867      <th>Faculty</th>
    … …  
    7069      <th>Mandatory</th>
    7170      <th>Score</th>
     71      <th>Automatic</th>
    7272    </tr>
    7373  </thead>
    … …  
    7878                  tal:attributes="value value/__name__" />
    7979      </td>
    80       <td tal:content="value/level">LEVEL</td>
    8180      <td> <a tal:attributes="href value/__name__">
    8281      <span tal:content="value/code">CODE</span>
    … …  
    8887      <td tal:content="value/core_or_elective">MANDATORY</td>
    8988      <td tal:content="value/score">SCORE</td>
     89      <td tal:content="value/automatic">AUTOMATIC</td>
    9090    </tr>
    9191  </tbody>

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

    r6783 r6802  
    2828  <thead>
    2929    <tr>
    30       <th>Level</th>
    31       <th>Course Code</th>
    32       <th>Course Title</th>
     30      <th>Code</th>
     31      <th>Title</th>
    3332      <th>Department</th>
    3433      <th>Faculty</th>
    … …  
    3635      <th>Mandatory</th>
    3736      <th>Score</th>
     37      <th>Automatic</th>
    3838    </tr>
    3939  </thead>
    4040  <tbody>
    4141    <tr tal:repeat="value context/values">
    42       <td tal:content="value/level">LEVEL</td>
    4342      <td> <a tal:attributes="href value/__name__">
    4443      <span tal:content="value/code">CODE</span>
    … …  
    5049      <td tal:content="value/core_or_elective">MANDATORY</td>
    5150      <td tal:content="value/score">SCORE</td>
    52 
     51      <td tal:content="value/automatic">AUTOMATIC</td>
    5352    </tr>
    5453  </tbody>

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

    r6795 r6802  
    238238    faculty = Attribute('faculty of the original course')
    239239    department = Attribute('department of the original course')
    240     level = Attribute('level of the original course referrer')
     240    automatic = Attribute('automatical creation of ticket')
    241241
    242242    core_or_elective = schema.Bool(
    … …  
    254254        )
    255255
    256     grade = schema.TextLine(
    257         title = u'Grade',
    258         default = u'',
    259         required = False,
    260         readonly = True,
    261         )
    262 
    263256class ICourseTicketAdd(ICourseTicket):
    264257    """An interface for adding course tickets

  • main/waeup.sirp/trunk/src/waeup/sirp/students/studycourse.py

    r6795 r6802  
    5353            ticket = CourseTicket()
    5454            ticket.code = val.getCourseCode()
    55             ticket.level = val.level
     55            ticket.automatic = True
    5656            ticket.core_or_elective = val.core_or_elective
    5757            ticket.title = val.course.title

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

    r6795 r6802  
    7474        super(CourseTicket, self).__init__()
    7575        self.code = None
    76         self.level = None
     76        self.automatic = None
    7777        self.title = None
    7878        self.faculty = None
Note: See TracChangeset for help on using the changeset viewer.