diff --git a/rowers/dataroutines.py b/rowers/dataroutines.py index 75b62a8b..1c5d9ae9 100644 --- a/rowers/dataroutines.py +++ b/rowers/dataroutines.py @@ -1732,6 +1732,8 @@ def read_data(columns, ids=[], doclean=True, workstrokesonly=True, debug=False, try: datadf = pl.concat(data) + except ShapeError: + return pl.DataFrame() except SchemaError: try: data = [ diff --git a/rowers/idoklad.py b/rowers/idoklad.py index 684f8d18..49cfbfa0 100644 --- a/rowers/idoklad.py +++ b/rowers/idoklad.py @@ -123,7 +123,7 @@ def create_contact(rower): data = { 'City': rower.city, 'CompanyName': rower.user.first_name+" "+rower.user.last_name, - 'CountryId': get_country_id(rower.country.code), + 'CountryId': get_country_id(rower.country), 'Email': rower.user.email, 'Firstname': rower.user.first_name, 'PostalCode': rower.postal_code, diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz index 8c06d57a..889110b9 100644 Binary files a/rowers/tests/testdata/testdata.tcx.gz and b/rowers/tests/testdata/testdata.tcx.gz differ diff --git a/rowers/views/.#paymentviews.py b/rowers/views/.#paymentviews.py new file mode 120000 index 00000000..5317f650 --- /dev/null +++ b/rowers/views/.#paymentviews.py @@ -0,0 +1 @@ +sander@rowsandall-2.17364:1733469196 \ No newline at end of file