Modified expected_duration property to reflect business logic better k…

…iwitcms#1923

tcms/testcases/models.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 import vinaigrette
+from datetime import timedelta
 from django.conf import settings
 from django.db import models
 from django.db.models import ObjectDoesNotExist
@@ -55,14 +56,17 @@ class TestCase(models.Model, UrlMixin):
     requirement = models.CharField(max_length=255, blank=True, null=True)
     notes = models.TextField(blank=True, null=True)
     text = models.TextField(blank=True)
-    setup_duration = models.DurationField(db_index=True, null=True, blank=True) or 0
-    testing_duration = models.DurationField(db_index=True, null=True, blank=True) or 0
+    setup_duration = models.DurationField(db_index=True, null=True, blank=True)
+    testing_duration = models.DurationField(db_index=True, null=True, blank=True)
 
     @property
     def expected_duration(self):
         if not self.setup_duration and not self.testing_duration:
-            return 0
-        return self.setup_duration + self.testing_duration
+            return None
+        result = timedelta(0)
+        result += self.setup_duration or timedelta(0)
+        result += self.testing_duration or timedelta(0)
+        return result
 
     case_status = models.ForeignKey(TestCaseStatus, on_delete=models.CASCADE)
     category = models.ForeignKey(

tcms/testcases/templates/testcases/mutable.html

@@ -100,18 +100,6 @@
                 </div>
             </div>
 
-            <div class="form-group">
-                <label class="col-md-1 col-lg-1">{% trans "Setup duration" %}</label>
-                <div class="col-md-3 col-lg-3">
-                    <!-- https://github.com/koss-lebedev/bootstrap-duration-picker -->
-                </div>
-
-                <label class="col-md-1 col-lg-1">{% trans "Testing duration" %}</label>
-                <div class="col-md-3 col-lg-3">
-                    <!-- https://github.com/koss-lebedev/bootstrap-duration-picker -->
-                </div>
-            </div>
-
             <div class="form-group">
                 <div class="col-md-12 col-lg-12">
                     <label class="{% if form.text.errors %}has-error{% endif %}">{% trans "Text" %}:</label>