diff --git a/apps/web/Components/Output/PaymentsTable/config.ts b/apps/web/Components/Output/PaymentsTable/config.ts index 788c5a2..46bc8c5 100644 --- a/apps/web/Components/Output/PaymentsTable/config.ts +++ b/apps/web/Components/Output/PaymentsTable/config.ts @@ -37,45 +37,45 @@ export const columns: ColumnsType = [ }).format, }, { - key: 'piColumn', - dataIndex: 'piColumn', - title: 'PIColumn', + key: '_piColumn', + dataIndex: '_piColumn', + title: 'PI Column', render: Intl.NumberFormat('ru', { style: 'currency', currency: 'RUB', }).format, }, { - key: 'cashflowMsfoWithCfColumn', - dataIndex: 'cashflowMsfoWithCfColumn', - title: 'CashflowMSFOWithCF', + key: '_cashflowMsfoWithCfColumn', + dataIndex: '_cashflowMsfoWithCfColumn', + title: 'CashflowMSFOWithCF Column', render: Intl.NumberFormat('ru', { style: 'currency', currency: 'RUB', }).format, }, { - key: 'creditPaymentColumn', - dataIndex: 'creditPaymentColumn', - title: 'CreditPayment', + key: '_creditPaymentColumn', + dataIndex: '_creditPaymentColumn', + title: 'CreditPayment Column', render: Intl.NumberFormat('ru', { style: 'currency', currency: 'RUB', }).format, }, { - key: 'cashflowMsfoColumn', - dataIndex: 'cashflowMsfoColumn', - title: 'CashflowMSFO', + key: '_cashflowMsfoColumn', + dataIndex: '_cashflowMsfoColumn', + title: 'CashflowMSFO Column', render: Intl.NumberFormat('ru', { style: 'currency', currency: 'RUB', }).format, }, { - key: 'interestColumn', - dataIndex: 'interestColumn', - title: 'Interest', + key: '_interestColumn', + dataIndex: '_interestColumn', + title: 'Interest Column', render: Intl.NumberFormat('ru', { style: 'currency', currency: 'RUB', diff --git a/apps/web/Components/Output/PaymentsTable/index.jsx b/apps/web/Components/Output/PaymentsTable/index.jsx index 158f448..e053f01 100644 --- a/apps/web/Components/Output/PaymentsTable/index.jsx +++ b/apps/web/Components/Output/PaymentsTable/index.jsx @@ -13,7 +13,7 @@ const PaymentsTable = observer(() => { return ( !x.key.includes('Column')) : columns} + columns={!unlimited ? columns.filter((x) => !x.key.includes('_')) : columns} dataSource={toJS($results.payments)} size="small" pagination={{ diff --git a/apps/web/config/schema/results.ts b/apps/web/config/schema/results.ts index 8ac56e0..59f8ba7 100644 --- a/apps/web/config/schema/results.ts +++ b/apps/web/config/schema/results.ts @@ -29,15 +29,15 @@ export const ResultValuesSchema = z.object({ }); export const ResultPaymentSchema = z.object({ - cashflowMsfoColumn: z.number(), - cashflowMsfoWithCfColumn: z.number(), - creditPaymentColumn: z.number(), - interestColumn: z.number(), + _cashflowMsfoColumn: z.number(), + _cashflowMsfoWithCfColumn: z.number(), + _creditPaymentColumn: z.number(), + _interestColumn: z.number(), + _piColumn: z.number(), key: z.string(), ndsCompensation: z.number(), num: z.number(), paymentSum: z.number(), - piColumn: z.number(), redemptionAmount: z.number(), }); diff --git a/apps/web/server/routers/calculate/lib/transform.ts b/apps/web/server/routers/calculate/lib/transform.ts index 0bd5a65..0b597ef 100644 --- a/apps/web/server/routers/calculate/lib/transform.ts +++ b/apps/web/server/routers/calculate/lib/transform.ts @@ -21,15 +21,15 @@ export function transformCalculateResults({ length: preparedValues.nmper, }, (_, i) => ({ - cashflowMsfoColumn: columns?.cashflowMsfoColumn.values[i + 1] || 0, - cashflowMsfoWithCfColumn: columns?.cashflowMsfoWithCfColumn.values[i + 1] || 0, - creditPaymentColumn: columns?.creditPaymentColumn.values[i + 1] || 0, - interestColumn: columns?.interestColumn.values[i + 1] || 0, + _cashflowMsfoColumn: columns?.cashflowMsfoColumn.values[i + 1] || 0, + _cashflowMsfoWithCfColumn: columns?.cashflowMsfoWithCfColumn.values[i + 1] || 0, + _creditPaymentColumn: columns?.creditPaymentColumn.values[i + 1] || 0, + _interestColumn: columns?.interestColumn.values[i + 1] || 0, + _piColumn: columns?.piColumn.values[i + 1] || 0, key: String(i + 1), ndsCompensation: columns?.vatColumn.values[i + 1] || 0, num: i + 1, paymentSum: columns?.sumWithVatColumn.values[i + 1] || 0, - piColumn: columns?.piColumn.values[i + 1] || 0, redemptionAmount: columns?.sumRepaymentColumn.values[i + 1] || 0, }) );