diff options
| -rw-r--r-- | ctrack/caf/templates/caf/caf_detail.html | 34 | ||||
| -rw-r--r-- | ctrack/caf/views.py | 2 |
2 files changed, 23 insertions, 13 deletions
diff --git a/ctrack/caf/templates/caf/caf_detail.html b/ctrack/caf/templates/caf/caf_detail.html index 7a8c151..0b9dee4 100644 --- a/ctrack/caf/templates/caf/caf_detail.html +++ b/ctrack/caf/templates/caf/caf_detail.html @@ -68,20 +68,30 @@ <div class="table-responsive"> <table class="table"> {% for ass in assessments_and_scores %} - <tr> - <th>Assessment</th> - <th></th> - <th>{{ ass.0 }}</th> - <th></th> - </tr> - {% for score in ass.1 %} + <table class="table-responsive p-2"> <tr> - <td>{{ score.caf_contributing_outcome.designation }}</td> - <td>{{ score.caf_contributing_outcome.name }}</td> - <td>{{ score.caf_contributing_outcome.description }}</td> - <td>{{ score.assessment_score }}</td> + <td><strong>Assessment:</strong></td> + <td>{{ ass.0 }}</td> </tr> - {% endfor %} + <tr> + <td><strong>Assessor:</strong></td> + <td>{{ ass.0.completer }}</td> + </tr> + <tr> + <td><strong>Comments:</strong></td> + <td>{{ ass.0.comments }}</td> + </tr> + </table> + <table class="table"> + {% for score in ass.1 %} + <tr> + <td>{{ score.caf_contributing_outcome.designation }}</td> + <td>{{ score.caf_contributing_outcome.name }}</td> + <td>{{ score.caf_contributing_outcome.description }}</td> + <td>{{ score.assessment_score }}</td> + </tr> + {% endfor %} + </table> {% endfor %} </table> </div> diff --git a/ctrack/caf/views.py b/ctrack/caf/views.py index d6fcdf1..893cbc1 100644 --- a/ctrack/caf/views.py +++ b/ctrack/caf/views.py @@ -33,7 +33,7 @@ def caf_detail_view(request, pk): _scrs = [] for ass in assessments: lst_scores = [] - lst_scores.append(ass.get_title()) + lst_scores.append(ass) lst_scores.append(CAFAssessmentOutcomeScore.objects.filter(caf_assessment=ass)) _scrs.append(lst_scores) context = { |