Merge branch '356-should-we-remove-__unicode__-method' into 'master'

Resolve "should we remove __unicode__ method?"

Closes #356

See merge request NCER-PD/scheduling-system!274

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

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:

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)

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)

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

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

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)

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)

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

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

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

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)

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

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)

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)

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')

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)

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

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: