Merge branch 'release/0.1.15'

clinicedc · Oct 5, 2018 · f573fb2 · f573fb2
2 parents 3660356 + 569e5fe
commit f573fb2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.1.14
+0.1.15
diff --git a/edc_subject_dashboard/modeladmin_mixins.py b/edc_subject_dashboard/modeladmin_mixins.py
@@ -11,6 +11,7 @@ def dashboard(self, obj=None):
         url = reverse(settings.DASHBOARD_URL_NAMES.get(self.subject_dashboard_url),
                       kwargs=dict(subject_identifier=obj.subject_identifier))
         return mark_safe(
-            f'<a class="button" title="go to subject dashboard" '
-            f'href="{url}">{obj.subject_identifier}</a>')
+            f'<span nowrap>{obj.subject_identifier}&nbsp;'
+            f'<a class="button" title="Go to subject\'s dashboard" '
+            f'href="{url}">Go</a></span>')
     dashboard.short_description = 'Dashboard'
diff --git a/edc_subject_dashboard/templates/edc_subject_dashboard/bootstrap3/dashboard/appointments.html b/edc_subject_dashboard/templates/edc_subject_dashboard/bootstrap3/dashboard/appointments.html
@@ -94,7 +94,11 @@
 
 	   		        </td>
 	   		        <td>{{wrapped.object.title}}</td>
-                    <td>{{ wrapped.object.appt_datetime|date:"SHORT_DATE_FORMAT" }} {{ wrapped.object.appt_datetime|date:"D"| capfirst }}</td>
+                    {% if wrapped.object.visit.report_datetime %}
+                    	<td>{{ wrapped.object.visit.report_datetime|date:"SHORT_DATE_FORMAT" }} {{ wrapped.object.visit.report_datetime|date:"D"| capfirst }}</td>
+                    {% else %}
+                    	<td class="text text-muted">{{ wrapped.object.appt_datetime|date:"SHORT_DATE_FORMAT" }} {{ wrapped.object.appt_datetime|date:"D"| capfirst }}</td>
+                    {% endif %}
                 </tr>
 		  {% endif %}
         {% endfor %}