Changeset 12811 for main


Ignore:
Timestamp:
23 Mar 2015, 11:06:26 (10 years ago)
Author:
Henrik Bettermann
Message:

Take also whitespaces and ignore marker into consideration.

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

Legend:

Unmodified
Added
Removed

  • main/waeup.kofa/trunk/src/waeup/kofa/students/tests/sample_student_data.csv

    r12810 r12811  
    55,Else,Mueller,4,1990-01-05,100003,aa@aa.ng,1234,f,school fee paid
    66,,,,,,,,,
    7 ,,,,,,,,,
     7,,,,  ,,, ,,
     8,,,,<IGNORE>,,,<IGNORE>,,
    89X888888,Alfons,Meier,5,1990-01-02,100004,aa@aa.ng,1234,m,courses validated
    910X999999,Herbert,Mueller,6,1990-01-02,100005,aa@aa.ng,1234,m,courses registered

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

    r12810 r12811  
    414414        # Nine students have been added.
    415415        self.assertEqual(len(self.app['students']), 10)
    416         # Two empty rows have been skipped.
    417         self.assertEqual(num, 11)
     416        # Three empty rows have been skipped.
     417        self.assertEqual(num, 12)
    418418        self.assertEqual(self.app['students']['X666666'].reg_number,'1')
    419419        self.assertEqual(

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

    r12810 r12811  
    278278        """
    279279        for value in row.values():
    280             if value:
     280            if value.strip() and not value in (None, IGNORE_MARKER):
    281281                return False
    282282        return True
Note: See TracChangeset for help on using the changeset viewer.