Improve staff My Work board filters business display and pagination
This commit is contained in:
@@ -2027,7 +2027,20 @@ def employee_my_work_task_status(
|
||||
|
||||
|
||||
@portal_router.get("/work")
|
||||
def employee_my_work(request: Request, q: str = "", status: str = "open", completed_page: int = 1):
|
||||
def employee_my_work(
|
||||
request: Request,
|
||||
q: str = "",
|
||||
status: str = "open",
|
||||
period: str = "",
|
||||
service: str = "",
|
||||
due: str = "",
|
||||
sort: str = "due_asc",
|
||||
page_size: int = 10,
|
||||
in_progress_page: int = 1,
|
||||
pending_page: int = 1,
|
||||
blocked_page: int = 1,
|
||||
completed_page: int = 1,
|
||||
):
|
||||
db = CommonSessionLocal()
|
||||
try:
|
||||
current_user = get_current_user(request, db=db)
|
||||
@@ -2048,8 +2061,15 @@ def employee_my_work(request: Request, q: str = "", status: str = "open", comple
|
||||
q=q,
|
||||
status=status,
|
||||
financial_year=financial_year,
|
||||
period=period,
|
||||
service=service,
|
||||
due_bucket=due,
|
||||
sort=sort,
|
||||
page_size=page_size,
|
||||
in_progress_page=in_progress_page,
|
||||
pending_page=pending_page,
|
||||
blocked_page=blocked_page,
|
||||
completed_page=completed_page,
|
||||
completed_page_size=25,
|
||||
)
|
||||
return _render(
|
||||
request,
|
||||
@@ -2061,6 +2081,11 @@ def employee_my_work(request: Request, q: str = "", status: str = "open", comple
|
||||
work_payload=work_payload,
|
||||
q=q,
|
||||
status=status,
|
||||
period=period,
|
||||
service=service,
|
||||
due=due,
|
||||
sort=sort,
|
||||
page_size=work_payload.get("filters", {}).get("page_size", 10),
|
||||
errors=[],
|
||||
financial_year=financial_year,
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user