avnazv/toolbox
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Журнал перемещений, упрощение и чистка

Browse Source
This commit is contained in:
Macbook
2025-12-13 23:47:46 +03:00
parent de572396a6
commit a9e57b4a38
20 changed files with 961 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/routers/__init__.py
+64 -8
View File
@@ -1,3 +1,4 @@
from datetime import date, datetime, timedelta
from fastapi import APIRouter, Depends, Request
from fastapi.responses import RedirectResponse
@@ -7,6 +8,7 @@ from .user import router as user
from .stocks import router as stocks
from .toolbox import router as toolbox
from .toolkit import router as toolkit
from .records import router as records
router = APIRouter()
@@ -15,6 +17,7 @@ router.include_router(user, prefix="/user", tags=["user"])
router.include_router(stocks, prefix="/stocks", tags=["stocks"])
router.include_router(toolbox, prefix="/toolbox", tags=["toolbox"])
router.include_router(toolkit, prefix="/toolkit", tags=["toolkit"])
router.include_router(records, prefix="/records", tags=["records"])
@router.get("/")
@@ -50,9 +53,16 @@ async def post_requests(
reqData = {
"tab": request_data.get("body").get("tabId"),
"userData": request_data.get("body").get("cookiesData").get("userData"),
"accessData": request_data.get("body").get("cookiesData").get("accessData"),
}
if "cookiesData" in request_data.get("body"):
if "userData" in request_data.get("body").get("cookiesData"):
reqData["userData"] = (
request_data.get("body").get("cookiesData").get("userData")
)
if "accessData" in request_data.get("body").get("cookiesData"):
reqData["accessData"] = (
request_data.get("body").get("cookiesData").get("accessData")
)
resultData = {"status": "error", "data": {}}
logger.info(f"Получение данных для вкладки {reqData.get('tab')}")
match reqData.get("tab"):
@@ -67,10 +77,23 @@ async def post_requests(
resultData["status"] = "ok"
resultData["data"] = toolbox
case "requests":
requests = await StocksRecordsHandler.get(reqData.get("userData").get("id"))
canDesign = reqData.get("accessData").get(
"refund_request_confirm", False
) or reqData.get("accessData").get("debit_request_confirm", False)
userId = reqData.get("userData").get("id")
requests = await StocksRecordsHandler.get(userId, canDesign)
users = await UserHandler.getAll()
toolboxes = await ToolboxHandler.getAll()
toolkitsIds = set([request.get("toolkit_id") for request in requests])
toolkits = await ToolkitHandler.getSeveral(list(toolkitsIds))
if isinstance(requests, list):
resultData["status"] = "ok"
resultData["data"] = requests
resultData["data"] = {
"requests": requests,
"users": users,
"toolboxes": toolboxes,
"toolkits": toolkits,
}
case "toolkits":
toolkits = await ToolkitHandler.getAll()
categories = await CategoryHandler.getAll()
@@ -80,12 +103,45 @@ async def post_requests(
"toolkits": toolkits,
"categories": categories,
}
# logger.info(resultData)
case "jurnal_toolkits":
jurnal_toolkits = await StocksRecordsHandler.get()
if jurnal_toolkits:
startDate = request_data.get("body").get(
"startDate", date.today() - timedelta(days=7)
)
if isinstance(startDate, str):
startDate = datetime.strptime(startDate, "%Y-%m-%d").date()
endDate = request_data.get("body").get("endDate", date.today())
if isinstance(endDate, str):
endDate = datetime.strptime(endDate, "%Y-%m-%d").date()
jurnal_toolkits = await StocksRecordsHandler.getLogs(startDate, endDate)
if isinstance(jurnal_toolkits, list):
if len(jurnal_toolkits) == 0:
resultData["status"] = "ok"
resultData["data"] = jurnal_toolkits
resultData["data"] = {
"requests": [],
"users": [],
"toolboxes": [],
"toolkits": [],
"startDate": startDate.strftime("%Y-%m-%d"),
"endDate": endDate.strftime("%Y-%m-%d"),
}
else:
users = await UserHandler.getAll()
toolboxes = await ToolboxHandler.getAll()
toolkitsIds = set(
[request.get("toolkit_id") for request in jurnal_toolkits]
)
toolkits = await ToolkitHandler.getSeveral(list(toolkitsIds))
resultData["status"] = "ok"
resultData["data"] = {
"requests": jurnal_toolkits,
"users": users,
"toolboxes": toolboxes,
"toolkits": toolkits,
"startDate": startDate.strftime("%Y-%m-%d"),
"endDate": endDate.strftime("%Y-%m-%d"),
}
case "jurnal_service":
jurnal_service = await ServiceRecordsHandler.get()
if jurnal_service:
api/routers/__pycache__/__init__.cpython-313.pyc
BIN
View File
Binary file not shown.
api/routers/__pycache__/records.cpython-313.pyc
BIN
View File
Binary file not shown.
api/routers/__pycache__/stocks.cpython-313.pyc
BIN
View File
Binary file not shown.
api/routers/__pycache__/toolbox.cpython-313.pyc
BIN
View File
Binary file not shown.
api/routers/__pycache__/toolkit.cpython-313.pyc
BIN
View File
Binary file not shown.
api/routers/records.py
+21
View File
@@ -0,0 +1,21 @@
from fastapi import APIRouter, Depends
from db.handlers.actions import StocksActions
from utils import requestDict, logger
router = APIRouter()
@router.post("/")
async def post_requests(
reqData: dict = Depends(requestDict),
):
logger.info("Получение записи о перемещении инструмента")
request_id = reqData.get("body").get("request_id")
user_id = reqData.get("body").get("user_id")
accepted = reqData.get("body").get("accepted")
if request_id and user_id and accepted is not None:
result = await StocksActions.movingDecision(int(request_id), user_id, accepted)
if result:
return {"status": "ok"}
return {"status": "error"}
api/routers/stocks.py
+1 -1
View File
@@ -15,7 +15,7 @@ router = APIRouter()
async def post_requests(
request_data: dict = Depends(requestDict),
):
toolboxId = request_data.get("body").get("toolboxId")
toolboxId = int(request_data.get("body").get("toolboxId"))
logger.info(f"Получение инструментов для тулбокса {toolboxId}")
response = {"status": "error", "data": []}
api/routers/toolbox.py
-2
View File
@@ -54,7 +54,6 @@ async def delete_toolbox(reqDict=Depends(requestDict)):
@router.post("/fill", summary="Заполнение ящика")
async def fill_toolbox(reqDict=Depends(requestDict)):
logger.info(f"Заполнение ящика")
logger.info(reqDict.get("body"))
response = {"status": "error"}
toolboxId = reqDict.get("body").get("toolboxId")
userId = reqDict.get("body").get("userId")
@@ -79,5 +78,4 @@ async def fill_toolbox(reqDict=Depends(requestDict)):
response["message"] = (
f"Оприходовано {successCount} записей из {len(items)}. Проверьте остатки и повторите попытку"
)
logger.info(response)
return response
api/routers/toolkit.py
-1
View File
@@ -25,7 +25,6 @@ async def get_toolkit(reqData: dict = Depends(requestDict)):
if toolkitId:
toolkit = await ToolkitHandler.get(int(toolkitId))
if toolkit:
# logger.info(toolkit)
response["status"] = "ok"
response["data"] = toolkit
return response
api/static/js/index.js
+817 -55
View File
File diff suppressed because it is too large Load Diff
api/static/js/user.js
+3
View File
@@ -120,6 +120,9 @@ class ClientManager {
// Очищаем cookie пользователя
this.clearUserCookie();
// Очищаем локальное хранилище
localStorage.clear();
// Переход на страницу выхода
setTimeout(() => {
window.location.href = '/user/login';
db/handlers/__pycache__/access.cpython-313.pyc
BIN
View File
Binary file not shown.
db/handlers/__pycache__/actions.cpython-313.pyc
BIN
View File
Binary file not shown.
db/handlers/__pycache__/records.cpython-313.pyc
BIN
View File
Binary file not shown.
db/handlers/access.py
-5
View File
@@ -90,21 +90,16 @@ class AccessLevelHandler:
"admin": {
"title": "Администратор",
"description": "Администратор. Полный доступ",
"receiving_edit": True,
"refund_request_edit": True,
"refund_request_confirm": True,
"debit_request_edit": True,
"debit_request_confirm": True,
"tools_creation": True,
"tools_registration": True,
"tools_registration_edit": True,
"tools_edit": True,
"tools_delete": True,
"users_creation": True,
"users_edit": True,
"users_disabling": True,
"users_view": True,
"available_own_toolbox": False,
"view_all_toolboxes": True,
"view_requests": True,
"view_services": True,
db/handlers/actions.py
+2 -2
View File
@@ -270,7 +270,7 @@ class StocksActions:
if not accept:
return accept
totalRecordsIds = [record_id]
totalRecordsIds = [record_id] if not record else [record.id]
if len(stocksMovements) > 1:
for stock in stocksMovements[1:]:
@@ -298,7 +298,7 @@ class StocksActions:
)
if not accept:
return False
totalRecordsIds.append(recorded)
totalRecordsIds.append(recorded.id)
logger.info(
f"Записи {', '.join(map(str, totalRecordsIds))} о {movingRecord.action} инструмента успешно приняты {user_id}"
db/handlers/records.py
+51 -21
View File
@@ -1,4 +1,4 @@
from datetime import datetime, timedelta
from datetime import date, datetime, time, timedelta
from sqlalchemy import select
@@ -142,39 +142,69 @@ class StocksRecordsHandler:
logger.error(f"Ошибка обновления записи: {str(e)}")
return False
async def get(user_id: int = None, days: int = 30):
async def getLogs(startDate: date, endDate: date):
from db import CRUD
try:
if user_id:
userInfo = f"пользователя {user_id} "
decided = "не решенных "
daysLimit = ""
query = select(StocksRecords).where(
start_dt = datetime.combine(startDate, time.min)
end_dt = datetime.combine(endDate, time.max)
query = (
select(StocksRecords)
.where(
StocksRecords.created_at.between(start_dt, end_dt),
StocksRecords.decision_user_id != None,
)
.order_by(StocksRecords.created_at.desc())
)
logger.debug("Получение записей за период %s - %s", startDate, endDate)
records = await CRUD.read(query, True)
logger.debug(
"%d записей за период %s - %s успешно получены",
len(records),
startDate,
endDate,
)
return [record.toDict() for record in records]
except Exception:
logger.exception("Ошибка получения записей")
return []
async def get(user_id: int, manager: bool):
from db import CRUD
try:
if manager:
query = (
select(StocksRecords)
.where(
StocksRecords.decision_user_id == None,
)
.order_by(StocksRecords.created_at.asc())
)
else:
query = (
select(StocksRecords)
.where(
StocksRecords.init_user_id == user_id,
StocksRecords.decision_user_id == None,
)
else:
userInfo = "всех пользователей "
decided = ""
daysLimit = f"за последние {days} дн."
query = select(StocksRecords).where(
StocksRecords.created_at > datetime.now() - timedelta(days=days),
.order_by(StocksRecords.created_at.asc())
)
logger.debug(f"Получение всех {decided}записей {userInfo}{daysLimit}")
logger.debug(f"Получение всех записей без решения")
records = await CRUD.read(query, True)
logger.debug(
f"{len(records)} {decided}записей {userInfo}{daysLimit} успешно получены"
)
if len(records) == 0:
return []
records.sort(key=lambda x: x.created_at, reverse=True)
logger.debug(f"{len(records)} записей без решения успешно получены")
recordsData = [record.toDict() for record in records]
logger.debug(recordsData)
return recordsData
except Exception as e:
logger.error(f"Ошибка получения записей: {str(e)}")
return False
return []
async def getById(record_id: int, record: bool = False):
from db import CRUD
db/schemas/__pycache__/access.cpython-313.pyc
BIN
View File
Binary file not shown.
db/schemas/access.py
-4
View File
@@ -14,14 +14,10 @@ class AccessLevel(Base):
updated_at = Column(DateTime, default=datetime.now, onupdate=datetime.now)
# permissions
receiving_edit = Column(Boolean, default=False)
refund_request_edit = Column(Boolean, default=False)
refund_request_confirm = Column(Boolean, default=False)
debit_request_edit = Column(Boolean, default=False)
debit_request_confirm = Column(Boolean, default=False)
tools_creation = Column(Boolean, default=False)
tools_registration = Column(Boolean, default=False)
tools_registration_edit = Column(Boolean, default=False)
tools_edit = Column(Boolean, default=False)
tools_delete = Column(Boolean, default=False)
users_creation = Column(Boolean, default=False)