@wg-npm/survey-response 0.5.165 → 0.5.167

package/dist/survey-response.esm.js

@@ -875,8 +875,8 @@ var script$c = Vue.extend({
             });
             this.value.score = score;
         },
-        toggleAnswer(subValue, subIndex) {
-            if (this.responseStatus == this.$consts.STATUS_DRAFT) {
+        toggleAnswer(subValue, subIndex, disabled) {
+            if (this.responseStatus == this.$consts.STATUS_DRAFT && !disabled) {
                 let subAnswer = this.value.answer[subIndex].answer;
                 this.value.answer[subIndex].answer = _.isEmpty(subAnswer)
                     ? subValue
@@ -893,7 +893,11 @@ const __vue_script__$c = script$c;
 var __vue_render__$c = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',_vm._l((_vm.question.subQuestions),function(subQuestion,subIndex){return _c('div',{key:subIndex,staticClass:"sub-question"},[_c('span',{staticClass:"number"},[_vm._v("\n      "+_vm._s(_vm.question.header.number)+"-"+_vm._s(subQuestion.number)+".")]),_vm._v(" "),_c('span',{staticClass:"title"},[_vm._v(" "+_vm._s(_vm.i18nText(subQuestion.text))+" ")]),_vm._v(" "),_c('FormItem',{attrs:{"prop":_vm.answerProp(subIndex),"rules":{
         required: _vm.question.options.required && !_vm.question.options.disabled,
         message: _vm.t('survey_response.question.question_required'),
-      }}},[_c('RadioGroup',{on:{"on-change":_vm.selChange},model:{value:(_vm.value.answer[subIndex].answer),callback:function ($$v) {_vm.$set(_vm.value.answer[subIndex], "answer", $$v);},expression:"value.answer[subIndex].answer"}},[_c('Row',{attrs:{"type":"flex","justify":"start","gutter":60}},_vm._l((_vm.question.choices),function(choice){return _c('Col',{key:choice.id,class:_vm.optionLayout},[_c('Radio',{key:choice.id,attrs:{"label":choice.id,"disabled":subQuestion.options.readonly || _vm.question.options.disabled},nativeOn:{"click":function($event){return _vm.toggleAnswer(choice.id, subIndex)}}},[_c('span',[_vm._v(_vm._s(_vm.i18nText(choice.text)))])])],1)}),1)],1)],1)],1)}),0)};
+      }}},[_c('RadioGroup',{on:{"on-change":_vm.selChange},model:{value:(_vm.value.answer[subIndex].answer),callback:function ($$v) {_vm.$set(_vm.value.answer[subIndex], "answer", $$v);},expression:"value.answer[subIndex].answer"}},[_c('Row',{attrs:{"type":"flex","justify":"start","gutter":60}},_vm._l((_vm.question.choices),function(choice){return _c('Col',{key:choice.id,class:_vm.optionLayout},[_c('Radio',{key:choice.id,attrs:{"label":choice.id,"disabled":subQuestion.options.readonly || _vm.question.options.disabled},nativeOn:{"click":function($event){return _vm.toggleAnswer(
+                  choice.id,
+                  subIndex,
+                  subQuestion.options.readonly || _vm.question.options.disabled
+                )}}},[_c('span',[_vm._v(_vm._s(_vm.i18nText(choice.text)))])])],1)}),1)],1)],1)],1)}),0)};
 var __vue_staticRenderFns__$c = [];
 
   /* style */
@@ -1205,96 +1209,113 @@ var __vue_staticRenderFns__$9 = [];
 
   var Star = __vue_component__$9;
 
