From d96e27bb4dc06e4a983a68b22904c1b329d2f5ff Mon Sep 17 00:00:00 2001 From: ewandor Date: Mon, 13 Feb 2023 00:34:31 +0100 Subject: [PATCH] regorganizng contracts routes --- back/app/contract/__init__.py | 10 +++++++++- back/app/contract/routes_draft.py | 4 +++- back/app/contract/routes_print.py | 3 +++ back/app/main.py | 2 +- front/app/src/app/views/contracts/drafts.component.ts | 2 +- 5 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 back/app/contract/routes_print.py diff --git a/back/app/contract/__init__.py b/back/app/contract/__init__.py index a828dc9e..944807a6 100644 --- a/back/app/contract/__init__.py +++ b/back/app/contract/__init__.py @@ -1 +1,9 @@ -from .routes import router as contract_router +from fastapi import APIRouter + +from .routes_draft import draft_router +from .routes_print import print_router + +contract_router = APIRouter() + +contract_router.include_router(draft_router, prefix="/draft", tags=["draft"], ) +contract_router.include_router(print_router, prefix="/print", tags=["print"], ) diff --git a/back/app/contract/routes_draft.py b/back/app/contract/routes_draft.py index 54acb83a..0557156a 100644 --- a/back/app/contract/routes_draft.py +++ b/back/app/contract/routes_draft.py @@ -1,5 +1,7 @@ +from fastapi import APIRouter + from ..core.routes import get_crud_router from .models import ContractDraft from .schemas import ContractDraftCreate, ContractDraftRead, ContractDraftUpdate -router = get_crud_router(ContractDraft, ContractDraftCreate, ContractDraftRead, ContractDraftUpdate) +draft_router = get_crud_router(ContractDraft, ContractDraftCreate, ContractDraftRead, ContractDraftUpdate) diff --git a/back/app/contract/routes_print.py b/back/app/contract/routes_print.py new file mode 100644 index 00000000..b201e359 --- /dev/null +++ b/back/app/contract/routes_print.py @@ -0,0 +1,3 @@ +from fastapi import APIRouter + +print_router = APIRouter() \ No newline at end of file diff --git a/back/app/main.py b/back/app/main.py index 1e51f1e7..2eb25bd4 100644 --- a/back/app/main.py +++ b/back/app/main.py @@ -25,7 +25,7 @@ app.include_router(user_router, prefix="/users", tags=["users"], ) app.include_router(entity_router, prefix="/entity", tags=["entity"], ) app.include_router(order_router, prefix="/order", tags=["order"], ) app.include_router(template_router, prefix="/template", tags=["template"], ) -app.include_router(contract_router, prefix="/contract-draft", tags=["contract-draft"], ) +app.include_router(contract_router, prefix="/contract", tags=["contract"], ) if __name__ == '__main__': import uvicorn diff --git a/front/app/src/app/views/contracts/drafts.component.ts b/front/app/src/app/views/contracts/drafts.component.ts index 8aecd863..460e5e22 100644 --- a/front/app/src/app/views/contracts/drafts.component.ts +++ b/front/app/src/app/views/contracts/drafts.component.ts @@ -6,7 +6,7 @@ import { CrudService } from "@common/crud/crud.service"; export class BaseEntitiesComponent { - protected resource: string = "contract-draft"; + protected resource: string = "contract/draft"; protected schema: string = "ContractDraft"; }