diff --git a/bun.lockb b/bun.lockb index 8ee4233..f61c227 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/src/client/models/DealSchema.ts b/src/client/models/DealSchema.ts index 6e0f322..bf518a8 100644 --- a/src/client/models/DealSchema.ts +++ b/src/client/models/DealSchema.ts @@ -4,14 +4,13 @@ /* eslint-disable */ import type { ClientSchema } from './ClientSchema'; import type { DealBillRequestSchema } from './DealBillRequestSchema'; +import type { DealGroupSchema } from './DealGroupSchema'; import type { DealProductSchema } from './DealProductSchema'; import type { DealServiceSchema } from './DealServiceSchema'; import type { DealStatusHistorySchema } from './DealStatusHistorySchema'; import type { ServicePriceCategorySchema } from './ServicePriceCategorySchema'; import type { ShippingWarehouseSchema } from './ShippingWarehouseSchema'; import type { UserSchema } from './UserSchema'; -import type { DealGroupSchema } from './DealGroupSchema'; - export type DealSchema = { id: number; name: string; @@ -31,7 +30,6 @@ export type DealSchema = { category?: (ServicePriceCategorySchema | null); group?: (DealGroupSchema | null); manager?: (UserSchema | null); - deliveryDate?: (string | null); receivingSlotDate?: (string | null); }; diff --git a/src/client/models/GetManagersResponse.ts b/src/client/models/GetManagersResponse.ts new file mode 100644 index 0000000..64dea79 --- /dev/null +++ b/src/client/models/GetManagersResponse.ts @@ -0,0 +1,9 @@ +/* generated using openapi-typescript-codegen -- do not edit */ +/* istanbul ignore file */ +/* tslint:disable */ +/* eslint-disable */ +import type { UserSchema } from './UserSchema'; +export type GetManagersResponse = { + managers: Array; +}; + diff --git a/src/pages/StatisticsPage/ui/StatisticsPage.tsx b/src/pages/StatisticsPage/ui/StatisticsPage.tsx index 491d599..d5b0270 100644 --- a/src/pages/StatisticsPage/ui/StatisticsPage.tsx +++ b/src/pages/StatisticsPage/ui/StatisticsPage.tsx @@ -1,14 +1,9 @@ -import { useState } from "react"; -import { - StatisticsTab, - StatisticsTabSegmentedControl, -} from "../components/StatisticsTabSegmentedControl/StatisticsTabSegmentedControl.tsx"; +import { StatisticsTab } from "../components/StatisticsTabSegmentedControl/StatisticsTabSegmentedControl.tsx"; import styles from "./StatisticsPage.module.css"; -import PageBlock from "../../../components/PageBlock/PageBlock.tsx"; import { ProfitTab } from "../tabs/ProfitTab/ProfitTab.tsx"; export const StatisticsPage = () => { - const [serviceType, setServiceType] = useState(StatisticsTab.PROFIT); + const serviceType = StatisticsTab.PROFIT; const getBody = () => { switch (serviceType) { @@ -16,10 +11,6 @@ export const StatisticsPage = () => { return ( ); - case StatisticsTab.SALARIES: - return ( - <>Статистика по ЗП - ); } }; diff --git a/src/routeTree.gen.ts b/src/routeTree.gen.ts index 2f4d3a7..ebd379d 100644 --- a/src/routeTree.gen.ts +++ b/src/routeTree.gen.ts @@ -18,6 +18,7 @@ import { Route as DealsDealIdImport } from './routes/deals.$dealId' // Create Virtual Routes const TestLazyImport = createFileRoute('/test')() +const StatisticsLazyImport = createFileRoute('/statistics')() const ShippingwarehousesLazyImport = createFileRoute('/shipping_warehouses')() const ServicesLazyImport = createFileRoute('/services')() const ProductsLazyImport = createFileRoute('/products')() @@ -37,6 +38,12 @@ const TestLazyRoute = TestLazyImport.update({ getParentRoute: () => rootRoute, } as any).lazy(() => import('./routes/test.lazy').then((d) => d.Route)) +const StatisticsLazyRoute = StatisticsLazyImport.update({ + id: '/statistics', + path: '/statistics', + getParentRoute: () => rootRoute, +} as any).lazy(() => import('./routes/statistics.lazy').then((d) => d.Route)) + const ShippingwarehousesLazyRoute = ShippingwarehousesLazyImport.update({ id: '/shipping_warehouses', path: '/shipping_warehouses', @@ -179,6 +186,13 @@ declare module '@tanstack/react-router' { preLoaderRoute: typeof ShippingwarehousesLazyImport parentRoute: typeof rootRoute } + '/statistics': { + id: '/statistics' + path: '/statistics' + fullPath: '/statistics' + preLoaderRoute: typeof StatisticsLazyImport + parentRoute: typeof rootRoute + } '/test': { id: '/test' path: '/test' @@ -209,6 +223,7 @@ export interface FileRoutesByFullPath { '/products': typeof ProductsLazyRoute '/services': typeof ServicesLazyRoute '/shipping_warehouses': typeof ShippingwarehousesLazyRoute + '/statistics': typeof StatisticsLazyRoute '/test': typeof TestLazyRoute '/deals/$dealId': typeof DealsDealIdRoute } @@ -224,6 +239,7 @@ export interface FileRoutesByTo { '/products': typeof ProductsLazyRoute '/services': typeof ServicesLazyRoute '/shipping_warehouses': typeof ShippingwarehousesLazyRoute + '/statistics': typeof StatisticsLazyRoute '/test': typeof TestLazyRoute '/deals/$dealId': typeof DealsDealIdRoute } @@ -240,6 +256,7 @@ export interface FileRoutesById { '/products': typeof ProductsLazyRoute '/services': typeof ServicesLazyRoute '/shipping_warehouses': typeof ShippingwarehousesLazyRoute + '/statistics': typeof StatisticsLazyRoute '/test': typeof TestLazyRoute '/deals/$dealId': typeof DealsDealIdRoute } @@ -257,6 +274,7 @@ export interface FileRouteTypes { | '/products' | '/services' | '/shipping_warehouses' + | '/statistics' | '/test' | '/deals/$dealId' fileRoutesByTo: FileRoutesByTo @@ -271,6 +289,7 @@ export interface FileRouteTypes { | '/products' | '/services' | '/shipping_warehouses' + | '/statistics' | '/test' | '/deals/$dealId' id: @@ -285,6 +304,7 @@ export interface FileRouteTypes { | '/products' | '/services' | '/shipping_warehouses' + | '/statistics' | '/test' | '/deals/$dealId' fileRoutesById: FileRoutesById @@ -301,6 +321,7 @@ export interface RootRouteChildren { ProductsLazyRoute: typeof ProductsLazyRoute ServicesLazyRoute: typeof ServicesLazyRoute ShippingwarehousesLazyRoute: typeof ShippingwarehousesLazyRoute + StatisticsLazyRoute: typeof StatisticsLazyRoute TestLazyRoute: typeof TestLazyRoute DealsDealIdRoute: typeof DealsDealIdRoute } @@ -316,6 +337,7 @@ const rootRouteChildren: RootRouteChildren = { ProductsLazyRoute: ProductsLazyRoute, ServicesLazyRoute: ServicesLazyRoute, ShippingwarehousesLazyRoute: ShippingwarehousesLazyRoute, + StatisticsLazyRoute: StatisticsLazyRoute, TestLazyRoute: TestLazyRoute, DealsDealIdRoute: DealsDealIdRoute, } @@ -340,6 +362,7 @@ export const routeTree = rootRoute "/products", "/services", "/shipping_warehouses", + "/statistics", "/test", "/deals/$dealId" ] @@ -374,6 +397,9 @@ export const routeTree = rootRoute "/shipping_warehouses": { "filePath": "shipping_warehouses.lazy.tsx" }, + "/statistics": { + "filePath": "statistics.lazy.tsx" + }, "/test": { "filePath": "test.lazy.tsx" },