-class ExprEvaluationQuestion {
-    constructor(questions, scope) {
-        this.questions = questions;
-        this.scope = _.sortBy(scope);
-        this.questionMap = this.buildQuestionMap();
-    }
-    calculateNumbers() {
-        const checkedQuestions = this.checkedQuestion();
-        const checkedNumberElements = new Array();
-        this.recurs(checkedQuestions, checkedNumberElements);
-        return checkedNumberElements;
-    }
-    buildQuestionMap() {
-        const questionMap = {};
-        _.forEach(this.questions, (question) => {
-            questionMap[question.id] = question;
-            if (question.type == "MATRIX") {
-                _.forEach(_.get(question, "subQuestions", []), (subQuestion) => {
-                    questionMap[subQuestion.id] = subQuestion;
-                });
-            }
-        });
-        return questionMap;
-    }
-    checkedQuestion() {
-        const questions = new Array();
-        _.forEach(this.questions, (question) => {
-            if (_.get(question, "type") == "MATRIX") {
-                const markedQuestions = new Array();
-                _.forEach(_.get(question, "subQuestions", []), (subQuestion) => {
-                    if (_.includes(this.scope, subQuestion.id)) {
-                        const newSubQuestion = _.cloneDeep(subQuestion);
-                        _.set(newSubQuestion, "type", "MATRIX");
-                        _.set(newSubQuestion, "parentId", _.get(question, "id"));
-                        markedQuestions.push(newSubQuestion);
-                    }
-                });
-                if (!_.isEmpty(markedQuestions)) {
-                    questions.push(markedQuestions);
-                }
-            }
-            else if (_.includes(this.scope, question.id)) {
-                questions.push(question);
-            }
-        });
-        return questions;
-    }
-    recurs(elements, numbers) {
-        for (let i = 0; i < elements.length; i++) {
-            const element = elements[i];
-            if (_.isArray(element)) {
-                numbers.push(new Array());
-                this.recurs(element, numbers[numbers.length - 1]);
-            }
-            else {
-                const temp = new Array();
-                temp.push(this.getFullNumber(element));
-                if (i == elements.length - 1) {
-                    numbers.push(temp);
-                    continue;
-                }
-                for (let j = i + 1;; j++) {
-                    if (j == elements.length ||
-                        !this.isContinuous(elements[j - 1], elements[j])) {
-                        numbers.push(temp);
-                        i = j - 1;
-                        break;
-                    }
-                    if (_.size(temp) > 1) {
-                        temp.pop();
-                    }
-                    temp.push(this.getFullNumber(elements[j]));
-                }
-            }
-        }
-    }
-    isContinuous(front, hind) {
-        return (!_.isArray(hind) && this.getNumber(hind) - this.getNumber(front) == 1);
-    }
-    getFullNumber(question) {
-        if (question.type == "MATRIX") {
-            return (this.questionMap[question.parentId].header.number +
-                "." +
-                this.getNumber(question));
-        }
-        return this.getNumber(question).toString();
-    }
-    getNumber(question) {
-        return question.type == "MATRIX" ? question.number : question.header.number;
-    }
+class ExprEvaluationQuestion {
+  questions;
+  scope;
+  questionMap;
+
+  constructor(questions, scope) {
+    this.questions = questions;
+    this.scope = _.sortBy(scope);
+
+    this.questionMap = this.buildQuestionMap();
+  }
+
+  calculateNumbers() {
+    const checkedQuestions = this.checkedQuestion();
+    const checkedNumberElements = new Array();
+    this.recurs(checkedQuestions, checkedNumberElements);
+
+    return checkedNumberElements;
+  }
+
+  buildQuestionMap() {
+    const questionMap = {};
+    _.forEach(this.questions, (question) => {
+      questionMap[question.id] = question;
+      if (question.type == "MATRIX") {
+        _.forEach(_.get(question, "subQuestions", []), (subQuestion) => {
+          questionMap[subQuestion.id] = subQuestion;
+        });
+      }
+    });
+    return questionMap;
+  }
+
+  checkedQuestion() {
+    const questions = new Array();
+    _.forEach(this.questions, (question) => {
+      if (_.get(question, "type") == "MATRIX") {
+        const markedQuestions = new Array();
+        _.forEach(_.get(question, "subQuestions", []), (subQuestion) => {
+          if (_.includes(this.scope, subQuestion.id)) {
+            const newSubQuestion = _.cloneDeep(subQuestion);
+            _.set(newSubQuestion, "type", "MATRIX");
+            _.set(newSubQuestion, "parentId", _.get(question, "id"));
+            markedQuestions.push(newSubQuestion);
+          }
+        });
+        if (!_.isEmpty(markedQuestions)) {
+          questions.push(markedQuestions);
+        }
+      } else if (_.includes(this.scope, question.id)) {
+        questions.push(question);
+      }
+    });
+    return questions;
+  }
+
+  recurs(elements, numbers) {
+    for (let i = 0; i < elements.length; i++) {
+      const element = elements[i];
+      if (_.isArray(element)) {
+        numbers.push(new Array());
+        this.recurs(element, numbers[numbers.length - 1]);
+      } else {
+        const temp = new Array();
+        temp.push(this.getFullNumber(element));
+        if (i == elements.length - 1) {
+          numbers.push(temp);
+          continue;
+        }
+        for (let j = i + 1; ; j++) {
+          if (
+            j == elements.length ||
+            !this.isContinuous(elements[j - 1], elements[j])
+          ) {
+            numbers.push(temp);
+            i = j - 1;
+            break;
+          }
+          if (_.size(temp) > 1) {
+            temp.pop();
+          }
+          temp.push(this.getFullNumber(elements[j]));
+        }
+      }
+    }
+  }
+
+  isContinuous(front, hind) {
+    return (
+      !_.isArray(hind) && this.getNumber(hind) - this.getNumber(front) == 1
+    );
+  }
+
+  getFullNumber(question) {
+    if (question.type == "MATRIX") {
+      return (
+        this.questionMap[question.parentId].header.number +
+        "." +
+        this.getNumber(question)
+      );
+    }
+    return this.getNumber(question).toString();
+  }
+
+  getNumber(question) {
+    return question.type == "MATRIX" ? question.number : question.header.number;
+  }
 }
 
 const SPLIT_LENGTH = 50;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wg-npm/survey-response",
-  "version": "0.5.165",
+  "version": "0.5.167",
   "description": "",
   "license": "MIT",
   "scripts": {
@@ -12,8 +12,8 @@
     "lint-fix": "eslint \"**/*.ts\"  \"**/*.vue\" --fix --no-error-on-unmatched-pattern"
   },
   "peerDependencies": {
-    "@wg-npm/survey-core": "0.5.165",
-    "@wg-npm/survey-service-api": "0.5.165",
+    "@wg-npm/survey-core": "0.5.167",
+    "@wg-npm/survey-service-api": "0.5.167",
     "axios": "^0.19.2",
     "deepmerge": "^4.2.2",
     "lodash": "^4.17.15",
@@ -34,8 +34,8 @@
     "@typescript-eslint/parser": "^3.6.0",
     "@vue/eslint-config-prettier": "^6.0.0",
     "@vue/eslint-config-typescript": "^5.0.2",
-    "@wg-npm/survey-core": "0.5.165",
-    "@wg-npm/survey-service-api": "0.5.165",
+    "@wg-npm/survey-core": "0.5.167",
+    "@wg-npm/survey-service-api": "0.5.167",
     "acorn": "^7.3.1",
     "axios": "^0.19.2",
     "babelrc-rollup": "^3.0.0",

package/src/components/question/type/matrix.vue

@@ -29,7 +29,13 @@
               <Radio
                 :label="choice.id"
                 :key="choice.id"
-                @click.native="toggleAnswer(choice.id, subIndex)"
+                @click.native="
+                  toggleAnswer(
+                    choice.id,
+                    subIndex,
+                    subQuestion.options.readonly || question.options.disabled
+                  )
+                "
                 :disabled="
                   subQuestion.options.readonly || question.options.disabled
                 "
@@ -138,8 +144,8 @@ export default Vue.extend({
       // @ts-ignore
       this.value.score = score;
     },
-    toggleAnswer(subValue, subIndex) {
-      if (this.responseStatus == this.$consts.STATUS_DRAFT) {
+    toggleAnswer(subValue, subIndex, disabled) {
+      if (this.responseStatus == this.$consts.STATUS_DRAFT && !disabled) {
         let subAnswer = this.value.answer[subIndex].answer;
         this.value.answer[subIndex].answer = _.isEmpty(subAnswer)
           ? subValue