diff --git a/smash/web/importer/csv_tns_visit_import_reader.py b/smash/web/importer/csv_tns_visit_import_reader.py index 6afd5400ef11bdaf54a572e1aabed3a53bee359c..1a6181a3b8255eca5a2fac5a143f04fa16173dd0 100644 --- a/smash/web/importer/csv_tns_visit_import_reader.py +++ b/smash/web/importer/csv_tns_visit_import_reader.py @@ -297,6 +297,15 @@ class TnsCsvVisitImportReader: text = 'Laboratoires réunis, 4, rue Tony Bourg, 1278, Gasperich' if text == 'lab-ketterthill-41': text = "Ketterthill, 143-147, route d'Arlon, 8009, Strassen" + if text == 'lab-reunis-42': + text = 'Laboratoires réunis, 31, route de Luxembourg, 7240, Bereldange' + if text == 'lab-reunis-43': + text = 'Laboratoires réunis, 11, rue de Peppange, 3270, Bettembourg' + if text == 'lab-reunis-44': + text = 'Laboratoires réunis, 3, Suebelwee, 5685, Dalheim' + if text == 'lab-reunis-45': + text = 'Laboratoires réunis, 1, rue des Glacis, 1628, Luxembourg, Glacis' + locations = Location.objects.filter(name=text) if len(locations) > 0: return locations[0] diff --git a/smash/web/models/worker.py b/smash/web/models/worker.py index 877bcbaef8452331a53e571ef680db919f8f36c0..3cfc4199a18f9ce24c743e7c7be6cd4cb7fcfbba 100644 --- a/smash/web/models/worker.py +++ b/smash/web/models/worker.py @@ -301,7 +301,7 @@ class Worker(models.Model): def __str__(self): if self.name != '': if self.first_name == '': - return self.name + return "%s (%s, %s)" % (self.name, self.address, self.city) else: return "%s %s %s" % (self.name, self.first_name, self.last_name) else: @@ -310,7 +310,7 @@ class Worker(models.Model): def __unicode__(self): if self.name != '': if self.first_name == '': - return self.name + return "%s (%s, %s)" % (self.name, self.address, self.city) else: return "%s %s %s" % (self.name, self.first_name, self.last_name) else: