Ignore:
Timestamp:
28 May 2015, 13:55:06 (10 years ago)
Author:
Henrik Bettermann
Message:

Revert changes from r13007.

Location:
main/waeup.kofa/trunk/src/waeup/kofa
Files:
7 edited

Legend:

Unmodified
Added
Removed

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

    r13005 r13012  
    4747    """
    4848    p_id = Attribute('Payment identifier')
    49     created_online = Attribute('True if not imported')
    5049
    5150    p_category = schema.Choice(

  • main/waeup.kofa/trunk/src/waeup/kofa/payments/payment.py

    r13005 r13012  
    4444    logger_format_str = '"%(asctime)s","%(user)s",%(message)s'
    4545
    46     created_online = False
     46    #def logger_info(self, comment=None):
     47    #    """Get the logger's info method.
     48    #    """
     49    #    self.logger.info('%s' % comment)
     50    #    return
    4751
    4852    def __init__(self):

  • main/waeup.kofa/trunk/src/waeup/kofa/payments/tests.py

    r13005 r13012  
    2626from waeup.kofa.testing import (FunctionalLayer, FunctionalTestCase)
    2727
    28 class PaymentsTestCase(FunctionalTestCase):
     28class PaymentsContainerTestCase(FunctionalTestCase):
    2929
    3030    layer = FunctionalLayer
    … …  
    5757        self.assertRaises(
    5858            NotImplementedError, container.clear)
    59         # created_online is always False
    60         payment = OnlinePayment()
    61         self.assertEqual(payment.created_online, False)
    62         return

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

    r13005 r13012  
    17411741            self.flash(error, type="danger")
    17421742            return
    1743         payment.created_online = True
    17441743        self.context[payment.p_id] = payment
    17451744        self.flash(_('Payment ticket created.'))
    … …  
    17811780            self.flash(error, type="danger")
    17821781            return
    1783         payment.created_online = True
    17841782        self.context[payment.p_id] = payment
    17851783        self.flash(_('Payment ticket created.'))

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

    r13003 r13012  
    739739    """
    740740    bed = Attribute('The bed object.')
     741    booking_date = Attribute('Date of booking the bed')
     742
     743    display_coordinates = schema.TextLine(
     744        title = _(u'Allocated Bed'),
     745        required = False,
     746        readonly = True,
     747        )
    741748
    742749    bed_coordinates = schema.TextLine(
    … …  
    746753        )
    747754
    748     display_coordinates = schema.TextLine(
    749         title = _(u'Allocated Bed'),
    750         required = False,
    751         readonly = True,
    752         )
    753 
    754755    bed_type = schema.TextLine(
    755756        title = _(u'Requested Bed Type'),
    … …  
    778779
    779780    def getSessionString():
    780         """Returns the title of academic_sessions_vocab term.
     781        """Returns the title of academic_sessions_vocab term of the session
     782        when the bed was booked.
    781783        """
    782784

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

    r13005 r13012  
    904904                           self.browser.contents)
    905905        self.assertEqual(self.student['payments'][value].amount_auth, 40000.0)
    906         self.assertEqual(self.student['payments'][value].created_online, True)
    907906        payment_url = self.browser.url
    908907        logfile = os.path.join(

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

    r13005 r13012  
    744744        self.assertEqual(
    745745            result,
    746             'ac,amount_auth,created_online,creation_date,p_category,p_current,p_id,'
     746            'ac,amount_auth,creation_date,p_category,p_current,p_id,'
    747747            'p_item,p_level,p_session,p_state,payment_date,r_amount_approved,'
    748748            'r_code,r_desc,student_id,state,current_session\r\n'
    749749
    750             ',0.0,0,2012-04-01 13:12:01#,,1,,,,,unpaid,,0.0,,,,,\r\n'
     750            ',0.0,2012-04-01 13:12:01#,,1,,,,,unpaid,,0.0,,,,,\r\n'
    751751            )
    752752        return
    … …  
    762762        self.assertEqual(
    763763            result,
    764             'ac,amount_auth,created_online,creation_date,p_category,p_current,p_id,'
     764            'ac,amount_auth,creation_date,p_category,p_current,p_id,'
    765765            'p_item,p_level,p_session,p_state,payment_date,r_amount_approved,'
    766766            'r_code,r_desc,student_id,state,current_session\r\n'
    767767
    768             '666,12.12,0,2012-04-01 13:12:01#,schoolfee,1,my-id,'
     768            '666,12.12,2012-04-01 13:12:01#,schoolfee,1,my-id,'
    769769            'p-item,100,2012,paid,2012-04-01 14:12:01#,12.12,'
    770770            'r-code,,A111111,created,2012\r\n'
    … …  
    781781        self.assertEqual(
    782782            result,
    783             'ac,amount_auth,created_online,creation_date,p_category,p_current,p_id,'
     783            'ac,amount_auth,creation_date,p_category,p_current,p_id,'
    784784            'p_item,p_level,p_session,p_state,payment_date,r_amount_approved,'
    785785            'r_code,r_desc,student_id,state,current_session\r\n'
    786786
    787             '666,12.12,0,2012-04-01 13:12:01#,schoolfee,1,my-id,'
     787            '666,12.12,2012-04-01 13:12:01#,schoolfee,1,my-id,'
    788788            'p-item,100,2012,paid,2012-04-01 14:12:01#,12.12,'
    789789            'r-code,,A111111,created,2012\r\n'
    … …  
    800800        self.assertEqual(
    801801            result,
    802             'ac,amount_auth,created_online,creation_date,p_category,p_current,p_id,'
     802            'ac,amount_auth,creation_date,p_category,p_current,p_id,'
    803803            'p_item,p_level,p_session,p_state,payment_date,r_amount_approved,'
    804804            'r_code,r_desc,student_id,state,current_session\r\n'
    805805
    806             '666,12.12,0,2012-04-01 13:12:01#,schoolfee,1,my-id,'
     806            '666,12.12,2012-04-01 13:12:01#,schoolfee,1,my-id,'
    807807            'p-item,100,2012,paid,2012-04-01 14:12:01#,12.12,'
    808808            'r-code,,A111111,created,2012\r\n'
    … …  
    822822        self.assertEqual(
    823823            result,
    824             'ac,amount_auth,created_online,creation_date,p_category,p_current,p_id,'
     824            'ac,amount_auth,creation_date,p_category,p_current,p_id,'
    825825            'p_item,p_level,p_session,p_state,payment_date,r_amount_approved,'
    826826            'r_code,r_desc,student_id,state,current_session\r\n'
    827827
    828             '666,12.12,0,2012-04-01 13:12:01#,schoolfee,1,my-id,'
     828            '666,12.12,2012-04-01 13:12:01#,schoolfee,1,my-id,'
    829829            'p-item,100,2012,paid,2012-04-01 14:12:01#,12.12,'
    830830            'r-code,,A111111,created,2012\r\n'
    … …  
    857857        self.assertEqual(
    858858            result,
    859             'ac,amount_auth,created_online,creation_date,p_category,p_current,p_id,'
     859            'ac,amount_auth,creation_date,p_category,p_current,p_id,'
    860860            'p_item,p_level,p_session,p_state,payment_date,r_amount_approved,'
    861861            'r_code,r_desc,student_id,state,current_session\r\n'
    862862
    863             '666,12.12,0,2012-04-01 13:12:01#,schoolfee,1,my-id,'
     863            '666,12.12,2012-04-01 13:12:01#,schoolfee,1,my-id,'
    864864            'p-item,100,2012,paid,2012-04-01 14:12:01#,12.12,'
    865865            'r-code,,A111111,created,2012\r\n'
    … …  
    873873        self.assertEqual(
    874874            result,
    875             'ac,amount_auth,created_online,creation_date,p_category,p_current,p_id,'
     875            'ac,amount_auth,creation_date,p_category,p_current,p_id,'
    876876            'p_item,p_level,p_session,p_state,payment_date,r_amount_approved,'
    877877            'r_code,r_desc,student_id,state,current_session\r\n'
    … …  
    884884        self.assertEqual(
    885885            result,
    886             'ac,amount_auth,created_online,creation_date,p_category,p_current,p_id,'
     886            'ac,amount_auth,creation_date,p_category,p_current,p_id,'
    887887            'p_item,p_level,p_session,p_state,payment_date,r_amount_approved,'
    888888            'r_code,r_desc,student_id,state,current_session\r\n'
    … …  
    917917        self.assertEqual(
    918918            result,
    919             'ac,amount_auth,created_online,creation_date,p_category,p_current,p_id,'
     919            'ac,amount_auth,creation_date,p_category,p_current,p_id,'
    920920            'p_item,p_level,p_session,p_state,payment_date,r_amount_approved,'
    921921            'r_code,r_desc,student_id,state,current_session\r\n'
    … …  
    927927        self.assertEqual(
    928928            result,
    929             'ac,amount_auth,created_online,creation_date,p_category,p_current,p_id,'
     929            'ac,amount_auth,creation_date,p_category,p_current,p_id,'
    930930            'p_item,p_level,p_session,p_state,payment_date,r_amount_approved,'
    931931            'r_code,r_desc,student_id,state,current_session\r\n'
    932932
    933             '666,12.12,0,2012-04-01 13:12:01#,schoolfee,1,my-id,'
     933            '666,12.12,2012-04-01 13:12:01#,schoolfee,1,my-id,'
    934934            'p-item,100,2012,unpaid,2012-04-01 14:12:01#,12.12,'
    935935            'r-code,,A111111,created,2012\r\n'
    … …  
    955955        self.assertEqual(
    956956            result,
    957             'ac,amount_auth,created_online,creation_date,p_category,p_current,p_id,p_item,'
     957            'ac,amount_auth,creation_date,p_category,p_current,p_id,p_item,'
    958958            'p_level,p_session,p_state,payment_date,r_amount_approved,r_code,'
    959959            'r_desc,student_id,matric_number,reg_number,firstname,middlename,lastname,'
    960960            'state,current_session,entry_session,entry_mode,faccode,depcode,certcode\r\n'
    961961
    962             '666,12.12,0,2012-04-01 13:12:01#,schoolfee,1,my-id,p-item,100,2012,'
     962            '666,12.12,2012-04-01 13:12:01#,schoolfee,1,my-id,p-item,100,2012,'
    963963            'paid,2012-04-01 14:12:01#,12.12,r-code,,A111111,234,123,'
    964964            'Anna,M.,Tester,created,2012,2010,ug_ft,NA,NA,CERT1\r\n'
Note: See TracChangeset for help on using the changeset viewer.