@touchpoll/tp-survey 0.0.48 → 0.0.50

package/fesm2022/touchpoll-tp-survey.mjs

@@ -199,21 +199,28 @@ const answerSSValidator = () => (control) => {
     //ошибок нет, всё корректно
     return null;
 };
-const answerMSValidator = (visibleAlternativeCount, minCount = 1, maxCount = 0) => (control) => {
-    //visibleAlternativeCount - количество альтернатив на экране, если 0, то смысла показывать вопрос нет
+const answerMSValidator = (visibleAlternativeList, minCount = 1, maxCount = 0) => (control) => {
+    //visibleAlternativeList - альтернативы на экране, если их 0, то смысла показывать вопрос нет
     //minCount - Минимальное количество ответов, которое может выбрать респондент, по умолчанию 1.
     //maxCount - Максимальное количество ответов, которые может выбрать респондент. Если указано 0, количество не ограничено. По умолчанию 0
-    if (visibleAlternativeCount === 0) {
+    if (visibleAlternativeList.length === 0) {
         return null;
     }
     //ответ не массив, такого быть не может, это ошибка
     if (!Array.isArray(control.value)) {
         return { answerMsAnswerType: true };
     }
+    //Проблема минимального количества ответов - если доступных на экране альтернатив меньше, чем настройка "минимальное количество ответов", то это нужно учитывать.
+    //Поэтому вычисляем минимально возможное количество ответов, которое может выбрать респондент и если оно меньше значения из настроек, возьмем его.
+    let minPossibleCount = minCount;
+    if (control.value.length > 0) {
+        const currentAlternativeGroup = visibleAlternativeList.find(alternative => alternative.Value === control.value[0])?.GroupNo ?? 1;
+        minPossibleCount = Math.min(visibleAlternativeList.filter(alternative => alternative.GroupNo === currentAlternativeGroup).length, minCount);
+    }
     //количество ответов
     const count = control.value.length;
     //проверяем minCount
-    if (count < minCount) {
+    if (count < minPossibleCount) {
         return { answerMsMinCount: true };
     }
     //проверяем maxCount
@@ -546,7 +553,6 @@ class AlternativesContainerDirective {
             const deltaHorizontal = (containerWidthFull - width * columnCount - horizontalDistance * (columnCount - 1)) / 2 - defaultHorizontalPadding;
             let rowNum = -1;
             let colNum = 0;
-            console.log(containerHeightFull, height * rowCount, verticalDistance, (rowCount - 1));
             alternatives.forEach((alt, index) => {
                 let left = 0;
                 let top = 0;
@@ -954,7 +960,7 @@ class AnswerOLComponent extends AnswerMasterComponent {
                 useExisting: forwardRef(() => AnswerOLComponent),
                 multi: true
             },
-        ], usesInheritance: true, ngImport: i0, template: "<div class=\"container-main\">\r\n @if (telephoneInput()) {\r\n  <mat-form-field appearance=\"outline\">\r\n   <input\r\n     type=\"text\"\r\n     inputmode=\"numeric\"\r\n     matInput\r\n     [formControl]=\"control\" tpSurveyFocusAndSelect>\r\n    <span matTextPrefix>+380 &nbsp;</span>\r\n  </mat-form-field>\r\n  @if(canSkip()) {\r\n   <button mat-button (click)=\"skipClick()\">\u041F\u0440\u043E\u043F\u0443\u0441\u0442\u0438\u0442\u0438</button>\r\n  }\r\n\r\n } @else {\r\n    <mat-form-field  appearance=\"outline\" class=\"input-text\">\r\n      <textarea rows=\"10\" matInput [formControl]=\"control\" tpSurveyFocusAndSelect></textarea>\r\n     </mat-form-field>\r\n\r\n<!--  <mat-form-field class=\"container-controls\" appearance=\"outline\">-->\r\n<!--   <textarea rows=\"10\" autofocus matInput  [(ngModel)]=\"answer.AnswerValue\" (ngModelChange)=\"answerChange()\" appFocusAndSelect></textarea>-->\r\n<!--  </mat-form-field>-->\r\n }\r\n\r\n<!-- <mat-form-field appearance=\"outline\" class=\"input-od-number\">-->\r\n<!--  <input [formControl]=\"control\" tpSurveyFocusAndSelect matInput type=\"number\">-->\r\n<!-- </mat-form-field>-->\r\n</div>\r\n", styles: [":host{width:100%}.container-main{display:flex;width:100%;justify-content:center;align-items:center;flex-flow:column;gap:2em;padding:0 2em;box-sizing:border-box}.input-text{width:100%}\n"], dependencies: [{ kind: "directive", type: FocusAndSelectDirective, selector: "[tpSurveyFocusAndSelect]" }, { kind: "ngmodule", type: FormsModule }, { kind: "directive", type: i1$2.DefaultValueAccessor, selector: "input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]" }, { kind: "directive", type: i1$2.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "component", type: MatFormField, selector: "mat-form-field", inputs: ["hideRequiredMarker", "color", "floatLabel", "appearance", "subscriptSizing", "hintLabel"], exportAs: ["matFormField"] }, { kind: "directive", type: MatInput, selector: "input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]", inputs: ["disabled", "id", "placeholder", "name", "required", "type", "errorStateMatcher", "aria-describedby", "value", "readonly", "disabledInteractive"], exportAs: ["matInput"] }, { kind: "ngmodule", type: ReactiveFormsModule }, { kind: "directive", type: i1$2.FormControlDirective, selector: "[formControl]", inputs: ["formControl", "disabled", "ngModel"], outputs: ["ngModelChange"], exportAs: ["ngForm"] }, { kind: "directive", type: MatPrefix, selector: "[matPrefix], [matIconPrefix], [matTextPrefix]", inputs: ["matTextPrefix"] }, { kind: "component", type: MatButton, selector: "    button[mat-button], button[mat-raised-button], button[mat-flat-button],    button[mat-stroked-button]  ", exportAs: ["matButton"] }] }); }
+        ], usesInheritance: true, ngImport: i0, template: "<div class=\"container-main\">\r\n @if (telephoneInput()) {\r\n  <mat-form-field appearance=\"outline\">\r\n   <input\r\n     type=\"text\"\r\n     inputmode=\"numeric\"\r\n     matInput\r\n     [formControl]=\"control\" tpSurveyFocusAndSelect>\r\n    <span matTextPrefix>+380 &nbsp;</span>\r\n  </mat-form-field>\r\n  @if(canSkip()) {\r\n   <button mat-button (click)=\"skipClick()\">\u041F\u0440\u043E\u043F\u0443\u0441\u0442\u0438\u0442\u0438</button>\r\n  }\r\n\r\n } @else {\r\n    <mat-form-field  appearance=\"outline\" class=\"input-text\">\r\n      <textarea rows=\"10\" matInput [formControl]=\"control\" tpSurveyFocusAndSelect></textarea>\r\n     </mat-form-field>\r\n }\r\n</div>\r\n", styles: [":host{width:100%}.container-main{display:flex;width:100%;justify-content:center;align-items:center;flex-flow:column;gap:2em;padding:0 2em;box-sizing:border-box}.input-text{width:100%}\n"], dependencies: [{ kind: "directive", type: FocusAndSelectDirective, selector: "[tpSurveyFocusAndSelect]" }, { kind: "ngmodule", type: FormsModule }, { kind: "directive", type: i1$2.DefaultValueAccessor, selector: "input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]" }, { kind: "directive", type: i1$2.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "component", type: MatFormField, selector: "mat-form-field", inputs: ["hideRequiredMarker", "color", "floatLabel", "appearance", "subscriptSizing", "hintLabel"], exportAs: ["matFormField"] }, { kind: "directive", type: MatInput, selector: "input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]", inputs: ["disabled", "id", "placeholder", "name", "required", "type", "errorStateMatcher", "aria-describedby", "value", "readonly", "disabledInteractive"], exportAs: ["matInput"] }, { kind: "ngmodule", type: ReactiveFormsModule }, { kind: "directive", type: i1$2.FormControlDirective, selector: "[formControl]", inputs: ["formControl", "disabled", "ngModel"], outputs: ["ngModelChange"], exportAs: ["ngForm"] }, { kind: "directive", type: MatPrefix, selector: "[matPrefix], [matIconPrefix], [matTextPrefix]", inputs: ["matTextPrefix"] }, { kind: "component", type: MatButton, selector: "    button[mat-button], button[mat-raised-button], button[mat-flat-button],    button[mat-stroked-button]  ", exportAs: ["matButton"] }] }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.1.7", ngImport: i0, type: AnswerOLComponent, decorators: [{
             type: Component,
@@ -972,7 +978,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.1.7", ngImpor
                             useExisting: forwardRef(() => AnswerOLComponent),
                             multi: true
                         },
