diff --git a/smash/web/models/appointment_type.py b/smash/web/models/appointment_type.py
index 76e9663741633a45f4424b374263f22d32ff5d5f..3514afa477bd767d807fe109b4ff921dc4b33ce9 100644
--- a/smash/web/models/appointment_type.py
+++ b/smash/web/models/appointment_type.py
@@ -55,6 +55,3 @@ class AppointmentType(models.Model):
def __str__(self):
return self.description
-
- def __unicode__(self):
- return self.description
diff --git a/smash/web/models/availability.py b/smash/web/models/availability.py
index 68580c2a57fc4ec47e33d12ccd8810f7a4dca14e..2513da6899476b3e08bb413db27dc29960cf5496 100644
--- a/smash/web/models/availability.py
+++ b/smash/web/models/availability.py
@@ -27,10 +27,6 @@ class Availability(models.Model):
day_of_week = self.get_day_of_week_as_string()
return "%s %s %s" % (day_of_week, self.person.last_name, self.person.first_name)
- def __unicode__(self):
- day_of_week = self.get_day_of_week_as_string()
- return "%s %s %s" % (day_of_week, self.person.last_name, self.person.first_name)
-
def get_day_of_week_as_string(self):
day_of_week = "N/A"
for row in WEEKDAY_CHOICES:
diff --git a/smash/web/models/configuration_item.py b/smash/web/models/configuration_item.py
index 86e3d12c5649c0727bff560d8b894c42152e2b33..9879847cb62413f0914aa0de43160abef2210fd4 100644
--- a/smash/web/models/configuration_item.py
+++ b/smash/web/models/configuration_item.py
@@ -28,9 +28,6 @@ class ConfigurationItem(models.Model):
def __str__(self):
return "%s %s" % (self.name, self.value)
- def __unicode__(self):
- return "%s %s" % (self.name, self.value)
-
@staticmethod
def is_valid(item):
message = ConfigurationItem.validation_error(item)
diff --git a/smash/web/models/contact_attempt.py b/smash/web/models/contact_attempt.py
index f1416f9ede9ba5b6b1b57c4d66034f3b55c77bee..ffadd6c779182f633c87cc043c6b1953ceb1e8d9 100644
--- a/smash/web/models/contact_attempt.py
+++ b/smash/web/models/contact_attempt.py
@@ -23,6 +23,3 @@ class ContactAttempt(models.Model):
def __str__(self):
return "%s %s" % (self.subject, self.worker)
-
- def __unicode__(self):
- return "%s %s" % (self.subject, self.worker)
diff --git a/smash/web/models/country.py b/smash/web/models/country.py
index ce180a164850ae034d9651cf70f6631f443fe35c..9813a8e55f4459f2ccf43c56c662ad36ca714339 100644
--- a/smash/web/models/country.py
+++ b/smash/web/models/country.py
@@ -13,6 +13,3 @@ class Country(models.Model):
def __str__(self):
return self.name
-
- def __unicode__(self):
- return "%s" % self.name
diff --git a/smash/web/models/flying_team.py b/smash/web/models/flying_team.py
index 45b9821758668bf4ed5b360cb62d4994714e03c1..73ed2b4c3278324115c327a23addc92435936303 100644
--- a/smash/web/models/flying_team.py
+++ b/smash/web/models/flying_team.py
@@ -10,6 +10,3 @@ class FlyingTeam(models.Model):
def __str__(self):
return "%s" % self.place
-
- def __unicode__(self):
- return "%s" % self.place
diff --git a/smash/web/models/holiday.py b/smash/web/models/holiday.py
index 40ff05e47a0203c42557f3c07b1c71735b1bd2ea..b8d0f44d3cb9824bc2ed2e996e244ab6ac3bebd1 100644
--- a/smash/web/models/holiday.py
+++ b/smash/web/models/holiday.py
@@ -26,6 +26,3 @@ class Holiday(models.Model):
def __str__(self):
return "%s %s" % (self.person.first_name, self.person.last_name)
-
- def __unicode__(self):
- return "%s %s" % (self.person.first_name, self.person.last_name)
diff --git a/smash/web/models/inconsistent_subject.py b/smash/web/models/inconsistent_subject.py
index fce64100f2027d03ee7400cb077f8853f295dd18..62441ad76fdd04f128179356cf0df4f133601383 100644
--- a/smash/web/models/inconsistent_subject.py
+++ b/smash/web/models/inconsistent_subject.py
@@ -37,9 +37,6 @@ class InconsistentField(models.Model):
def __str__(self):
return self.name + ": " + self.smash_value + "; RED Cap: " + self.redcap_value
- def __unicode__(self):
- return self.name + ": " + self.smash_value + "; RED Cap: " + self.redcap_value
-
class InconsistentSubject(models.Model):
class Meta:
@@ -70,6 +67,3 @@ class InconsistentSubject(models.Model):
def __str__(self):
return "Subject: " + str(self.subject)
-
- def __unicode__(self):
- return "Subject: " + str(self.subject)
diff --git a/smash/web/models/item.py b/smash/web/models/item.py
index b27f729c7a4d87037b1a80a8a6dccce3017771b3..3199141fc9c3afed49227a18234669911e84e1af 100644
--- a/smash/web/models/item.py
+++ b/smash/web/models/item.py
@@ -22,6 +22,3 @@ class Item(models.Model):
def __str__(self):
return self.name
-
- def __unicode__(self):
- return self.name
diff --git a/smash/web/models/location.py b/smash/web/models/location.py
index 217a699d2c0495d7a373ec3b3be68881f6265ccf..84d597d56551630adbdeee3afaed37d21ff4cb3b 100644
--- a/smash/web/models/location.py
+++ b/smash/web/models/location.py
@@ -17,6 +17,3 @@ class Location(models.Model):
def __str__(self):
return "%s" % self.name
-
- def __unicode__(self):
- return "%s" % self.name
diff --git a/smash/web/models/missing_subject.py b/smash/web/models/missing_subject.py
index 284e3f96e8497148897773e6912212d55c3ad382..4f99144473d1634aafbe2e208438cb398aba2512 100644
--- a/smash/web/models/missing_subject.py
+++ b/smash/web/models/missing_subject.py
@@ -42,8 +42,3 @@ class MissingSubject(models.Model):
if self.subject is not None:
return "Subject: " + str(self.subject)
return "RED Cap subject: " + self.redcap_id
-
- def __unicode__(self):
- if self.subject is not None:
- return "Subject: " + str(self.subject)
- return "RED Cap subject: " + self.redcap_id
diff --git a/smash/web/models/room.py b/smash/web/models/room.py
index 2822b8dfd8b71da5974c7c52dcc9ed67c60b4f0e..acef700daeb585ebb4f8b2eaeec34af4cd52936f 100644
--- a/smash/web/models/room.py
+++ b/smash/web/models/room.py
@@ -28,6 +28,3 @@ class Room(models.Model):
def __str__(self):
return "%d %s %s" % (self.room_number, self.address, self.city)
-
- def __unicode__(self):
- return "%d %s %s" % (self.room_number, self.address, self.city)
diff --git a/smash/web/models/study.py b/smash/web/models/study.py
index dafb713e79907640f2b0e3cc8223a28387d3c1df..2ff035ab10562e70f8ca58f223310c316efdd5b8 100644
--- a/smash/web/models/study.py
+++ b/smash/web/models/study.py
@@ -101,9 +101,6 @@ class Study(models.Model):
def __str__(self):
return "%s" % self.name
- def __unicode__(self):
- return "%s" % self.name
-
@property
def has_voucher_types(self):
return self.columns.voucher_types
diff --git a/smash/web/models/study_subject.py b/smash/web/models/study_subject.py
index ce9cd0b01fc86d9c116d0ecd20a5fb9acbce5cae..95cf4c5e8208253695e2a43e60f7bb8f48266640 100644
--- a/smash/web/models/study_subject.py
+++ b/smash/web/models/study_subject.py
@@ -372,9 +372,6 @@ class StudySubject(models.Model):
def __str__(self):
return "%s %s" % (self.subject.first_name, self.subject.last_name)
- def __unicode__(self):
- return "%s %s" % (self.subject.first_name, self.subject.last_name)
-
# SIGNALS
@receiver(post_save, sender=StudySubject)
diff --git a/smash/web/models/subject.py b/smash/web/models/subject.py
index 2f35eb689a2b73869d771ae6a9523fa1d5eda5cb..160c2c41d1347a79271e22c4663ecec4df610eb0 100644
--- a/smash/web/models/subject.py
+++ b/smash/web/models/subject.py
@@ -151,9 +151,6 @@ class Subject(models.Model):
def __str__(self):
return "%s %s" % (self.first_name, self.last_name)
- def __unicode__(self):
- return "%s %s" % (self.first_name, self.last_name)
-
# SIGNALS
@receiver(post_save, sender=Subject)
diff --git a/smash/web/models/visit.py b/smash/web/models/visit.py
index 5d7cec4eb4f236f8e87e8ce7dcae924920dbe358..6516aab20c8adfb52643a0d14ba890460863ef1a 100644
--- a/smash/web/models/visit.py
+++ b/smash/web/models/visit.py
@@ -55,12 +55,6 @@ class Visit(models.Model):
def future_visits(self):
return Visit.objects.filter(subject=self.subject).filter(visit_number__gt=self.visit_number).order_by('datetime_begin','datetime_end')
- def __unicode__(self):
- start = self.datetime_begin.strftime('%Y-%m-%d')
- end = self.datetime_end.strftime('%Y-%m-%d')
- finished = '✓' if self.is_finished else ''
- return f'#{self.visit_number:02} | {start} / {end} | {self.subject.subject.first_name} {self.subject.subject.last_name} | {finished}'
-
def __str__(self):
start = self.datetime_begin.strftime('%Y-%m-%d')
end = self.datetime_end.strftime('%Y-%m-%d')
diff --git a/smash/web/models/voucher.py b/smash/web/models/voucher.py
index 53bd4785d3dd79dcdd9e1d41ac2027348327d052..72938c587cee96215dfb7a7e9bbf9e99b6a2b0c9 100644
--- a/smash/web/models/voucher.py
+++ b/smash/web/models/voucher.py
@@ -68,6 +68,3 @@ class Voucher(models.Model):
def __str__(self):
return "%s - %s %s" % (self.number, self.study_subject.subject.first_name, self.study_subject.subject.last_name)
-
- def __unicode__(self):
- return "%s - %s %s" % (self.number, self.study_subject.subject.first_name, self.study_subject.subject.last_name)
diff --git a/smash/web/models/voucher_type.py b/smash/web/models/voucher_type.py
index 99829ec7e4e70c2732ec4c5102680fa6022ded92..64b51d0cca3b0de159e0f457f1b464128bd2b7ab 100644
--- a/smash/web/models/voucher_type.py
+++ b/smash/web/models/voucher_type.py
@@ -20,6 +20,3 @@ class VoucherType(models.Model):
def __str__(self):
return "%s (%s)" % (self.code, self.description)
-
- def __unicode__(self):
- return '{} ({})'.format(self.code, self.description)
\ No newline at end of file
diff --git a/smash/web/models/worker.py b/smash/web/models/worker.py
index 183cb92a24bc7f0a1244be41d3db21fb23f83dbc..5273042c3bb40a8b627019538ecda8824efa1a6c 100644
--- a/smash/web/models/worker.py
+++ b/smash/web/models/worker.py
@@ -307,15 +307,6 @@ class Worker(models.Model):
else:
return "%s %s" % (self.first_name, self.last_name)
- def __unicode__(self):
- if self.name != '':
- if self.first_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:
- return "%s %s" % (self.first_name, self.last_name)
-
def initials(self):
result = ""
if len(self.first_name) > 0: