Ignore:
Timestamp:
21 Dec 2011, 07:59:29 (13 years ago)
Author:
Henrik Bettermann
Message:

Adjust custom package to the changes made in the base package.

Set svn properties and harmonize copyright statement.

Location:
main/waeup.custom/trunk/src/waeup
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • main/waeup.custom/trunk/src/waeup/__init__.py

    • Property svn:keywords set to Id
    r4918 r7419  
    1 # namespace package boilerplate
     1## $Id$
     2##
     3## Copyright (C) 2011 Uli Fouquet & Henrik Bettermann
     4## This program is free software; you can redistribute it and/or modify
     5## it under the terms of the GNU General Public License as published by
     6## the Free Software Foundation; either version 2 of the License, or
     7## (at your option) any later version.
     8##
     9## This program is distributed in the hope that it will be useful,
     10## but WITHOUT ANY WARRANTY; without even the implied warranty of
     11## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     12## GNU General Public License for more details.
     13##
     14## You should have received a copy of the GNU General Public License
     15## along with this program; if not, write to the Free Software
     16## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
     17##
    218try:
    319    import pkg_resources

  • main/waeup.custom/trunk/src/waeup/custom/__init__.py

    • Property svn:keywords set to Id

  • main/waeup.custom/trunk/src/waeup/custom/browser/__init__.py

    • Property svn:keywords set to Id

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

    r6924 r7419  
     1## $Id$
     2##
     3## Copyright (C) 2011 Uli Fouquet & Henrik Bettermann
     4## This program is free software; you can redistribute it and/or modify
     5## it under the terms of the GNU General Public License as published by
     6## the Free Software Foundation; either version 2 of the License, or
     7## (at your option) any later version.
     8##
     9## This program is distributed in the hope that it will be useful,
     10## but WITHOUT ANY WARRANTY; without even the implied warranty of
     11## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     12## GNU General Public License for more details.
     13##
     14## You should have received a copy of the GNU General Public License
     15## along with this program; if not, write to the Free Software
     16## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
     17##
    118import grok
    219from waeup.sirp.browser.pages import (

  • main/waeup.custom/trunk/src/waeup/custom/browser/resources.py

    • Property svn:keywords set to Id
    r6895 r7419  
     1## $Id$
     2##
     3## Copyright (C) 2011 Uli Fouquet & Henrik Bettermann
     4## This program is free software; you can redistribute it and/or modify
     5## it under the terms of the GNU General Public License as published by
     6## the Free Software Foundation; either version 2 of the License, or
     7## (at your option) any later version.
     8##
     9## This program is distributed in the hope that it will be useful,
     10## but WITHOUT ANY WARRANTY; without even the implied warranty of
     11## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     12## GNU General Public License for more details.
     13##
     14## You should have received a copy of the GNU General Public License
     15## along with this program; if not, write to the Free Software
     16## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
     17##
    118import grok
    219from waeup.sirp.browser.resources import (

  • main/waeup.custom/trunk/src/waeup/custom/browser/tests.py

    r6926 r7419  
     1## $Id$
     2##
     3## Copyright (C) 2011 Uli Fouquet & Henrik Bettermann
     4## This program is free software; you can redistribute it and/or modify
     5## it under the terms of the GNU General Public License as published by
     6## the Free Software Foundation; either version 2 of the License, or
     7## (at your option) any later version.
     8##
     9## This program is distributed in the hope that it will be useful,
     10## but WITHOUT ANY WARRANTY; without even the implied warranty of
     11## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     12## GNU General Public License for more details.
     13##
     14## You should have received a copy of the GNU General Public License
     15## along with this program; if not, write to the Free Software
     16## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
     17##
    118import tempfile
    219import shutil

  • main/waeup.custom/trunk/src/waeup/custom/browser/theming.py

    • Property svn:keywords set to Id
    r6895 r7419  
     1## $Id$
     2##
    13## Copyright (C) 2011 Uli Fouquet & Henrik Bettermann
    24## This program is free software; you can redistribute it and/or modify
    … …  
    46## the Free Software Foundation; either version 2 of the License, or
    57## (at your option) any later version.
    6 ## 
     8##
    79## This program is distributed in the hope that it will be useful,
    810## but WITHOUT ANY WARRANTY; without even the implied warranty of
    911## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    1012## GNU General Public License for more details.
    11 ## 
     13##
    1214## You should have received a copy of the GNU General Public License
    1315## along with this program; if not, write to the Free Software
    … …  
    1921
    2022class CustomTheme1(grok.GlobalUtility):
    21     """A custom theme based on the WAeUP base theme.
     23    """A custom theme based on the SIRP base theme.
    2224    """
    2325    grok.implements(ITheme)

  • main/waeup.custom/trunk/src/waeup/custom/configuration.py

    r6923 r7419  
     1## $Id$
     2##
     3## Copyright (C) 2011 Uli Fouquet & Henrik Bettermann
     4## This program is free software; you can redistribute it and/or modify
     5## it under the terms of the GNU General Public License as published by
     6## the Free Software Foundation; either version 2 of the License, or
     7## (at your option) any later version.
     8##
     9## This program is distributed in the hope that it will be useful,
     10## but WITHOUT ANY WARRANTY; without even the implied warranty of
     11## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     12## GNU General Public License for more details.
     13##
     14## You should have received a copy of the GNU General Public License
     15## along with this program; if not, write to the Free Software
     16## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
     17##
    118"""
    219Containers for session configuration objects.

  • main/waeup.custom/trunk/src/waeup/custom/interfaces.py

    r7145 r7419  
     1## $Id$
    12##
    2 ## interfaces.py
     3## Copyright (C) 2011 Uli Fouquet & Henrik Bettermann
     4## This program is free software; you can redistribute it and/or modify
     5## it under the terms of the GNU General Public License as published by
     6## the Free Software Foundation; either version 2 of the License, or
     7## (at your option) any later version.
     8##
     9## This program is distributed in the hope that it will be useful,
     10## but WITHOUT ANY WARRANTY; without even the implied warranty of
     11## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     12## GNU General Public License for more details.
     13##
     14## You should have received a copy of the GNU General Public License
     15## along with this program; if not, write to the Free Software
     16## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
     17##
    318from zope import schema
    419from waeup.sirp.interfaces import (
    5     IWAeUPObject, ISessionConfiguration, academic_sessions_vocab)
     20    ISIRPObject, ISessionConfiguration, academic_sessions_vocab)
    621
    722# It's recommended to replicate all fields from the base package here.

  • main/waeup.custom/trunk/src/waeup/custom/students/tests.py

    r7146 r7419  
     1## $Id$
     2##
     3## Copyright (C) 2011 Uli Fouquet & Henrik Bettermann
     4## This program is free software; you can redistribute it and/or modify
     5## it under the terms of the GNU General Public License as published by
     6## the Free Software Foundation; either version 2 of the License, or
     7## (at your option) any later version.
     8##
     9## This program is distributed in the hope that it will be useful,
     10## but WITHOUT ANY WARRANTY; without even the implied warranty of
     11## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     12## GNU General Public License for more details.
     13##
     14## You should have received a copy of the GNU General Public License
     15## along with this program; if not, write to the Free Software
     16## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
     17##
    118from waeup.custom.testing import FunctionalLayer
    219from waeup.sirp.students.tests.test_browser import StudentsFullSetup
    … …  
    3552        self.assertMatches('...ticket created...',
    3653                           self.browser.contents)
     54        ctrl = self.browser.getControl(name='val_id')
     55        value = ctrl.options[0]
     56        self.browser.getLink(value).click()
     57        self.assertMatches('...Amount Authorized...',
     58                           self.browser.contents)
     59        #payment_url = self.browser.url
     60        #self.browser.open(payment_url)
     61        self.browser.getLink("Request callback").click()
     62        self.assertMatches('...Valid callback received...',
     63                          self.browser.contents)
    3764        self.browser.open(self.manage_student_path)
    3865        self.browser.getControl(
    3966            name="transition").value = ['pay_first_school_fee']
    4067        self.browser.getControl("Save").click()
     68        # Reset to returning
    4169        self.browser.getControl(name="transition").value = ['reset6']
    4270        self.browser.getControl("Save").click()
    4371        self.browser.open(self.payments_student_path + '/addop')
    4472        self.browser.getControl("Create ticket").click()
    45         self.assertMatches('...This payment ticket already exists...',
     73        self.assertMatches('...This type of payment has already been made...',
    4674                           self.browser.contents)
    4775        # Remove all payments so that we can add a school fee payment again

  • main/waeup.custom/trunk/src/waeup/custom/students/utils.py

    r7152 r7419  
     1## $Id$
     2##
     3## Copyright (C) 2011 Uli Fouquet & Henrik Bettermann
     4## This program is free software; you can redistribute it and/or modify
     5## it under the terms of the GNU General Public License as published by
     6## the Free Software Foundation; either version 2 of the License, or
     7## (at your option) any later version.
     8##
     9## This program is distributed in the hope that it will be useful,
     10## but WITHOUT ANY WARRANTY; without even the implied warranty of
     11## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     12## GNU General Public License for more details.
     13##
     14## You should have received a copy of the GNU General Public License
     15## along with this program; if not, write to the Free Software
     16## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
     17##
    118import grok
    2 from waeup.sirp.students.vocabularies import academic_sessions_vocab
    319from waeup.sirp.students.workflow import CLEARED, RETURNING
    420from waeup.sirp.students.utils import StudentsUtils
    … …  
    3147    grok.implements(IStudentsUtils)
    3248
    33     def get_payment_details(self, category, student):
     49    def getPaymentDetails(self, category, student):
    3450        d = {}
    3551        d['surcharge_1'] = d['surcharge_2'] = d['surcharge_3'] = 0
    … …  
    6076            d['amount'] = get_school_fee(student, d['surcharge_1'] + d['surcharge_2'])
    6177            code = student['studycourse'].certificate.code
    62             #session_string = academic_sessions_vocab.by_value[p_session + 1].title
    6378            d['p_item'] = code
    6479            d['p_session'] += 1

  • main/waeup.custom/trunk/src/waeup/custom/testing.py

    r6903 r7419  
     1## $Id$
     2##
     3## Copyright (C) 2011 Uli Fouquet & Henrik Bettermann
     4## This program is free software; you can redistribute it and/or modify
     5## it under the terms of the GNU General Public License as published by
     6## the Free Software Foundation; either version 2 of the License, or
     7## (at your option) any later version.
     8##
     9## This program is distributed in the hope that it will be useful,
     10## but WITHOUT ANY WARRANTY; without even the implied warranty of
     11## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     12## GNU General Public License for more details.
     13##
     14## You should have received a copy of the GNU General Public License
     15## along with this program; if not, write to the Free Software
     16## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
     17##
    118"""Testing support for :mod:`waeup.custom`.
    219"""

  • main/waeup.custom/trunk/src/waeup/custom/tests/test_configuration.py

    r6923 r7419  
     1## $Id$
     2##
    13## Copyright (C) 2011 Uli Fouquet & Henrik Bettermann
    24## This program is free software; you can redistribute it and/or modify
Note: See TracChangeset for help on using the changeset viewer.