From 1f37f7a0d2515bb201c8d7c5743017fc5585443c Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Mon, 16 Nov 2020 09:54:29 +0100
Subject: [PATCH] __unicode__ removed - it's not necessary by django with
python 3
---
smash/web/models/appointment_type.py | 3 ---
smash/web/models/availability.py | 4 ----
smash/web/models/configuration_item.py | 3 ---
smash/web/models/contact_attempt.py | 3 ---
smash/web/models/country.py | 3 ---
smash/web/models/flying_team.py | 3 ---
smash/web/models/holiday.py | 3 ---
smash/web/models/inconsistent_subject.py | 6 ------
smash/web/models/item.py | 3 ---
smash/web/models/location.py | 3 ---
smash/web/models/missing_subject.py | 5 -----
smash/web/models/room.py | 3 ---
smash/web/models/study.py | 3 ---
smash/web/models/study_subject.py | 3 ---
smash/web/models/subject.py | 3 ---
smash/web/models/visit.py | 6 ------
smash/web/models/voucher.py | 3 ---
smash/web/models/voucher_type.py | 3 ---
smash/web/models/worker.py | 9 ---------
19 files changed, 72 deletions(-)
diff --git a/smash/web/models/appointment_type.py b/smash/web/models/appointment_type.py
index 76e96637..3514afa4 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 68580c2a..2513da68 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 86e3d12c..9879847c 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 f1416f9e..ffadd6c7 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 ce180a16..9813a8e5 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 45b98217..73ed2b4c 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 40ff05e4..b8d0f44d 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 fce64100..62441ad7 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 b27f729c..3199141f 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 217a699d..84d597d5 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 284e3f96..4f991444 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 2822b8df..acef700d 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 dafb713e..2ff035ab 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 ce9cd0b0..95cf4c5e 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 2f35eb68..160c2c41 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 5d7cec4e..6516aab2 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 53bd4785..72938c58 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 99829ec7..64b51d0c 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 183cb92a..5273042c 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:
--
GitLab