Changeset 7549


Ignore:
Timestamp:
1 Feb 2012, 11:24:35 (13 years ago)
Author:
Henrik Bettermann
Message:

Do not store faculty and department titles in each course ticket.

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

Legend:

Unmodified
Added
Removed

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

    r7539 r7549  
    10251025        ticket.code = course.code
    10261026        ticket.title = course.title
    1027         ticket.faculty = course.__parent__.__parent__.__parent__.title
    1028         ticket.department = course.__parent__.__parent__.title
    10291027        ticket.fcode = course.__parent__.__parent__.__parent__.code
    10301028        ticket.dcode = course.__parent__.__parent__.code

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

    r7464 r7549  
    1717        </td>
    1818        <td>
    19             <span tal:replace="context/faculty">FACULTY</span>
     19            <span tal:replace="context/fcode">FACULTY</span>
    2020        </td>
    2121      </tr>
    … …  
    2525        </td>
    2626        <td>
    27             <span tal:replace="context/department">DEPARTMENT</span>
     27            <span tal:replace="context/dcode">DEPARTMENT</span>
    2828        </td>
    2929      </tr>

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

    r7464 r7549  
    1414      </td>
    1515      <td>
    16           <span tal:replace="context/department">DEPARTMENT</span>
     16          <span tal:replace="context/dcode">DEPARTMENT</span>
    1717      </td>
    1818    </tr>
    … …  
    2222      </td>
    2323      <td>
    24           <span tal:replace="context/faculty">FACULTY</span>
     24          <span tal:replace="context/fcode">FACULTY</span>
    2525      </td>
    2626    </tr>

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

    r7464 r7549  
    2828      </a></td>
    2929      <td tal:content="value/title">TITLE</td>
    30       <td tal:content="value/department">DEPARTMENT</td>
    31       <td tal:content="value/faculty">FACULTY</td>
     30      <td tal:content="value/dcode">DEPARTMENT</td>
     31      <td tal:content="value/fcode">FACULTY</td>
    3232      <td tal:content="value/credits">CREDITS</td>
    3333      <td tal:content="value/score">SCORE</td>

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

    r7484 r7549  
    6969          </a></td>
    7070          <td tal:content="value/title">TITLE</td>
    71           <td tal:content="value/department">DEPARTMENT</td>
    72           <td tal:content="value/faculty">FACULTY</td>
     71          <td tal:content="value/dcode">DEPARTMENT</td>
     72          <td tal:content="value/fcode">FACULTY</td>
    7373          <td tal:content="value/credits">CREDITS</td>
    7474          <td tal:content="value/core_or_elective">MANDATORY</td>

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

    r7538 r7549  
    4949      </a></td>
    5050      <td tal:content="value/title">TITLE</td>
    51       <td tal:content="value/department">DEPARTMENT</td>
    52       <td tal:content="value/faculty">FACULTY</td>
     51      <td tal:content="value/dcode">DEPARTMENT</td>
     52      <td tal:content="value/fcode">FACULTY</td>
    5353      <td tal:content="value/credits">CREDITS</td>
    5454      <td tal:content="value/core_or_elective">MANDATORY</td>

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

    r7538 r7549  
    336336    passmark = Attribute('passmark of the original course')
    337337    semester = Attribute('semester of the original course')
    338     faculty = Attribute('faculty of the original course')
    339     department = Attribute('department of the original course')
    340338    fcode = Attribute('faculty code of the original course')
    341339    dcode = Attribute('department code of the original course')

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

    r7548 r7549  
    9090        self.code = None
    9191        self.title = None
    92         self.faculty = None
    93         self.department = None
    9492        self.fcode = None
    9593        self.dcode = None
Note: See TracChangeset for help on using the changeset viewer.