Settings: refactor layout

Unlimited: add selectUser to Settings

apps/web/Components/Calculation/Settings/config.ts

@@ -2,7 +2,7 @@ import type { FormTabRows } from '../lib/render-rows';
 
 const defaultRowStyle = { gridTemplateColumns: '1fr' };
 
-export const rows: FormTabRows = [
+export const mainRows: FormTabRows = [
   { title: 'Выбор Интереса/ЛС' },
   [['selectLead'], defaultRowStyle],
   [['selectOpportunity'], defaultRowStyle],
@@ -14,10 +14,33 @@ export const rows: FormTabRows = [
       gridTemplateColumns: ['1fr 0.15fr'],
     },
   ],
+];
 
+export const unlimitedMainRows: FormTabRows = [
+  { title: 'Выбор Интереса/ЛС' },
+  [['selectUser'], defaultRowStyle],
+  [['selectLead'], defaultRowStyle],
+  [['selectOpportunity'], defaultRowStyle],
+  [['cbxRecalcWithRevision'], defaultRowStyle],
+  [['selectQuote'], defaultRowStyle],
+  [
+    ['btnCalculate', 'btnCreateKPMini'],
+    {
+      gridTemplateColumns: ['1fr 0.15fr'],
+    },
+  ],
+];
+
+export const paramsRows: FormTabRows = [
   { title: 'Параметры расчета' },
-  [['labelIrrInfo'], defaultRowStyle],
   [['radioCalcType'], defaultRowStyle],
   [['tbxIRR_Perc'], defaultRowStyle],
   [['tbxTotalPayments'], defaultRowStyle],
 ];
+
+export const unlimitedParamsRows: FormTabRows = [
+  { title: 'Параметры расчета' },
+  [['radioCalcType'], defaultRowStyle],
+  [['tbxIRR_Perc', 'tbxPi'], { gridTemplateColumns: '1fr 1fr' }],
+  [['tbxTotalPayments'], defaultRowStyle],
+];

apps/web/Components/Calculation/Settings/index.jsx

@@ -1,6 +1,7 @@
 import renderFormRows from '../lib/render-rows';
-import { rows } from './config';
+import * as config from './config';
 import Background from '@/Components/Layout/Background';
+import { useStore } from '@/stores/hooks';
 import { min } from '@/styles/mq';
 import styled from 'styled-components';
 
@@ -17,5 +18,19 @@ const Wrapper = styled(Background)`
 `;
 
 export default function Settings() {
-  return <Wrapper>{renderFormRows(rows)}</Wrapper>;
+  const { $process } = useStore();
+
+  const mainRows = $process.has('Unlimited')
+    ? renderFormRows(config.unlimitedMainRows)
+    : renderFormRows(config.mainRows);
+  const paramsRows = $process.has('Unlimited')
+    ? renderFormRows(config.unlimitedParamsRows)
+    : renderFormRows(config.paramsRows);
+
+  return (
+    <Wrapper>
+      {mainRows}
+      {paramsRows}
+    </Wrapper>
+  );
 }

apps/web/Components/Calculation/config/elements-components.ts

@@ -133,6 +133,7 @@ const components = wrapComponentsMap({
   tbxVIN: e.Input,
   selectUser: e.Select,
   cbxSupplierFinancing: e.Switch,
+  tbxPi: e.InputNumber,
 
   /** Readonly Elements */
   labelLeaseObjectRisk: e.Text,

apps/web/Components/Calculation/config/elements-props.tsx

@@ -481,7 +481,19 @@ const props: Partial<ElementsProps> = {
     optionFilterProp: 'label',
   },
   tbxIRR_Perc: {
-    min: 0,
+    min: -500,
+    max: 500,
+    step: 0.0001,
+    precision: 6,
+    parser,
+    formatter: createFormatter({ minimumFractionDigits: 6, maximumFractionDigits: 6 }),
+    addonAfter: '%',
+    style: {
+      width: '100%',
+    },
+  },
+  tbxPi: {
+    min: -500,
     max: 500,
     step: 0.0001,
     precision: 6,

apps/web/Components/Calculation/config/elements-render/override.tsx

@@ -15,9 +15,15 @@ import { LoadingOutlined } from 'ui/elements/icons';
 
 const defaultLinkProps: ComponentProps<typeof Link> = {
   children: 'Открыть в CRM',
+  size: 'small',
+  style: { padding: 0 },
   type: 'link',
 };
 
+const formatter = Intl.NumberFormat('ru', {
+  minimumFractionDigits: 2,
+}).format;
+
 const overrideRender: Partial<Record<keyof typeof map, RenderProps>> = {
   selectHighSeasonStart: {
     render: () => {
@@ -179,6 +185,40 @@ const overrideRender: Partial<Record<keyof typeof map, RenderProps>> = {
     },
   },
 
+  tbxIRR_Perc: {
+    render: () => {
+      const elementName = 'tbxIRR_Perc';
+      const title = titles.tbxIRR_Perc;
+      const valueName = map.tbxIRR_Perc;
+      const Component = components.tbxIRR_Perc;
+      const props = elementsProps.tbxIRR_Perc;
+      const { builder } = types.tbxIRR_Perc();
+
+      const Element = builder(Component, {
+        elementName,
+        valueName,
+      });
+
+      const RenderedComponent = observer(() => {
+        const { $calculation } = useStore();
+        const { min, max } = $calculation.$values.getValue('irrInfo');
+
+        return (
+          <Container>
+            <Head
+              htmlFor={elementName}
+              title={title}
+              addon={`${formatter(min)}% - ${formatter(max)}%`}
+            />
+            <Element {...props} min={min} max={max} />
+          </Container>
+        );
+      });
+
+      return <RenderedComponent />;
+    },
+  },
+
   tbxVehicleTaxInYear: {
     render: () => {
       const elementName = 'tbxVehicleTaxInYear';

apps/web/Components/Calculation/config/elements-titles.ts

@@ -127,6 +127,7 @@ const titles: Record<ActionElements | ValuesElements, string> = {
   tbxVIN: 'VIN',
   selectUser: 'Пользователь',
   cbxSupplierFinancing: 'Финансирование поставщика',
+  tbxPi: 'PI',
 
   /** Link Elements */
   linkDownloadKp: '',

apps/web/Components/Calculation/config/elements-types.ts

@@ -192,6 +192,7 @@ const types = wrapElementsTypes({
   tbxVIN: t.Value,
   selectUser: t.Options,
   cbxSupplierFinancing: t.Switch,
+  tbxPi: t.Number,
 
   labelLeaseObjectRisk: t.Readonly,
   tbxInsKaskoPriceLeasePeriod: t.Readonly,

apps/web/Components/Calculation/config/map/values.ts

@@ -130,6 +130,7 @@ const elementsToValues = wrapElementsMap({
   tbxVIN: 'vin',
   selectUser: 'user',
   cbxSupplierFinancing: 'supplierFinancing',
+  tbxPi: 'pi',
 
   /** Readonly Elements */
   labelLeaseObjectRisk: 'leaseObjectRiskName',

apps/web/config/default-options.ts

@@ -193,14 +193,14 @@ export const radioCalcType = [
     label: 'IRR',
     value: 100_000_000,
   },
-  {
-    label: 'Суммы',
-    value: 100_000_001,
-  },
   {
     label: 'PI',
     value: 100_000_099,
   },
+  {
+    label: 'Суммы',
+    value: 100_000_001,
+  },
 ];
 
 export const selectRequirementTelematic = [
@@ -503,6 +503,7 @@ const defaultOptions: CalculationOptions = {
   tbxVIN: [],
   selectUser: [],
   cbxSupplierFinancing: [],
+  tbxPi: [],
 };
 
 export default defaultOptions;

apps/web/config/default-statuses.ts

@@ -126,6 +126,7 @@ const defaultStatuses: CalculationStatuses = {
   tbxMileage: 'Default',
   tbxMinPriceChange: 'Default',
   tbxParmentsDecreasePercent: 'Default',
+  tbxPi: 'Default',
   tbxQuoteName: 'Default',
   tbxRedemptionPaymentSum: 'Disabled',
   tbxSaleBonus: 'Default',

apps/web/config/default-values.ts

@@ -65,7 +65,7 @@ const defaultValues: CalculationValues = {
   insUnlimitDrivers: true,
   insurance: true,
   IRR_Perc: 20,
-  irrInfo: '-',
+  irrInfo: { min: 0, max: 0 },
   kpUrl: null,
   lastPaymentPerc: 1,
   lastPaymentRedemption: true,
@@ -101,6 +101,7 @@ const defaultValues: CalculationValues = {
   opportunity: null,
   opportunityUrl: null,
   parmentsDecreasePercent: 94,
+  pi: 0,
   plPriceRub: 0,
   priceWithDiscount: false,
   product: null,
@@ -134,12 +135,12 @@ const defaultValues: CalculationValues = {
   townRegistration: null,
   tracker: null,
   typePTS: null,
+  user: null,
   VATInLeaseObjectPrice: 0,
   vehicleTaxInLeasingPeriod: 0,
   vehicleTaxInYear: 0,
-  withTrailer: false,
   vin: null,
-  user: null,
+  withTrailer: false,
 };
 
 export default defaultValues;

apps/web/config/schema/values.ts

@@ -90,6 +90,7 @@ const ValuesSchema = z.object({
   objectTypeTax: z.number().nullable(),
   opportunity: z.string().nullable(),
   parmentsDecreasePercent: z.number(),
+  pi: z.number(),
   priceWithDiscount: z.boolean(),
   product: z.string().nullable(),
   quote: z.string().nullable(),
@@ -119,12 +120,12 @@ const ValuesSchema = z.object({
   townRegistration: z.string().nullable(),
   tracker: z.string().nullable(),
   typePTS: z.number().nullable(),
+  user: z.string().nullable(),
   VATInLeaseObjectPrice: z.number(),
   vehicleTaxInLeasingPeriod: z.number(),
   vehicleTaxInYear: z.number(),
-  withTrailer: z.boolean(),
   vin: z.string().nullable(),
-  user: z.string().nullable(),
+  withTrailer: z.boolean(),
 
   /**
    * Link Values
@@ -141,7 +142,10 @@ const ValuesSchema = z.object({
   depreciationGroup: z.string().nullable(),
   discountRub: z.number(),
   insKaskoPriceLeasePeriod: z.number(),
-  irrInfo: z.string().nullable(),
+  irrInfo: z.object({
+    min: z.number(),
+    max: z.number(),
+  }),
   leaseObjectRiskName: z.string().nullable(),
   plPriceRub: z.number(),
   registrationDescription: z.string().nullable(),

apps/web/process/calculate/reactions/common.ts

@@ -2,10 +2,6 @@ import helper from '../lib/helper';
 import type { ProcessContext } from '@/process/types';
 import { reaction } from 'mobx';
 
-export const formatter = Intl.NumberFormat('ru', {
-  minimumFractionDigits: 2,
-}).format;
-
 export default function reactions({ store, apolloClient }: ProcessContext) {
   const { $calculation } = store;
 
@@ -38,7 +34,7 @@ export default function reactions({ store, apolloClient }: ProcessContext) {
     async (values) => {
       const { min, max } = await getIrr(values);
 
-      $calculation.element('labelIrrInfo').setValue(`${formatter(min)}% - ${formatter(max)}%`);
+      $calculation.element('labelIrrInfo').setValue({ max, min });
     }
   );
 }

apps/web/server/routers/calculate/lib/request.ts

@@ -858,7 +858,7 @@ export async function createRequestData({
     },
 
     async npvniExpected() {
-      return 0;
+      return values.pi / 100;
     },
 
     async nsBonus() {

apps/web/server/routers/calculate/lib/transform.ts

@@ -104,6 +104,7 @@ export function transformCalculateResults({
     IRR_Perc: columns?.cashflowMsfoColumn?.nominal * 100,
     downloadKp: null,
     lastPaymentRub: last(columns?.sumWithVatColumn?.values) || 0,
+    pi: columns?.piColumn.values[0] * 100,
     totalPayments: columns?.sumWithVatColumn?.values[0] - inputValues.subsidySum,
   };
 

apps/web/server/routers/calculate/types.ts

@@ -25,6 +25,7 @@ export const OutputDataSchema = z.object({
     IRR_Perc: true,
     downloadKp: true,
     lastPaymentRub: true,
+    pi: true,
     totalPayments: true,
   }),
 });

packages/ui/elements/Radio.tsx

@@ -14,15 +14,15 @@ export function Radio({ value = null, options, spaceProps, onChange, ...props }:
     if (onChange) onChange(event.target.value);
   }
 
+  const buttons = options?.map((option) => (
+    <AntRadio key={option.value as Key} value={option.value}>
+      {option.label}
+    </AntRadio>
+  ));
+
   return (
     <AntRadio.Group onChange={handleChange} value={value} {...props}>
-      <Space {...spaceProps}>
+      {spaceProps ? <Space {...spaceProps}>{buttons}</Space> : buttons}
-        {options?.map((option) => (
-          <AntRadio key={option.value as Key} value={option.value}>
-            {option.label}
-          </AntRadio>
-        ))}
-      </Space>
     </AntRadio.Group>
   );
 }