@wg-npm/survey-core 1.78.511900 → 1.78.511938

package/dist/survey-core.esm.js

@@ -48,7 +48,7 @@ class QuestionFactory {
         return _.range(4).map(() => this.createDefault(locale));
     }
     static createMatrixQuestionChoices(locale) {
-        return _.range(5).map(() => this.createDefault(locale));
+        return _.range(4).map(() => this.createDefault(locale));
     }
     static createEvaluationItems(locale) {
         return _.range(5).map(() => this.createEvaluationItem(locale));
@@ -158,8 +158,16 @@ class BaseQuestionModel {
             return Math.round(result * 100) / 100;
         }
         else if (question.type == "MATRIX") {
-            const score = _.max(_.map(question.choices, (choice) => parseFloat(_.get(choice, "options.score", 0) || 0))) || 0;
-            return score * question.subQuestions.length;
+            let total = 0;
+            if (question.options.titleScoringEnabled) {
+                const titleMax = _.get(question, "options.scoreMax", null) ?? _.get(question, "options.score", 0);
+                total += parseFloat(titleMax || 0);
+            }
+            if (question.options.scoringEnabled) {
+                const choiceMaxScore = _.max(_.map(question.choices, (choice) => parseFloat(_.get(choice, "options.score", 0) || 0))) || 0;
+                total += choiceMaxScore * question.subQuestions.length;
+            }
+            return total;
         }
         else if (question.type == "SCORING") {
             const score = question.options.maxRange;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wg-npm/survey-core",
-  "version": "1.78.511900",
+  "version": "1.78.511938",
   "description": "",
   "license": "MIT",
   "scripts": {
@@ -47,7 +47,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "51b5c6a6eff6f9ff420a037e671ffb4fe3bf3ed2",
+  "gitHead": "ad10a00e012ea9db36e51202b7a24265681d8630",
   "rollup": {
     "external": [
       "lodash"

package/src/models.ts

@@ -141,6 +141,11 @@ export class QuestionOptionsModel {
   readonly?: Boolean;
   sliderValue?: Number;
   richTextEnabled?: Boolean;
+  titleScoringEnabled?: Boolean;
+  score?: any;
+  scoreMin?: any;
+  scoreMax?: any;
+  subRequired?: Boolean;
 
   constructor(required: Boolean) {
     this.required = required;
@@ -222,15 +227,25 @@ export class BaseQuestionModel {
       );
       return Math.round(result * 100) / 100;
     } else if (question.type == QuestionType.MATRIX) {
-      const score =
-        _.max(
-          _.map(question.choices, (choice: any) =>
-            // @ts-ignore
-            parseFloat(_.get(choice, "options.score", 0) || 0)
-          )
-        ) || 0;
-      // @ts-ignore
-      return score * question.subQuestions.length;
+      let total = 0;
+      if (question.options.titleScoringEnabled) {
+        // @ts-ignore
+        const titleMax = _.get(question, "options.scoreMax", null) ?? _.get(question, "options.score", 0);
+        // @ts-ignore
+        total += parseFloat(titleMax || 0);
+      }
+      if (question.options.scoringEnabled) {
+        const choiceMaxScore =
+          _.max(
+            _.map(question.choices, (choice: any) =>
+              // @ts-ignore
+              parseFloat(_.get(choice, "options.score", 0) || 0)
+            )
+          ) || 0;
+        // @ts-ignore
+        total += choiceMaxScore * question.subQuestions.length;
+      }
+      return total;
     } else if (question.type == QuestionType.SCORING) {
       const score = question.options.maxRange;
       return (

package/src/quetion-factory.ts

@@ -74,7 +74,7 @@ export class QuestionFactory {
   }
 
   public static createMatrixQuestionChoices(locale: string) {
-    return _.range(5).map(() => this.createDefault(locale));
+    return _.range(4).map(() => this.createDefault(locale));
   }
 
   public static createEvaluationItems(locale: string) {