-                    ], template: "<div class=\"container-main\">\r\n @if (telephoneInput()) {\r\n  <mat-form-field appearance=\"outline\">\r\n   <input\r\n     type=\"text\"\r\n     inputmode=\"numeric\"\r\n     matInput\r\n     [formControl]=\"control\" tpSurveyFocusAndSelect>\r\n    <span matTextPrefix>+380 &nbsp;</span>\r\n  </mat-form-field>\r\n  @if(canSkip()) {\r\n   <button mat-button (click)=\"skipClick()\">\u041F\u0440\u043E\u043F\u0443\u0441\u0442\u0438\u0442\u0438</button>\r\n  }\r\n\r\n } @else {\r\n    <mat-form-field  appearance=\"outline\" class=\"input-text\">\r\n      <textarea rows=\"10\" matInput [formControl]=\"control\" tpSurveyFocusAndSelect></textarea>\r\n     </mat-form-field>\r\n\r\n<!--  <mat-form-field class=\"container-controls\" appearance=\"outline\">-->\r\n<!--   <textarea rows=\"10\" autofocus matInput  [(ngModel)]=\"answer.AnswerValue\" (ngModelChange)=\"answerChange()\" appFocusAndSelect></textarea>-->\r\n<!--  </mat-form-field>-->\r\n }\r\n\r\n<!-- <mat-form-field appearance=\"outline\" class=\"input-od-number\">-->\r\n<!--  <input [formControl]=\"control\" tpSurveyFocusAndSelect matInput type=\"number\">-->\r\n<!-- </mat-form-field>-->\r\n</div>\r\n", styles: [":host{width:100%}.container-main{display:flex;width:100%;justify-content:center;align-items:center;flex-flow:column;gap:2em;padding:0 2em;box-sizing:border-box}.input-text{width:100%}\n"] }]
+                    ], template: "<div class=\"container-main\">\r\n @if (telephoneInput()) {\r\n  <mat-form-field appearance=\"outline\">\r\n   <input\r\n     type=\"text\"\r\n     inputmode=\"numeric\"\r\n     matInput\r\n     [formControl]=\"control\" tpSurveyFocusAndSelect>\r\n    <span matTextPrefix>+380 &nbsp;</span>\r\n  </mat-form-field>\r\n  @if(canSkip()) {\r\n   <button mat-button (click)=\"skipClick()\">\u041F\u0440\u043E\u043F\u0443\u0441\u0442\u0438\u0442\u0438</button>\r\n  }\r\n\r\n } @else {\r\n    <mat-form-field  appearance=\"outline\" class=\"input-text\">\r\n      <textarea rows=\"10\" matInput [formControl]=\"control\" tpSurveyFocusAndSelect></textarea>\r\n     </mat-form-field>\r\n }\r\n</div>\r\n", styles: [":host{width:100%}.container-main{display:flex;width:100%;justify-content:center;align-items:center;flex-flow:column;gap:2em;padding:0 2em;box-sizing:border-box}.input-text{width:100%}\n"] }]
         }] });
 
 class AsFormArrayPipe {
@@ -1298,7 +1304,7 @@ class ContainerAnswerComponent {
                 break;
             }
             case QuestionsType.eqMS: {
-                this.answerForm.controls.answer.addValidators(answerMSValidator(this.visibleAlternativeList().length, this.question().AlternativeMinAnswersCount, this.question().AlternativeMaxAnswersCount));
+                this.answerForm.controls.answer.addValidators(answerMSValidator(this.visibleAlternativeList(), this.question().AlternativeMinAnswersCount, this.question().AlternativeMaxAnswersCount));
                 break;
             }
             case QuestionsType.eqOD: {
@@ -1813,8 +1819,8 @@ class TpSurveyCoreService {
         if (!currentQuestion) {
             return;
         }
-        //если ответ на текущий вопрос не закончен, выходим
-        if (!this._interview.questionIsComplete(currentQuestion.QuestionGuid)) {
+        //если ответ на текущий вопрос не закончен И опция пропуска вопроса не активна, выходим
+        if (!this._interview.questionIsComplete(currentQuestion.QuestionGuid) && !currentQuestion.CanSkip) {
             return;
         }
         //если указан PostScript, выполним его
@@ -2475,7 +2481,9 @@ class SurveyPlayComponent {
         * кнопка далее нужно проверять при показе вопроса и при изменении ответа. При показе она может быть доступна сразу(например info).
         * Кнопка доступна если ответ корректно заполнен(questionIsComplete) и это не eqEND вопрос
         * */
-        this.nextButtonAvailable = toSignal(merge(this.#core.on(SurveyEvents.seQuestionAnswersChange).pipe(map(data => data.question)), this.#core.on(SurveyEvents.seQuestionShow).pipe(map(data => data))).pipe(map(question => this.#core.questionIsComplete(question.QuestionGuid) && question.QuestionType !== QuestionsType.eqEND && question.QuestionType !== QuestionsType.eqLANG), delay(1)), { initialValue: false });
+        this.nextButtonAvailable = toSignal(merge(this.#core.on(SurveyEvents.seQuestionAnswersChange).pipe(map(data => data.question)), this.#core.on(SurveyEvents.seQuestionShow).pipe(map(data => data))).pipe(
+        //вопрос должен быть не eqEND и не eqLANG(для них кнопки далее быть не должно) + вопрос должен быть заполнен или его можно пропустить(указано в настройках)
+        map(question => !([QuestionsType.eqEND, QuestionsType.eqLANG].includes(question.QuestionType)) && (this.#core.questionIsComplete(question.QuestionGuid) || question.CanSkip)), delay(1)), { initialValue: false });
         //кнопку Назад можно показывать если в настройках указали ShowBtnBack и это не eqEND вопрос
         this.backButtonAvailable = toSignal(this.#core.on(SurveyEvents.seQuestionShow).pipe(filter(question => !!question), map((question) => question.QuestionNum > 1 && question.ShowBtnBack && question.QuestionType !== QuestionsType.eqEND && question.QuestionType !== QuestionsType.eqLANG), delay(1)));
         this.#core.on(SurveyEvents.seSurveyEnd).pipe(takeUntilDestroyed(this.#destroyRef)).subscribe({