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

{workers_control-0.2.3/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.3
+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
@@ -13,14 +13,14 @@ 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.3 → workers_control-0.2.4}/pyproject.toml

@@ -5,7 +5,7 @@ backend-path = ["."]
 
 [project]
 name = "workers-control"
-version = "0.2.3"
+version = "0.2.4"
 description = "A flask app for labour time accounting."
 license = "AGPL-3.0-or-later"
 requires-python = ">=3.13"
@@ -19,14 +19,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]

workers_control-0.2.3/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.3 → workers_control-0.2.4}/src/workers_control/flask/routes/accountant/routes.py

@@ -1,26 +1,18 @@
-from uuid import UUID
-
-from flask import Response as FlaskResponse
 from flask import render_template
 
 from workers_control.core.interactors.get_accountant_dashboard import (
     GetAccountantDashboardInteractor,
 )
-from workers_control.core.interactors.get_plan_details import GetPlanDetailsInteractor
 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.http_error_view import http_404
 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.get_plan_details_accountant_presenter import (
-    GetPlanDetailsAccountantPresenter,
-)
 from workers_control.web.www.presenters.list_plans_with_pending_review_presenter import (
     ListPlansWithPendingReviewPresenter,
 )
@@ -61,24 +53,3 @@ def list_plans_with_pending_review(
 @AccountantRoute("/accountant/plans/<uuid:plan_id>/review", methods=["GET", "POST"])
 @as_flask_view()
 class review_plan(ReviewPlanView): ...
-
-
-@AccountantRoute("/accountant/plan_details/<uuid:plan_id>")
-def plan_details(
-    plan_id: UUID,
-    interactor: GetPlanDetailsInteractor,
-    presenter: GetPlanDetailsAccountantPresenter,
-) -> Response:
-    interactor_request = GetPlanDetailsInteractor.Request(plan_id)
-    interactor_response = interactor.get_plan_details(interactor_request)
-    if interactor_response:
-        view_model = presenter.present(interactor_response)
-        return FlaskResponse(
-            render_template(
-                "accountant/plan_details.html",
-                view_model=view_model,
-                navbar_items=presenter.create_navbar_items(),
-            )
-        )
-    else:
-        return http_404()

{workers_control-0.2.3 → 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.3 → 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.3 → 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 (
@@ -182,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.3 → workers_control-0.2.4}/src/workers_control/flask/templates/company/my_cooperations.html

@@ -21,6 +21,14 @@
                     <div class="subtitle"></div>
                 </div>
             </a>
+            <div class="pt-3"></div>
+            <a href="{{ url_for('main_company.request_cooperation') }}">
+                <div class="box has-background-primary-light">
+                    <h1 class="title is-5"><span class="icon">{{ "envelope"|icon }}</span>
+                        {{ gettext("Request cooperation") }}</h1>
+                    <div class="subtitle"></div>
+                </div>
+            </a>
     </div>
 </div>
 <div class="section has-text-centered">
@@ -175,6 +183,18 @@
                     </p>
                 </div>
             </div>
+            <div class="media-right">
+                <form action="{{ url_for('main_company.end_plan_cooperation') }}" method="post">
+                    <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
+                    <input type="hidden" name="plan_id" value="{{ plan.plan_id }}">
+                    <input type="hidden" name="cooperation_id" value="{{ plan.coop_id }}">
+                    <button class="button large-button is-danger"
+                            type="submit"
+                            title="{{ gettext('End cooperation') }}">
+                        {{ "times"|icon }}
+                    </button>
+                </form>
+            </div>
         </article>
         {% endfor %}
         {% else %}

{workers_control-0.2.3/src/workers_control/flask/templates/accountant → workers_control-0.2.4/src/workers_control/flask/templates/user}/plan_details.html

@@ -8,5 +8,4 @@
 {% block content %}
 {% from 'macros/plan_details.html' import plan_details %}
 {{ plan_details(view_model) }}
-
-{% endblock %}
+{% endblock %}

{workers_control-0.2.3 → workers_control-0.2.4}/src/workers_control/flask/url_index.py

@@ -5,19 +5,11 @@ from uuid import UUID
 from flask import url_for
 
 from workers_control.core.records import ConsumptionType
-from workers_control.web.session import UserRole
 
 
 class GeneralUrlIndex:
-    def get_plan_details_url(self, user_role: Optional[UserRole], plan_id: UUID) -> str:
-        if user_role == UserRole.company:
-            return url_for("main_company.plan_details", plan_id=plan_id)
-        elif user_role == UserRole.member:
-            return url_for("main_member.plan_details", plan_id=plan_id)
-        elif user_role == UserRole.accountant:
-            return url_for("main_accountant.plan_details", plan_id=plan_id)
-        else:
-            raise ValueError(f"Plan summary url is unsupported for {user_role}")
+    def get_plan_details_url(self, plan_id: UUID) -> str:
+        return url_for("main_user.plan_details", plan_id=plan_id)
 
     def get_accountant_invitation_url(self, token: str) -> str:
         return url_for("auth.signup_accountant", token=token)

workers_control-0.2.4/src/workers_control/flask/views/end_plan_cooperation_view.py

@@ -0,0 +1,39 @@
+from dataclasses import dataclass
+from uuid import UUID
+
+import flask
+
+from workers_control.core.interactors.end_cooperation import (
+    EndCooperationInteractor,
+    EndCooperationRequest,
+)
+from workers_control.db import commit_changes
+from workers_control.flask.flask_session import FlaskSession
+from workers_control.flask.types import Response
+from workers_control.web.www.presenters.end_plan_cooperation_presenter import (
+    EndPlanCooperationPresenter,
+)
+
+
+@dataclass
+class EndPlanCooperationView:
+    interactor: EndCooperationInteractor
+    presenter: EndPlanCooperationPresenter
+    flask_session: FlaskSession
+
+    @commit_changes
+    def POST(self) -> Response:
+        form = flask.request.form
+        current_user = self.flask_session.get_current_user()
+        assert current_user
+        cooperation_id = UUID(form["cooperation_id"].strip())
+        plan_id = UUID(form["plan_id"].strip())
+        response = self.interactor.execute(
+            EndCooperationRequest(
+                requester_id=current_user,
+                plan_id=plan_id,
+                cooperation_id=cooperation_id,
+            )
+        )
+        view_model = self.presenter.render_response(response)
+        return flask.redirect(view_model.redirection_url)

workers_control-0.2.3/src/workers_control/flask/views/get_plan_details_company_view.py → workers_control-0.2.4/src/workers_control/flask/views/get_plan_details_view.py

@@ -6,15 +6,15 @@ from flask import render_template
 from workers_control.core.interactors.get_plan_details import GetPlanDetailsInteractor
 from workers_control.flask.types import Response
 from workers_control.flask.views.http_error_view import http_404
-from workers_control.web.www.presenters.get_plan_details_company_presenter import (
-    GetPlanDetailsCompanyPresenter,
+from workers_control.web.www.presenters.get_plan_details_presenter import (
+    GetPlanDetailsPresenter,
 )
 
 
 @dataclass
-class GetPlanDetailsCompanyView:
+class GetPlanDetailsView:
     interactor: GetPlanDetailsInteractor
-    presenter: GetPlanDetailsCompanyPresenter
+    presenter: GetPlanDetailsPresenter
 
     def GET(self, plan_id: UUID) -> Response:
         interactor_request = GetPlanDetailsInteractor.Request(plan_id)
@@ -23,7 +23,7 @@ class GetPlanDetailsCompanyView:
             return http_404()
         view_model = self.presenter.present(interactor_response)
         return render_template(
-            "company/plan_details.html",
+            "user/plan_details.html",
             view_model=view_model,
             navbar_items=self.presenter.create_navbar_items(),
         )

{workers_control-0.2.3 → workers_control-0.2.4}/src/workers_control/web/url_index.py

@@ -7,21 +7,17 @@ need different urls for different roles include the user role in the
 arguments of the declared method.
 """
 
-from dataclasses import dataclass
 from decimal import Decimal
 from typing import Optional, Protocol
 from uuid import UUID
 
 from workers_control.core.records import ConsumptionType
-from workers_control.web.session import Session, UserRole
 
 
 class UrlIndex(Protocol):
     def get_member_dashboard_url(self) -> str: ...
 
-    def get_plan_details_url(
-        self, *, user_role: Optional[UserRole], plan_id: UUID
-    ) -> str: ...
+    def get_plan_details_url(self, plan_id: UUID) -> str: ...
 
     def get_work_invite_url(self, invite_id: UUID) -> str: ...
 
@@ -183,22 +179,3 @@ class UrlIndex(Protocol):
     def get_basic_service_url(self, basic_service_id: UUID) -> str: ...
 
     def get_deactivate_basic_service_url(self, basic_service_id: UUID) -> str: ...
-
-
-@dataclass
-class UserUrlIndex:
-    """This class is not an interface and therefore should not be
-    implemented by the web framework. It is merely used internally as
-    a convinience interface. You should refrain from using this class
-    in your tests and instead rely on the UrlIndex interface. In a
-    test scenario you most likely know in advance if you expect a url
-    intended for a member, company or any other role. This is why the
-    UrlIndex interface is much better suited for testing needs.
-    """
-
-    session: Session
-    url_index: UrlIndex
-
-    def get_plan_details_url(self, plan_id: UUID) -> str:
-        user_role = self.session.get_user_role()
-        return self.url_index.get_plan_details_url(user_role=user_role, plan_id=plan_id)

{workers_control-0.2.3 → workers_control-0.2.4}/src/workers_control/web/www/presenters/end_cooperation_presenter.py

@@ -1,11 +1,9 @@
 from dataclasses import dataclass
-from urllib.parse import urlparse
 from uuid import UUID
 
 from workers_control.core.interactors.end_cooperation import EndCooperationResponse
 from workers_control.web.notification import Notifier
 from workers_control.web.request import Request
-from workers_control.web.session import Session
 from workers_control.web.translator import Translator
 from workers_control.web.url_index import UrlIndex
 
@@ -20,7 +18,6 @@ class EndCooperationPresenter:
     notifier: Notifier
     url_index: UrlIndex
     translator: Translator
-    session: Session
 
     def present(
         self, response: EndCooperationResponse, *, web_request: Request
@@ -37,23 +34,9 @@ class EndCooperationPresenter:
         return self.ViewModel(show_404=False, redirect_url=redirect_url)
 
     def _get_redirect_url(self, request: Request) -> str:
-        referer = request.get_header("Referer")
         query_string = request.query_string()
-        plan_id = query_string.get_last_value("plan_id") or request.get_form("plan_id")
         cooperation_id = query_string.get_last_value(
             "cooperation_id"
         ) or request.get_form("cooperation_id")
-        assert plan_id
         assert cooperation_id
-        if referer:
-            if self._refers_from_plan_details(referer):
-                url = self.url_index.get_plan_details_url(
-                    user_role=self.session.get_user_role(), plan_id=UUID(plan_id)
-                )
-                return url
-        url = self.url_index.get_coop_summary_url(coop_id=UUID(cooperation_id))
-        return url
-
-    def _refers_from_plan_details(self, referer: str) -> bool:
-        referer_path = urlparse(referer).path
-        return True if referer_path.startswith("/company/plan_details") else False
+        return self.url_index.get_coop_summary_url(coop_id=UUID(cooperation_id))

workers_control-0.2.4/src/workers_control/web/www/presenters/end_plan_cooperation_presenter.py

@@ -0,0 +1,29 @@
+from dataclasses import dataclass
+
+from workers_control.core.interactors.end_cooperation import EndCooperationResponse
+from workers_control.web.notification import Notifier
+from workers_control.web.translator import Translator
+from workers_control.web.url_index import UrlIndex
+
+
+@dataclass
+class ViewModel:
+    redirection_url: str
+
+
+@dataclass
+class EndPlanCooperationPresenter:
+    translator: Translator
+    notifier: Notifier
+    url_index: UrlIndex
+
+    def render_response(self, response: EndCooperationResponse) -> ViewModel:
+        if not response.is_rejected:
+            self.notifier.display_info(
+                self.translator.gettext("Cooperation has been terminated.")
+            )
+        else:
+            self.notifier.display_warning(
+                self.translator.gettext("Cooperation could not be terminated.")
+            )
+        return ViewModel(redirection_url=self.url_index.get_my_cooperations_url())

{workers_control-0.2.3 → workers_control-0.2.4}/src/workers_control/web/www/presenters/get_company_summary_presenter.py

@@ -9,7 +9,7 @@ from workers_control.core.interactors.get_company_summary import (
 )
 from workers_control.web.formatters.datetime_formatter import DatetimeFormatter
 from workers_control.web.translator import Translator
-from workers_control.web.url_index import UrlIndex, UserUrlIndex
+from workers_control.web.url_index import UrlIndex
 from workers_control.web.www.navbar import NavbarItem
 
 
@@ -57,7 +57,6 @@ class GetCompanySummaryViewModel:
 
 @dataclass
 class GetCompanySummarySuccessPresenter:
-    user_url_index: UserUrlIndex
     translator: Translator
     url_index: UrlIndex
     control_thresholds: ControlThresholds
@@ -125,8 +124,8 @@ class GetCompanySummarySuccessPresenter:
         return PlanDetailsWeb(
             id=str(plan_details.id),
             name=plan_details.name,
-            url=self.user_url_index.get_plan_details_url(
-                plan_details.id,
+            url=self.url_index.get_plan_details_url(
+                plan_id=plan_details.id,
             ),
             status=(
                 self.translator.gettext("Active")

{workers_control-0.2.3 → workers_control-0.2.4}/src/workers_control/web/www/presenters/get_coop_summary_presenter.py

@@ -5,7 +5,7 @@ from typing import List, Optional
 from workers_control.core.interactors.get_coop_summary import GetCoopSummaryResponse
 
 from ...translator import Translator
-from ...url_index import UrlIndex, UserUrlIndex
+from ...url_index import UrlIndex
 from ..navbar import NavbarItem
 
 
@@ -37,7 +37,6 @@ class GetCoopSummaryViewModel:
 
 @dataclass
 class GetCoopSummarySuccessPresenter:
-    user_url_index: UserUrlIndex
     url_index: UrlIndex
     translator: Translator
 
@@ -73,7 +72,7 @@ class GetCoopSummarySuccessPresenter:
                 AssociatedPlan(
                     plan_id=str(plan.plan_id),
                     plan_name=plan.plan_name,
-                    plan_url=self.user_url_index.get_plan_details_url(plan.plan_id),
+                    plan_url=self.url_index.get_plan_details_url(plan_id=plan.plan_id),
                     plan_individual_price=self.__format_price(
                         plan.plan_individual_price
                     ),

workers_control-0.2.3/src/workers_control/web/formatters/plan_details_formatter.py → workers_control-0.2.4/src/workers_control/web/www/presenters/get_plan_details_presenter.py

@@ -2,11 +2,14 @@ from dataclasses import dataclass
 from decimal import Decimal
 from typing import List, Optional, Tuple
 
-from workers_control.core.services.plan_details import PlanDetails
+from workers_control.core.interactors.get_plan_details import (
+    GetPlanDetailsInteractor,
+    PlanDetails,
+)
+from workers_control.web.formatters.datetime_formatter import DatetimeFormatter
 from workers_control.web.translator import Translator
 from workers_control.web.url_index import UrlIndex
-
-from .datetime_formatter import DatetimeFormatter
+from workers_control.web.www.navbar import NavbarItem
 
 
 @dataclass
@@ -32,12 +35,27 @@ class PlanDetailsWeb:
 
 
 @dataclass
-class PlanDetailsFormatter:
-    url_index: UrlIndex
+class GetPlanDetailsViewModel:
+    details: PlanDetailsWeb
+
+
+@dataclass
+class GetPlanDetailsPresenter:
     translator: Translator
+    url_index: UrlIndex
     datetime_formatter: DatetimeFormatter
 
-    def format_plan_details(self, plan_details: PlanDetails) -> PlanDetailsWeb:
+    def create_navbar_items(self) -> list[NavbarItem]:
+        return [NavbarItem(text=self.translator.gettext("Plan information"), url=None)]
+
+    def present(
+        self, response: GetPlanDetailsInteractor.Response
+    ) -> GetPlanDetailsViewModel:
+        return GetPlanDetailsViewModel(
+            details=self._format_plan_details(response.plan_details),
+        )
+
+    def _format_plan_details(self, plan_details: PlanDetails) -> PlanDetailsWeb:
         return PlanDetailsWeb(
             plan_id=(self.translator.gettext("Plan ID"), str(plan_details.plan_id)),
             activity_string=(

{workers_control-0.2.3 → workers_control-0.2.4}/src/workers_control/web/www/presenters/get_plan_for_review_presenter.py

@@ -5,7 +5,6 @@ from dataclasses import dataclass
 from workers_control.core.interactors.get_plan_for_review import (
     GetPlanForReviewInteractor as Interactor,
 )
-from workers_control.web.session import UserRole
 from workers_control.web.translator import Translator
 from workers_control.web.url_index import UrlIndex
 from workers_control.web.www.navbar import NavbarItem
@@ -27,7 +26,7 @@ class GetPlanForReviewPresenter:
         return self.ViewModel(
             product_name=response.product_name,
             plan_details_url=self.url_index.get_plan_details_url(
-                user_role=UserRole.accountant, plan_id=response.plan_id
+                plan_id=response.plan_id
             ),
             review_form_action_url=self.url_index.get_plan_review_url(response.plan_id),
             navbar_items=[