aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ctrack/caf/models.py4
-rw-r--r--ctrack/caf/templates/caf/applicablesystem_list.html2
-rw-r--r--ctrack/static/css/project.css2
-rw-r--r--ctrack/static/sass/project.css2
-rw-r--r--ctrack/static/sass/project.scss2
5 files changed, 7 insertions, 5 deletions
diff --git a/ctrack/caf/models.py b/ctrack/caf/models.py
index c290ee3..637ef92 100644
--- a/ctrack/caf/models.py
+++ b/ctrack/caf/models.py
@@ -75,5 +75,5 @@ class CAF(models.Model):
def __str__(self):
# Get the organisation and applicable system
- org = ApplicableSystem.objects.filter(caf=self).first()
- return f"CAF | {org.name}"
+ ass = ApplicableSystem.objects.filter(caf=self).first()
+ return f"CAF | {ass.organisation.name}"
diff --git a/ctrack/caf/templates/caf/applicablesystem_list.html b/ctrack/caf/templates/caf/applicablesystem_list.html
index caeee44..b1ba1a1 100644
--- a/ctrack/caf/templates/caf/applicablesystem_list.html
+++ b/ctrack/caf/templates/caf/applicablesystem_list.html
@@ -14,6 +14,7 @@
<tr>
<th>Organisation</th>
<th>System</th>
+ <th>CAF</th>
<th>Sub Mode</th>
<th class="tabaligncenter">Confidence Grade</th>
<th>Triage Review Date</th>
@@ -24,6 +25,7 @@
<tr>
<td>{{ sys.organisation.name }}</td>
<td>{{ sys.name }}</td>
+ <td>{{ sys.caf }}</td>
<td>{{ sys.organisation.submode.descriptor }}</td>
<td class="tabaligncenter">{{ sys.caf.confidence_grading.descriptor }}</td>
<td>{{ sys.caf.triage_review_date }}</td>
diff --git a/ctrack/static/css/project.css b/ctrack/static/css/project.css
index ceefa8a..e2ff1d0 100644
--- a/ctrack/static/css/project.css
+++ b/ctrack/static/css/project.css
@@ -30,7 +30,7 @@
.table-sm tr {
font-size: 0.75rem;
- line-height: 10px;
+ line-height: 12px;
min-height: 10px; }
.textinput {
diff --git a/ctrack/static/sass/project.css b/ctrack/static/sass/project.css
index ceefa8a..e2ff1d0 100644
--- a/ctrack/static/sass/project.css
+++ b/ctrack/static/sass/project.css
@@ -30,7 +30,7 @@
.table-sm tr {
font-size: 0.75rem;
- line-height: 10px;
+ line-height: 12px;
min-height: 10px; }
.textinput {
diff --git a/ctrack/static/sass/project.scss b/ctrack/static/sass/project.scss
index 36b9525..78985ae 100644
--- a/ctrack/static/sass/project.scss
+++ b/ctrack/static/sass/project.scss
@@ -64,7 +64,7 @@ $input-height: 49px;
.table-sm tr {
font-size: 0.75rem;
- line-height: 10px;
+ line-height: 12px;
min-height: 10px;
}