@redneckz/wildless-cms-uni-blocks 0.14.578 → 0.14.580

package/mobile/src/components/ApplicationForm/getFormatData.tsx

@@ -14,7 +14,6 @@ export const getFormatData = (data: FormState): Record<string, any> => {
     term,
     annualRevenue,
     serviceType,
-    feedbackType,
     vedTypes,
     region,
     ...usedData
@@ -26,7 +25,6 @@ export const getFormatData = (data: FormState): Record<string, any> => {
     ...getRegion(region),
     ...(partnerComments ? { partnerComments } : {}),
     ...(serviceType ? { typeForm: serviceType } : {}),
-    ...(feedbackType ? { typeForm: feedbackType } : {}),
   };
 
   return Object.fromEntries(

package/mobile/src/components/ApplicationForm/getInitialFormState.tsx

@@ -1,6 +1,5 @@
 import {
   FEEDBACK_METHOD,
-  FEEDBACK_TYPES,
   SERVICE_DIRECTIONS,
   SERVICE_TYPES,
 } from '../../ui-kit/FormField/constants';
@@ -20,7 +19,6 @@ export interface FormState {
   email?: string;
   acquiringType?: Option;
   serviceType?: Option;
-  feedbackType?: Option;
   vedTypes?: string;
   region?: Option;
   onlineCheckout?: boolean;
@@ -47,7 +45,6 @@ const initialFormState = {
   amount: 100000,
   acquiringType: ACQUIRING_TYPES[0],
   serviceType: SERVICE_TYPES[0],
-  feedbackType: FEEDBACK_TYPES[0],
   feedbackMethod: FEEDBACK_METHOD[0],
   serviceDirection: SERVICE_DIRECTIONS[0],
   vedTypes: VED_TYPES[0],

package/mobile/src/components/ApplicationLeadForm/ApplicationLeadFormContent.ts

@@ -18,7 +18,7 @@ export type SubmitButtonProps = TextProps & {
 /**
  * @title Название поля ввода
  * @required
- * @enumNames ["Фамилия", "Имя", "Отчество", "Email", "Телефон", "ФИО", "ИНН", "Комментарий", "Регион", "Регион выездной сервис", "Адрес", "Тип формы", "День рождения", "Клиент банка", "Согласие на получение материалов", "Тип эквайринга", "Онлайн касса", "POS-терминал", "Направление обслуживания", "Ультра/Премиум", "Тип обратной связи", "Способ получения ответа", "Банковский служащий", "Дата и время обращения", "Дополнительный телефон", "ВЭД", "Срок (месяцев)", "Сумма ₽", "Годовой доход", "Количество объектов инкассации", "День встречи", "Продукт", "Комментарий партнёров", "Согласие на обработку", "Образование", "Тип жилья", "Информация о трудоустройстве", "Тип организации", "Количество работающих в организации", "Вид деятельности работодателя", "Вид организации работодателя", "Должность в организации"]
+ * @enumNames ["Фамилия", "Имя", "Отчество", "Образование", "Тип жилья", "Информация о трудоустройстве", "Тип организации", "Количество работающих в организации", "Вид деятельности работодателя", "Вид организации работодателя", "Должность в организации", "Email", "Телефон", "ФИО", "ИНН", "ОПФ", "Наименование организации", "Общий стаж", "Стаж на последнем рабочем месте", "Стаж", "Количество мест работы", "Дата начала работы на текущем месте", "Адрес работодателя", "Комментарий", "Регион", "Регион выездной сервис", "Адрес", "Тип формы", "День рождения", "Клиент банка", "Согласие на получение материалов", "Тип эквайринга", "Онлайн касса", "POS-терминал", "Направление обслуживания", "Ультра/Премиум", "Тип обратной связи", "Способ получения ответа", "Банковский служащий", "Дата и время обращения", "Дополнительный телефон", "ВЭД", "Срок (месяцев)", "Сумма ₽", "Годовой доход", "Количество объектов инкассации", "День встречи", "Продукт", "Комментарий партнёров", "Согласие на обработку"]
  */
 export type NameFieldDef =
   | 'surname'
@@ -36,6 +36,14 @@ export type NameFieldDef =
   | 'phone'
   | 'fullName'
   | 'inn'
+  | 'legalForm'
+  | 'organizationName'
+  | 'generalSeniority'
+  | 'lastJobExperience'
+  | 'experience5Years'
+  | 'jobsNumber'
+  | 'beginDate'
+  | 'fullAddress'
   | 'comment'
   | 'region'
   | 'addressBranch'
@@ -48,7 +56,6 @@ export type NameFieldDef =
   | 'posTerminal'
   | 'serviceDirection'
   | 'serviceType'
-  | 'feedbackType'
   | 'feedbackMethod'
   | 'bankEmpolee'
   | 'applicationDate'

package/mobile/src/components/ApplicationLeadForm/getInitialFormState.tsx

@@ -1,6 +1,5 @@
 import {
   FEEDBACK_METHOD,
-  FEEDBACK_TYPES,
   SERVICE_DIRECTIONS,
   SERVICE_TYPES,
 } from '../../ui-kit/FormField/constants';
@@ -29,7 +28,6 @@ export interface FormState {
   email?: string;
   acquiringType?: Option;
   serviceType?: Option;
-  feedbackType?: Option;
   vedTypes?: string;
   region?: Option;
   onlineCheckout?: boolean;
@@ -40,6 +38,14 @@ export interface FormState {
   serviceDirection?: string;
   desiredMeetingDate?: string;
   inn?: number;
+  legalForm?: string;
+  organizationName?: string;
+  generalSeniority?: string;
+  lastJobExperience?: string;
+  experience5Years?: string;
+  jobsNumber?: string;
+  beginDate?: string;
+  fullAddress?: string;
   addressBranch?: string;
   bankEmpolee?: string;
   applicationDate?: string;
@@ -77,7 +83,6 @@ const initialFormState = {
   amount: 100000,
   acquiringType: ACQUIRING_TYPES[0],
   serviceType: SERVICE_TYPES[0],
-  feedbackType: FEEDBACK_TYPES[0],
   feedbackMethod: FEEDBACK_METHOD[0],
   serviceDirection: SERVICE_DIRECTIONS[0],
   vedTypes: VED_TYPES[0],

package/mobile/src/ui-kit/FormField/Fields/BeginDateField.tsx

@@ -0,0 +1,13 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { DatePickerControl } from '../../DatePicker/DatePickerControl';
+import { type CustomFieldProps } from '../CustomFieldProps';
+import { validatorObj } from '../getObjectValidator';
+import { getValidation } from '../getValidation';
+
+export const BeginDateField = JSX<CustomFieldProps>(({ field, input }) => (
+  <DatePickerControl
+    label="Дата начала работы на текущем месте"
+    {...getValidation(field('beginDate'), validatorObj.beginDate, input?.required)}
+    {...input}
+  />
+));

package/mobile/src/ui-kit/FormField/Fields/Experience5YearsField.tsx

@@ -0,0 +1,14 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { InputControl } from '../../Input/InputControl';
+import { type CustomFieldProps } from '../CustomFieldProps';
+import { validatorObj } from '../getObjectValidator';
+import { getValidation } from '../getValidation';
+
+export const Experience5YearsField = JSX<CustomFieldProps>(({ field, input }) => (
+  <InputControl
+    label="Стаж"
+    placeholder="За последние 5 лет"
+    {...getValidation(field('experience5Years'), validatorObj.experience5Years, input?.required)}
+    {...input}
+  />
+));

package/mobile/src/ui-kit/FormField/Fields/FeedbackTypeField.tsx

@@ -1,25 +0,0 @@
-import { JSX } from '@redneckz/uni-jsx';
-import { useEffect } from '@redneckz/uni-jsx/lib/hooks';
-import { SelectControl } from '../../Select/SelectControl';
-import { FEEDBACK_TYPES, SERVICE_DIRECTIONS } from '../constants';
-import { type CustomFieldProps } from '../CustomFieldProps';
-import { validatorObj } from '../getObjectValidator';
-import { getValidation } from '../getValidation';
-
-export const FeedbackTypeField = JSX<CustomFieldProps>(({ field, input }) => {
-  const feedbackType = field('feedbackType');
-  useEffect(() => {
-    if (feedbackType?.value?.key === 'FEEDBACK') {
-      field('serviceDirection')?.onChange?.(SERVICE_DIRECTIONS[0]);
-    }
-  }, [feedbackType?.value]);
-
-  return (
-    <SelectControl
-      label="Тема"
-      placeholder="Выберите тему"
-      options={FEEDBACK_TYPES}
-      {...getValidation(feedbackType, validatorObj.feedbackType, input?.required)}
-    />
-  );
-});

package/mobile/src/ui-kit/FormField/Fields/FullAddressField.tsx

@@ -0,0 +1,13 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { InputControl } from '../../Input/InputControl';
+import { type CustomFieldProps } from '../CustomFieldProps';
+import { validatorObj } from '../getObjectValidator';
+import { getValidation } from '../getValidation';
+
+export const FullAddressField = JSX<CustomFieldProps>(({ field, input }) => (
+  <InputControl
+    label="Адрес"
+    {...getValidation(field('fullAddress'), validatorObj.fullAddress, input?.required)}
+    {...input}
+  />
+));

package/mobile/src/ui-kit/FormField/Fields/GeneralSeniorityField.tsx

@@ -0,0 +1,14 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { InputControl } from '../../Input/InputControl';
+import { type CustomFieldProps } from '../CustomFieldProps';
+import { validatorObj } from '../getObjectValidator';
+import { getValidation } from '../getValidation';
+
+export const GeneralSeniorityField = JSX<CustomFieldProps>(({ field, input }) => (
+  <InputControl
+    label="Общий стаж"
+    placeholder="Количество лет"
+    {...getValidation(field('generalSeniority'), validatorObj.generalSeniority, input?.required)}
+    {...input}
+  />
+));

package/mobile/src/ui-kit/FormField/Fields/JobsNumberField.tsx

@@ -0,0 +1,15 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { InputControl } from '../../Input/InputControl';
+import { type CustomFieldProps } from '../CustomFieldProps';
+import { validatorObj } from '../getObjectValidator';
+import { getValidation } from '../getValidation';
+
+export const JobsNumberField = JSX<CustomFieldProps>(({ field, input }) => (
+  <InputControl
+    label="Общий стаж"
+    placeholder="Количество лет"
+    type="number"
+    {...getValidation(field('jobsNumber'), validatorObj.jobsNumber, input?.required)}
+    {...input}
+  />
+));

package/mobile/src/ui-kit/FormField/Fields/LastJobExperienceField.tsx

@@ -0,0 +1,14 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { InputControl } from '../../Input/InputControl';
+import { type CustomFieldProps } from '../CustomFieldProps';
+import { validatorObj } from '../getObjectValidator';
+import { getValidation } from '../getValidation';
+
+export const LastJobExperienceField = JSX<CustomFieldProps>(({ field, input }) => (
+  <InputControl
+    label="Стаж на последнем рабочем месте"
+    placeholder="Количество лет"
+    {...getValidation(field('lastJobExperience'), validatorObj.lastJobExperience, input?.required)}
+    {...input}
+  />
+));

package/mobile/src/ui-kit/FormField/Fields/LegalFormField.tsx

@@ -0,0 +1,14 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { InputControl } from '../../Input/InputControl';
+import { type CustomFieldProps } from '../CustomFieldProps';
+import { validatorObj } from '../getObjectValidator';
+import { getValidation } from '../getValidation';
+
+export const LegalFormField = JSX<CustomFieldProps>(({ field, input }) => (
+  <InputControl
+    label="ОПФ"
+    placeholder="ООО, ПАО  и др."
+    {...getValidation(field('legalForm'), validatorObj.legalForm, input?.required)}
+    {...input}
+  />
+));

package/mobile/src/ui-kit/FormField/Fields/OrganizationNameField.tsx

@@ -0,0 +1,13 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { InputControl } from '../../Input/InputControl';
+import { type CustomFieldProps } from '../CustomFieldProps';
+import { validatorObj } from '../getObjectValidator';
+import { getValidation } from '../getValidation';
+
+export const OrganizationNameField = JSX<CustomFieldProps>(({ field, input }) => (
+  <InputControl
+    label="Наименование организации"
+    {...getValidation(field('organizationName'), validatorObj.organizationName, input?.required)}
+    {...input}
+  />
+));

package/mobile/src/ui-kit/FormField/getField.tsx

@@ -9,6 +9,7 @@ import { AmountField } from './Fields/AmountField';
 import { AmountWorkersField } from './Fields/AmountWorkersField';
 import { AnnualRevenueField } from './Fields/AnnualRevenueField';
 import { BankEmpoleeField } from './Fields/BankEmpoleeField';
+import { BeginDateField } from './Fields/BeginDateField';
 import { BirthdayField } from './Fields/BirthdayField';
 import { CollectionCountField } from './Fields/CollectionCountField';
 import { CommentField } from './Fields/CommentField';
@@ -24,17 +25,23 @@ import { EmailField } from './Fields/EmailField';
 import { EmployerActivitiesField } from './Fields/EmployerActivitiesField';
 import { EmployerOrganizationField } from './Fields/EmployerOrganizationField';
 import { EmploymentField } from './Fields/EmploymentField';
+import { Experience5YearsField } from './Fields/Experience5YearsField';
 import { FeedbackMethodField } from './Fields/FeedbackMethodField';
-import { FeedbackTypeField } from './Fields/FeedbackTypeField';
+import { FullAddressField } from './Fields/FullAddressField';
 import { FullNameField } from './Fields/FullNameField';
+import { GeneralSeniorityField } from './Fields/GeneralSeniorityField';
 import { HousingField } from './Fields/HousingField';
 import { InnField } from './Fields/InnField';
 import { IsClientField } from './Fields/IsClientField';
+import { JobsNumberField } from './Fields/JobsNumberField';
+import { LastJobExperienceField } from './Fields/LastJobExperienceField';
+import { LegalFormField } from './Fields/LegalFormField';
 import { LocalitiesField } from './Fields/LocalitiesField';
 import { MiddleNameField } from './Fields/MiddleNameField';
 import { NameField } from './Fields/NameField';
 import { OnlineCheckoutField } from './Fields/OnlineCheckoutField';
 import { OrganizationField } from './Fields/OrganizationField';
+import { OrganizationNameField } from './Fields/OrganizationNameField';
 import { PartnerCommentsField } from './Fields/PartnerCommentsField';
 import { PhoneField } from './Fields/PhoneField';
 import { PositionOrganizationField } from './Fields/PositionOrganizationField';
@@ -68,6 +75,14 @@ export const getField =
       email: <EmailField field={field} input={input} />,
       fullName: <FullNameField field={field} input={input} />,
       inn: <InnField field={field} input={input} />,
+      legalForm: <LegalFormField field={field} input={input} />,
+      organizationName: <OrganizationNameField field={field} input={input} />,
+      generalSeniority: <GeneralSeniorityField field={field} input={input} />,
+      lastJobExperience: <LastJobExperienceField field={field} input={input} />,
+      experience5Years: <Experience5YearsField field={field} input={input} />,
+      jobsNumber: <JobsNumberField field={field} input={input} />,
+      beginDate: <BeginDateField field={field} input={input} />,
+      fullAddress: <FullAddressField field={field} input={input} />,
       comment: <CommentField field={field} input={input} />,
       addressBranch: <AddressBranchField field={field} input={input} isPremium={isPremium} />,
       birthday: <BirthdayField field={field} input={input} />,
@@ -85,7 +100,6 @@ export const getField =
       amount: <AmountField field={field} />,
       annualRevenue: <AnnualRevenueField field={field} input={input} />,
       vedTypes: <VedField field={field} />,
-      feedbackType: <FeedbackTypeField field={field} input={input} />,
       feedbackMethod: <FeedbackMethodField field={field} input={input} />,
       serviceDirection: <ServiceDirectionField field={field} input={input} />,
       bankEmpolee: <BankEmpoleeField field={field} />,

package/mobile/src/ui-kit/FormField/getObjectValidator.tsx

@@ -30,11 +30,18 @@ export const validatorObj: Record<string, Validator> = {
   email: defaultValidator,
   fullName: nameValidator,
   inn: innValidator,
+  legalForm: defaultValidator,
+  organizationName: defaultValidator,
+  generalSeniority: defaultValidator,
+  lastJobExperience: defaultValidator,
+  experience5Years: defaultValidator,
+  jobsNumber: defaultValidator,
+  beginDate: defaultValidator,
+  fullAddress: defaultValidator,
   partnerComments: defaultValidator,
   collectionCount: defaultValidator,
   comment: defaultValidator,
   acquiringType: defaultSelectValidator,
-  feedbackType: defaultSelectValidator,
   feedbackMethod: defaultSelectValidator,
   serviceType: defaultSelectValidator,
   serviceDirection: defaultSelectValidator,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.14.578",
+  "version": "0.14.580",
   "private": false,
   "license": "MIT",
   "author": "ЦК",