Changeset 8920


Ignore:
Timestamp:
5 Jul 2012, 14:48:51 (12 years ago)
Author:
Henrik Bettermann
Message:

Rename course referrers to certificate courses (according to the discussion long time ago).

Edit some button labels and titles.

Move code from view to content components.

Location:
main/waeup.kofa/trunk/src/waeup/kofa
Files:
25 edited
1 moved

Legend:

Unmodified
Added
Removed

  • main/waeup.kofa/trunk/src/waeup/kofa/browser/browser.txt

    r8777 r8920  
    10001000with their code as key.
    10011001
    1002 Each certificate provides a ``Add course referrer`` action button near top.
     1002Each certificate provides a ``Add certificate course`` action button near top.
    10031003
    10041004Certificates provide an add-form to add new certcourses:
    … …  
    10061006  >>> cert_url = dept_url + '/certificates/CERT1'
    10071007  >>> browser.open(cert_url + '/manage')
    1008   >>> browser.getControl('Add course referrer').click()
     1008  >>> browser.getControl('Add certificate course').click()
    10091009  >>> print browser.contents
    10101010  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"...
    … …  
    10251025  >>> ctrl.getControl('COURSE1').selected = True
    10261026  >>> browser.getControl(name='form.level').value = ['100']
    1027   >>> browser.getControl('Add course referrer').click()
     1027  >>> browser.getControl('Add certificate course').click()
    10281028
    10291029Our certificatecourse will be linked on the parent certificate page:
    … …  
    10381038  >>> cert_url = dept_url + '/certificates/CERT1'
    10391039  >>> browser.open(cert_url + '/manage')
    1040   >>> browser.getControl('Add course referrer').click()
     1040  >>> browser.getControl('Add certificate course').click()
    10411041  >>> ctrl = browser.getControl(name='form.course')
    10421042  >>> ctrl.getControl('COURSE1').selected = True
    10431043  >>> browser.getControl(name='form.level').value = ['100']
    1044   >>> browser.getControl('Add course referrer').click()
    1045   >>> 'The chosen course referrer is already' in browser.contents
     1044  >>> browser.getControl('Add certificate course').click()
     1045  >>> 'The chosen certificate course is already' in browser.contents
    10461046  True
    10471047
    … …  
    10631063
    10641064  >>> browser.open(cert_url + '/COURSE1_100')
    1065   >>> browser.getLink('Edit course referrer').click()
     1065  >>> browser.getLink('Edit certificate course').click()
    10661066
    10671067If we just click 'Save and return' nothing will change:
    … …  
    10881088changed:
    10891089
    1090   >>> browser.getLink('Edit course referrer').click()
     1090  >>> browser.getLink('Edit certificate course').click()
    10911091  >>> browser.getControl(name='form.level').value = ['400']
    10921092  >>> browser.getControl('Cancel').click()
    … …  
    11251125  >>> 'COURSE1_200</a>' in browser.contents
    11261126  True
    1127   >>> browser.getControl('Remove selected course referrers').click()
     1127  >>> browser.getControl('Remove selected certificate courses').click()
    11281128  >>> 'No item selected' in browser.contents
    11291129  True
    11301130  >>> browser.getControl(name='val_id').getControl(
    11311131  ...    value='COURSE1_200').selected = True
    1132   >>> browser.getControl('Remove selected course referrers').click()
     1132  >>> browser.getControl('Remove selected certificate courses').click()
    11331133  >>> 'Successfully removed: COURSE1_200' in browser.contents
    11341134  True

  • main/waeup.kofa/trunk/src/waeup/kofa/browser/pages.py

    r8858 r8920  
    19201920    grok.template('certificatemanagepage')
    19211921    taboneactions = [_('Save'),_('Cancel')]
    1922     tabtwoactions = [_('Add course referrer'),
    1923                      _('Remove selected course referrers'),_('Cancel')]
     1922    tabtwoactions = [_('Add certificate course'),
     1923                     _('Remove selected certificate courses'),_('Cancel')]
    19241924    tabthreeactions1 = [_('Remove selected local roles')]
    19251925    tabthreeactions2 = [_('Add local role')]
    … …  
    19441944        return msave(self, **data)
    19451945
    1946     @jsaction(_('Remove selected course referrers'))
     1946    @jsaction(_('Remove selected certificate courses'))
    19471947    def delCertificateCourses(self, **data):
    19481948        delSubobjects(self, redirect='@@manage', tab='2')
    19491949        return
    19501950
    1951     @action(_('Add course referrer'), validator=NullValidator)
     1951    @action(_('Add certificate course'), validator=NullValidator)
    19521952    def addCertificateCourse(self, **data):
    19531953        self.redirect(self.url(self.context, 'addcertificatecourse'))
    … …  
    19861986    form_fields = grok.AutoFields(ICertificateCourseAdd)
    19871987    pnav = 1
    1988     label = _('Add course referrer')
    1989 
    1990     @action(_('Add course referrer'))
     1988    label = _('Add certificate course')
     1989
     1990    @action(_('Add certificate course'))
    19911991    def addCertcourse(self, **data):
    19921992        try:
    1993             self.context.addCourseRef(**data)
     1993            self.context.addCertCourse(**data)
    19941994        except KeyError:
    1995             self.status = self.flash(_('The chosen course referrer is already '
     1995            self.status = self.flash(_('The chosen certificate course is already '
    19961996                                  'part of this certificate.'))
    19971997            return
    19981998        self.status = self.flash(
    1999             _("Course referrer ${a}_${b} added.",
     1999            _("certificate course ${a}_${b} added.",
    20002000            mapping = {'a': data['course'].code, 'b': data['level']}))
    20012001        code = "%s_%s" % (data['course'].code, data['level'])
    … …  
    20382038    grok.require('waeup.manageAcademics')
    20392039    form_fields = grok.AutoFields(ICertificateCourse)
    2040     label = _('Edit course referrer')
     2040    label = _('Edit certificate course')
    20412041    pnav = 1
    20422042
    … …  
    20512051            old_level = self.context.level
    20522052            data['course'] = self.context.course
    2053             parent.addCourseRef(**data)
    2054             parent.delCourseRef(data['course'].code, level=old_level)
     2053            parent.addCertCourse(**data)
     2054            parent.delCertCourse(data['course'].code, level=old_level)
    20552055            self.flash(_('Form has been saved.'))
    20562056            old_code = "%s_%s" % (data['course'].code, old_level)

  • main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/certificatemanagepage.pt

    r7811 r8920  
    44  <ul class="tabs" data-tabs="tabs">
    55    <li tal:attributes="class view/tab1"><a href="#tab-1" i18n:translate="">Settings</a></li>
    6     <li tal:attributes="class view/tab2"><a href="#tab-2" i18n:translate="">Course Referrers</a></li>
     6    <li tal:attributes="class view/tab2"><a href="#tab-2" i18n:translate="">Certificate Courses</a></li>
    77    <li tal:attributes="class view/tab3"><a href="#tab-3" i18n:translate="">Local Roles</a></li>
    88  </ul>
    … …  
    2424    </div>
    2525    <div id="tab-2" tal:attributes="class view/tab2">
    26       <h3 i18n:translate="">Course Referrers</h3>
     26      <h3>
     27        <span tal:content="context/__name__">Code</span>
     28        <span i18n:domain="waeup.kofa" i18n:translate="">Courses</span>
     29      </h3>
    2730      <table class="display dataTableManage">
    2831        <thead>
    2932          <tr>
    30             <th>&nbsp;</th><th i18n:translate="">Level</th>
    31             <th i18n:translate="">Semester</th><th i18n:translate="">Referrer</th>
    32             <th i18n:translate="">Course</th><th i18n:translate="">Title</th>
     33            <th>&nbsp;</th>
     34            <th i18n:translate="">Level</th>
     35            <th i18n:translate="">Semester</th>
     36            <th i18n:translate="">Cert. Course</th>
     37            <th i18n:translate="">Dep. Course</th>
     38            <th i18n:translate="">Title</th>
    3339            <th i18n:translate="">Mandatory</th>
    3440          </tr>
    … …  
    3743          <tr tal:repeat="cc context/values" class="gradeC">
    3844             <td>
    39               <input type="checkbox"
    40                          name="val_id"
     45              <input type="checkbox" name="val_id"
    4146                         tal:attributes="value cc/__name__" />
    4247            </td>

  • main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/certificatepage.pt

    r7811 r8920  
    2020<h3>
    2121  <span tal:content="context/__name__">Code</span>
    22   <span i18n:domain="waeup.kofa" i18n:translate="">Course Referrers</span>
     22  <span i18n:domain="waeup.kofa" i18n:translate="">Courses</span>
    2323</h3>
    2424<br />
    … …  
    2626<thead>
    2727  <tr>
    28     <th i18n:translate="">Level</th><th i18n:translate="">Semester</th>
    29     <th i18n:translate="">Referrer</th><th i18n:translate="">Course</th>
    30     <th i18n:translate="">Title</th><th i18n:translate="">Mandatory</th>
     28    <th i18n:translate="">Level</th>
     29    <th i18n:translate="">Semester</th>
     30    <th i18n:translate="">Cert. Course</th>
     31    <th i18n:translate="">Dep. Course</th>
     32    <th i18n:translate="">Title</th>
     33    <th i18n:translate="">Mandatory</th>
    3134  </tr>
    3235</thead>

  • main/waeup.kofa/trunk/src/waeup/kofa/browser/tests/test_browser.py

    r8755 r8920  
    8484        self.app['faculties']['fac1']['dep1'].courses.addCourse(
    8585            self.course)
    86         self.app['faculties']['fac1']['dep1'].certificates['CERT1'].addCourseRef(
     86        self.app['faculties']['fac1']['dep1'].certificates['CERT1'].addCertCourse(
    8787            self.course, level=100)
    8888

  • main/waeup.kofa/trunk/src/waeup/kofa/browser/tests/test_permissions.py

    r7811 r8920  
    9191        cert.code = 'cert1'
    9292        dept.certificates.addCertificate(cert)
    93         cert.addCourseRef(course)
     93        cert.addCertCourse(course)
    9494
    9595        self.browser = Browser()

  • main/waeup.kofa/trunk/src/waeup/kofa/browser/viewlets.py

    r8387 r8920  
    456456    grok.context(ICertificateCourse)
    457457    grok.view(CertificateCoursePage)
    458     text = _('Edit course referrer')
     458    text = _('Edit certificate course')
    459459
    460460#

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

    r8903 r8920  
    932932        ticket.automatic = False
    933933        ticket.carry_over = False
    934         ticket.code = course.code
    935         ticket.title = course.title
    936         ticket.fcode = course.__parent__.__parent__.__parent__.code
    937         ticket.dcode = course.__parent__.__parent__.code
    938         ticket.credits = course.credits
    939         ticket.passmark = course.passmark
    940         ticket.semester = course.semester
    941934        try:
    942             self.context.addCourseTicket(ticket)
     935            self.context.addCourseTicket(ticket, course)
    943936        except KeyError:
    944937            self.flash(_('The ticket exists.'))
    … …  
    17841777        level_title = translate(self.context.level_title, 'waeup.kofa',
    17851778            target_language=lang)
    1786         return _('Add and remove course tickets of study level ${a}',
     1779        return _('Edit course list of ${a}',
    17871780            mapping = {'a':level_title})
    17881781
    … …  
    18551848        ticket = createObject(u'waeup.CourseTicket')
    18561849        course = data['course']
    1857         for name in ['code', 'title', 'credits', 'passmark', 'semester']:
    1858             setattr(ticket, name, getattr(course, name))
    18591850        ticket.automatic = False
     1851        ticket.carry_over = False
    18601852        try:
    1861             self.context.addCourseTicket(ticket)
     1853            self.context.addCourseTicket(ticket, course)
    18621854        except KeyError:
    18631855            self.flash(_('The ticket exists.'))

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

    r8141 r8920  
    3434      <th i18n:translate="">Code</th>
    3535      <th i18n:translate="">Title</th>
    36       <th i18n:translate="">Dept.</th>
    37       <th i18n:translate="">Fact.</th>
     36      <th i18n:translate="">Dep.</th>
     37      <th i18n:translate="">Fac.</th>
    3838      <th i18n:translate="">Cred.</th>
    3939      <th i18n:translate="">Mand.</th>

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

    r8854 r8920  
    402402        )
    403403
    404     def addCourseTicket(courseticket):
     404    def addCourseTicket(ticket, course):
    405405        """Add a course ticket object.
    406406        """

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

    r8736 r8920  
    5656        return studylevelsource.factory.getTitle(self.__parent__, self.level)
    5757
    58     def addCourseTicket(self, courseticket):
     58    def addCourseTicket(self, ticket, course):
    5959        """Add a course ticket object.
    6060        """
    61         if not ICourseTicket.providedBy(courseticket):
     61        if not ICourseTicket.providedBy(ticket):
    6262            raise TypeError(
    6363                'StudentStudyLeves contain only ICourseTicket instances')
    64         self[courseticket.code] = courseticket
     64        ticket.code = course.code
     65        ticket.title = course.title
     66        ticket.fcode = course.__parent__.__parent__.__parent__.code
     67        ticket.dcode = course.__parent__.__parent__.code
     68        ticket.credits = course.credits
     69        ticket.passmark = course.passmark
     70        ticket.semester = course.semester
     71        self[ticket.code] = ticket
    6572        return
    6673
    … …  
    8794
    8895    A course ticket contains a copy of the original course and
    89     course referrer data. If the courses and/or their referrers are removed, the
    90     corresponding tickets remain unchanged. So we do not need any event
     96    certificate course data. If the courses and/or the referrin certificate
     97    courses are removed, the corresponding tickets remain unchanged.
     98    So we do not need any event
    9199    triggered actions on course tickets.
    92100    """

  • main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_batching.py

    r8888 r8920  
    218218        ticket.passmark = 100
    219219        ticket.semester = 2
    220         study_level.addCourseTicket(ticket)
     220        study_level[ticket.code] = ticket
    221221        self.add_payment(student)
    222222        return student
    … …  
    688688        shutil.rmtree(os.path.dirname(fin_file))
    689689
    690         # Add course and course referrer
     690        # Add course and certificate course
    691691        self.course = createObject('waeup.Course')
    692692        self.course.code = 'COURSE1'
    … …  
    696696        self.app['faculties']['fac1']['dep1'].courses.addCourse(
    697697            self.course)
    698         self.app['faculties']['fac1']['dep1'].certificates['CERT1'].addCourseRef(
     698        self.app['faculties']['fac1']['dep1'].certificates['CERT1'].addCertCourse(
    699699            self.course, level=100)
    700700

  • main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py

    r8903 r8920  
    171171        self.app['faculties']['fac1']['dep1'].courses.addCourse(
    172172            self.course)
    173         self.app['faculties']['fac1']['dep1'].certificates['CERT1'].addCourseRef(
     173        self.app['faculties']['fac1']['dep1'].certificates['CERT1'].addCertCourse(
    174174            self.course, level=100)
    175175
    … …  
    12401240        self.browser.getControl("Create course list now").click()
    12411241        self.browser.getLink("100").click()
    1242         self.browser.getLink("Add and remove courses").click()
     1242        self.browser.getLink("Edit course list").click()
    12431243        self.browser.getControl("Add course ticket").click()
    12441244        self.browser.getControl(name="form.course").value = ['COURSE1']
    … …  
    12531253        self.browser.getControl("Create course list now").click()
    12541254        self.browser.getLink("200").click()
    1255         self.browser.getLink("Add and remove courses").click()
     1255        self.browser.getLink("Edit course list").click()
    12561256        self.browser.getControl("Add course ticket").click()
    12571257        self.browser.getControl(name="form.course").value = ['COURSE1']
    … …  
    15211521        # The new SFE-0 pin can be used for starting new session
    15221522        self.browser.open(self.studycourse_path)
    1523         self.browser.getLink('Start session').click()
     1523        self.browser.getLink('Start new session').click()
    15241524        pin = self.app['accesscodes']['SFE-0'].keys()[0]
    15251525        parts = pin.split('-')[1:]
    … …  
    15701570        # The new SFE-0 pin can be used for starting session
    15711571        self.browser.open(self.studycourse_path)
    1572         self.browser.getLink('Start session').click()
     1572        self.browser.getLink('Start new session').click()
    15731573        pin = self.app['accesscodes']['SFE-0'].keys()[0]
    15741574        parts = pin.split('-')[1:]
    … …  
    16101610        # The new SFE-1 pin can be used for starting new session
    16111611        self.browser.open(self.studycourse_path)
    1612         self.browser.getLink('Start session').click()
     1612        self.browser.getLink('Start new session').click()
    16131613        self.browser.getControl(name="ac_series").value = sfeseries
    16141614        self.browser.getControl(name="ac_number").value = sfenumber

  • main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_student.py

    r8735 r8920  
    129129        studylevel = StudentStudyLevel()
    130130        self.assertRaises(
    131             TypeError, studylevel.addCourseTicket, department)
     131            TypeError, studylevel.addCourseTicket, department, department)
    132132
    133133    def test_booking_date(self):

  • main/waeup.kofa/trunk/src/waeup/kofa/students/viewlets.py

    r8903 r8920  
    445445    grok.require('waeup.handleStudent')
    446446    icon = 'actionicon_start.gif'
    447     text = _('Start session')
     447    text = _('Start new session')
    448448    target = 'start_session'
    449449
    … …  
    477477    grok.view(StudyLevelDisplayFormPage)
    478478    grok.require('waeup.handleStudent')
    479     text = _('Add and remove courses')
     479    text = _('Edit course list')
    480480    target = 'edit'
    481481

  • main/waeup.kofa/trunk/src/waeup/kofa/university/api.txt

    r7811 r8920  
    2828   :maxdepth: 1
    2929
    30    courserefs.txt
     30   certcourses.txt

  • main/waeup.kofa/trunk/src/waeup/kofa/university/batching.py

    r8302 r8920  
    317317    def addEntry(self, obj, row, site):
    318318        parent = self.getParent(row, site)
    319         parent.addCourseRef(row['course'],
     319        parent.addCertCourse(row['course'],
    320320                            row['level'], row['mandatory'])
    321321        return
    … …  
    323323    def delEntry(self, row, site):
    324324        parent = self.getParent(row, site)
    325         parent.delCourseRef(row['course'].code, row['level'])
    326         return
     325        parent.delCertCourse(row['course'].code, row['level'])
     326        return

  • main/waeup.kofa/trunk/src/waeup/kofa/university/catalog.py

    r7811 r8920  
    159159        self.title = context.course.title
    160160        self.code = context.getCourseCode
    161         self.type = 'Course Referrer'
     161        self.type = 'Certificate Course'
    162162
    163163def search(query=None, view=None):

  • main/waeup.kofa/trunk/src/waeup/kofa/university/certcourses.txt

    r8898 r8920  
    1 Course referrers
    2 ****************
     1Certificate Courses
     2*******************
    33
    44Courses are referred to by certificate courses.
    … …  
    6464    >>> fac['DEPT'].certificates.addCertificate(cert)
    6565
    66     >>> fac['DEPT'].certificates['CERT'].addCourseRef(
     66    >>> fac['DEPT'].certificates['CERT'].addCertCourse(
    6767    ...   fac['DEPT'].courses['CRS1'])
    6868
    69     >>> fac['DEPT'].certificates['CERT'].addCourseRef(
     69    >>> fac['DEPT'].certificates['CERT'].addCertCourse(
    7070    ...   fac['DEPT2'].courses['CRS2'])
    7171
    7272We add the latter course again, but this time for the second level:
    7373
    74     >>> fac['DEPT'].certificates['CERT'].addCourseRef(
     74    >>> fac['DEPT'].certificates['CERT'].addCertCourse(
    7575    ...   fac['DEPT2'].courses['CRS2'], level=200)
    7676

  • main/waeup.kofa/trunk/src/waeup/kofa/university/certificate.py

    r8738 r8920  
    6363        return "%s (%s)" % (self.title,self.code)
    6464
    65     def addCourseRef(self, course, level=100, mandatory=True):
    66         """Add a course referrer.
     65    def addCertCourse(self, course, level=100, mandatory=True):
     66        """Add a certificate course.
    6767        """
    6868        code = "%s_%s" % (course.code, level)
    … …  
    7272        self._p_changed = True
    7373
    74     def delCourseRef(self, code, level=None):
    75         """Delete a course referrer denoted by its code.
     74    def delCertCourse(self, code, level=None):
     75        """Delete a certificate course denoted by its code.
    7676        """
    7777        keys = list(self.keys()) # create list copy

  • main/waeup.kofa/trunk/src/waeup/kofa/university/certificate.txt

    r7819 r8920  
    9696      .. XXX: This is not a proper description
    9797
    98    .. method:: addCourseRef(course[, level=100,[ mandatory=True]])
    99 
    100       Add a referrer of a course. A course is an object implementing
     98   .. method:: addCertCourse(course[, level=100,[ mandatory=True]])
     99
     100      Add a certificate course. A course is an object implementing
    101101      :class:`waeup.kofa.interfaces.ICourse`.
    102102
    103       Please don't be confused by the term 'referrer'. As course objects
    104       will normaly be  stored
    105       in a department, the course referrer refers to
     103      Please don't be confused by the term 'certificate course'.
     104      As course objects will normaly be  stored
     105      in a department, the certificate course refers to
    106106      the 'real' course in the department container.
    107107
    108    .. method:: delCourseRef(code)
    109 
    110       Remove a course referrer from a certificate.
    111 
    112       The referrer must be given by its code number.
     108   .. method:: delCertCourse(code)
     109
     110      Remove a certificate course from a certificate.
     111
     112      The certificate course must be given by its code number.
    113113
    114114:class:`CertificateCourse`
    … …  
    117117.. class:: CertificateCourse(course[, level=100[, mandatory=True]])
    118118
    119    Create a course referrer.
    120 
    121    A certificate course (old term) or course referrer are held in
     119   Create a certificate course.
     120
     121   A certificate course are held in
    122122   certificates and refer to an existing :class:`Course` instance held
    123123   elsewhere.
    124124
    125    A certificate can require several course referrers and one
    126    course referrer can be required by several certificates.
     125   A certificate can require several certificate courses and one
     126   certificate course can be required by several certificates.
    127127
    128128   .. attribute:: course
    … …  
    225225
    226226   To accomplish that, the parents of the removed course are looked up
    227    for a certifcate container which contains a course referrer that
     227   for a certifcate container which contains a certificate course that
    228228   refers to the deleted course.
    229229
    … …  
    341341    >>> mycert.code = 'MYCERT'
    342342    >>> mydept.certificates.addCertificate(mycert)
    343     >>> mycert.addCourseRef(mycourse)
     343    >>> mycert.addCertCourse(mycourse)
    344344
    345345    >>> transaction.commit()
    … …  
    354354    ['mydept']
    355355
    356 The course referrer we stored in the certificate is indeed a
     356The certificate course we stored in the certificate is indeed a
    357357referrer of the course, not a copy of it:
    358358

  • main/waeup.kofa/trunk/src/waeup/kofa/university/course.py

    r7811 r8920  
    7878        # Remove that referrer...
    7979        cert = certcourse.__parent__
    80         cert.delCourseRef(code)
     80        cert.delCertCourse(code)
    8181        cert._p_changed = True
    8282    return

  • main/waeup.kofa/trunk/src/waeup/kofa/university/interfaces.py

    r8472 r8920  
    286286    """
    287287    course = schema.Choice(
    288         title = _(u'Course Referrer'),
     288        title = _(u'Course'),
    289289        source = CourseSource(),
    290290        readonly = True,

  • main/waeup.kofa/trunk/src/waeup/kofa/university/tests/test_batching.py

    r7811 r8920  
    266266        self.department2.certificates['CRT'] = self.certificate
    267267        self.course = Course(code='CRS')
    268         self.department2.certificates['CRT'].addCourseRef(self.course)
     268        self.department2.certificates['CRT'].addCertCourse(self.course)
    269269        self.cert_course = self.certificate['CRS_100']
    270270        self.department2.courses['CRS'] = self.course

  • main/waeup.kofa/trunk/src/waeup/kofa/university/tests/test_export.py

    r8303 r8920  
    444444        self.dept1.certificates.addCertificate(self.cert2)
    445445        self.dept2.certificates.addCertificate(self.cert3)
    446         self.cert1.addCourseRef(self.course1, 100, True)
    447         self.cert1.addCourseRef(self.course2, 400, False)
    448         self.cert3.addCourseRef(self.course3, 100, False)
     446        self.cert1.addCertCourse(self.course1, 100, True)
     447        self.cert1.addCertCourse(self.course2, 400, False)
     448        self.cert3.addCertCourse(self.course3, 100, False)
    449449        self.certcourse1 = self.cert1['C1_100']
    450450        self.certcourse2 = self.cert1['C2_400']

  • main/waeup.kofa/trunk/src/waeup/kofa/university/tests/test_university.py

    r7811 r8920  
    3333def test_suite():
    3434    # collect doctests for university subpackage
    35     suite = get_doctest_suite(['university/courserefs.txt',])
     35    suite = get_doctest_suite(['university/certcourses.txt',])
    3636    # add local unittests (actually only one)
    3737    for testcase in [UniversitySubpackageTests,]:
Note: See TracChangeset for help on using the changeset viewer.