Changeset 7419

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:

• __init__.py (modified) (1 diff, 1 prop)
• custom/__init__.py (modified) (1 prop)
• custom/browser/__init__.py (modified) (1 prop)
• custom/browser/pages.py (modified) (1 diff)
• custom/browser/resources.py (modified) (1 diff, 1 prop)
• custom/browser/tests.py (modified) (1 diff)
• custom/browser/theming.py (modified) (3 diffs, 1 prop)
• custom/configuration.py (modified) (1 diff)
• custom/interfaces.py (modified) (1 diff)
• custom/students/tests.py (modified) (2 diffs)
• custom/students/utils.py (modified) (3 diffs)
• custom/testing.py (modified) (1 diff)
• custom/tests/test_configuration.py (modified) (1 diff)

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

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

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

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

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

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

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

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

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

@@ +1 @@
+## $Id$
+##
 ## Copyright (C) 2011 Uli Fouquet & Henrik Bettermann
 ## This program is free software; you can redistribute it and/or modify
@@ -4 +6 @@
 ## the Free Software Foundation; either version 2 of the License, or
 ## (at your option) any later version.
-## 
+##
 ## This program is distributed in the hope that it will be useful,
 ## but WITHOUT ANY WARRANTY; without even the implied warranty of
 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ## GNU General Public License for more details.
-## 
+##
 ## You should have received a copy of the GNU General Public License
 ## along with this program; if not, write to the Free Software
@@ -19 +21 @@
 
 class CustomTheme1(grok.GlobalUtility):
-    """A custom theme based on the WAeUP base theme.
+    """A custom theme based on the SIRP base theme.
     """
     grok.implements(ITheme)

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

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

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

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

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

@@ +1 @@
+## $Id$
+##
+## Copyright (C) 2011 Uli Fouquet & Henrik Bettermann
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
 from waeup.custom.testing import FunctionalLayer
 from waeup.sirp.students.tests.test_browser import StudentsFullSetup
@@ -35 +52 @@
         self.assertMatches('...ticket created...',
                            self.browser.contents)
+        ctrl = self.browser.getControl(name='val_id')
+        value = ctrl.options[0]
+        self.browser.getLink(value).click()
+        self.assertMatches('...Amount Authorized...',
+                           self.browser.contents)
+        #payment_url = self.browser.url
+        #self.browser.open(payment_url)
+        self.browser.getLink("Request callback").click()
+        self.assertMatches('...Valid callback received...',
+                          self.browser.contents)
         self.browser.open(self.manage_student_path)
         self.browser.getControl(
             name="transition").value = ['pay_first_school_fee']
         self.browser.getControl("Save").click()
+        # Reset to returning
         self.browser.getControl(name="transition").value = ['reset6']
         self.browser.getControl("Save").click()
         self.browser.open(self.payments_student_path + '/addop')
         self.browser.getControl("Create ticket").click()
-        self.assertMatches('...This payment ticket already exists...',
+        self.assertMatches('...This type of payment has already been made...',
                            self.browser.contents)
         # Remove all payments so that we can add a school fee payment again

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

@@ +1 @@
+## $Id$
+##
+## Copyright (C) 2011 Uli Fouquet & Henrik Bettermann
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##
 import grok
-from waeup.sirp.students.vocabularies import academic_sessions_vocab
 from waeup.sirp.students.workflow import CLEARED, RETURNING
 from waeup.sirp.students.utils import StudentsUtils
@@ -31 +47 @@
     grok.implements(IStudentsUtils)
 
-    def get_payment_details(self, category, student):
+    def getPaymentDetails(self, category, student):
         d = {}
         d['surcharge_1'] = d['surcharge_2'] = d['surcharge_3'] = 0
@@ -60 +76 @@
             d['amount'] = get_school_fee(student, d['surcharge_1'] + d['surcharge_2'])
             code = student['studycourse'].certificate.code
-            #session_string = academic_sessions_vocab.by_value[p_session + 1].title
             d['p_item'] = code
             d['p_session'] += 1

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

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

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

@@ +1 @@
+## $Id$
+##
 ## Copyright (C) 2011 Uli Fouquet & Henrik Bettermann
 ## This program is free software; you can redistribute it and/or modify