string interpolation moved to print function

Author: mwasiluk

dist/form-viewer.min.js

@@ -21,7 +21,7 @@ angular.module('mwFormViewer')
         },
         link: function (scope, ele, attrs, mwFormViewer){
             var ctrl = scope.ctrl;
-
+            ctrl.print =  mwFormViewer.print;
         }
     };
 });

src/viewer/form-confirmation-page.directive.js

@@ -119,7 +119,7 @@ angular.module('mwFormViewer').factory("FormQuestionId", function(){
         },
         link: function (scope, ele, attrs, mwFormViewer){
             var ctrl = scope.ctrl;
-
+            ctrl.print =  mwFormViewer.print;
         }
     };
 });

src/viewer/form-question.directive.js

@@ -119,31 +119,13 @@ angular.module('mwFormViewer').directive('mwFormViewer', function () {
                     ctrl.buttons.nextPage.visible=!formSubmit;
                 }
             };
-            
-            ctrl.applyTemplateDataToElement = function(element){
-              if (ctrl.templateData){                
-                if (element.paragraph){
-                  element.paragraph.displayHtml = $interpolate(element.paragraph.html)(ctrl.templateData);
-                }
-                if (element.question){
-                  element.question.displayText = $interpolate(element.question.text)(ctrl.templateData);
-                  
-                  if (element.question.offeredAnswers){
-                    element.question.offeredAnswers.forEach(function (offeredAnswer){
-                      offeredAnswer.displayValue = $interpolate(offeredAnswer.value)(ctrl.templateData);
-                    });
-                  }
-                }                
-              }
-            };
 
             ctrl.initResponsesForCurrentPage = function(){
                 ctrl.currentPage.elements.forEach(function(element){
                     var question = element.question;
                     if(question && !ctrl.responseData[question.id]){
                         ctrl.responseData[question.id]={};
                     }
-                    ctrl.applyTemplateDataToElement(element);
                 });
             };
 
@@ -235,6 +217,13 @@ angular.module('mwFormViewer').directive('mwFormViewer', function () {
                 });
             }
 
