use checkboxes for dead and resigned statuses - #68

Closes #68 (closed)

smash/web/models/subject.py

@@ -25,15 +25,11 @@ class Subject(models.Model):
 
     def mark_as_dead(self):
         self.dead = True
-        self.save()
-
         self.finish_all_visits()
         self.finish_all_appointments()
 
-    def mark_as_rejected(self):
+    def mark_as_resigned(self):
         self.resigned = True
-        self.save()
-
         self.finish_all_visits()
         self.finish_all_appointments()
 
@@ -55,16 +51,6 @@ class Subject(models.Model):
                             verbose_name='Type'
                             )
 
-    dead = models.BooleanField(
-        verbose_name='Dead',
-        default=False,
-        editable=False
-    )
-    resigned = models.BooleanField(
-        verbose_name='Resigned',
-        default=False,
-        editable=False
-    )
     default_location = models.ForeignKey(Location,
                                          verbose_name='Default appointment location',
                                          )
@@ -160,6 +146,17 @@ class Subject(models.Model):
         verbose_name='Year of diagnosis (YYYY)'
     )
 
+    dead = models.BooleanField(
+        verbose_name='Deceased',
+        default=False,
+        editable=True
+    )
+    resigned = models.BooleanField(
+        verbose_name='Resigned',
+        default=False,
+        editable=True
+    )
+
     def latest_visit(self):
         visits = self.visit_set.all()
         if len(visits) == 0: