hl-core 0.0.9-beta.4 → 0.0.9-beta.41

package/components/Pages/Anketa.vue

@@ -1,6 +1,6 @@
 <template>
   <base-fade-transition>
-    <section v-if="firstQuestionList && firstQuestionList.length && !firstPanel && !secondPanel" class="flex flex-col">
+    <section v-if="firstQuestionList && firstQuestionList.length && !firstPanel && !secondPanel" class="flex flex-col shrink grow max-h-[90vh]">
       <section :class="[$styles.blueBgLight, $styles.rounded]" class="mx-[10px] my-[14px] p-4 flex flex-col gap-4">
         <base-form-toggle
           v-model="answerToAll"
@@ -10,7 +10,7 @@
           @clicked="handleToggler"
         />
       </section>
-      <v-form ref="vForm" class="max-h-[70vh] overflow-y-scroll" @submit="submitForm">
+      <v-form ref="vForm" class="grow shrink overflow-y-scroll" @submit="submitForm">
         <section
           v-if="firstQuestionList.filter(i => i.first.definedAnswers === 'N').length"
           :class="[$styles.blueBgLight, $styles.rounded]"
@@ -34,19 +34,19 @@
           <base-form-text-section v-for="(question, index) in firstQuestionList.filter(i => i.first.definedAnswers === 'Y')" :key="index">
             <base-fade-transition>
               <div
-                v-if="question.first.answerName === 'Да' && secondQuestionList"
+                v-if="question.first.answerName === 'Да' && question.second"
                 :class="[$styles.greenBg, $styles.whiteText, $styles.textSimple]"
                 class="rounded-t-lg pl-6 py-1 cursor-pointer"
                 @click="openFirstPanel(question)"
               >
-                {{ $dataStore.t('questionnaireType.pleaseAnswer', { text: secondQuestionList.length }) }}
+                {{ $dataStore.t('questionnaireType.pleaseAnswer', { text: question.second.length }) }}
               </div>
             </base-fade-transition>
             <span :class="[$styles.textTitle]" class="border-b-[1px] border-b-[#F3F6FC] p-6 flex items-center justify-between">
               {{ question.first.name }}
               <base-fade-transition>
                 <i
-                  v-if="question.first.answerName === 'Да' && secondQuestionList && secondQuestionList.length"
+                  v-if="question.first.answerName === 'Да' && question.second && question.second.length"
                   class="mdi mdi-chevron-right text-2xl cursor-pointer"
                   @click="openFirstPanel(question)"
                 ></i>
@@ -68,43 +68,87 @@
             </div>
           </base-form-text-section>
         </section>
+        <section
+          v-if="firstQuestionList.filter(i => i.first.definedAnswers === 'D').length"
+          :class="[$styles.blueBgLight, $styles.rounded]"
+          class="mx-[10px] mt-[14px] p-4 flex flex-col gap-4"
+        >
+          <base-form-text-section v-for="(question, index) in firstQuestionList.filter(i => i.first.definedAnswers === 'D')" :key="index">
+            <span :class="[$styles.textTitle]" class="border-b-[1px] border-b-[#F3F6FC] p-6 flex items-center justify-between"> {{ question.first.name }} </span>
+            <div class="flex items-center justify-start gap-5 px-4 pt-4" :class="[$styles.textSimple]">
+              <v-radio-group
+                v-model="question.first.answerName"
+                class="anketa-radio"
+                :true-icon="`mdi-radiobox-marked ${$styles.greenText}`"
+                false-icon="mdi-radiobox-blank text-[#636363]"
+                :rules="$rules.required"
+                :readonly="formStore.isDisabled[whichSurvey] || !$dataStore.isTask()"
+                inline
+              >
+                <v-radio label="Да" value="Да" />
+                <v-radio label="Нет" value="Нет" />
+              </v-radio-group>
+            </div>
+            <base-fade-transition>
+              <div v-if="question.first.answerName === 'Да'" :class="[$styles.whiteText, $styles.textSimple]">
+                <base-form-input
+                  v-model="question.first.answerText"
+                  :label="$dataStore.t('labels.inDetails')"
+                  :readonly="formStore.isDisabled[whichSurvey] || !$dataStore.isTask()"
+                  :rules="$rules.required"
+                />
+              </div>
+            </base-fade-transition>
+          </base-form-text-section>
+        </section>
       </v-form>
-      <base-btn
-        class="my-[14px] self-center"
-        :loading="isButtonLoading"
-        :disabled="formStore.isDisabled[whichSurvey] || !$dataStore.isTask()"
-        @click="submitForm"
-        :text="$dataStore.t('buttons.save')"
-      />
+      <div class="px-[14px]">
+        <base-btn
+          class="my-[14px] self-center"
+          :loading="isButtonLoading"
+          :disabled="formStore.isDisabled[whichSurvey] || !$dataStore.isTask()"
+          @click="submitForm"
+          :text="$dataStore.t('buttons.save')"
+        />
+      </div>
     </section>