+            ctrl.print=function(input){
+                if (ctrl.templateData){
+                    return $interpolate(input)(ctrl.templateData);
+                }
+                return input;
+            }
+
         },
         link: function (scope, ele, attrs){
             var ctrl = scope.ctrl;

src/viewer/form-viewer.directive.js

@@ -1,6 +1,6 @@
 <div class="mw-form-confirmation-page">
     <div class="mw-confirmation-message" ng-if="ctrl.submitStatus=='SUCCESS'">
-        <span ng-if="ctrl.confirmationMessage"> {{ctrl.confirmationMessage}}</span>
+        <span ng-if="ctrl.confirmationMessage"> {{::ctrl.print(ctrl.confirmationMessage)}}</span>
         <span ng-if="!ctrl.confirmationMessage" translate="mwForm.confirmationPage.defaultMessage"> Twoja odpowiedź została zapisana</span>
     </div>
     <div class="mw-error-message" ng-if="ctrl.submitStatus=='ERROR'">

src/viewer/mw-form-confirmation-page.html

@@ -1,7 +1,7 @@
 <div class="mw-form-question">
 
     <div class="mw-question-text">
-        {{ctrl.question.displayText}} <span ng-if="ctrl.question.required">*</span>
+        {{::ctrl.print(ctrl.question.text)}} <span ng-if="ctrl.question.required">*</span>
     </div>
 
     <div class="mw-question-answers" ng-switch="ctrl.question.type">
@@ -15,7 +15,7 @@
             <div class="radio" ng-repeat="answer in ctrl.question.offeredAnswers">
                 <label>
                     <input type="radio" ng-model="ctrl.questionResponse.selectedAnswer" ng-value="answer.id" name="answer-for-question-{{ctrl.question.id}}" ng-change="ctrl.selectedAnswerChanged()" ng-required="ctrl.question.required &&!ctrl.isOtherAnswer" ng-disabled="ctrl.readOnly">
-                    {{answer.displayValue}}
+                    {{::ctrl.print(answer.value)}}
                 </label>
             </div>
             <div class="radio" ng-if="ctrl.question.otherAnswer">
@@ -33,7 +33,7 @@
             <div class="checkbox" ng-repeat="answer in ::ctrl.question.offeredAnswers">
                 <label>
                     <input type="checkbox" name="answer-for-question-{{ctrl.question.id}}" ng-checked="ctrl.questionResponse.selectedAnswers.indexOf(answer.id) != -1" ng-click="ctrl.toggleSelectedAnswer(answer)" ng-disabled="ctrl.readOnly">
-                    {{::answer.displayValue}}
+                    {{::ctrl.print(answer.value)}}
                 </label>
             </div>
             <div class="checkbox"  ng-if="ctrl.question.otherAnswer">
@@ -55,15 +55,15 @@
                     <tr>
                         <td></td>
                         <td ng-repeat="col in ::ctrl.question.grid.cols">
-                            <label>{{::col.label}}</label>
+                            <label>{{::ctrl.print(col.label)}}</label>
                         </td>
                     </tr>
 
                     </thead>
                     <tbody>
                     <tr ng-repeat="row in ::ctrl.question.grid.rows">
                         <td>
-                            {{::row.label}}
+                            {{::ctrl.print(row.label)}}
                         </td>
                         <td ng-repeat="col in ::ctrl.question.grid.cols">
                             <input type="radio" ng-model="ctrl.questionResponse[row.id]" ng-value="col.id" name="answer-for-question-{{row.id}}" ng-required="ctrl.question.required" ng-disabled="ctrl.readOnly">
@@ -78,10 +78,10 @@
             <div class="form-inline" style="margin-bottom: 5px" ng-repeat="item in ctrl.question.divisionList">
                 <div class="form-group">
                     <label>
-                        {{item.value}}
+                        {{::ctrl.print(item.value)}}
                     </label>
                     <input type="number" class="form-control" ng-model="ctrl.questionResponse[item.id]" min="0" max="{{ctrl.question.quantity}}" required style="width: 80px" ng-change="ctrl.computeDivisionSum()" ng-readonly="ctrl.readOnly">
-                    <span>{{::ctrl.question.unit}}</span>
+                    <span>{{::ctrl.print(ctrl.question.unit)}}</span>
                 </div>
 
             </div>

src/viewer/mw-form-question.html

@@ -21,7 +21,7 @@ <h2 class="mw-page-title" ng-if="ctrl.currentPage.namedPage && ctrl.currentPage.
                         </figure>
                     </div>
                     <div ng-switch-when="paragraph">
-                        <p ng-bind-html="pageElement.paragraph.displayHtml"></p>
+                        <p ng-bind-html="::ctrl.print(pageElement.paragraph.html)"></p>
                     </div>
 
                 </div>

src/viewer/mw-form-viewer-content.html

@@ -13,7 +13,7 @@
 
                 <div class="mw-item" ng-repeat="item in ctrl.questionResponse.priorityList">
 
-                    <strong>{{$index+1}}.</strong> {{::ctrl.idToItem[item.id].value}}
+                    <strong>{{$index+1}}.</strong> {{::ctrl.print(ctrl.idToItem[item.id].value)}}
                 </div>
 
 
@@ -23,7 +23,7 @@
 
                 <div class="mw-item" ng-repeat="item in ctrl.availableItems">
 
-                    {{::ctrl.idToItem[item.id].value}}
+                    {{::ctrl.print(ctrl.idToItem[item.id].value)}}
                 </div>
 
             </td>

src/viewer/mw-priority-list.html

@@ -93,9 +93,9 @@ angular.module('mwFormViewer')
             });
 
         },
-        link: function (scope, ele, attrs, mwFormViewer){
+        link: function (scope, ele, attrs, mwFormQuestion){
             var ctrl = scope.ctrl;
-
+            ctrl.print =  mwFormQuestion.print;
         }
     };
 });