Merge pull request #704 from ubc/#695-fix-comparisons-answer-name

Use user fullname for answer in comparisons tab
ubc · Feb 6, 2018 · 2c85f2c · 2c85f2c
2 parents b05d5f4 + a4d5af4
commit 2c85f2c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/compair/static/modules/assignment/assignment-view-partial.html b/compair/static/modules/assignment/assignment-view-partial.html
@@ -206,7 +206,7 @@ <h2>All answers
                     </div>
 
                     <!-- Instructor Answer -->
-                    <div class="content instructor-answer">
+                    <div class="instructor-answer">
                         <rich-content content="answer.content" attachment="answer.file"></rich-content>
                     </div>
 
@@ -272,7 +272,7 @@ <h2>All answers
                     </div>
 
                     <!-- Student Answer -->
-                    <div class="content {{answer.id}}" get-height>
+                    <div class="{{answer.id}}" get-height>
                         <rich-content content="answer.content" attachment="answer.file" ng-click="revealContent(answer)"></rich-content>
                     </div>
                     <!-- Student Answer Read More Button (not used for instructor answers) -->
@@ -393,7 +393,7 @@ <h2>Your answer and its feedback</h2>
                 </div>
 
                 <!-- Student Answer -->
-                <div class="content {{answer.id}}">
+                <div class="{{answer.id}}">
                     <rich-content content="answer.content" attachment="answer.file" ng-click="revealContent(answer)"></rich-content>
                 </div>
 

diff --git a/compair/static/modules/comment/answer.html b/compair/static/modules/comment/answer.html
@@ -1,5 +1,5 @@
 <div ng-if="answer">
-    <compair-avatar user-id="answer.user_id" avatar="answer.user.avatar" display-name="answer.user.displayname"></compair-avatar>
+    <compair-avatar user-id="answer.user_id" avatar="answer.user.avatar" display-name="answer.user.fullname"></compair-avatar>
     <strong>answered</strong> on {{ answer.created | amDateFormat: 'MMM D @ h:mm a'}}:
     <rich-content content="answer.content" attachment="answer.file"></rich-content>
 </div>

diff --git a/compair/static/modules/comparison/comparison-view-partial.html b/compair/static/modules/comparison/comparison-view-partial.html
@@ -50,8 +50,8 @@ <h4 class="text-center evaluator-heading" ng-if="$first">
                     <p class="content"><a href="" ng-click="loadAnswerByAuthor(comparison.user_id);showMyAnswer = !showMyAnswer;">
                         <i ng-show="showMyAnswer" class="fa fa-chevron-down"></i>
                         <i ng-hide="showMyAnswer" class="fa fa-chevron-right"></i>
-                        <em ng-if="isInstructional(comparison.user_id)">Show instructor/TA's answer</em>
-                        <em ng-if="!isInstructional(comparison.user_id)">Show student's answer</em>
+                        <span ng-if="isInstructional(comparison.user_id)">Show instructor/TA's answer</span>
+                        <span ng-if="!isInstructional(comparison.user_id)">Show student's answer</span>
                     </a></p>
                     <compair-student-answer class="answer" answer="(answers | filter:{user_id:comparison.user_id}:true)[0]" ng-show="showMyAnswer"></compair-student-answer>
                     <br />

diff --git a/compair/static/modules/rich-content/rich-content-template.html b/compair/static/modules/rich-content/rich-content-template.html
@@ -1,4 +1,4 @@
-<div dynamic-rich-content="richContent" class="rich-content"></div>
+<div dynamic-rich-content="richContent" class="rich-content content"></div>
 
 <div ng-if="attachmentContent.length > 0" class="rich-content-attachments">
     <strong class="h5">{{attachmentContent.length}} Attachment<span ng-if="attachmentContent.length > 1">s</span>:</strong>