From 194140f6278ac4495fce03fb40b2c6a625e1b664 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Fri, 8 Jul 2022 14:46:04 +0200 Subject: [PATCH] adding full_name --- .../migrations/0017_athlete_full_name.py | 19 ++++++++++++++ boatmovers/models.py | 4 ++- boatmovers/scrapers.py | 9 ++++--- ratings.csv | 26 ++++++++++++++++++- 4 files changed, 52 insertions(+), 6 deletions(-) create mode 100644 boatmovers/migrations/0017_athlete_full_name.py diff --git a/boatmovers/migrations/0017_athlete_full_name.py b/boatmovers/migrations/0017_athlete_full_name.py new file mode 100644 index 00000000..f3056eb9 --- /dev/null +++ b/boatmovers/migrations/0017_athlete_full_name.py @@ -0,0 +1,19 @@ +# Generated by Django 3.2.12 on 2022-07-08 12:37 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('boatmovers', '0016_race_gender'), + ] + + operations = [ + migrations.AddField( + model_name='athlete', + name='full_name', + field=models.CharField(default=' ', max_length=200), + preserve_default=False, + ), + ] diff --git a/boatmovers/models.py b/boatmovers/models.py index ff758841..b02c69cf 100644 --- a/boatmovers/models.py +++ b/boatmovers/models.py @@ -19,6 +19,7 @@ def current_day(ttz=None): class Athlete(models.Model): first_name = models.CharField(max_length=200) last_name = models.CharField(max_length=200) + full_name = models.CharField(max_length=200) club = models.CharField(max_length=200) trueskill_mu = models.FloatField(default=25.) trueskill_sigma = models.FloatField(default=25./3.) @@ -35,7 +36,8 @@ class Athlete(models.Model): def save(self, *args, **kwargs): name = '{f} {l}'.format(f = self.first_name, l = self.last_name) - athletes = Athlete.objects.filter(gender=self.gender) + self.full_name = name + athletes = Athlete.objects.filter(gender=self.gender, full_name=self.full_name) if self.pk is not None: athletes = athletes.exclude(pk=self.pk) for a in athletes: diff --git a/boatmovers/scrapers.py b/boatmovers/scrapers.py index d67e2fea..811fd948 100644 --- a/boatmovers/scrapers.py +++ b/boatmovers/scrapers.py @@ -37,8 +37,10 @@ def csv_reader(filename,raceid,clubcol='Ploeg',bankjes=['Slag'],uitslag='Pos',ge first_name = 'Unknown' last_name = 'Athlete' dummy=True - athletes = Athlete.objects.filter(first_name = first_name, - last_name = last_name, + athletes = Athlete.objects.filter(full_name='{f} {l}'.format( + f=full_name, + l=last_name, + ), gender=gender) if len(athletes) >= 1: athlete = athletes[0] @@ -117,8 +119,7 @@ def time_team_scraper(url,raceid,gender='m',startorder=1): first_name = 'Unknown' last_name = 'Athlete' dummy=True - athletes = Athlete.objects.filter(first_name = first_name, - last_name = last_name) + athletes = Athlete.objects.filter(full_name=names) if len(athletes) >= 1: athlete = athletes[0] else: diff --git a/ratings.csv b/ratings.csv index 2f359c99..cf3aacd8 100644 --- a/ratings.csv +++ b/ratings.csv @@ -1121,4 +1121,28 @@ Jul-05-2022 05:15:50 3483,Nina,Samel,21.633584272648232,6.986487626428133,37,Dut Jul-05-2022 05:15:50 3484,Karin,Russig,21.633584272648232,6.986487626428133,37,Dutch Masters Open W 2x B Jul-05-2022 06:01:13 3485,Kyra,Rikhof,35.46331566836524,5.781346201169277,38,Dutch Masters Open W 1x A Jul-05-2022 06:01:13 3300,Merel,Dubbeldam,32.37542402083459,3.47109788107947,38,Dutch Masters Open W 1x A -Jul-05-2022 06:01:13 3415,Noreen van der,Linden,28.048661279760804,3.6732773372236722,38,Dutch Masters Open W 1x A \ No newline at end of file +Jul-05-2022 06:01:13 3415,Noreen van der,Linden,28.048661279760804,3.6732773372236722,38,Dutch Masters Open W 1x A +Jul-08-2022 12:45:18 3487,Raymond,Marchee,27.234256760451462,7.144963505200698,40,Dutch Masters Open M 2x C +Jul-08-2022 12:45:18 3488,Wouter,Boogaart,27.234256760451462,7.144963505200698,40,Dutch Masters Open M 2x C +Jul-08-2022 12:45:18 3487,Raymond,Marchee,27.238964524164913,7.143627713411198,40,Dutch Masters Open M 2x C +Jul-08-2022 12:45:18 3488,Wouter,Boogaart,27.238964524164913,7.143627713411198,40,Dutch Masters Open M 2x C +Jul-08-2022 12:45:18 3489,Wim,Ruts,22.761035475835076,7.143627713411201,40,Dutch Masters Open M 2x C +Jul-08-2022 12:45:18 3490,Ive Van,Cleemput,22.761035475835072,7.143627713411201,40,Dutch Masters Open M 2x C +Jul-08-2022 12:45:18 3489,Wim,Ruts,22.765743239548534,7.144963505200703,40,Dutch Masters Open M 2x C +Jul-08-2022 12:45:18 3490,Ive Van,Cleemput,22.765743239548534,7.144963505200703,40,Dutch Masters Open M 2x C +Jul-08-2022 12:45:32 3011,Marlies van der,Lugt,32.27086561393082,5.886042209786575,39,Tweehead DM2- +Jul-08-2022 12:45:32 3012,Janneke,Voordouw,32.27086561393082,5.886042209786575,39,Tweehead DM2- +Jul-08-2022 12:45:32 3011,Marlies van der,Lugt,32.27624864694899,5.884313161836087,39,Tweehead DM2- +Jul-08-2022 12:45:32 3012,Janneke,Voordouw,32.27624864694899,5.884313161836087,39,Tweehead DM2- +Jul-08-2022 12:45:32 3031,Maaike van,Agtmaal,27.709267297621736,6.285567815961603,39,Tweehead DM2- +Jul-08-2022 12:45:32 3486,Pascalle,Vermeulen,27.88601282230246,6.647457539632571,39,Tweehead DM2- +Jul-08-2022 12:45:32 3031,Maaike van,Agtmaal,27.724892525413573,6.284695902686206,39,Tweehead DM2- +Jul-08-2022 12:45:32 3486,Pascalle,Vermeulen,27.90544747220051,6.646182057124882,39,Tweehead DM2- +Jul-08-2022 12:45:33 2410,Geke,Uninge,25.615378324665993,5.65878850827226,39,Tweehead DM2- +Jul-08-2022 12:45:33 2412,Marit,Wolffenbuttel,25.615378324666004,5.65878850827226,39,Tweehead DM2- +Jul-08-2022 12:45:33 2410,Geke,Uninge,25.63694044776362,5.658907993140321,39,Tweehead DM2- +Jul-08-2022 12:45:33 2412,Marit,Wolffenbuttel,25.63694044776363,5.658907993140321,39,Tweehead DM2- +Jul-08-2022 12:45:33 2367,Inge,Nijhuis,23.13128454291232,5.068418863655849,39,Tweehead DM2- +Jul-08-2022 12:45:33 2369,Petra van,Woensel,24.962071638107,5.356179640801852,39,Tweehead DM2- +Jul-08-2022 12:45:33 2367,Inge,Nijhuis,23.140485323180155,5.070134681780092,39,Tweehead DM2- +Jul-08-2022 12:45:33 2369,Petra van,Woensel,24.97294343048674,5.358446493030599,39,Tweehead DM2- \ No newline at end of file