separate the parts of feedback messages about credit

In order to comply with the new feedback settings, it should be possible
to show part feedback messages but not the student's current score.

To do this, the part of the message about the credit (e.g. "you were
awarded 1 mark") is now in a separate attribute, `credit_message`, which
is only shown if `showActualMark` is true.

Author: christianp

runtime/scripts/part.js

@@ -1312,13 +1312,7 @@ if(res) { \
         };
 
         this.question && this.question.updateScore();
-        if(this.answered)
-        {
-            if(!(this.parentPart && this.parentPart.type=='gapfill') && this.settings.showFeedbackIcon && this.marks!=0) {
-                this.markingComment(
-                    R('part.marking.total score',{count:this.score})
-                );
-            }
+        if(this.answered) {
             if(this.display) {
                 this.display.showScore(this.answered);
             }
@@ -1776,14 +1770,11 @@ if(res) { \
                     action.message = '';
                 }
                 if(change!=0) {
-                    if(util.isNonemptyHTML(action.message)) {
-                        action.message += '\n\n';
-                    }
                     var marks = Math.abs(change);
                     if(change>0) {
-                        action.message += R('feedback.you were awarded',{count:marks});
+                        action.credit_message = R('feedback.you were awarded',{count:marks});
                     } else if(change<0) {
-                        action.message += R('feedback.taken away',{count:marks});
+                        action.credit_message = R('feedback.taken away',{count:marks});
                     }
                 }
             }

themes/default/files/resources/exam.css

@@ -1186,7 +1186,6 @@ select.multiplechoice {
 
 .part .feedback-icon {
     display: inline-block;
-    line-height: 1rem;
 }
 
 .part .feedbackMessage ~ .feedbackMessage {

themes/default/files/scripts/part-display.js

@@ -425,11 +425,19 @@ Numbas.queueScript('part-display',['display-util', 'display-base','util','jme'],
          */
         this.shownFeedbackMessages = Knockout.computed(function() {
             var messages = this.feedbackMessages();
-            if(this.showFeedbackMessages()) {
-                return messages;
-            } else {
-                return messages.filter(function(m) { return m.credit_change == 'invalid'; });
+            if(!this.showFeedbackMessages()) {
+                messages = messages.filter(function(m) { return m.credit_change == 'invalid'; });
+            }
+            if(feedback_settings.showFeedbackIcon && this.marks()!=0 && this.scoreFeedback.showActualMark()) {
+                messages.push({
+                    credit_change: 0,
+                    message: '',
+                    icon: undefined,
+                    credit_message: R('part.marking.total score',{count:p.score}),
+                    format: 'string'
+                });
             }
+            return messages;
         },this);
 
         /**
@@ -699,7 +707,7 @@ Numbas.queueScript('part-display',['display-util', 'display-base','util','jme'],
                             'neutral': '',
                             'invalid': 'icon-exclamation-sign'
                         }
-                        return {credit_change: action.credit_change, message: action.message, icon: icons[action.credit_change], format: action.format || 'string'};
+                        return {credit_change: action.credit_change, message: action.message, credit_message: action.credit_message, icon: icons[action.credit_change], format: action.format || 'string'};
                     });
                     this.feedbackMessages(messages);
                 }

themes/default/templates/xslt/part.xslt

@@ -64,12 +64,21 @@
                     <p class="sr-only" data-bind="visible: isNotOnlyPart, text: feedback_title"></p>
                     <ol data-bind="visible: shownFeedbackMessages().length, foreach: shownFeedbackMessages">
                         <li class="feedbackMessage" data-bind="attr: {{'data-credit-change': credit_change}}">
-                            <xsl:comment>ko if: format=='html'</xsl:comment>
-                                <span class="message" data-bind="dom: message"></span>
-                            <xsl:comment>/ko</xsl:comment>
-                            <xsl:comment>ko if: format=='string'</xsl:comment>
-                                <span class="message" data-bind="latex: message"></span>
-                            <xsl:comment>/ko</xsl:comment>
+                            <span class="message">
+                                <xsl:comment>ko if: format=='html'</xsl:comment>
+                                    <span data-bind="dom: message"></span>
+                                <xsl:comment>/ko</xsl:comment>
+
+                                <xsl:comment>ko if: format=='string'</xsl:comment>
+                                    <span data-bind="latex: message"></span>
+                                <xsl:comment>/ko</xsl:comment>
+
+                                <xsl:comment>ko if: $parent.scoreFeedback.showActualMark() &amp;&amp; credit_message</xsl:comment>
+                                    <xsl:text> </xsl:text>
+                                    <span data-bind="dom: credit_message"></span>
+                                <xsl:comment>/ko</xsl:comment>
+                            </span>
+
                             <span data-bind="visible: $parent.showFeedbackIcon, css: 'feedback-icon '+icon" aria-hidden="true"></span> 
                         </li>
                     </ol>