-    <v-btn
-      v-if="secondQuestionList && secondQuestionList.length && firstPanel"
-      icon="mdi mdi-close"
-      class="ml-3 !absolute z-10"
-      @click="
-        firstPanel = false;
-        secondPanel = false;
-      "
+    <base-btn
+      v-if="currentQuestion && currentQuestion.second && currentQuestion.second.length && firstPanel"
+      class="!absolute z-10 my-[14px] self-center w-[96%] bottom-[-40px]"
+      :text="$dataStore.t('buttons.save')"
+      @click="submitSecondaryForm"
     />
-    <section ref="firstPanelSection" v-if="secondQuestionList && secondQuestionList.length && firstPanel" class="flex flex-col px-[10px] pb-[14px]" :class="[$styles.scrollPage]">
-      <section v-if="currentQuestion" :class="[$styles.blueBgLight, $styles.rounded]" class="mx-[10px] mt-[14px] p-4 flex flex-col gap-4">
+    <section ref="firstPanelSection" v-if="currentQuestion && currentQuestion.second && firstPanel" class="flex flex-col px-[10px] pb-[14px]" :class="[$styles.scrollPage]">
+      <v-form
+        v-if="currentQuestion"
+        :class="[$styles.blueBgLight, $styles.rounded]"
+        class="mx-[10px] mt-[14px] p-4 flex flex-col gap-4"
+        ref="vSecondaryForm"
+        @submit="submitSecondaryForm"
+      >
         <base-form-text-section v-for="question in currentQuestion.second" :title="question.name" :key="question.name">
           <base-form-input
             v-if="question.definedAnswers === 'N'"
             v-model="question.answerText"
             class="border-t-[1px] border-t-[#F3F6FC]"
-            placeholder="Введите текст"
+            :placeholder="$dataStore.t('labels.inputText')"
             :readonly="formStore.isDisabled[whichSurvey] || !$dataStore.isTask()"
+            :rules="isSecondRequired ? $rules.required : []"
           />
-          <span v-else class="flex items-center justify-between p-4 cursor-pointer" :class="[$styles.textTitle, $styles.greenText]" @click="openSecondPanel(question)">
-            {{ question.answerName ? question.answerName : 'Выбрать вариант ответа' }}
-            <i class="mdi mdi-chevron-right text-[28px]"></i>
-          </span>
+          <base-panel-input
+            v-else
+            :class="[$styles.textTitle, $styles.greenText]"
+            :value="question.answerName ? question.answerName : 'Выбрать вариант ответа'"
+            :readonly="formStore.isDisabled[whichSurvey] || !$dataStore.isTask()"
+            :clearable="false"
+            :error-messages="isSecondRequired ? (question.answerName ? [] : ['Выбрать вариант ответа']) : []"
+            @click="openSecondPanel(question)"
+          ></base-panel-input>
         </base-form-text-section>
-      </section>
+      </v-form>
     </section>
   </base-fade-transition>
-  <Teleport v-if="secondPanel" to="#panel-actions">
+  <Teleport v-if="secondPanel" to="#right-panel-actions">
     <div :class="[$styles.scrollPage]" class="flex flex-col items-center">
       <base-rounded-input v-model="searchQuery" :label="$dataStore.t('labels.search')" class="w-full p-2" :hide-details="true" />
       <div v-if="$dataStore.questionRefs && $dataStore.questionRefs.length && isPanelLoading === false" class="w-full flex flex-col gap-2 p-2">
@@ -119,7 +163,7 @@
       <base-loader v-if="isPanelLoading" class="absolute mt-10" :size="50" />
     </div>
   </Teleport>
-  <base-scroll-buttons @up="scrollForm('up')" @down="scrollForm('down')" />
+  <base-scroll-buttons v-if="firstQuestionList && firstQuestionList.length" @up="scrollForm('up')" @down="scrollForm('down')" />
 </template>
 
 <script lang="ts">
