Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions src/onegov/pas/homepage.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
from __future__ import annotations

from onegov.user.auth.core import Auth
from onegov.pas.app import PasApp
from onegov.core.security import Public
from onegov.org.models import Organisation
from morepath import redirect


from typing import TYPE_CHECKING
if TYPE_CHECKING:
from onegov.town6.request import TownRequest
from webob import Response


@PasApp.view(model=Organisation, permission=Public)
def view_org(
self: Organisation,
request: TownRequest
) -> Response:
""" Renders the homepage. """

if not request.is_logged_in:
return redirect(request.class_link(Auth, name='login'))

return redirect(request.class_link(Organisation, name='pas'))
11 changes: 11 additions & 0 deletions src/onegov/pas/layouts/default.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,21 @@
from functools import cached_property
from onegov.pas import _
from onegov.town6.layout import DefaultLayout as BaseDefaultLayout
from onegov.pas.models.settlement_run import SettlementRun


class DefaultLayout(BaseDefaultLayout):

@cached_property
def current_settlement_run(self) -> SettlementRun | None:
try:
session = self.request.session
query = session.query(SettlementRun)
query = query.filter(SettlementRun.active == True)
return query.first() if query.count() == 1 else None
except Exception: # layout.pt checks for None
return None

@cached_property
def pas_settings_url(self) -> str:
return self.request.link(self.app.org, 'pas-settings')
Expand Down
8 changes: 7 additions & 1 deletion src/onegov/pas/locale/de_CH/LC_MESSAGES/onegov.pas.po
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: OneGov Cloud 1.0\n"
"POT-Creation-Date: 2025-09-02 16:15+0200\n"
"POT-Creation-Date: 2025-09-04 12:14+0200\n"
"PO-Revision-Date: 2021-03-03 16:24+0100\n"
"Language-Team: German\n"
"Language: de_CH\n"
Expand Down Expand Up @@ -544,6 +544,12 @@ msgstr "Keine Import Logs gefunden"
msgid "Skip navigation"
msgstr "Navigation überspringen"

msgid "Settlement Run"
msgstr "Abrechnungslauf"

msgid "(not active)"
msgstr "(Keiner aktiv)"

msgid "Search term"
msgstr "Suchbegriff"

Expand Down
8 changes: 8 additions & 0 deletions src/onegov/pas/templates/layout.pt
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,14 @@
<div class="grid-x grid-padding-x">
<div class="cell small-12">
<div class="global-header-flex ${'' if toolbox else 'centered'}">
<div tal:condition="python:getattr(layout, 'current_settlement_run', None)" class="current-settlement-run">
<a href="${request.link(layout.current_settlement_run, '..')}">
<i class="fas fa-hand-holding-usd" aria-hidden="true"></i>
<span i18n:translate="">Settlement Run</span>:
<span>${layout.format_date(layout.current_settlement_run.start, 'date')} - ${layout.format_date(layout.current_settlement_run.end, 'date')}</span>
<span class="not-active" tal:condition="not layout.current_settlement_run.active" i18n:translate="">(not active)</span>
</a>
</div>
<ul tal:condition="toolbox" class="vertical medium-horizontal menu global-tools-menu" data-responsive-menu="accordion medium-dropdown">
<li tal:repeat="tool toolbox">
<tal:b condition="tool.links|nothing" define="dropdown_id 'global-dropdown-{}'.format(repeat.tool.number)">
Expand Down
5 changes: 5 additions & 0 deletions src/onegov/pas/theme/styles/pas.scss
Original file line number Diff line number Diff line change
Expand Up @@ -172,3 +172,8 @@ pre {
transform: scale(1);
}
}

.current-settlement-run {
color: white;
}

Loading