workers-control 0.2.2__tar.gz → 0.2.4__tar.gz

{workers_control-0.2.2/src/workers_control.egg-info → workers_control-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: workers-control
-Version: 0.2.2
+Version: 0.2.4
 Summary: A flask app for labour time accounting.
 License-Expression: AGPL-3.0-or-later
 Project-URL: Source, https://github.com/ida-arbeitszeit/workers-control
@@ -8,19 +8,19 @@ Project-URL: Documentation, https://workers-control.readthedocs.io/
 Project-URL: Changelog, https://github.com/ida-arbeitszeit/workers-control/blob/master/CHANGELOG.md
 Classifier: Framework :: Flask
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Requires-Python: >=3.12
+Classifier: Programming Language :: Python :: 3.14
+Requires-Python: >=3.13
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: alembic<=1.18.1,>=1.16.4
-Requires-Dist: email-validator<=2.3.0,>=2.2.0
+Requires-Dist: alembic==1.18.1
+Requires-Dist: email-validator==2.3.0
 Requires-Dist: flask==3.1.2
 Requires-Dist: flask-babel==4.0.0
 Requires-Dist: flask-talisman==1.1.0
 Requires-Dist: flask-login==0.6.3
 Requires-Dist: flask-wtf==1.2.2
-Requires-Dist: matplotlib<=3.10.9,>=3.10.5
+Requires-Dist: matplotlib<=3.11.0,>=3.10.9
 Provides-Extra: profiling
 Requires-Dist: flask_profiler; extra == "profiling"
 Dynamic: license-file

{workers_control-0.2.2 → workers_control-0.2.4}/pyproject.toml

@@ -5,28 +5,28 @@ backend-path = ["."]
 
 [project]
 name = "workers-control"
-version = "0.2.2"
+version = "0.2.4"
 description = "A flask app for labour time accounting."
 license = "AGPL-3.0-or-later"
-requires-python = ">=3.12"
+requires-python = ">=3.13"
 classifiers = [
     "Framework :: Flask",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
 ]
 readme = "README.rst"
 
 dependencies = [
     # Pin to exact versions, if possible.
-    "alembic>=1.16.4, <=1.18.1",  # different versions in stable/unstable nixpkgs
-    "email-validator>=2.2.0, <=2.3.0", # different versions in stable/unstable nixpkgs
+    "alembic==1.18.1",
+    "email-validator==2.3.0",
     "flask==3.1.2",
     "flask-babel==4.0.0",
     "flask-talisman==1.1.0",
     "flask-login==0.6.3",
     "flask-wtf==1.2.2",
-    "matplotlib>=3.10.5, <=3.10.9" # different versions in stable/unstable nixpkgs
+    "matplotlib>=3.10.9, <=3.11.0" # different versions in stable/unstable nixpkgs
 ]
 
 [project.optional-dependencies]
@@ -41,7 +41,7 @@ Changelog = "https://github.com/ida-arbeitszeit/workers-control/blob/master/CHAN
 where = [ "src" ]
 
 [tool.black]
-target-version = ['py312']
+target-version = ['py313']
 extend-exclude = '''
 (
   ^/src/workers_control/db/migrations/versions/

workers_control-0.2.2/src/workers_control/core/services/plan_details.py → workers_control-0.2.4/src/workers_control/core/interactors/get_plan_details.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from dataclasses import dataclass
 from datetime import datetime
 from decimal import Decimal
@@ -35,16 +37,24 @@ class PlanDetails:
 
 
 @dataclass
-class PlanDetailsService:
+class GetPlanDetailsInteractor:
+    @dataclass
+    class Request:
+        plan_id: UUID
+
+    @dataclass
+    class Response:
+        plan_details: PlanDetails
+
     database_gateway: DatabaseGateway
     price_calculator: PriceCalculator
     datetime_service: DatetimeService
 
-    def get_details_from_plan(self, plan_id: UUID) -> Optional[PlanDetails]:
+    def get_plan_details(self, request: Request) -> Optional[Response]:
         now = self.datetime_service.now()
         plan_and_cooperation = (
             self.database_gateway.get_plans()
-            .with_id(plan_id)
+            .with_id(request.plan_id)
             .joined_with_cooperation()
             .first()
         )
@@ -54,26 +64,28 @@ class PlanDetailsService:
         price_per_unit = self.price_calculator.calculate_price(plan.id)
         planner = self.database_gateway.get_companies().with_id(plan.planner).first()
         assert planner
-        return PlanDetails(
-            plan_id=plan.id,
-            is_active=plan.is_active_as_of(now),
-            planner_id=planner.id,
-            planner_name=planner.name,
-            product_name=plan.prd_name,
-            description=plan.description,
-            timeframe=plan.timeframe,
-            active_days=plan.active_days(now) or 0,
-            production_unit=plan.prd_unit,
-            amount=plan.prd_amount,
-            means_cost=plan.production_costs.means_cost,
-            resources_cost=plan.production_costs.resource_cost,
-            labour_cost=plan.production_costs.labour_cost,
-            is_public_service=plan.is_public_service,
-            price_per_unit=price_per_unit,
-            cost_per_unit=plan.cost_per_unit(),
-            is_cooperating=bool(cooperation),
-            cooperation=cooperation.id if cooperation else None,
-            creation_date=plan.plan_creation_date,
-            approval_date=plan.approval_date,
-            expiration_date=plan.expiration_date,
+        return self.Response(
+            plan_details=PlanDetails(
+                plan_id=plan.id,
+                is_active=plan.is_active_as_of(now),
+                planner_id=planner.id,
+                planner_name=planner.name,
+                product_name=plan.prd_name,
+                description=plan.description,
+                timeframe=plan.timeframe,
+                active_days=plan.active_days(now) or 0,
+                production_unit=plan.prd_unit,
+                amount=plan.prd_amount,
+                means_cost=plan.production_costs.means_cost,
+                resources_cost=plan.production_costs.resource_cost,
+                labour_cost=plan.production_costs.labour_cost,
+                is_public_service=plan.is_public_service,
+                price_per_unit=price_per_unit,
+                cost_per_unit=plan.cost_per_unit(),
+                is_cooperating=bool(cooperation),
+                cooperation=cooperation.id if cooperation else None,
+                creation_date=plan.plan_creation_date,
+                approval_date=plan.approval_date,
+                expiration_date=plan.expiration_date,
+            )
         )

workers_control-0.2.4/src/workers_control/core/interactors/get_plan_for_review.py

@@ -0,0 +1,26 @@
+from __future__ import annotations
+
+from dataclasses import dataclass
+from uuid import UUID
+
+from workers_control.core.repositories import DatabaseGateway
+
+
+@dataclass
+class GetPlanForReviewInteractor:
+    @dataclass
+    class Request:
+        plan: UUID
+
+    @dataclass
+    class Response:
+        plan_id: UUID
+        product_name: str
+
+    database_gateway: DatabaseGateway
+
+    def get_plan_for_review(self, request: Request) -> Response | None:
+        plan = self.database_gateway.get_plans().with_id(request.plan).first()
+        if plan is None:
+            return None
+        return self.Response(plan_id=plan.id, product_name=plan.prd_name)

{workers_control-0.2.2 → workers_control-0.2.4}/src/workers_control/core/interactors/reject_plan.py

@@ -34,7 +34,7 @@ class RejectPlanInteractor:
         assert planner
         if plan.is_rejected:
             return self.Response(is_plan_rejected=False)
-        matching_plans.update().set_rejection_date(now).perform()
+        self.database_gateway.create_plan_rejection(plan_id=plan.id, date=now)
         email_address_from_planner = (
             self.database_gateway.get_email_addresses()
             .that_belong_to_company(planner.id)

{workers_control-0.2.2 → workers_control-0.2.4}/src/workers_control/core/records.py

@@ -245,6 +245,13 @@ class PlanApproval:
     transfer_of_credit_a: UUID
 
 
+@dataclass
+class PlanRejection:
+    id: UUID
+    plan_id: UUID
+    date: datetime
+
+
 class ConsumptionType(Enum):
     means_of_prod = "means_of_prod"
     raw_materials = "raw_materials"

{workers_control-0.2.2 → workers_control-0.2.4}/src/workers_control/core/repositories.py

@@ -146,11 +146,6 @@ class PlanUpdate(DatabaseUpdate, Protocol):
         updated through this method.
         """
 
-    def set_rejection_date(self, rejection_date: Optional[datetime]) -> Self:
-        """Set the rejection date on all matching plans. The return
-        value counts all the plans that were changed by this method.
-        """
-
     def hide(self) -> Self: ...
 
 
@@ -806,6 +801,12 @@ class DatabaseGateway(Protocol):
 
     def get_plan_approvals(self) -> PlanApprovalResult: ...
 
+    def create_plan_rejection(
+        self,
+        plan_id: UUID,
+        date: datetime,
+    ) -> records.PlanRejection: ...
+
     def create_basic_service(
         self,
         name: str,

{workers_control-0.2.2 → workers_control-0.2.4}/src/workers_control/db/migrations/versions/480a749375de_drop_transaction_table.py

@@ -20,6 +20,10 @@ depends_on: Union[str, Sequence[str], None] = None
 
 
 def upgrade() -> None:
+    inspector = sa.inspect(op.get_bind())
+    if "transaction" not in inspector.get_table_names():
+        return
+
     with op.batch_alter_table("transaction") as batch_op:
         batch_op.drop_constraint(
             "transaction_receiving_account_fkey", type_="foreignkey"

workers_control-0.2.4/src/workers_control/db/migrations/versions/f4a9c2e1b6d3_replace_plan_review_with_plan_rejection.py

@@ -0,0 +1,53 @@
+"""Replace plan_review with plan_rejection
+
+Revision ID: f4a9c2e1b6d3
+Revises: c9f2e1a4b8d7
+Create Date: 2026-05-31 12:00:00.000000
+
+"""
+
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = "f4a9c2e1b6d3"
+down_revision: Union[str, None] = "c9f2e1a4b8d7"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    op.create_table(
+        "plan_rejection",
+        sa.Column("id", sa.Uuid(), nullable=False),
+        sa.Column("plan_id", sa.Uuid(), nullable=False),
+        sa.Column("date", sa.DateTime(), nullable=False),
+        sa.ForeignKeyConstraint(["plan_id"], ["plan.id"], ondelete="CASCADE"),
+        sa.PrimaryKeyConstraint("id"),
+    )
+    op.execute(
+        "INSERT INTO plan_rejection (id, plan_id, date) "
+        "SELECT id, plan_id, rejection_date FROM plan_review "
+        "WHERE rejection_date IS NOT NULL"
+    )
+    op.drop_table("plan_review")
+
+
+def downgrade() -> None:
+    op.create_table(
+        "plan_review",
+        sa.Column("id", sa.Uuid(), nullable=False),
+        sa.Column("rejection_date", sa.DateTime(), nullable=True),
+        sa.Column("plan_id", sa.Uuid(), nullable=False),
+        sa.ForeignKeyConstraint(["plan_id"], ["plan.id"], ondelete="CASCADE"),
+        sa.PrimaryKeyConstraint("id"),
+    )
+    op.execute(
+        "INSERT INTO plan_review (id, plan_id, rejection_date) "
+        "SELECT plan.id, plan.id, plan_rejection.date "
+        "FROM plan LEFT JOIN plan_rejection ON plan_rejection.plan_id = plan.id"
+    )
+    op.drop_table("plan_rejection")

{workers_control-0.2.2 → workers_control-0.2.4}/src/workers_control/db/models.py

@@ -191,8 +191,8 @@ class Plan(Base):
     )
     hidden_by_user: Mapped[bool] = mapped_column(default=False)
 
-    review: Mapped["PlanReview  | None"] = relationship(
-        "PlanReview", back_populates="plan"
+    rejection: Mapped["PlanRejection | None"] = relationship(
+        "PlanRejection", back_populates="plan"
     )
     approval: Mapped["PlanApproval | None"] = relationship(
         "PlanApproval", back_populates="plan"
@@ -206,19 +206,19 @@ class PlanCooperation(Base):
     cooperation: Mapped[UUID] = mapped_column(Uuid, ForeignKey("cooperation.id"))
 
 
-class PlanReview(Base):
-    __tablename__ = "plan_review"
+class PlanRejection(Base):
+    __tablename__ = "plan_rejection"
 
     id: Mapped[UUID] = mapped_column(Uuid, primary_key=True, default=uuid4)
-    rejection_date: Mapped[datetime | None] = mapped_column(TZDateTime)
     plan_id: Mapped[UUID] = mapped_column(
         Uuid, ForeignKey("plan.id", ondelete="CASCADE")
     )
+    date: Mapped[datetime] = mapped_column(TZDateTime)
 
-    plan: Mapped["Plan"] = relationship("Plan", back_populates="review")
+    plan: Mapped["Plan"] = relationship("Plan", back_populates="rejection")
 
     def __repr__(self) -> str:
-        return f"PlanReview(id={self.id!r}, plan_id={self.plan_id!r}, rejection_date={self.rejection_date!r})"
+        return f"PlanRejection(id={self.id!r}, plan_id={self.plan_id!r}, date={self.date!r})"
 
 
 class PlanApproval(Base):

{workers_control-0.2.2 → workers_control-0.2.4}/src/workers_control/db/repositories.py

@@ -114,16 +114,11 @@ class PlanQueryResult(SqlQueryResult[records.Plan]):
         )
 
     def ordered_by_rejection_date(self, ascending: bool = True) -> Self:
-        review = aliased(models.PlanReview)
-        ordering = (
-            review.rejection_date.asc() if ascending else review.rejection_date.desc()
-        )
-        query = self._with_modified_query(
-            lambda query: query.join(review, review.plan_id == models.Plan.id).order_by(
-                ordering
-            )
+        rejection = aliased(models.PlanRejection)
+        ordering = rejection.date.asc() if ascending else rejection.date.desc()
+        return self._with_modified_query(
+            lambda query: query.outerjoin(rejection).order_by(ordering)
         )
-        return query
 
     def with_id_containing(self, query: str) -> Self:
         return self._with_modified_query(
@@ -143,11 +138,8 @@ class PlanQueryResult(SqlQueryResult[records.Plan]):
         )
 
     def that_are_rejected(self) -> Self:
-        plan_review = aliased(models.PlanReview)
         return self._with_modified_query(
-            lambda query: query.join(plan_review).filter(
-                plan_review.rejection_date != None
-            )
+            lambda query: query.filter(models.Plan.rejection != None)
         )
 
     def that_were_approved_before(self, timestamp: datetime) -> Self:
@@ -207,14 +199,11 @@ class PlanQueryResult(SqlQueryResult[records.Plan]):
         )
 
     def without_completed_review(self) -> Self:
-        plan_review = aliased(models.PlanReview)
         return self._with_modified_query(
-            lambda query: query.join(
-                plan_review, plan_review.plan_id == models.Plan.id
-            ).filter(
+            lambda query: query.filter(
                 and_(
                     models.Plan.approval == None,
-                    plan_review.rejection_date == None,
+                    models.Plan.rejection == None,
                 )
             )
         )
@@ -436,7 +425,6 @@ class PlanUpdate:
     query: Query
     db: Database
     plan_update_values: Dict[str, Any] = field(default_factory=dict)
-    review_update_values: Dict[str, Any] = field(default_factory=dict)
     cooperation_update: SetCooperation | None = None
 
     @dataclass
@@ -459,19 +447,6 @@ class PlanUpdate:
             )
             result = self.db.session.execute(sql_statement)
             row_count = cast(CursorResult, result).rowcount
-        if self.review_update_values:
-            sql_statement = (
-                update(models.PlanReview)
-                .where(
-                    models.PlanReview.plan_id.in_(
-                        self.query.with_entities(models.Plan.id).scalar_subquery()
-                    )
-                )
-                .values(**self.review_update_values)
-                .execution_options(synchronize_session="fetch")
-            )
-            result = self.db.session.execute(sql_statement)
-            row_count = max(row_count, cast(CursorResult, result).rowcount)
         if self.cooperation_update:
             match self.cooperation_update:
                 case self.SetCooperation(cooperation=None):
@@ -527,14 +502,6 @@ class PlanUpdate:
             ),
         )
 
-    def set_rejection_date(self, rejection_date: Optional[datetime]) -> Self:
-        return replace(
-            self,
-            review_update_values=dict(
-                self.review_update_values, rejection_date=rejection_date
-            ),
-        )
-
     def hide(self) -> Self:
         return replace(
             self,
@@ -2803,9 +2770,7 @@ class DatabaseGatewayImpl:
             timeframe=duration_in_days,
             is_public_service=is_public_service,
         )
-        review = models.PlanReview(plan=plan, rejection_date=None)
         self.db.session.add(plan)
-        self.db.session.add(review)
         self.db.session.flush()
         return self.plan_from_orm(plan)
 
@@ -2828,7 +2793,7 @@ class DatabaseGatewayImpl:
             timeframe=int(plan.timeframe),
             is_public_service=plan.is_public_service,
             approval_date=plan.approval.date if plan.approval else None,
-            rejection_date=plan.review.rejection_date if plan.review else None,
+            rejection_date=plan.rejection.date if plan.rejection else None,
             requested_cooperation=(
                 plan.requested_cooperation if plan.requested_cooperation else None
             ),
@@ -3361,6 +3326,33 @@ class DatabaseGatewayImpl:
             mapper=self.plan_approval_from_orm,
         )
 
+    def create_plan_rejection(
+        self,
+        plan_id: UUID,
+        date: datetime,
+    ) -> records.PlanRejection:
+        rejection_orm = models.PlanRejection(
+            id=uuid4(),
+            plan_id=plan_id,
+            date=date,
+        )
+        plan_orm = self.db.session.query(models.Plan).filter_by(id=plan_id).first()
+        assert plan_orm
+        plan_orm.rejection = rejection_orm
+        self.db.session.add(rejection_orm)
+        self.db.session.flush()
+        return self.plan_rejection_from_orm(rejection_orm)
+
+    @classmethod
+    def plan_rejection_from_orm(
+        cls, orm: models.PlanRejection
+    ) -> records.PlanRejection:
+        return records.PlanRejection(
+            id=orm.id,
+            plan_id=orm.plan_id,
+            date=orm.date,
+        )
+
     @classmethod
     def basic_service_from_orm(cls, orm: models.BasicService) -> records.BasicService:
         return records.BasicService(

workers_control-0.2.4/src/workers_control/flask/routes/accountant/routes.py

@@ -0,0 +1,55 @@
+from flask import render_template
+
+from workers_control.core.interactors.get_accountant_dashboard import (
+    GetAccountantDashboardInteractor,
+)
+from workers_control.core.interactors.list_plans_with_pending_review import (
+    ListPlansWithPendingReviewInteractor,
+)
+from workers_control.flask.class_based_view import as_flask_view
+from workers_control.flask.flask_session import FlaskSession
+from workers_control.flask.types import Response
+from workers_control.flask.views.review_plan_view import ReviewPlanView
+from workers_control.web.www.presenters.get_accountant_dashboard_presenter import (
+    GetAccountantDashboardPresenter,
+)
+from workers_control.web.www.presenters.list_plans_with_pending_review_presenter import (
+    ListPlansWithPendingReviewPresenter,
+)
+
+from .blueprint import AccountantRoute
+
+
+@AccountantRoute("/accountant/dashboard")
+def dashboard(
+    flask_session: FlaskSession,
+    interactor: GetAccountantDashboardInteractor,
+    presenter: GetAccountantDashboardPresenter,
+) -> Response:
+    current_user = flask_session.get_current_user()
+    assert current_user
+    response = interactor.get_dashboard(current_user)
+    view_model = presenter.create_dashboard_view_model(response)
+    return render_template(
+        "accountant/dashboard.html",
+        view_model=view_model,
+    )
+
+
+@AccountantRoute("/accountant/plans/unreviewed")
+def list_plans_with_pending_review(
+    interactor: ListPlansWithPendingReviewInteractor,
+    presenter: ListPlansWithPendingReviewPresenter,
+) -> Response:
+    response = interactor.list_plans_with_pending_review(request=interactor.Request())
+    view_model = presenter.list_plans_with_pending_review(response)
+    return render_template(
+        "accountant/plans-to-review-list.html",
+        view_model=view_model,
+        navbar_items=presenter.create_navbar_items(),
+    )
+
+
+@AccountantRoute("/accountant/plans/<uuid:plan_id>/review", methods=["GET", "POST"])
+@as_flask_view()
+class review_plan(ReviewPlanView): ...

{workers_control-0.2.2 → workers_control-0.2.4}/src/workers_control/flask/routes/company/routes.py

@@ -19,12 +19,12 @@ from workers_control.flask.views.create_draft_view import CreateDraftView
 from workers_control.flask.views.delete_draft_view import DeleteDraftView
 from workers_control.flask.views.deny_cooperation_view import DenyCooperationView
 from workers_control.flask.views.draft_details_view import DraftDetailsView
+from workers_control.flask.views.end_plan_cooperation_view import (
+    EndPlanCooperationView,
+)
 from workers_control.flask.views.file_plan_with_accounting_view import (
     FilePlanWithAccountingView,
 )
-from workers_control.flask.views.get_plan_details_company_view import (
-    GetPlanDetailsCompanyView,
-)
 from workers_control.flask.views.get_productive_consumption_details import (
     GetProductiveConsumptionDetailsView,
 )
@@ -147,11 +147,6 @@ class register_productive_consumption_of_basic_service(
 ): ...
 
 
-@CompanyRoute("/plan_details/<uuid:plan_id>")
-@as_flask_view()
-class plan_details(GetPlanDetailsCompanyView): ...
-
-
 @CompanyRoute(
     "/cooperation_summary/<uuid:coop_id>/request_coordination_transfer",
     methods=["GET", "POST"],
@@ -218,6 +213,11 @@ class list_pending_work_invites(ListPendingWorkInvitesView): ...
 class end_cooperation(EndCooperationView): ...
 
 
+@CompanyRoute("/end_plan_cooperation", methods=["POST"])
+@as_flask_view()
+class end_plan_cooperation(EndPlanCooperationView): ...
+
+
 @CompanyRoute("/review_registered_consumptions")
 @as_flask_view()
 class review_registered_consumptions(ReviewRegisteredConsumptionsView): ...

{workers_control-0.2.2 → workers_control-0.2.4}/src/workers_control/flask/routes/member/routes.py

@@ -10,9 +10,6 @@ from workers_control.flask.views.create_basic_service_view import (
 from workers_control.flask.views.deactivate_basic_service_view import (
     DeactivateBasicServiceView,
 )
-from workers_control.flask.views.get_plan_details_member_view import (
-    GetPlanDetailsMemberView,
-)
 from workers_control.flask.views.get_private_consumption_details import (
     GetPrivateConsumptionDetailsView,
 )
@@ -77,11 +74,6 @@ class dashboard(MemberDashboardView): ...
 class my_account(ShowMemberAccountDetailsView): ...
 
 
-@MemberRoute("/plan_details/<uuid:plan_id>")
-@as_flask_view()
-class plan_details(GetPlanDetailsMemberView): ...
-
-
 @MemberRoute("/invite_details/<uuid:invite_id>", methods=["GET", "POST"])
 @as_flask_view()
 class show_company_work_invite(CompanyWorkInviteView): ...

{workers_control-0.2.2 → workers_control-0.2.4}/src/workers_control/flask/routes/user/routes.py

@@ -15,6 +15,7 @@ from workers_control.flask.views import QueryCompaniesView, QueryOffersView
 from workers_control.flask.views.change_email_address_view import ChangeEmailAddressView
 from workers_control.flask.views.change_user_name_view import ChangeUserNameView
 from workers_control.flask.views.coop_summary_view import CoopSummaryView
+from workers_control.flask.views.get_plan_details_view import GetPlanDetailsView
 from workers_control.flask.views.get_statistics_view import GetStatisticsView
 from workers_control.flask.views.http_error_view import http_404
 from workers_control.flask.views.list_all_cooperations_view import (
@@ -86,6 +87,7 @@ def company_summary(
         return render_template(
             "user/company_summary.html",
             view_model=view_model,
+            navbar_items=presenter.create_navbar_items(),
         )
     else:
         return http_404()
@@ -181,3 +183,8 @@ class show_payout_factor_details(ShowPayoutFactorDetailsView): ...
 @AuthenticatedUserRoute("/basic_service/<uuid:basic_service_id>")
 @as_flask_view()
 class show_basic_service(ShowBasicServiceView): ...
+
+
+@AuthenticatedUserRoute("/plan_details/<uuid:plan_id>")
+@as_flask_view()
+class plan_details(GetPlanDetailsView): ...

{workers_control-0.2.2 → workers_control-0.2.4}/src/workers_control/flask/static/main.js

@@ -1,7 +1,30 @@
-function expandMenu() {
-  var element = document.getElementById("navbarOnTop");
-  element.classList.toggle("is-active");
-}
+// Toggle the mobile navbar ("burger") menu, keep aria-expanded in sync, and
+// close it again when clicking outside the menu or following a navbar link.
+document.addEventListener('DOMContentLoaded', () => {
+  const burgers = Array.prototype.slice.call(
+    document.querySelectorAll('.navbar-burger'), 0);
+
+  function closeMenus() {
+    burgers.forEach((burger) => {
+      const menu = document.getElementById(burger.dataset.target);
+      burger.classList.remove('is-active');
+      if (menu) menu.classList.remove('is-active');
+      burger.setAttribute('aria-expanded', 'false');
+    });
+  }
+
+  burgers.forEach((burger) => {
+    burger.addEventListener('click', (event) => {
+      event.stopPropagation();
+      const menu = document.getElementById(burger.dataset.target);
+      const isActive = burger.classList.toggle('is-active');
+      if (menu) menu.classList.toggle('is-active', isActive);
+      burger.setAttribute('aria-expanded', isActive ? 'true' : 'false');
+    });
+  });
+
+  document.addEventListener('click', closeMenus);
+});
 
 // Detect browser timezone and store in cookie for server-side use
 (function() {