@@ -132,6 +176,7 @@ export default defineComponent({
     const formStore = useFormStore();
     const dataStore = useDataStore();
     const vForm = ref<any>();
+    const vSecondaryForm = ref<any>();
     const firstPanelSection = ref<any>();
     const isButtonLoading = ref<boolean>(false);
     const answerToAll = ref<boolean>(false);
@@ -148,13 +193,13 @@ export default defineComponent({
         : 'surveyByCriticalBasePolicyholder',
     );
     const firstQuestionList = ref<AnketaBody[]>([]);
-    const secondQuestionList = ref<AnketaSecond[]>([]);
     const currentQuestion = ref<AnketaBody>();
     const currentSecond = ref<AnketaSecond>();
     const isPanelLoading = ref<boolean>(false);
     const searchQuery = ref<string>('');
 
     const whichMember = computed(() => ('member' in route.query && !!route.query.member ? (route.query.member as 'insured' | 'policyholder') : 'insured'));
+    const isSecondRequired = computed(() => dataStore.controls.isSecondAnketaRequired);
     const scrollForm = (direction: 'up' | 'down') => {
       const scrollObject = { top: direction === 'up' ? 0 : screen.height * 10, behavior: 'smooth' };
       if (firstPanel.value) {
@@ -168,11 +213,28 @@ export default defineComponent({
       await vForm.value.validate().then(async (v: { valid: Boolean; errors: any }) => {
         if (v.valid) {
           isButtonLoading.value = true;
-          formStore[whichSurvey.value]!.body.forEach((survey: AnketaBody) => {
-            if (survey.first.answerText === 'Нет') {
-              survey.second = [];
-            }
-          });
+          const isValid = dataStore.validateAnketa(whichSurvey.value);
+          if (!isValid) {
+            isButtonLoading.value = false;
+            return false;
+          }
+          if (formStore[whichSurvey.value] && formStore[whichSurvey.value]?.body) {
+            formStore[whichSurvey.value]?.body.forEach(question => {
+              if (question.first.definedAnswers === 'Y' && question.first.answerName?.match(new RegExp('Нет', 'i')) && question.second && question.second.length) {
+                question.second.forEach(second => {
+                  if (second.definedAnswers === 'N') {
+                    second.answerText = null;
+                  } else {
+                    second.answerId = null;
+                    second.answerName = null;
+                  }
+                });
+              }
+              if (question.first.definedAnswers === 'D' && question.first.answerName?.match(new RegExp('Нет', 'i')) && question.first.answerText) {
+                question.first.answerText = null;
+              }
+            });
+          }
           formStore[whichSurvey.value]!.type = surveyType.value;
           const anketaToken = await dataStore.setSurvey(formStore[whichSurvey.value]!);
           if (typeof anketaToken === 'string') {
@@ -201,13 +263,36 @@ export default defineComponent({
       });
     };
 
-    const openFirstPanel = async (question: AnketaBody) => {
-      currentQuestion.value = question;
-      formStore[whichSurvey.value]!.body.forEach((question_object: AnketaBody) => {
-        if ((question_object.first.id === question.first.id && question_object.second && !question_object.second.length) || question_object.second == null) {
-          question_object.second = JSON.parse(JSON.stringify(formStore[surveyType.value === 'health' ? 'surveyByHealthSecond' : 'surveyByCriticalSecond']));
+    const submitSecondaryForm = async () => {
+      await vSecondaryForm.value.validate().then(async (v: { valid: Boolean; errors: any }) => {
+        if (v.valid) {
+          if (isSecondRequired.value && currentQuestion.value && currentQuestion.value.second) {
+            const hasError = currentQuestion.value.second.find(second => (second.definedAnswers === 'N' ? !second.answerText : !second.answerName));
+            if (hasError) {
+              dataStore.showToaster('error', dataStore.t('toaster.emptySecondAnketa', { text: hasError.name }), 5000);
+              return false;
+            }
+          }
+          firstPanel.value = false;
+          secondPanel.value = false;
+        } else {
+          const errors = document.querySelector('.v-input--error');
+          if (errors) {
+            const errorText = errors.parentElement?.children[0].innerHTML;
+            if (errorText) {
+              dataStore.showToaster('error', dataStore.t('toaster.errorFormField', { text: errorText?.replace(/[-<>!//.]/g, '') }));
+            }
+            errors.scrollIntoView({
+              behavior: 'smooth',
+              block: 'center',
+              inline: 'nearest',
+            });
+          }
         }
       });
+    };
+    const openFirstPanel = async (question: AnketaBody) => {
+      currentQuestion.value = question;
       firstPanel.value = true;
       secondPanel.value = false;
     };
@@ -219,8 +304,8 @@ export default defineComponent({
       await dataStore.getQuestionRefs(question.id);
       secondPanel.value = true;
       dataStore.panelAction = null;
-      dataStore.panel.open = true;
-      dataStore.panel.title = question.name;
+      dataStore.rightPanel.open = true;
+      dataStore.rightPanel.title = question.name;
       isPanelLoading.value = false;
     };
 
@@ -231,12 +316,11 @@ export default defineComponent({
       }
       secondPanel.value = false;
       dataStore.panelAction = null;
-      dataStore.panel.open = false;
+      dataStore.rightPanel.open = false;
       dataStore.questionRefs = [];
     };
 
     const getDefinedAnswerId = async (id: string, value: any, index: number) => {
-      // @ts-ignore
       await dataStore.definedAnswers(id, whichSurvey.value, value, index);
     };
 
@@ -272,18 +356,16 @@ export default defineComponent({
         formStore.applicationData.processInstanceId,
         whichMember.value === 'insured' ? formStore.applicationData.insuredApp[0].id : formStore.applicationData.clientApp.id,
         whichSurvey.value,
-        surveyType.value === 'health' ? 'surveyByHealthSecond' : 'surveyByCriticalSecond',
         whichMember.value,
       );
       firstQuestionList.value = formStore[whichSurvey.value]!.body;
-      secondQuestionList.value = formStore[surveyType.value === 'health' ? 'surveyByHealthSecond' : 'surveyByCriticalSecond']!;
       formStore[whichSurvey.value]!.type = surveyType.value;
       const negativeAnswer = firstQuestionList.value.every(i => i.first.answerName === 'Нет');
       if (negativeAnswer) {
         answerToAll.value = true;
       }
       await Promise.allSettled(
-        firstQuestionList.value.map(async (question: any) => {
+        firstQuestionList.value.map(async question => {
           await dataStore.definedAnswers(question.first.id, whichSurvey.value);
         }),
       );
@@ -293,10 +375,14 @@ export default defineComponent({
       await onInit();
     });
 
+    onUnmounted(() => {
+      dataStore.abortRequests();
+    });
+
     watch(
-      () => dataStore.panel.open,
+      () => dataStore.rightPanel.open,
       () => {
-        if (dataStore.panel.open === false) {
+        if (dataStore.rightPanel.open === false) {
           secondPanel.value = false;
           dataStore.panelAction = null;
         }
@@ -308,7 +394,7 @@ export default defineComponent({
       () => firstQuestionList.value,
       value => {
         if (value) {
-          const hasPositiveAnswer = value.some(i => i.first.definedAnswers === 'Y' && i.first.answerName !== 'Нет');
+          const hasPositiveAnswer = value.some(i => (i.first.definedAnswers === 'Y' || i.first.definedAnswers === 'D') && i.first.answerName !== 'Нет');
           answerToAll.value = !hasPositiveAnswer;
         }
       },
@@ -320,10 +406,10 @@ export default defineComponent({
     return {
       // State
       vForm,
+      vSecondaryForm,
       formStore,
       answerToAll,
       firstQuestionList,
-      secondQuestionList,
       whichSurvey,
       isButtonLoading,
       firstPanel,
@@ -333,9 +419,11 @@ export default defineComponent({
       isPanelLoading,
       searchQuery,
       firstPanelSection,
+      isSecondRequired,
 
       // Functions
       submitForm,
+      submitSecondaryForm,
       getDefinedAnswerId,
       scrollForm,
       handleToggler,

package/components/Pages/Auth.vue

@@ -24,7 +24,15 @@
         <span :class="[$styles.greyTextDark]" class="text-[16px]">{{ $dataStore.t('labels.needAuth') }}</span>
       </div>
       <v-form ref="vForm" class="w-2/3 lg:w-[25vw] self-center">
-        <base-rounded-input class="mb-1" v-model.trim="login" :rules="$rules.required" :loading="authLoading" :placeholder="$dataStore.t('buttons.userLogin')" type="text" />
+        <base-rounded-input
+          class="mb-1"
+          v-model.trim="login"
+          :rules="$rules.required"
+          :loading="authLoading"
+          :placeholder="$dataStore.t('buttons.userLogin')"
+          type="text"
+          @keyup.enter="submitAuthForm"
+        />
         <base-rounded-input
           class="mb-1"
           v-model.trim="password"
@@ -34,6 +42,7 @@
           :append-inner-icon="showPassword ? 'mdi-eye-outline' : 'mdi-eye-off-outline'"
           @append="showPassword = !showPassword"
           :type="showPassword ? ('' as InputTypes) : 'password'"
+          @keyup.enter="submitAuthForm"
         />
         <span v-if="$dataStore.isLKA" class="inline-block w-full text-end mb-4" :class="[$styles.textSimple, $styles.greyTextDark]" @click="isLogin = false">{{
           $dataStore.t('labels.resetPassword')
@@ -61,6 +70,7 @@
           :loading="authLoading"
           :placeholder="$dataStore.t('form.phoneNumber')"
           type="text"
+          @keyup.enter="submitAuthForm"
         />
         <base-rounded-input
           v-if="resetPasswordType === 'email'"
@@ -69,6 +79,7 @@
           :loading="authLoading"
           :placeholder="$dataStore.t('form.email')"
           type="text"
+          @keyup.enter="submitAuthForm"
         />
         <span class="inline-block w-full text-end mb-4" :class="[$styles.textSimple, $styles.greyTextDark]" @click="isLogin = true">{{ $dataStore.t('buttons.login') }}</span>
         <base-btn :text="$dataStore.t('buttons.reset')" :disabled="authLoading" :btn="$styles.greenBtn" @click="submitAuthForm" />