- {% translate "Personal Data" %}
-
+
+
+
+
+ {% translate "Personal Data" %}
+
+
{% translate 'Mails' %}
-
-
-
-
-
- {% translate "Name" %}:
- {% get_display_name_full object %}
-
+ {% if perms.group.manage %}
+
+ {% translate 'Edit groups' %}
+
+ {% endif %}
+
+ {% translate 'Edit username' %}
+
+ {% if perms.accounts.manage %}
+
+ {% translate 'Edit' %}
+
+ {% else %}
+
+ {% translate 'Edit name and pronouns' %}
+
+ {% endif %}
+
+
+
+
+
+
+ {% translate "Name" %}:
+ {% get_display_name_full object %}
-
- {% translate "Username" %}:
- {{ object.username }}
+
+
+ {% translate "Username" %}:
+ {{ object.username }}
+
+
+ {% translate "Email" %}:
+ {{ object.email }}
+
+
+ {% translate "Phone number" %}:
+
+ {% if object.phone_number %}
+ {{ object.phone_number|format_phone_number }}
+ {% else %}
+ {% translate "Missing" %}
+ {% endif %}
+
+
+
+ {% translate "Birthdate" %}:
+
+ {% if object.birthdate %}
+ {{ object.birthdate|date:"d.m.Y" }}
+ {% else %}
+ {% translate "Missing" %}
+ {% endif %}
-
- {% translate "Email" %}:
- {{ object.email }}
+
+
+ {% translate "Address" %}:
+
+ {% if object.street and object.city %}
+ {{ object.get_display_address }}
+ {% else %}
+ {% translate "Missing" %}
+ {% endif %}
-
- {% translate "Phone number" %}:
-
- {% if object.phone_number %}
- {{ object.phone_number|format_phone_number }}
- {% else %}
- {% translate "Missing" %}
- {% endif %}
-
+
+
+ {% translate "Preferred Language" %}:
+ {{ object.get_preferred_language_display }}
+
+ {% if perms.accounts.view %}
+
+ {% translate "Groups" %}:
+ {{ object.get_groups_display }}
+
+
+ {% translate "Permissions" %}:
+ {{ object.get_permissions_display }}
+
+ {% endif %}
+
+ {% translate "Co-Purchaser" %}:
+
+ {% if object.co_purchaser %}
+ {{ object.co_purchaser }}
+ {% else %}
+ -
+ {% endif %}
-
- {% translate "Preferred Language" %}:
- {{ object.get_preferred_language_display }}
+
+
+ {% if perms.accounts.manage %}
+
+
- {% if perms.accounts.view %}
-
- {% translate "Groups" %}:
- {{ object.get_groups_display }}
-
-
- {% translate "Permissions" %}:
- {{ object.get_permissions_display }}
-
{% endif %}
-
- {% translate "Co-Purchaser" %}:
-
- {% if object.co_purchaser %}
- {{ object.co_purchaser }}
- {% else %}
- -
- {% endif %}
-
+ {% if object.pk == request.user.pk %}
+
+ {% endif %}
+
+
+ {% if object.share_owner.rizoma_member_data and object.share_owner.rizoma_member_data.photo_id %}
+
+
+ 
- {% if object.share_owner.rizoma_member_data and object.share_owner.rizoma_member_data.photo_id %}
-
-
-
-
-
- {% endif %}
+ {% endif %}
- {% if not shifts_only %}
- {% share_owner_ownership_list object.share_owner %}
- {% endif %}
-
-
- {% user_shifts_overview object %}
- {% log_entry_list tapir_user=object %}
{% if not shifts_only %}
-
- {% purchase_tracking_card tapir_user=object %}
- {% if tapir_user.share_owner and tapir_user.allows_purchase_tracking %}
- {% purchase_statistics_card tapir_user=object %}
- {% credit_account_card tapir_user=object %}
- {% endif %}
-
+ {% share_owner_ownership_list object.share_owner %}
+ {% endif %}
+
+
+ {% user_shifts_overview object %}
+ {% log_entry_list tapir_user=object %}
+
+{% if not shifts_only %}
+
+ {% purchase_tracking_card tapir_user=object %}
+ {% if tapir_user.share_owner and tapir_user.allows_purchase_tracking %}
+ {% purchase_statistics_card tapir_user=object %}
+ {% credit_account_card tapir_user=object %}
{% endif %}
+
+{% endif %}
{% endblock content %}
\ No newline at end of file
diff --git a/rizoma/templates/core/base.html b/rizoma/templates/core/base.html
index a329302ed..367976616 100644
--- a/rizoma/templates/core/base.html
+++ b/rizoma/templates/core/base.html
@@ -48,7 +48,7 @@
{% vite_react_refresh %}
-
+
diff --git a/rizoma/templates/rizoma/all_shifts.html b/rizoma/templates/rizoma/all_shifts.html
new file mode 100644
index 000000000..4d96e4a13
--- /dev/null
+++ b/rizoma/templates/rizoma/all_shifts.html
@@ -0,0 +1,128 @@
+{% extends "shifts/base.html" %}
+
+{% block body_class %}all-shifts-page{% endblock %}
+
+{% load django_bootstrap5 %}
+{% load static %}
+{% load shifts %}
+{% load i18n %}
+{% load core %}
+{% block head %}
+
+ {{ block.super }}
+
+
+
+
+
+{% endblock head %}
+{% block content %}
+
+
+
+
+
+
+ {{ _("All Shifts") }}
+
+
+
+ {{_("Upcoming")}}
+ {{_("Recurring")}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {% for day, shift_infos in shifts_infos_by_day.items %}
+
+
+ {{ day|date:"D d/m/y" }}
+
+
+
+
+ {{ time.start_time|date:"H:i" }} - {{ time.end_time|date:"H:i" }}
+ {% endfor %}
+
+
+ {% for name in shift_infos.names %}
+
+ {{ name }}
+
+ {% for time in shift_infos.times %}
+
+ {% for shift in shift_infos.shifts%}
+
+ {% if shift.start_time == time.start_time %}
+
+ {% for attendance in shift.attendances|dictionary_get:name %}
+ {% if attendance.state == "empty" %}
+
+
+ {{_("Empty")}}
+
+
+
+
+ {% else %}
+
+ {{ attendance.user.get_full_name }}
+ {% if attendance.state == "single" %}
+
+ {{ _("Flex") }}
+
+ {% endif %}
+
+ {% endif %}
+ {% endfor %}
+
+ {% endif %}
+ {% endfor %}
+
+ {% endfor %}
+
+ {% endfor %}
+
+
+
+ {% endfor %}
+
+{% endblock content %}
diff --git a/rizoma/templates/shifts/shift_template_group_calendar.html b/rizoma/templates/shifts/shift_template_group_calendar.html
new file mode 100644
index 000000000..33bcced93
--- /dev/null
+++ b/rizoma/templates/shifts/shift_template_group_calendar.html
@@ -0,0 +1,47 @@
+{% extends "shifts/base.html" %}
+{% load django_bootstrap5 %}
+{% load i18n %}
+{% load static %}
+{% load shifts %}
+{% load coop %}
+{% load core %}
+{% block title %}
+ {% translate 'ABCD weeks calendar' %}
+{% endblock title %}
+{% block head %}
+ {{ block.super }}
+
+{% endblock head %}
+{% block content %}
+
+
+
+ {{ _("All Shifts") }}
+
+
+ {{_("Upcoming")}}
+ {{_("Recurring")}}
+
+
+
+ {% translate 'ABCD weeks calendar' %}
+
+
+ {{ displayed_year|add:-1 }}
+
+
+
+ {{ displayed_year }} {% translate 'as pdf' %}
+
+
+ {{ displayed_year|add:1 }}
+
+
+
+ {{ rendered_calendar }}
+
+
+{% endblock content %}
diff --git a/rizoma/templates/shifts/user_dashboard.html b/rizoma/templates/shifts/user_dashboard.html
new file mode 100644
index 000000000..ab9059600
--- /dev/null
+++ b/rizoma/templates/shifts/user_dashboard.html
@@ -0,0 +1,501 @@
+{% extends "shifts/base.html" %}
+{% load django_bootstrap5 %}
+{% load static %}
+{% load utils %}
+{% load i18n %}
+{% load shifts %}
+{% load core %}
+{% load i18n %}
+{% block head %}
+ {{ block.super }}
+{% endblock head %}
+{% block title %}
+ {% translate 'Your Shift Dashboard' %}
+{% endblock title %}
+{% block content %}
+
+{% comment %}
+
+##### #####
+# # # # # ###### ##### # # ##### ## ##### # # ####
+# # # # # # # # # # # # # #
+ ##### ###### # ##### # ##### # # # # # # ####
+ # # # # # # # # ###### # # # #
+# # # # # # # # # # # # # # # # #
+ ##### # # # # # ##### # # # # #### ####
+
+
+ copied from user_shifts_overview_tag
+
+{% endcomment %}
+
+
+
+ {% translate "Shifts" %}
+
+ {% if perms.shifts.manage and user.shift_user_data %}
+
+ {% translate 'Edit' %}
+
+ {% endif %}
+
+
+
+
+ {% translate "Status" %}:
+ {% get_attendance_mode_display user.shift_user_data %}
+
+
+ {% if user.shift_attendance_templates.count > 0 %}
+ {% translate "ABCD Shift" %}:
+
+ {% for shift_attendance_template in user.shift_attendance_templates.all %}
+
+
+ {{ shift_attendance_template.slot_template.get_display_name }}
+
+
+ {% if not forloop.last %},{% endif %}
+ {% endfor %}
+
+ {% elif user.shift_user_data.attendance_mode == 'regular' %}
+ {% translate "ABCD Shift" %}:
+
+ {% translate "Missing" %}
+ {% if perms.shifts.manage %}
+
+ {% translate "Find an ABCD shift" %}
+
+ {% endif %}
+
+ {% endif %}
+
+
+ {% translate "Upcoming Shift" %}:
+
+ {% with next_slot=user.shift_user_data.get_upcoming_shift_attendances.first.slot %}
+ {% if next_slot %}
+ {{ next_slot.get_display_name }}
+ (in {{ next_slot.shift.start_time|timeuntil }})
+
+ {% translate "Show more" %}
+
+ {% for shift_attendance in user.shift_user_data.get_upcoming_shift_attendances %}
+
+ {% shift_block shift_attendance.slot.shift %}
+
+ {% endfor %}
+
+ {% else %}
+ {% translate "None" context "No upcoming shift" %}
+ {% endif %}
+ {% endwith %}
+
+
+
+ {% translate "Shift Status" %}:
+
+ {% if user.shift_user_data.is_balance_ok %}
+ {% translate "OK" %}
+ {% if user.shift_user_data.get_account_balance < 0 %}
+ ({% translate "Shift for ongoing cycle pending" %})
+ {% elif user.shift_user_data.get_account_balance > 0 %}
+ ({% blocktranslate with num_banked_shifts=user.shift_user_data.get_account_balance %}
+ {{ num_banked_shifts }} banked shifts
+ {% endblocktranslate %})
+ {% endif %}
+ {% else %}
+ {% translate "On alert" %} ({{ user.shift_user_data.get_account_balance|stringformat:"+d" }})
+ {% endif %}
+ {% translate 'log' %}
+
+
+
+ {% translate "Qualifications" %}:
+
+ {% if user.shift_user_data.capabilities %}
+ {{ user.shift_user_data.get_capabilities_display }}
+ {% else %}
+ {% translate "None" context "No qualifications" %}
+ {% endif %}
+
+
+
+ {% translate "Exemption" %}:
+
+
+ {% with exemption=user.shift_user_data.get_current_shift_exemption %}
+ {% if exemption %}
+ {{ exemption.description }} {% translate 'until' %}
+ {% if exemption.end_date %}
+ {{ user.shift_user_data.get_current_shift_exemption.end_date|date:"d.m.y" }}
+ {% else %}
+ ∞
+ {% endif %}
+ {% else %}
+ {% translate "None" context "No shift exemption" %}
+ {% endif %}
+ {% endwith %}
+
+
+
+ {% translate 'View all' %}
+
+
+
+ {% feature_flag_enabled "Enable Solidarity Shifts" as solidarity_shifts_enabled %}
+ {% if solidarity_shifts_enabled %}
+
+ {% translate "Solidarity" %}:
+
+
+
+
+
+
+ {% translate "Solidarity Status" %}:
+
+ {% get_used_solidarity_shifts_current_year user.shift_user_data as used_solidarity_shifts_current_year %}
+ {% if used_solidarity_shifts_current_year >= 2 %}
+ {% blocktranslate with used_solidarity_shifts_current_year=used_solidarity_shifts_current_year %}
+ You already used {{ used_solidarity_shifts_current_year }} out of 2 Solidarity Shifts
+ this year
+ {% endblocktranslate %}
+ {% elif used_solidarity_shifts_current_year < 2 and user.shift_user_data.get_available_solidarity_shifts and user.shift_user_data.get_account_balance < 0 %}
+ {% blocktranslate with used_solidarity_shifts_current_year=used_solidarity_shifts_current_year %}
+ There are Solidarity Shifts available for you to use. You
+ used {{ used_solidarity_shifts_current_year }} out of 2 Solidarity Shifts this year
+ {% endblocktranslate %}
+ {% elif used_solidarity_shifts_current_year < 2 and user.shift_user_data.get_available_solidarity_shifts and user.shift_user_data.get_account_balance <= 0 %}
+ {% blocktranslate %}
+
+ You cannot receive a Solidarity Shift at the moment
+ {% endblocktranslate %}
+ {% elif not user.shift_user_data.get_available_solidarity_shifts %}
+ {% blocktranslate %}
+ There are no Solidarity Shifts available at the moment
+ {% endblocktranslate %}
+ {% endif %}
+
+
+ {% endif %}
+ {% feature_flag_enabled "feature_flags.shifts.shift_partner" as shift_partner_enabled %}
+ {% if shift_partner_enabled %}
+
+ {% translate "Shift partner" %}:
+
+ {% if user.shift_user_data.shift_partner_of %}
+ {% get_html_link_or_just_name user.shift_user_data.shift_partner_of.user request.user %}
+ {% elif user.shift_user_data.shift_partner %}
+ {% get_html_link_or_just_name user.shift_user_data.shift_partner.user request.user %}
+ {% else %}
+ {% blocktranslate asvar tooltip %}
+ You can email the member office to ask for a shift partner to be registered.
+ See member manual section III.F.6
+ {% endblocktranslate %}
+
+ {% translate "None" context "No shift partner" %}
+
+ {% endif %}
+
+
+ {% endif %}
+
+
+
+{% comment %}
+
+# # #####
+# # ##### #### #### # # # # # #### # # # # # ###### ##### ####
+# # # # # # # # ## ## # ## # # # # # # # # # #
+# # # # # # # # ## # # # # # # ##### ###### # ##### # ####
+# # ##### # # # # # # # # # # ### # # # # # # #
+# # # # # # # # # # # ## # # # # # # # # # # #
+ ##### # #### #### # # # # # #### ##### # # # # # ####
+
+
+ stolen from user_shifts_overview_tag.html and adapted
+
+{% endcomment %}
+
+
+
+
+ {% translate 'Upcoming Shifts: ' %}
+
+
+
+ {% for shift_attendance in user.shift_user_data.get_upcoming_shift_attendances %}
+ {% with next_slot=shift_attendance.slot %}
+ {% if next_slot %}
+ {{ next_slot.get_display_name }}
+ (in {{ next_slot.shift.start_time|timeuntil }})
+
+ {% translate "Show more" %}
+
+ {% for shift_attendance in user.shift_user_data.get_upcoming_shift_attendances %}
+
+ {% shift_block shift_attendance.slot.shift %}
+
+ {% endfor %}
+
+ {% else %}
+ {% translate "None" context "No upcoming shift" %}
+ {% endif %}
+ {% endwith %}
+ {% endfor %}
+
+
+
+{% comment %}
+
+###### #####
+# # ## #### ##### # # # # # ###### ##### ####
+# # # # # # # # # # # # #
+###### # # #### # ##### ###### # ##### # ####
+# ###### # # # # # # # # #
+# # # # # # # # # # # # # # #
+# # # #### # ##### # # # # # ####
+
+
+copied from user_shift_account_log.html
+
+{% endcomment %}
+
+
+
+
+
+ {% translate 'Shift account log for: ' %}
+ {% get_display_name_for_viewer user request.user %}
+
+ {% if perms.shifts.manage %}
+
+ {% translate 'Add a manual entry' %}
+
+ {% endif %}
+
+
+
+
+
+ {% translate 'Date' %}
+ {% translate 'Value' %}
+ {% translate 'Balance at date' %}
+ {% translate 'Description' %}
+
+
+
+ {% for entry_data in entries_data %}
+
+ {{ entry_data.entry.date|date:"d.m.Y H:i" }}
+ {{ entry_data.entry.value }}
+ {{ entry_data.balance_at_date }}
+ {{ entry_data.entry.description }}
+
+ {% endfor %}
+
+
+
+
+
+
+{% comment %}
+
+####### #####
+# # # ##### ##### # # # # # # # ###### ##### ####
+# ## ## # # # # # # # # # # # #
+##### # ## # # # # # ##### ###### # ##### # ####
+# # # ##### # # # # # # # # #
+# # # # # # # # # # # # # # #
+####### # # # # # ##### # # # # # ####
+
+ started from shift_calendar_template.html
+
+
+{% endcomment %}
+
+
+{% if urgent_shifts %}
+
+
+
+ {% translate "Urgent Shifts" %}
+ ({{ total_urgent_slots }} {% translate "slots need coverage" %})
+
+
+
+
+
+
+
+ {% translate "Type" %}
+ {% translate "Date" %}
+ {% translate "Time" %}
+ {% translate "Note" %}
+ {% translate "Action" %}
+
+
+
+ {% for shift in urgent_shifts %}
+ {% for slot in shift.attendable_slots %}
+
+
+ {% if slot.name %}
+ {{ slot.name }}
+ {% else %}
+ {{ shift.name }}
+ {% endif %}
+
+ {{ shift.start_time|date:"D, M d" }}
+ {{ shift.start_time|date:"H:i" }} - {{ shift.end_time|date:"H:i" }}
+
+ {% if shift.description %}
+ {{ shift.description|truncatechars:50 }}
+ {% else %}
+ -
+ {% endif %}
+
+
+
+
+ {% translate "Join" %}
+
+
+
+ {% endfor %}
+ {% endfor %}
+
+
+
+
+
+{% endif %}
+
+
+
+
+
+ {% translate "Available Shifts" %}
+ ({{ total_available_slots }} {% translate "slots available" %})
+
+
+
+ {% if shifts %}
+
+
+
+
+ {% translate "Type" %}
+ {% translate "Date" %}
+ {% translate "Time" %}
+ {% translate "Note" %}
+ {% translate "Action" %}
+
+
+
+ {% for shift in shifts %}
+ {% for slot in shift.attendable_slots %}
+
+
+ {% if slot.name %}
+ {{ slot.name }}
+ {% else %}
+ {{ shift.name }}
+ {% endif %}
+
+ {{ shift.start_time|date:"D, M d" }}
+ {{ shift.start_time|date:"H:i" }} - {{ shift.end_time|date:"H:i" }}
+
+ {% if shift.description %}
+ {{ shift.description|truncatechars:50 }}
+ {% else %}
+ -
+ {% endif %}
+
+
+
+
+ {% translate "Join" %}
+
+
+
+ {% endfor %}
+ {% endfor %}
+
+
+
+ {% else %}
+
+
+
+ {% translate "No available shifts found for the selected period." %}
+ {% translate "Try adjusting your date range or check back later." %}
+
+
+ {% endif %}
+
+
+
+{% endblock content %}
\ No newline at end of file
diff --git a/tapir/rizoma/apps.py b/tapir/rizoma/apps.py
index a0f7c55e5..6f5ef92d8 100644
--- a/tapir/rizoma/apps.py
+++ b/tapir/rizoma/apps.py
@@ -19,7 +19,7 @@ def register_rizoma_sidebar_link_groups(self):
admin_group.add_link(
display_name=_("All shifts"),
material_icon="calendar_today",
- url=reverse_lazy("shifts:calendar"),
+ url=reverse_lazy("rizoma:all_shifts"),
ordering=1,
required_permissions=[PERMISSION_COOP_ADMIN],
)
\ No newline at end of file
diff --git a/tapir/rizoma/urls.py b/tapir/rizoma/urls.py
new file mode 100644
index 000000000..ce0291d20
--- /dev/null
+++ b/tapir/rizoma/urls.py
@@ -0,0 +1,12 @@
+from django.urls import path
+
+from tapir.rizoma import views
+
+app_name = "rizoma"
+urlpatterns = [
+ path(
+ "shifts/all",
+ views.RizomaAllShiftsView.as_view(),
+ name="all_shifts",
+ ),
+]
diff --git a/tapir/rizoma/utils.py b/tapir/rizoma/utils.py
new file mode 100644
index 000000000..1559de915
--- /dev/null
+++ b/tapir/rizoma/utils.py
@@ -0,0 +1,83 @@
+from tapir.shifts.models import ShiftSlot
+from tapir.shifts.models import ShiftAttendance
+from django.utils.translation import gettext_lazy as _
+from tapir.shifts.templatetags.shifts import sort_slots_by_name
+from tapir.shifts.templatetags.shifts import get_html_classes_for_filtering
+from tapir.shifts.templatetags.shifts import template_group_name_to_character
+from tapir.shifts.models import Shift
+
+def get_attendance_details(slot: ShiftSlot) -> str:
+ attendance = None
+ for a in slot.attendances.all():
+ if a.is_valid():
+ attendance = a
+ break
+
+ if not attendance:
+ return {
+ "state": "empty",
+ "slot": slot,
+ }
+
+ if attendance.state == ShiftAttendance.State.LOOKING_FOR_STAND_IN:
+ return {
+ "state": "standin",
+ "slot": slot,
+ }
+ if (
+ slot.slot_template is not None
+ and hasattr(slot.slot_template, "attendance_template")
+ and slot.slot_template.attendance_template.user == attendance.user
+ ):
+ return {
+ "state": "regular",
+ "user": slot.slot_template.attendance_template.user,
+ "infos": slot.slot_template.attendance_template,
+ "slot": slot,
+ }
+
+ return {
+ "state": "single",
+ "user": attendance.user,
+ "slot": slot,
+ }
+
+def format_shift_for_template(shift: Shift, fill_parent: bool):
+ attendances = {}
+
+ slots = sort_slots_by_name(list(shift.slots.all()))
+
+ for slot in slots:
+ slot_name = slot.name
+ if slot_name == "":
+ slot_name = _("General")
+ if slot_name not in attendances:
+ attendances[slot_name] = []
+
+ attendances[slot_name].append(get_attendance_details(slot))
+
+ template_group = None
+ if shift.shift_template:
+ template_group = template_group_name_to_character(
+ shift.shift_template.group.name
+ )
+
+ style = ""
+ if fill_parent:
+ style = "height:100%; width: 100%;"
+
+ return {
+ "attendances": attendances,
+ "name": shift.name,
+ "start_time": shift.start_time,
+ "end_time": shift.end_time,
+ "start_date": shift.start_time,
+ "weekday": None,
+ "template_group": template_group,
+ "style": style,
+ "id": shift.id,
+ "is_template": False,
+ "filter_classes": " ".join(get_html_classes_for_filtering(shift)),
+ "flexible_time": shift.flexible_time,
+ }
+
diff --git a/tapir/rizoma/views.py b/tapir/rizoma/views.py
index 91ea44a21..41d20a513 100644
--- a/tapir/rizoma/views.py
+++ b/tapir/rizoma/views.py
@@ -1,3 +1,181 @@
from django.shortcuts import render
+from django.contrib.auth.mixins import LoginRequiredMixin
+from django.views.generic import TemplateView
+import datetime
+from django.utils import timezone
+from collections import OrderedDict
+from tapir.shifts.models import Shift
+from tapir.shifts.models import ShiftSlot
+from tapir.shifts.templatetags.shifts import shift_name_as_class
+from django.utils.translation import gettext_lazy as _
+from tapir.rizoma.utils import format_shift_for_template
-# Create your views here.
+from datetime import date, timedelta
+from django.urls import reverse
+
+
+# based on the ShiftCalendarView in shifts/views/calendars.py
+class RizomaAllShiftsView(LoginRequiredMixin, TemplateView):
+ template_name = "rizoma/all_shifts.html"
+ DATE_FORMAT = "%Y-%m-%d"
+
+ def get_context_data(self, *args, **kwargs):
+ context_data = super().get_context_data(**kwargs)
+
+ try:
+ date_from = (
+ datetime.datetime.strptime(
+ self.request.GET["date_from"], self.DATE_FORMAT
+ ).date()
+ if "date_from" in self.request.GET.keys()
+ else timezone.now().date()
+ )
+ date_to = (
+ datetime.datetime.strptime(
+ self.request.GET["date_to"], self.DATE_FORMAT
+ ).date()
+ if "date_to" in self.request.GET.keys()
+ else date_from + datetime.timedelta(days=7)
+ )
+ except:
+ date_from = timezone.now().date()
+ date_to = date_from + datetime.timedelta(days=7)
+
+ context_data["date_from"] = date_from.strftime(self.DATE_FORMAT)
+ context_data["date_to"] = date_to.strftime(self.DATE_FORMAT)
+
+ context_data["nb_days_for_self_unregister"] = Shift.NB_DAYS_FOR_SELF_UNREGISTER
+ # Because the shift views show a lot of shifts,
+ # we preload all related objects to avoid doing many database requests.
+ shifts = (
+ Shift.objects.prefetch_related("slots")
+ .prefetch_related("slots__attendances")
+ .prefetch_related("slots__attendances__user")
+ .prefetch_related("slots__slot_template")
+ .prefetch_related("slots__slot_template__attendance_template")
+ .prefetch_related("slots__slot_template__attendance_template__user")
+ .prefetch_related("shift_template")
+ .prefetch_related("shift_template__group")
+ .filter(
+ start_time__gte=date_from,
+ start_time__lt=date_to + datetime.timedelta(days=1),
+ deleted=False,
+ )
+ .order_by("start_time")
+ )
+
+ # A nested dict containing weeks (indexed by the Monday of the week), then days, then a list of shifts
+ # OrderedDict[OrderedDict[list]]
+ shifts_by_weeks_and_days = OrderedDict()
+ week_to_group = {}
+ for shift in shifts:
+ shift_day = shift.start_time.date()
+ shift_week_monday = shift_day - datetime.timedelta(days=shift_day.weekday())
+
+ # Ensure the nested OrderedDict[OrderedDict[list]] dictionary has the right data structures for the new item
+ shifts_by_weeks_and_days.setdefault(shift_week_monday, OrderedDict())
+ shifts_by_weeks_and_days[shift_week_monday].setdefault(shift_day, [])
+
+ shifts_by_weeks_and_days[shift_week_monday][shift_day].append(shift)
+
+ if shift.shift_template is not None:
+ week_to_group[shift_week_monday] = shift.shift_template.group
+
+ # A dict containing the shifts times and the shifts names for each day
+ shifts_infos_by_day = OrderedDict()
+ for shift in shifts:
+ shift_day = shift.start_time.date()
+
+ if shifts_infos_by_day.get(shift_day) is None:
+ shifts_infos_by_day[shift_day] = {
+ "times": [],
+ "names": [],
+ "shifts": [],
+ }
+
+ infos = shifts_infos_by_day[shift_day]
+ shift_times = {
+ "start_time": shift.start_time,
+ "end_time": shift.end_time,
+ }
+
+ has_this_shift_time = any(t['start_time'] == shift_times['start_time'] and t['end_time'] == shift_times['end_time'] for t in infos["times"])
+ if not has_this_shift_time:
+ shifts_infos_by_day[shift_day]["times"].append(shift_times)
+
+ if shift.slots.first().name not in infos["names"]:
+ shifts_infos_by_day[shift_day]["names"].append(shift.slots.first().name)
+
+ shifts_infos_by_day[shift_day]["shifts"].append(format_shift_for_template(shift, False))
+
+ context_data["shifts_by_weeks_and_days"] = shifts_by_weeks_and_days
+
+ context_data["shift_slot_names"] = get_shift_slot_names()
+ context_data["week_to_group"] = week_to_group
+
+ context_data["shifts_infos_by_day"] = shifts_infos_by_day
+
+ context_data["week_ranges"] = get_week_ranges({
+ "start": date_from,
+ "end": date_to,
+ })
+ # Find the selected week range in week_ranges
+ current_week_range = next(
+ (
+ week
+ for week in context_data["week_ranges"]
+ if week["start"] == date_from and week["end"] == date_to
+ ),
+ None
+ )
+ context_data["current_week_range"] = current_week_range if current_week_range is not None else {
+ "start": date_from,
+ "end": date_to,
+ }
+ context_data["next_week_range"] = {
+ "start": context_data["current_week_range"].get("start") + timedelta(days=7),
+ "end": context_data["current_week_range"].get("end") + timedelta(days=7),
+ }
+ context_data["previous_week_range"] = {
+ "start": context_data["current_week_range"].get("start") - timedelta(days=7),
+ "end": context_data["current_week_range"].get("end") - timedelta(days=7),
+ }
+
+ return context_data
+
+def get_shift_slot_names():
+ shift_slot_names = (
+ ShiftSlot.objects.filter(shift__start_time__gt=timezone.now())
+ .values_list("name", flat=True)
+ .distinct()
+ )
+ shift_slot_names = [
+ (shift_name_as_class(name), _(name)) for name in shift_slot_names if name != ""
+ ]
+ shift_slot_names.append(("", _("General")))
+ return shift_slot_names
+
+
+def get_week_ranges(current_week_range):
+ if current_week_range.get("start") and current_week_range.get("end"):
+ current_start = current_week_range.get("start")
+ current_end = current_week_range.get("end")
+ else:
+ current_start = timezone.now().date()
+ current_end = timezone.now().date() + timedelta(days=6)
+
+ today = date.today()
+ # Find the most recent Monday (or today if today is Monday)
+ start_of_week = today - timedelta(days=today.weekday())
+ week_ranges = []
+ for i in range(10):
+ week_start = start_of_week + timedelta(weeks=i)
+ week_end = week_start + timedelta(days=6)
+ week_ranges.append({
+ "start": week_start,
+ "end": week_end,
+ "url": reverse("shifts:calendar") + f"?date_from={week_start}&date_to={week_end}",
+ "is_selected": week_start <= current_start and week_end >= current_end,
+ })
+ # Pass week_ranges to the template context
+ return week_ranges
diff --git a/tapir/settings/__init__.py b/tapir/settings/__init__.py
new file mode 100644
index 000000000..ba9000136
--- /dev/null
+++ b/tapir/settings/__init__.py
@@ -0,0 +1,10 @@
+
+from .env import env
+
+ENABLE_RIZOMA_CONTENT = env.bool("ENABLE_RIZOMA_CONTENT", default=False)
+if ENABLE_RIZOMA_CONTENT:
+ print("Loading rizoma settings module")
+ from .rizoma import *
+else:
+ print("Loading default settings module")
+ from .shared import *
\ No newline at end of file
diff --git a/tapir/settings/env.py b/tapir/settings/env.py
new file mode 100644
index 000000000..639181465
--- /dev/null
+++ b/tapir/settings/env.py
@@ -0,0 +1,11 @@
+import os
+import environ
+
+from pathlib import Path
+
+env = environ.Env()
+
+# Build paths inside the project like this: BASE_DIR / 'subdir'.
+BASE_DIR = Path(__file__).resolve().parent.parent.parent
+
+environ.Env.read_env(os.path.join(BASE_DIR, ".env"))
\ No newline at end of file
diff --git a/tapir/settings/rizoma.py b/tapir/settings/rizoma.py
new file mode 100644
index 000000000..bfea5162d
--- /dev/null
+++ b/tapir/settings/rizoma.py
@@ -0,0 +1,51 @@
+# Custom settings for Rizoma overwrites
+
+from .shared import *
+from .env import (env, BASE_DIR)
+
+LANGUAGE_CODE = "pt" # PT?!?
+PHONENUMBER_DEFAULT_REGION = "PT"
+TIME_ZONE = "Europe/Lisbon"
+
+# FIXME: we probably need to update these for rizoma
+
+EMAIL_ADDRESS_MEMBER_OFFICE = "mitglied@rizomacoop.pt "
+EMAIL_ADDRESS_ACCOUNTING_TEAM = "accounting@rizomacoop.pt "
+EMAIL_ADDRESS_ACCOUNTING_SOFTWARE = env.str(
+ "EMAIL_ADDRESS_ACCOUNTING_SOFTWARE", default=None
+)
+EMAIL_ADDRESS_MANAGEMENT = "contact@rizomacoop.pt "
+EMAIL_ADDRESS_SUPERVISORS = "aufsichtsrat@rizomacoop.pt "
+
+COOP_NAME = "Rizoma"
+COOP_FULL_NAME = "Rizoma Cooperativa Integral "
+COOP_STREET = "R. José Estêvão 4"
+COOP_PLACE = "1150-192 Lisboa, Portugal"
+FROM_EMAIL_MEMBER_OFFICE = f"{COOP_NAME} Membros <{EMAIL_ADDRESS_MEMBER_OFFICE}>"
+DEFAULT_FROM_EMAIL = FROM_EMAIL_MEMBER_OFFICE
+
+
+# we need to add our rizoma app
+INSTALLED_APPS.append("tapir.rizoma")
+
+ACTIVE_LOGIN_BACKEND = env.str("ACTIVE_LOGIN_BACKEND", default="coops.pt")
+if ACTIVE_LOGIN_BACKEND == LOGIN_BACKEND_COOPS_PT:
+ AUTHENTICATION_BACKENDS = ["tapir.rizoma.coops_pt_auth_backend.CoopsPtAuthBackend"]
+ COOPS_PT_API_BASE_URL = env.str("COOPS_PT_API_BASE_URL", default="https://api.demo.coops.pt")
+ COOPS_PT_API_KEY = env.str("COOPS_PT_API_KEY", default="invalid_key")
+ COOPS_PT_RSA_PUBLIC_KEY_FILE_PATH = env.str("COOPS_PT_RSA_PUBLIC_KEY_FILE_PATH", default="")
+
+# we prefix all templates with our custom rizoma templates
+TEMPLATES[0]['DIRS'].insert(0, os.path.join(BASE_DIR, "rizoma/templates"))
+
+# we have to upadte the celery background jobs to sync our users
+CELERY_BEAT_SCHEDULE.update(
+ {
+ "sync_users_with_coops_pt_backend": {
+ "task": "tapir.rizoma.tasks.sync_users_with_coops_pt_backend",
+ "schedule": celery.schedules.crontab(hour="*", minute="0"),
+ },
+ }
+)
+
+LOGIN_REDIRECT_URL = "/shifts/dashboard"
\ No newline at end of file
diff --git a/tapir/settings.py b/tapir/settings/shared.py
similarity index 92%
rename from tapir/settings.py
rename to tapir/settings/shared.py
index db276ddbe..a688ddf77 100644
--- a/tapir/settings.py
+++ b/tapir/settings/shared.py
@@ -17,16 +17,9 @@
import celery.schedules
import django_auth_ldap
-import environ
import ldap
from django_auth_ldap.config import LDAPSearch, GroupOfNamesType, NestedGroupOfNamesType
-
-env = environ.Env()
-
-# Build paths inside the project like this: BASE_DIR / 'subdir'.
-BASE_DIR = Path(__file__).resolve().parent.parent
-
-environ.Env.read_env(os.path.join(BASE_DIR, ".env"))
+from .env import (env, BASE_DIR)
# Quick-start development settings - unsuitable for production
# See https://docs.djangoproject.com/en/3.1/howto/deployment/checklist/
@@ -43,8 +36,6 @@
ENABLE_SILK_PROFILING = False
-ENABLE_RIZOMA_CONTENT = env.bool("ENABLE_RIZOMA_CONTENT", default=False)
-
# Application definition
INSTALLED_APPS = [
# Must come before contrib.auth to let the custom templates be discovered for auth views
@@ -76,9 +67,6 @@
"django_vite",
]
-if ENABLE_RIZOMA_CONTENT:
- INSTALLED_APPS.append("tapir.rizoma")
-
if ENABLE_SILK_PROFILING:
INSTALLED_APPS.append("silk")
@@ -98,6 +86,7 @@
if ENABLE_SILK_PROFILING:
MIDDLEWARE = ["silk.middleware.SilkyMiddleware"] + MIDDLEWARE
+LOGIN_BACKEND_COOPS_PT = "coops.pt"
ROOT_URLCONF = "tapir.urls"
DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
@@ -195,15 +184,6 @@
}
)
-if ENABLE_RIZOMA_CONTENT:
- CELERY_BEAT_SCHEDULE.update(
- {
- "sync_users_with_coops_pt_backend": {
- "task": "tapir.rizoma.tasks.sync_users_with_coops_pt_backend",
- "schedule": celery.schedules.crontab(hour="*", minute="0"),
- },
- }
- )
# Password validation
# https://docs.djangoproject.com/en/3.1/ref/settings/#auth-password-validators
@@ -231,8 +211,6 @@
# https://docs.djangoproject.com/en/3.1/topics/i18n/
LANGUAGE_CODE = "de"
-if ENABLE_RIZOMA_CONTENT:
- LANGUAGE_CODE = "en"
TIME_ZONE = "Europe/Berlin"
USE_I18N = True
USE_TZ = True
@@ -396,14 +374,12 @@
}
AUTH_USER_MODEL = "accounts.TapirUser"
-LOGIN_REDIRECT_URL = "accounts:user_me"
+LOGIN_REDIRECT_URL = "/accounts/"
SITE_URL = env("SITE_URL", default="http://localhost:8000")
CSRF_TRUSTED_ORIGINS = [SITE_URL]
PHONENUMBER_DEFAULT_REGION = "DE"
-if ENABLE_RIZOMA_CONTENT:
- PHONENUMBER_DEFAULT_REGION = "PT"
LOCALE_PATHS = [os.path.join(BASE_DIR, "tapir/translations/locale")]
@@ -415,13 +391,10 @@
SLACK_BOT_TOKEN = env("SLACK_BOT_TOKEN", cast=str, default="")
LOGIN_BACKEND_LDAP = "ldap"
-LOGIN_BACKEND_COOPS_PT = "coops.pt"
ACTIVE_LOGIN_BACKEND = env.str("ACTIVE_LOGIN_BACKEND", default=LOGIN_BACKEND_LDAP)
if ACTIVE_LOGIN_BACKEND == LOGIN_BACKEND_LDAP:
AUTHENTICATION_BACKENDS = ["django_auth_ldap.backend.LDAPBackend"]
-if ACTIVE_LOGIN_BACKEND == LOGIN_BACKEND_COOPS_PT:
- AUTHENTICATION_BACKENDS = ["tapir.rizoma.coops_pt_auth_backend.CoopsPtAuthBackend"]
LDAP_DOCKER_SERVICE_NAME = env("LDAP_DOCKER_SERVICE_NAME", cast=str, default="openldap")
AUTH_LDAP_SERVER_URI = f"ldap://{LDAP_DOCKER_SERVICE_NAME}"
@@ -454,11 +427,6 @@
SECURE_PROXY_SSL_HEADER = ("HTTP_X_FORWARDED_PROTO", "https")
-if ACTIVE_LOGIN_BACKEND == LOGIN_BACKEND_COOPS_PT:
- COOPS_PT_API_BASE_URL = env.str("COOPS_PT_API_BASE_URL")
- COOPS_PT_API_KEY = env.str("COOPS_PT_API_KEY")
- COOPS_PT_RSA_PUBLIC_KEY_FILE_PATH = env.str("COOPS_PT_RSA_PUBLIC_KEY_FILE_PATH")
-
RUNNING_TESTS = False
diff --git a/tapir/shifts/urls.py b/tapir/shifts/urls.py
index d1c6f0c50..831c14cd0 100644
--- a/tapir/shifts/urls.py
+++ b/tapir/shifts/urls.py
@@ -88,6 +88,10 @@
views.shift_attendance_template_delete,
name="shift_attendance_template_delete",
),
+ path('dashboard',
+ views.UserDashboardView.as_view(),
+ name='dashboard',
+ ),
path(
"calendar",
views.ShiftCalendarView.as_view(),
diff --git a/tapir/shifts/views/dashboard.py b/tapir/shifts/views/dashboard.py
new file mode 100644
index 000000000..2bddf5cf4
--- /dev/null
+++ b/tapir/shifts/views/dashboard.py
@@ -0,0 +1,178 @@
+import datetime
+from django.shortcuts import render
+from calendar import MONDAY
+from collections import OrderedDict
+from django.views.generic import TemplateView
+from django.utils import timezone
+from django.utils.translation import gettext_lazy as _
+from django.contrib.auth.mixins import LoginRequiredMixin, PermissionRequiredMixin
+from django.db.models import Count, Q, F, Exists, OuterRef, Subquery
+from tapir.shifts.models import (
+ Shift,
+ ShiftAttendance,
+ WEEKDAY_CHOICES,
+ ShiftTemplateGroup,
+ ShiftTemplate,
+ ShiftSlot,
+)
+from tapir.shifts.templatetags.shifts import shift_name_as_class
+from tapir.shifts.utils import sort_slots_by_name
+from tapir.shifts.utils import ColorHTMLCalendar, get_week_group
+from tapir.utils.shortcuts import get_monday, set_header_for_file_download
+
+
+# FIXME: should not be in views.py
+def get_shift_slot_names():
+ shift_slot_names = (
+ ShiftSlot.objects.filter(shift__start_time__gt=timezone.now())
+ .values_list("name", flat=True)
+ .distinct()
+ )
+ shift_slot_names = [
+ (shift_name_as_class(name), _(name)) for name in shift_slot_names if name != ""
+ ]
+ shift_slot_names.append(("", _("General")))
+ return shift_slot_names
+
+
+class UserDashboardView(LoginRequiredMixin,TemplateView):
+ template_name = "shifts/user_dashboard.html"
+ DATE_FORMAT = "%Y-%m-%d"
+
+ def get_context_data(self, **kwargs):
+ context = super().get_context_data(**kwargs)
+
+ user = self.request.user
+
+
+ date_from = timezone.now().date()
+ date_to = date_from + datetime.timedelta(days=60)
+ context["date_from"] = date_from.strftime(self.DATE_FORMAT)
+ context["date_to"] = date_to.strftime(self.DATE_FORMAT)
+
+ context["nb_days_for_self_unregister"] = Shift.NB_DAYS_FOR_SELF_UNREGISTER
+ # Because the shift views show a lot of shifts,
+ # we preload all related objects to avoid doing many database requests.
+ # Filter for upcoming shifts the user can attend but isn't already attending
+
+ # Create subquery to check if user has required capabilities for any slot in the shift
+ user_capabilities = user.shift_user_data.capabilities.values_list('id', flat=True)
+
+ # Subquery to find shifts where user can attend at least one slot
+ attendable_slots_subquery = ShiftSlot.objects.filter(
+ # Slot is available (no valid attendance or looking for stand-in)
+ Q(attendances__isnull=True) |
+ Q(attendances__state=ShiftAttendance.State.LOOKING_FOR_STAND_IN),
+ # User has required capabilities (if any required)
+ Q(required_capabilities__isnull=True) |
+ Q(required_capabilities__in=user_capabilities),
+ # User is active member
+ shift__start_time__gt=timezone.now(),
+ shift=OuterRef('pk'),
+ ).exclude(
+ # User not already attending this shift
+ shift__slots__attendances__user=user,
+ shift__slots__attendances__state__in=ShiftAttendance.VALID_STATES
+ )
+
+ # Get upcoming shifts with database-level filtering for availability and user eligibility
+ shifts = (
+ Shift.objects.prefetch_related("slots")
+ .prefetch_related("slots__attendances")
+ .prefetch_related("slots__attendances__user")
+ .prefetch_related("slots__slot_template")
+ .prefetch_related("slots__slot_template__attendance_template")
+ .prefetch_related("slots__slot_template__attendance_template__user")
+ .prefetch_related("shift_template")
+ .prefetch_related("shift_template__group")
+ .prefetch_related("slots__required_capabilities")
+ .annotate(
+ # Count total slots in the shift
+ total_slots=Count("slots", distinct=True),
+ # Count occupied slots (slots with valid attendances that are not looking for stand-in)
+ occupied_slots=Count(
+ "slots__attendances",
+ filter=Q(
+ slots__attendances__state__in=[
+ ShiftAttendance.State.PENDING,
+ ShiftAttendance.State.DONE,
+ ]
+ ),
+ distinct=True
+ ),
+ # Check if user can attend any slot in this shift
+ has_attendable_slots=Exists(attendable_slots_subquery)
+ )
+ .filter(
+ start_time__gte=date_from,
+ start_time__lt=date_to + datetime.timedelta(days=1),
+ deleted=False,
+ cancelled=False,
+ # Shift has available slots (not completely full)
+ occupied_slots__lt=F("total_slots"),
+ # User can attend at least one slot
+ has_attendable_slots=True,
+ )
+ .exclude(
+ # Exclude shifts user is already attending with valid state
+ slots__attendances__user=user,
+ slots__attendances__state__in=ShiftAttendance.VALID_STATES
+ )
+ .order_by("start_time")
+ )
+
+ # Since we already filtered at database level, we just need to add attendable slots info
+ # and deduplicate by slot type for display
+ for shift in shifts:
+ # Get unique slot types that user can attend
+ attendable_slots = []
+ seen_slot_types = set()
+
+ # Use prefetched data to avoid additional queries
+ for slot in shift.slots.all():
+ # Quick check using prefetched data - most filtering already done at DB level
+ if (not slot.get_valid_attendance() or
+ slot.get_valid_attendance().state == ShiftAttendance.State.LOOKING_FOR_STAND_IN):
+
+ # Use slot name as the type identifier, fallback to shift name if slot has no name
+ slot_type = slot.name if slot.name else shift.name
+
+ # Only add if we haven't seen this slot type yet for this shift
+ if slot_type not in seen_slot_types:
+ attendable_slots.append(slot)
+ seen_slot_types.add(slot_type)
+
+ # Add the attendable slots as an attribute for template use
+ shift.attendable_slots = attendable_slots
+
+ # Sort shifts by start time for the table display
+ shifts = sorted(shifts, key=lambda s: s.start_time)
+
+ # Separate urgent shifts (within 7 days and all slots empty) - use database annotation
+ now = timezone.now()
+ urgent_cutoff = now + datetime.timedelta(days=7)
+
+ # Use list comprehension for better performance
+ urgent_shifts = [
+ shift for shift in shifts
+ if (shift.start_time <= urgent_cutoff and
+ shift.occupied_slots == 0) # Use the database annotation
+ ]
+
+ regular_shifts = [
+ shift for shift in shifts
+ if not (shift.start_time <= urgent_cutoff and
+ shift.occupied_slots == 0)
+ ]
+
+ # Calculate total available slots for each category
+ total_available_slots = sum(len(shift.attendable_slots) for shift in regular_shifts)
+ total_urgent_slots = sum(len(shift.attendable_slots) for shift in urgent_shifts)
+
+ context["shifts"] = regular_shifts
+ context["urgent_shifts"] = urgent_shifts
+ context["total_available_slots"] = total_available_slots
+ context["total_urgent_slots"] = total_urgent_slots
+ context["shift_slot_names"] = get_shift_slot_names()
+
+ return context
\ No newline at end of file
diff --git a/tapir/shifts/views/views.py b/tapir/shifts/views/views.py
index 2efe53bda..88a07a124 100644
--- a/tapir/shifts/views/views.py
+++ b/tapir/shifts/views/views.py
@@ -52,6 +52,7 @@
from tapir.shifts.templatetags.shifts import shift_name_as_class
from tapir.shifts.utils import sort_slots_by_name
from tapir.utils.user_utils import UserUtils
+from .dashboard import UserDashboardView
class SelectedUserViewMixin:
diff --git a/tapir/translations/locale/pt/LC_MESSAGES/django.po b/tapir/translations/locale/pt/LC_MESSAGES/django.po
index 25725ed73..0e746c5ad 100644
--- a/tapir/translations/locale/pt/LC_MESSAGES/django.po
+++ b/tapir/translations/locale/pt/LC_MESSAGES/django.po
@@ -220,7 +220,7 @@ msgstr "Mais informações"
#: accounts/templates/accounts/purchase_tracking_card.html:25
msgid "The checkout system links your purchase to your member account. The total amount of your purchase is saved each time. However, it does not record which specific products you have purchased. You can also still decide with each purchase whether you want to have your membership card scanned or not. With your general consent here on Tapir, you do not enter into any obligation to scan. You can revoke your consent at any time by deactivating the checkbox above. With your consent, you help Supercoop to better understand the shopping habits of its members. This is important for the further development of our supermarket. More information: https://wiki.supercoop.de/wiki/Mitgliederkarte"
-msgstr ""
+msgstr "O sistema de caixa associa a sua compra à sua conta de membro. O valor total da sua compra é guardado em cada transação. No entanto, não são registados os produtos específicos que comprou. Pode também decidir, em cada compra, se deseja ou não que o seu cartão de membro seja lido. Ao dar o seu consentimento geral aqui no Tapir, não assume nenhuma obrigação de leitura. Pode revogar o seu consentimento a qualquer momento, desmarcando a caixa acima. Com o seu consentimento, ajuda a Supercoop a compreender melhor os hábitos de compra dos seus membros. Isto é importante para o desenvolvimento futuro do nosso supermercado. Mais informações: https://wiki.supercoop.de/wiki/Mitgliederkarte"
#: accounts/templates/accounts/purchase_tracking_card.html:30
#: coop/templates/coop/tags/user_coop_share_ownership_list_tag.html:169
@@ -271,7 +271,7 @@ msgstr "Editar nome de utilizador"
#: core/templates/core/featureflag_list.html:30
#: shifts/templates/shifts/shift_detail.html:44
#: shifts/templates/shifts/shift_template_detail.html:25
-#: shifts/templates/shifts/shift_template_detail.html:113
+#: shifts/templates/shifts/shift_template_detail.html:116
#: shifts/templates/shifts/user_shifts_overview_tag.html:14
msgid "Edit"
msgstr "Editar"
@@ -675,7 +675,7 @@ msgstr "Estado do membro"
#: coop/forms.py:291
msgid "In the case where the member wants their money back, they stay a member for 3 more years. However, it is very likely that the member doesn't want to be active anymore. If they haven't explicitly mentioned it, please ask them if we can switch them to investing."
-msgstr ""
+msgstr "No caso de o membro querer o reembolso, permanece como membro por mais 3 anos. No entanto, é muito provável que o membro não queira mais estar ativo. Se não tiverem mencionado explicitamente, pergunte se podemos convertê-lo em membro investidor."
#: coop/forms.py:316
msgid "Send confirmation mails"
@@ -1095,7 +1095,7 @@ msgstr "Criar candidato(a)"
#: shifts/templates/shifts/register_user_to_shift_slot.html:27
#: shifts/templates/shifts/register_user_to_shift_slot_template.html:26
#: shifts/templates/shifts/shift_detail.html:226
-#: shifts/templates/shifts/shift_template_detail.html:84
+#: shifts/templates/shifts/shift_template_detail.html:87
msgid "Register"
msgstr "Registar"
@@ -1148,7 +1148,7 @@ msgstr "título(s)"
#: coop/templates/coop/email/accounting_recap.body.default.html:33
msgid "New shares for existing members upload only after approval in Duo"
-msgstr ""
+msgstr "Novas ações para membros existentes são carregadas apenas após aprovação no Duo"
#: coop/templates/coop/email/accounting_recap.body.default.html:47
#, fuzzy
@@ -1399,7 +1399,7 @@ msgid ""
" updated. You may change working groups as needed.\n"
" \n"
" \n"
-" You also have opportunities to get involved at SuperCoop in addition to your regular shift. To make it as easy\n"
+" You also have opportunities to get involved at SuperCoop in addition to your regular shift. To make it as easy\n"
" as\n"
" possible for you to get started, we have summarized all additional\n"
" working groups in the wiki. Please see the Wiki for further information on how to get involved.\n"
@@ -2176,7 +2176,7 @@ msgid "Share owner"
msgstr "Proprietário da ação"
#: coop/templates/coop/membershipresignation_detail.html:61
-#: shifts/models.py:547
+#: shifts/models.py:552
msgid "Cancellation reason"
msgstr "Motivo da rescisão"
@@ -2415,14 +2415,14 @@ msgstr ""
" "
#: coop/templates/coop/tags/user_coop_share_ownership_list_tag.html:56
-#: shifts/models.py:941 shifts/templates/shifts/shift_day_printable.html:56
+#: shifts/models.py:954 shifts/templates/shifts/shift_day_printable.html:56
#: shifts/templates/shifts/shift_detail.html:281
#: shifts/templates/shifts/shift_detail_printable.html:51
msgid "Attended"
msgstr "Compareceu"
#: coop/templates/coop/tags/user_coop_share_ownership_list_tag.html:58
-#: shifts/models.py:940
+#: shifts/models.py:953
msgid "Pending"
msgstr "Pendente"
@@ -2742,7 +2742,7 @@ msgid "List of all emails"
msgstr "Lista de todos os e-mails"
#: core/templates/core/email_list.html:39 shifts/models.py:56
-#: shifts/models.py:84 shifts/models.py:514 shifts/models.py:1079
+#: shifts/models.py:84 shifts/models.py:519 shifts/models.py:1092
#: shifts/templates/shifts/user_shift_account_log.html:29
msgid "Description"
msgstr "Descrição"
@@ -2945,6 +2945,14 @@ msgstr "Adicionar nota"
msgid "Log Type"
msgstr "Tipo de registo"
+#: rizoma/apps.py:17
+msgid "Admin"
+msgstr ""
+
+#: rizoma/apps.py:20
+msgid "All shifts"
+msgstr "Todos os turnos"
+
#: rizoma/coops_pt_auth_backend.py:43
msgid "Invalid username or password"
msgstr "Nome de utilizador ou palavra-passe inválidos"
@@ -3019,11 +3027,6 @@ msgstr "Enviado a um membro quando o Member Office marca o turno como em falta"
msgid "Shift reminder"
msgstr "Lembrete de turno"
-#: shifts/emails/shift_reminder_email.py:30
-#, python-brace-format
-msgid "Sent to a member {config.REMINDER_EMAIL_DAYS_BEFORE_SHIFT} days before their shift"
-msgstr "Enviado a um membro {config.REMINDER_EMAIL_DAYS_BEFORE_SHIFT} dias antes do seu turno"
-
#: shifts/emails/stand_in_found_email.py:23
msgid "Stand-in found"
msgstr "Substituto encontrado"
@@ -3066,11 +3069,6 @@ msgstr "Avisos"
msgid "I have read the warning about the missing qualification and confirm that the user should get registered to the shift"
msgstr "Li o aviso sobre a qualificação em falta e confirmo que o utilizador deve ser registado no turno"
-#: shifts/forms.py:199
-#, python-brace-format
-msgid "The selected user is missing the required qualification for this shift : {missing_capabilities}"
-msgstr "O utilizador selecionado não possui a qualificação necessária para este turno: {missing_capabilities}"
-
#: shifts/forms.py:242
msgid "Please set the chosen time after the start of the shift"
msgstr "Defina a hora escolhida após o início do turno"
@@ -3099,11 +3097,6 @@ msgstr "Este turno foi eliminado. Não é possível registar-se nele."
msgid "I am aware that the member will be unregistered from their ABCD shift"
msgstr "Tenho conhecimento de que o membro será removido do seu turno ABCD"
-#: shifts/forms.py:403
-#, python-brace-format
-msgid "{own_name} is already partner of {partner_of_name}, they can't have a partner of their own"
-msgstr "{own_name} já é parceiro de {partner_of_name}, não pode ter um parceiro próprio"
-
#: shifts/forms.py:414
msgid "The selected member must be an investing member."
msgstr "O membro selecionado deve ser um membro investidor."
@@ -3120,11 +3113,6 @@ msgstr "Li o aviso sobre as presenças canceladas e confirmo que a isenção dev
msgid "I have read the warning about the cancelled ABCD attendances and confirm that the exemption should be created"
msgstr "Li o aviso sobre as presenças ABCD canceladas e confirmo que a isenção deve ser criada"
-#: shifts/forms.py:555
-#, python-brace-format
-msgid "The member will be unregistered from the following shifts because they are within the range of the exemption : {attendances_display}"
-msgstr "O membro será removido dos seguintes turnos por estarem dentro do período da isenção: {attendances_display}"
-
#: shifts/forms.py:580
#, python-format
msgid "The user will be unregistered from the following ABCD shifts because the exemption is longer than %(number_of_cycles)s cycles: %(attendances_display)s "
@@ -3154,18 +3142,18 @@ msgstr "Idioma"
msgid "This determines from which date shifts should be generated from this ABCD shift."
msgstr "Determina a partir de que data os turnos devem ser gerados a partir deste turno ABCD."
-#: shifts/models.py:198 shifts/models.py:522
+#: shifts/models.py:198 shifts/models.py:527
#: shifts/templates/shifts/shift_block_tag.html:9
msgid "Flexible time"
msgstr "Horário flexível"
-#: shifts/models.py:200 shifts/models.py:524
+#: shifts/models.py:200 shifts/models.py:529
msgid "If enabled, members who register for that shift can choose themselves the time where they come do their shift."
msgstr "Se ativado, os membros que se registam nesse turno podem escolher a hora a que vêm fazer o turno."
-#: shifts/models.py:418 shifts/models.py:832
+#: shifts/models.py:418 shifts/models.py:842
#: shifts/templates/shifts/shift_detail.html:95
-#: shifts/templates/shifts/shift_template_detail.html:42
+#: shifts/templates/shifts/shift_template_detail.html:43
msgid "Chosen time"
msgstr "Hora escolhida"
@@ -3173,66 +3161,66 @@ msgstr "Hora escolhida"
msgid "This shift lets you choose at what time you come during the day of the shift. In order to help organising the attendance, please specify when you expect to come.Setting or updating this field will set the time for all individual shifts generated from this ABCD shift.You can update the time of a single shift individually and at any time on the shift page."
msgstr "Este turno permite-lhe escolher a hora a que vem no dia do turno. Para ajudar a organizar as presenças, indique quando prevê vir. Definir ou atualizar este campo definirá a hora para todos os turnos individuais gerados a partir deste turno ABCD. Pode atualizar a hora de um turno específico a qualquer momento na página do turno."
-#: shifts/models.py:504
+#: shifts/models.py:509
msgid "Number of required attendances"
msgstr "Número de presenças necessárias"
-#: shifts/models.py:506
+#: shifts/models.py:511
msgid "If there are less members registered to a shift than that number, it will be highlighted in the shift calendar."
msgstr "Se houver menos membros registados num turno do que esse número, o turno será destacado no calendário."
-#: shifts/models.py:515
+#: shifts/models.py:520
msgid "Is shown on the shift page below the title"
msgstr "É mostrado na página do turno abaixo do título"
-#: shifts/models.py:535 shifts/models.py:541
+#: shifts/models.py:540 shifts/models.py:546
msgid "If 'flexible time' is enabled, then the time component is ignored"
msgstr "Se o 'horário flexível' estiver ativado, o componente de hora é ignorado"
-#: shifts/models.py:834
+#: shifts/models.py:844
msgid "This shift lets you choose at what time you come during the day of the shift. In order to help organising the attendance, please specify when you expect to come."
msgstr "Este turno permite-lhe escolher a hora a que vem no dia do turno. Para ajudar na organização das presenças, indique quando prevê vir."
-#: shifts/models.py:942 shifts/templates/shifts/shift_day_printable.html:57
+#: shifts/models.py:955 shifts/templates/shifts/shift_day_printable.html:57
#: shifts/templates/shifts/shift_detail.html:291
#: shifts/templates/shifts/shift_detail_printable.html:52
msgid "Missed"
msgstr "Em falta"
-#: shifts/models.py:943 shifts/templates/shifts/shift_day_printable.html:58
+#: shifts/models.py:956 shifts/templates/shifts/shift_day_printable.html:58
#: shifts/templates/shifts/shift_detail.html:321
#: shifts/templates/shifts/shift_detail_printable.html:53
msgid "Excused"
msgstr "Justificado"
-#: shifts/models.py:944 shifts/templates/shifts/shift_detail.html:329
+#: shifts/models.py:957 shifts/templates/shifts/shift_detail.html:329
msgid "Cancelled"
msgstr "Cancelado"
-#: shifts/models.py:945 shifts/templates/shifts/shift_day_printable.html:97
+#: shifts/models.py:958 shifts/templates/shifts/shift_day_printable.html:97
#: shifts/templates/shifts/shift_detail.html:313
#: shifts/templates/shifts/shift_detail_printable.html:94
#: shifts/templates/shifts/shift_filters.html:83
msgid "Looking for a stand-in"
msgstr "À procura de substituto"
-#: shifts/models.py:978
+#: shifts/models.py:991
msgid "🏠 ABCD"
msgstr "🏠 ABCD"
-#: shifts/models.py:979
+#: shifts/models.py:992
msgid "✈ Flying"
msgstr "✈ Flex"
-#: shifts/models.py:980
+#: shifts/models.py:993
msgid "❄ Frozen"
msgstr "❄ Suspenso"
-#: shifts/models.py:1006
+#: shifts/models.py:1019
msgid "Is frozen"
msgstr "Está suspenso"
-#: shifts/models.py:1185
+#: shifts/models.py:1198
msgid "Cycle start date"
msgstr "Data de início do ciclo"
@@ -3933,7 +3921,7 @@ msgstr "Horário flexível não especificado"
#: shifts/templates/shifts/shift_day_printable.html:94
#: shifts/templates/shifts/shift_detail.html:122
#: shifts/templates/shifts/shift_detail_printable.html:90
-#: shifts/templates/shifts/shift_template_detail.html:64
+#: shifts/templates/shifts/shift_template_detail.html:66
msgid "Shift partner: "
msgstr "Parceiro de turno: "
@@ -3985,12 +3973,12 @@ msgid "Number"
msgstr "Número"
#: shifts/templates/shifts/shift_detail.html:89
-#: shifts/templates/shifts/shift_template_detail.html:38
+#: shifts/templates/shifts/shift_template_detail.html:39
msgid "Details"
msgstr "Detalhes"
#: shifts/templates/shifts/shift_detail.html:90
-#: shifts/templates/shifts/shift_template_detail.html:40
+#: shifts/templates/shifts/shift_template_detail.html:41
msgid "Registered user"
msgstr "Utilizador registado"
@@ -4003,7 +3991,7 @@ msgid "Do you meet the requirements?"
msgstr "Cumpre os requisitos?"
#: shifts/templates/shifts/shift_detail.html:98
-#: shifts/templates/shifts/shift_template_detail.html:45
+#: shifts/templates/shifts/shift_template_detail.html:46
msgid "Member-Office actions"
msgstr "Ações do Escritório de Membros"
@@ -4039,8 +4027,7 @@ msgid ""
" you can't\n"
" attend, contact your shift leader as soon as\n"
" possible."
-msgstr ""
-"Só pode procurar um substituto até %(NB_DAYS_FOR_SELF_LOOK_FOR_STAND_IN)s dias antes do turno. Se não puder participar, contacte o seu responsável de turno o mais rapidamente possível."
+msgstr "Só pode procurar um substituto até %(NB_DAYS_FOR_SELF_LOOK_FOR_STAND_IN)s dias antes do turno. Se não puder participar, contacte o seu responsável de turno o mais rapidamente possível."
#: shifts/templates/shifts/shift_detail.html:183
msgid "Look for a stand-in"
@@ -4058,8 +4045,7 @@ msgid ""
" attend, look for a stand-in or contact your shift leader as soon\n"
" as\n"
" possible."
-msgstr ""
-"Só pode cancelar a sua inscrição até %(NB_DAYS_FOR_SELF_UNREGISTER)s dias antes do turno. Além disso, os turnos ABCD não podem ser cancelados. Se não puder participar, procure um substituto ou contacte o seu responsável de turno o mais rapidamente possível."
+msgstr "Só pode cancelar a sua inscrição até %(NB_DAYS_FOR_SELF_UNREGISTER)s dias antes do turno. Além disso, os turnos ABCD não podem ser cancelados. Se não puder participar, procure um substituto ou contacte o seu responsável de turno o mais rapidamente possível."
#: shifts/templates/shifts/shift_detail.html:207
msgid "Unregister myself"
@@ -4084,7 +4070,7 @@ msgstr ""
"- O turno não tiver sido cancelado (férias, etc.)
"
#: shifts/templates/shifts/shift_detail.html:254
-#: shifts/templates/shifts/shift_template_detail.html:95
+#: shifts/templates/shifts/shift_template_detail.html:98
msgid "Not specified"
msgstr "Não especificado"
@@ -4222,23 +4208,23 @@ msgstr "Configuração"
msgid "ABCD Shift"
msgstr "Turno ABCD"
-#: shifts/templates/shifts/shift_template_detail.html:34
+#: shifts/templates/shifts/shift_template_detail.html:35
msgid "List of slots for this ABCD shifts"
msgstr "Lista de lugares para este turno ABCD"
-#: shifts/templates/shifts/shift_template_detail.html:39
+#: shifts/templates/shifts/shift_template_detail.html:40
msgid "Requirements"
msgstr "Requisitos"
-#: shifts/templates/shifts/shift_template_detail.html:73
+#: shifts/templates/shifts/shift_template_detail.html:75
msgid "Unregister"
msgstr "Cancelar inscrição"
-#: shifts/templates/shifts/shift_template_detail.html:122
+#: shifts/templates/shifts/shift_template_detail.html:125
msgid "Future generated Shifts"
msgstr "Turnos futuros gerados"
-#: shifts/templates/shifts/shift_template_detail.html:132
+#: shifts/templates/shifts/shift_template_detail.html:135
msgid "Past generated Shifts"
msgstr "Turnos passados gerados"
@@ -4567,32 +4553,27 @@ msgctxt "No shift partner"
msgid "None"
msgstr "Nenhum"
-#: shifts/templatetags/shifts.py:61 shifts/templatetags/shifts.py:165
-#: shifts/views/views.py:148
+#: shifts/templatetags/shifts.py:57 shifts/templatetags/shifts.py:154
+#: shifts/views/views.py:149
msgid "General"
msgstr "Geral"
-#: shifts/utils.py:163
-#, python-brace-format
-msgid "Unknown mode {attendance_mode}"
-msgstr "Modo desconhecido {attendance_mode}"
-
-#: shifts/views/attendance.py:197 shifts/views/attendance.py:341
+#: shifts/views/attendance.py:202 shifts/views/attendance.py:347
#, python-format
msgid "Shift attendance: %(name)s"
msgstr "Presença no turno: %(name)s"
-#: shifts/views/attendance.py:203 shifts/views/attendance.py:347
+#: shifts/views/attendance.py:208 shifts/views/attendance.py:353
#, python-format
msgid "Updating shift attendance: %(member_link)s, %(slot_link)s"
msgstr "A atualizar presença no turno: %(member_link)s, %(slot_link)s"
-#: shifts/views/attendance.py:381
+#: shifts/views/attendance.py:387
#, python-format
msgid "ABCD attendance: %(name)s"
msgstr "Presença ABCD: %(name)s"
-#: shifts/views/attendance.py:388
+#: shifts/views/attendance.py:394
#, python-format
msgid "Updating ABCD attendance: %(member_link)s, %(slot_link)s"
msgstr "A atualizar presença ABCD: %(member_link)s, %(slot_link)s"
@@ -4660,22 +4641,22 @@ msgstr "Não foi possível encontrar uma presença de turno para usar como turno
msgid "Solidarity Shift given. Account Balance debited with -1."
msgstr "Turno solidário doado. Saldo da conta debitado em -1."
-#: shifts/views/views.py:128 shifts/views/views.py:133
+#: shifts/views/views.py:129 shifts/views/views.py:134
#, python-format
msgid "Edit user shift data: %(name)s"
msgstr "Editar dados de turnos do utilizador: %(name)s"
-#: shifts/views/views.py:201
+#: shifts/views/views.py:202
#, python-format
msgid "Shift account: %(name)s"
msgstr "Conta de turnos: %(name)s"
-#: shifts/views/views.py:207
+#: shifts/views/views.py:208
#, python-format
msgid "Create manual shift account entry for: %(link)s"
msgstr "Criar registo manual na conta de turnos para: %(link)s"
-#: shifts/views/views.py:358
+#: shifts/views/views.py:367
msgid "Frozen statuses updated."
msgstr "Estados suspensos atualizados."
@@ -5019,7 +5000,6 @@ msgstr ""
"\n"
" O seu crédito atual é %(credit)s€.\n"
" "
-
#: statistics/templates/statistics/tags/credit_account_card.html:14
msgid "List of last charged credits"
msgstr "Lista dos últimos créditos carregados"
@@ -6066,7 +6046,7 @@ msgstr "NOME INDISPONÍVEL"
#: welcomedesk/apps.py:21 welcomedesk/apps.py:24
#: welcomedesk/templates/welcomedesk/welcome_desk_search.html:14
msgid "Welcome Desk"
-msgstr ""
+msgstr "Welcome Desk"
#: welcomedesk/services/welcome_desk_reasons_cannot_shop_service.py:44
#, python-format
diff --git a/tapir/translations/locale/pt/LC_MESSAGES/djangojs.po b/tapir/translations/locale/pt/LC_MESSAGES/djangojs.po
index 608ff0348..d9797f6e0 100644
--- a/tapir/translations/locale/pt/LC_MESSAGES/djangojs.po
+++ b/tapir/translations/locale/pt/LC_MESSAGES/djangojs.po
@@ -188,7 +188,7 @@ msgstr ""
#: dist/assets/welcome_desk-OgiTR3jj.js:1
msgid "Welcome Desk"
-msgstr ""
+msgstr "Welcome Desk"
#: dist/assets/welcome_desk-OgiTR3jj.js:1
msgid "Name or member ID"
diff --git a/tapir/urls.py b/tapir/urls.py
index 9e165ff03..388f37159 100644
--- a/tapir/urls.py
+++ b/tapir/urls.py
@@ -23,10 +23,11 @@
from tapir.settings import ENABLE_SILK_PROFILING
urlpatterns = [
- path("", generic.RedirectView.as_view(pattern_name="accounts:index")),
+ path("", generic.RedirectView.as_view(url=settings.LOGIN_REDIRECT_URL)),
path("admin/", admin.site.urls),
path("accounts/", include("tapir.accounts.urls")),
path("shifts/", include("tapir.shifts.urls")),
+ path("rizoma/", include("tapir.rizoma.urls")),
path("coop/", include("tapir.coop.urls")),
path("log/", include("tapir.log.urls")),
path("core/", include("tapir.core.urls")),
+ {% translate "Personal Data" %} + + {% translate 'Mails' %} -
-+ {{ _("All Shifts") }} +
+ ++ {{ day|date:"D d/m/y" }} +
+ +| + {% for time in shift_infos.times %} + | {{ time.start_time|date:"H:i" }} - {{ time.end_time|date:"H:i" }} | + {% endfor %} + + + {% for name in shift_infos.names %} +
|---|---|
| {{ name }} | + + {% for time in shift_infos.times %} +
+ {% for shift in shift_infos.shifts%}
+
+ {% if shift.start_time == time.start_time %}
+
+ {% for attendance in shift.attendances|dictionary_get:name %}
+ {% if attendance.state == "empty" %}
+
+
+ {{_("Empty")}}
+
+
+
+
+ {% else %}
+
+ {{ attendance.user.get_full_name }}
+ {% if attendance.state == "single" %}
+
+ {{ _("Flex") }}
+
+ {% endif %}
+
+ {% endif %}
+ {% endfor %}
+
+ {% endif %}
+ {% endfor %}
+ |
+ {% endfor %}
+
+ {{ _("All Shifts") }} +
++ {% translate 'ABCD weeks calendar' %} + + + {{ displayed_year|add:-1 }} + + + + {{ displayed_year }} {% translate 'as pdf' %} + + + {{ displayed_year|add:1 }} + + +
++ {% translate "Shifts" %} + + {% if perms.shifts.manage and user.shift_user_data %} + + {% translate 'Edit' %} + + {% endif %} + +
++ {% translate "Show more" %} +
You already used {{ used_solidarity_shifts_current_year }} out of 2 Solidarity Shifts + this year
+ {% endblocktranslate %} + {% elif used_solidarity_shifts_current_year < 2 and user.shift_user_data.get_available_solidarity_shifts and user.shift_user_data.get_account_balance < 0 %} + {% blocktranslate with used_solidarity_shifts_current_year=used_solidarity_shifts_current_year %} +There are Solidarity Shifts available for you to use. You + used {{ used_solidarity_shifts_current_year }} out of 2 Solidarity Shifts this year
+ {% endblocktranslate %} + {% elif used_solidarity_shifts_current_year < 2 and user.shift_user_data.get_available_solidarity_shifts and user.shift_user_data.get_account_balance <= 0 %} + {% blocktranslate %} ++ You cannot receive a Solidarity Shift at the moment
+ {% endblocktranslate %} + {% elif not user.shift_user_data.get_available_solidarity_shifts %} + {% blocktranslate %} +There are no Solidarity Shifts available at the moment
+ {% endblocktranslate %} + {% endif %} ++ See member manual section III.F.6 + {% endblocktranslate %} + + {% translate "None" context "No shift partner" %} + + {% endif %} +
+ + {% translate 'Upcoming Shifts: ' %} + +
++ {% translate "Show more" %} +
+ + {% translate 'Shift account log for: ' %} + {% get_display_name_for_viewer user request.user %} + + {% if perms.shifts.manage %} + + {% translate 'Add a manual entry' %} + + {% endif %} +
+| {% translate 'Date' %} | +{% translate 'Value' %} | +{% translate 'Balance at date' %} | +{% translate 'Description' %} | +
|---|---|---|---|
| {{ entry_data.entry.date|date:"d.m.Y H:i" }} | +{{ entry_data.entry.value }} | +{{ entry_data.balance_at_date }} | +{{ entry_data.entry.description }} | +
+ {% translate "Urgent Shifts" %} + ({{ total_urgent_slots }} {% translate "slots need coverage" %}) +
+| {% translate "Type" %} | +{% translate "Date" %} | +{% translate "Time" %} | +{% translate "Note" %} | +{% translate "Action" %} | +
|---|---|---|---|---|
| + {% if slot.name %} + {{ slot.name }} + {% else %} + {{ shift.name }} + {% endif %} + | +{{ shift.start_time|date:"D, M d" }} | +{{ shift.start_time|date:"H:i" }} - {{ shift.end_time|date:"H:i" }} | ++ {% if shift.description %} + {{ shift.description|truncatechars:50 }} + {% else %} + - + {% endif %} + | ++ + + {% translate "Join" %} + + | +
+ {% translate "Available Shifts" %} + ({{ total_available_slots }} {% translate "slots available" %}) +
+| {% translate "Type" %} | +{% translate "Date" %} | +{% translate "Time" %} | +{% translate "Note" %} | +{% translate "Action" %} | +
|---|---|---|---|---|
| + {% if slot.name %} + {{ slot.name }} + {% else %} + {{ shift.name }} + {% endif %} + | +{{ shift.start_time|date:"D, M d" }} | +{{ shift.start_time|date:"H:i" }} - {{ shift.end_time|date:"H:i" }} | ++ {% if shift.description %} + {{ shift.description|truncatechars:50 }} + {% else %} + - + {% endif %} + | ++ + + {% translate "Join" %} + + | +
{% translate "No available shifts found for the selected period." %}
+ {% translate "Try adjusting your date range or check back later." %} +\n"
-" You also have opportunities to get involved at SuperCoop in addition to your regular shift. To make it as easy\n"
+" You also have opportunities to get involved at SuperCoop in addition to your regular shift. To make it as easy\n"
" as\n"
" possible for you to get started, we have summarized all additional\n"
" working groups in the wiki. Please see the Wiki for further information on how to get involved.\n"
@@ -2176,7 +2176,7 @@ msgid "Share owner"
msgstr "Proprietário da ação"
#: coop/templates/coop/membershipresignation_detail.html:61
-#: shifts/models.py:547
+#: shifts/models.py:552
msgid "Cancellation reason"
msgstr "Motivo da rescisão"
@@ -2415,14 +2415,14 @@ msgstr ""
" "
#: coop/templates/coop/tags/user_coop_share_ownership_list_tag.html:56
-#: shifts/models.py:941 shifts/templates/shifts/shift_day_printable.html:56
+#: shifts/models.py:954 shifts/templates/shifts/shift_day_printable.html:56
#: shifts/templates/shifts/shift_detail.html:281
#: shifts/templates/shifts/shift_detail_printable.html:51
msgid "Attended"
msgstr "Compareceu"
#: coop/templates/coop/tags/user_coop_share_ownership_list_tag.html:58
-#: shifts/models.py:940
+#: shifts/models.py:953
msgid "Pending"
msgstr "Pendente"
@@ -2742,7 +2742,7 @@ msgid "List of all emails"
msgstr "Lista de todos os e-mails"
#: core/templates/core/email_list.html:39 shifts/models.py:56
-#: shifts/models.py:84 shifts/models.py:514 shifts/models.py:1079
+#: shifts/models.py:84 shifts/models.py:519 shifts/models.py:1092
#: shifts/templates/shifts/user_shift_account_log.html:29
msgid "Description"
msgstr "Descrição"
@@ -2945,6 +2945,14 @@ msgstr "Adicionar nota"
msgid "Log Type"
msgstr "Tipo de registo"
+#: rizoma/apps.py:17
+msgid "Admin"
+msgstr ""
+
+#: rizoma/apps.py:20
+msgid "All shifts"
+msgstr "Todos os turnos"
+
#: rizoma/coops_pt_auth_backend.py:43
msgid "Invalid username or password"
msgstr "Nome de utilizador ou palavra-passe inválidos"
@@ -3019,11 +3027,6 @@ msgstr "Enviado a um membro quando o Member Office marca o turno como em falta"
msgid "Shift reminder"
msgstr "Lembrete de turno"
-#: shifts/emails/shift_reminder_email.py:30
-#, python-brace-format
-msgid "Sent to a member {config.REMINDER_EMAIL_DAYS_BEFORE_SHIFT} days before their shift"
-msgstr "Enviado a um membro {config.REMINDER_EMAIL_DAYS_BEFORE_SHIFT} dias antes do seu turno"
-
#: shifts/emails/stand_in_found_email.py:23
msgid "Stand-in found"
msgstr "Substituto encontrado"
@@ -3066,11 +3069,6 @@ msgstr "Avisos"
msgid "I have read the warning about the missing qualification and confirm that the user should get registered to the shift"
msgstr "Li o aviso sobre a qualificação em falta e confirmo que o utilizador deve ser registado no turno"
-#: shifts/forms.py:199
-#, python-brace-format
-msgid "The selected user is missing the required qualification for this shift : {missing_capabilities}"
-msgstr "O utilizador selecionado não possui a qualificação necessária para este turno: {missing_capabilities}"
-
#: shifts/forms.py:242
msgid "Please set the chosen time after the start of the shift"
msgstr "Defina a hora escolhida após o início do turno"
@@ -3099,11 +3097,6 @@ msgstr "Este turno foi eliminado. Não é possível registar-se nele."
msgid "I am aware that the member will be unregistered from their ABCD shift"
msgstr "Tenho conhecimento de que o membro será removido do seu turno ABCD"
-#: shifts/forms.py:403
-#, python-brace-format
-msgid "{own_name} is already partner of {partner_of_name}, they can't have a partner of their own"
-msgstr "{own_name} já é parceiro de {partner_of_name}, não pode ter um parceiro próprio"
-
#: shifts/forms.py:414
msgid "The selected member must be an investing member."
msgstr "O membro selecionado deve ser um membro investidor."
@@ -3120,11 +3113,6 @@ msgstr "Li o aviso sobre as presenças canceladas e confirmo que a isenção dev
msgid "I have read the warning about the cancelled ABCD attendances and confirm that the exemption should be created"
msgstr "Li o aviso sobre as presenças ABCD canceladas e confirmo que a isenção deve ser criada"
-#: shifts/forms.py:555
-#, python-brace-format
-msgid "The member will be unregistered from the following shifts because they are within the range of the exemption : {attendances_display}"
-msgstr "O membro será removido dos seguintes turnos por estarem dentro do período da isenção: {attendances_display}"
-
#: shifts/forms.py:580
#, python-format
msgid "The user will be unregistered from the following ABCD shifts because the exemption is longer than %(number_of_cycles)s cycles: %(attendances_display)s "
@@ -3154,18 +3142,18 @@ msgstr "Idioma"
msgid "This determines from which date shifts should be generated from this ABCD shift."
msgstr "Determina a partir de que data os turnos devem ser gerados a partir deste turno ABCD."
-#: shifts/models.py:198 shifts/models.py:522
+#: shifts/models.py:198 shifts/models.py:527
#: shifts/templates/shifts/shift_block_tag.html:9
msgid "Flexible time"
msgstr "Horário flexível"
-#: shifts/models.py:200 shifts/models.py:524
+#: shifts/models.py:200 shifts/models.py:529
msgid "If enabled, members who register for that shift can choose themselves the time where they come do their shift."
msgstr "Se ativado, os membros que se registam nesse turno podem escolher a hora a que vêm fazer o turno."
-#: shifts/models.py:418 shifts/models.py:832
+#: shifts/models.py:418 shifts/models.py:842
#: shifts/templates/shifts/shift_detail.html:95
-#: shifts/templates/shifts/shift_template_detail.html:42
+#: shifts/templates/shifts/shift_template_detail.html:43
msgid "Chosen time"
msgstr "Hora escolhida"
@@ -3173,66 +3161,66 @@ msgstr "Hora escolhida"
msgid "This shift lets you choose at what time you come during the day of the shift. In order to help organising the attendance, please specify when you expect to come.Setting or updating this field will set the time for all individual shifts generated from this ABCD shift.You can update the time of a single shift individually and at any time on the shift page."
msgstr "Este turno permite-lhe escolher a hora a que vem no dia do turno. Para ajudar a organizar as presenças, indique quando prevê vir. Definir ou atualizar este campo definirá a hora para todos os turnos individuais gerados a partir deste turno ABCD. Pode atualizar a hora de um turno específico a qualquer momento na página do turno."
-#: shifts/models.py:504
+#: shifts/models.py:509
msgid "Number of required attendances"
msgstr "Número de presenças necessárias"
-#: shifts/models.py:506
+#: shifts/models.py:511
msgid "If there are less members registered to a shift than that number, it will be highlighted in the shift calendar."
msgstr "Se houver menos membros registados num turno do que esse número, o turno será destacado no calendário."
-#: shifts/models.py:515
+#: shifts/models.py:520
msgid "Is shown on the shift page below the title"
msgstr "É mostrado na página do turno abaixo do título"
-#: shifts/models.py:535 shifts/models.py:541
+#: shifts/models.py:540 shifts/models.py:546
msgid "If 'flexible time' is enabled, then the time component is ignored"
msgstr "Se o 'horário flexível' estiver ativado, o componente de hora é ignorado"
-#: shifts/models.py:834
+#: shifts/models.py:844
msgid "This shift lets you choose at what time you come during the day of the shift. In order to help organising the attendance, please specify when you expect to come."
msgstr "Este turno permite-lhe escolher a hora a que vem no dia do turno. Para ajudar na organização das presenças, indique quando prevê vir."
-#: shifts/models.py:942 shifts/templates/shifts/shift_day_printable.html:57
+#: shifts/models.py:955 shifts/templates/shifts/shift_day_printable.html:57
#: shifts/templates/shifts/shift_detail.html:291
#: shifts/templates/shifts/shift_detail_printable.html:52
msgid "Missed"
msgstr "Em falta"
-#: shifts/models.py:943 shifts/templates/shifts/shift_day_printable.html:58
+#: shifts/models.py:956 shifts/templates/shifts/shift_day_printable.html:58
#: shifts/templates/shifts/shift_detail.html:321
#: shifts/templates/shifts/shift_detail_printable.html:53
msgid "Excused"
msgstr "Justificado"
-#: shifts/models.py:944 shifts/templates/shifts/shift_detail.html:329
+#: shifts/models.py:957 shifts/templates/shifts/shift_detail.html:329
msgid "Cancelled"
msgstr "Cancelado"
-#: shifts/models.py:945 shifts/templates/shifts/shift_day_printable.html:97
+#: shifts/models.py:958 shifts/templates/shifts/shift_day_printable.html:97
#: shifts/templates/shifts/shift_detail.html:313
#: shifts/templates/shifts/shift_detail_printable.html:94
#: shifts/templates/shifts/shift_filters.html:83
msgid "Looking for a stand-in"
msgstr "À procura de substituto"
-#: shifts/models.py:978
+#: shifts/models.py:991
msgid "🏠 ABCD"
msgstr "🏠 ABCD"
-#: shifts/models.py:979
+#: shifts/models.py:992
msgid "✈ Flying"
msgstr "✈ Flex"
-#: shifts/models.py:980
+#: shifts/models.py:993
msgid "❄ Frozen"
msgstr "❄ Suspenso"
-#: shifts/models.py:1006
+#: shifts/models.py:1019
msgid "Is frozen"
msgstr "Está suspenso"
-#: shifts/models.py:1185
+#: shifts/models.py:1198
msgid "Cycle start date"
msgstr "Data de início do ciclo"
@@ -3933,7 +3921,7 @@ msgstr "Horário flexível não especificado"
#: shifts/templates/shifts/shift_day_printable.html:94
#: shifts/templates/shifts/shift_detail.html:122
#: shifts/templates/shifts/shift_detail_printable.html:90
-#: shifts/templates/shifts/shift_template_detail.html:64
+#: shifts/templates/shifts/shift_template_detail.html:66
msgid "Shift partner: "
msgstr "Parceiro de turno: "
@@ -3985,12 +3973,12 @@ msgid "Number"
msgstr "Número"
#: shifts/templates/shifts/shift_detail.html:89
-#: shifts/templates/shifts/shift_template_detail.html:38
+#: shifts/templates/shifts/shift_template_detail.html:39
msgid "Details"
msgstr "Detalhes"
#: shifts/templates/shifts/shift_detail.html:90
-#: shifts/templates/shifts/shift_template_detail.html:40
+#: shifts/templates/shifts/shift_template_detail.html:41
msgid "Registered user"
msgstr "Utilizador registado"
@@ -4003,7 +3991,7 @@ msgid "Do you meet the requirements?"
msgstr "Cumpre os requisitos?"
#: shifts/templates/shifts/shift_detail.html:98
-#: shifts/templates/shifts/shift_template_detail.html:45
+#: shifts/templates/shifts/shift_template_detail.html:46
msgid "Member-Office actions"
msgstr "Ações do Escritório de Membros"
@@ -4039,8 +4027,7 @@ msgid ""
" you can't\n"
" attend, contact your shift leader as soon as\n"
" possible."
-msgstr ""
-"Só pode procurar um substituto até %(NB_DAYS_FOR_SELF_LOOK_FOR_STAND_IN)s dias antes do turno. Se não puder participar, contacte o seu responsável de turno o mais rapidamente possível."
+msgstr "Só pode procurar um substituto até %(NB_DAYS_FOR_SELF_LOOK_FOR_STAND_IN)s dias antes do turno. Se não puder participar, contacte o seu responsável de turno o mais rapidamente possível."
#: shifts/templates/shifts/shift_detail.html:183
msgid "Look for a stand-in"
@@ -4058,8 +4045,7 @@ msgid ""
" attend, look for a stand-in or contact your shift leader as soon\n"
" as\n"
" possible."
-msgstr ""
-"Só pode cancelar a sua inscrição até %(NB_DAYS_FOR_SELF_UNREGISTER)s dias antes do turno. Além disso, os turnos ABCD não podem ser cancelados. Se não puder participar, procure um substituto ou contacte o seu responsável de turno o mais rapidamente possível."
+msgstr "Só pode cancelar a sua inscrição até %(NB_DAYS_FOR_SELF_UNREGISTER)s dias antes do turno. Além disso, os turnos ABCD não podem ser cancelados. Se não puder participar, procure um substituto ou contacte o seu responsável de turno o mais rapidamente possível."
#: shifts/templates/shifts/shift_detail.html:207
msgid "Unregister myself"
@@ -4084,7 +4070,7 @@ msgstr ""
"- O turno não tiver sido cancelado (férias, etc.)
"
#: shifts/templates/shifts/shift_detail.html:254
-#: shifts/templates/shifts/shift_template_detail.html:95
+#: shifts/templates/shifts/shift_template_detail.html:98
msgid "Not specified"
msgstr "Não especificado"
@@ -4222,23 +4208,23 @@ msgstr "Configuração"
msgid "ABCD Shift"
msgstr "Turno ABCD"
-#: shifts/templates/shifts/shift_template_detail.html:34
+#: shifts/templates/shifts/shift_template_detail.html:35
msgid "List of slots for this ABCD shifts"
msgstr "Lista de lugares para este turno ABCD"
-#: shifts/templates/shifts/shift_template_detail.html:39
+#: shifts/templates/shifts/shift_template_detail.html:40
msgid "Requirements"
msgstr "Requisitos"
-#: shifts/templates/shifts/shift_template_detail.html:73
+#: shifts/templates/shifts/shift_template_detail.html:75
msgid "Unregister"
msgstr "Cancelar inscrição"
-#: shifts/templates/shifts/shift_template_detail.html:122
+#: shifts/templates/shifts/shift_template_detail.html:125
msgid "Future generated Shifts"
msgstr "Turnos futuros gerados"
-#: shifts/templates/shifts/shift_template_detail.html:132
+#: shifts/templates/shifts/shift_template_detail.html:135
msgid "Past generated Shifts"
msgstr "Turnos passados gerados"
@@ -4567,32 +4553,27 @@ msgctxt "No shift partner"
msgid "None"
msgstr "Nenhum"
-#: shifts/templatetags/shifts.py:61 shifts/templatetags/shifts.py:165
-#: shifts/views/views.py:148
+#: shifts/templatetags/shifts.py:57 shifts/templatetags/shifts.py:154
+#: shifts/views/views.py:149
msgid "General"
msgstr "Geral"
-#: shifts/utils.py:163
-#, python-brace-format
-msgid "Unknown mode {attendance_mode}"
-msgstr "Modo desconhecido {attendance_mode}"
-
-#: shifts/views/attendance.py:197 shifts/views/attendance.py:341
+#: shifts/views/attendance.py:202 shifts/views/attendance.py:347
#, python-format
msgid "Shift attendance: %(name)s"
msgstr "Presença no turno: %(name)s"
-#: shifts/views/attendance.py:203 shifts/views/attendance.py:347
+#: shifts/views/attendance.py:208 shifts/views/attendance.py:353
#, python-format
msgid "Updating shift attendance: %(member_link)s, %(slot_link)s"
msgstr "A atualizar presença no turno: %(member_link)s, %(slot_link)s"
-#: shifts/views/attendance.py:381
+#: shifts/views/attendance.py:387
#, python-format
msgid "ABCD attendance: %(name)s"
msgstr "Presença ABCD: %(name)s"
-#: shifts/views/attendance.py:388
+#: shifts/views/attendance.py:394
#, python-format
msgid "Updating ABCD attendance: %(member_link)s, %(slot_link)s"
msgstr "A atualizar presença ABCD: %(member_link)s, %(slot_link)s"
@@ -4660,22 +4641,22 @@ msgstr "Não foi possível encontrar uma presença de turno para usar como turno
msgid "Solidarity Shift given. Account Balance debited with -1."
msgstr "Turno solidário doado. Saldo da conta debitado em -1."
-#: shifts/views/views.py:128 shifts/views/views.py:133
+#: shifts/views/views.py:129 shifts/views/views.py:134
#, python-format
msgid "Edit user shift data: %(name)s"
msgstr "Editar dados de turnos do utilizador: %(name)s"
-#: shifts/views/views.py:201
+#: shifts/views/views.py:202
#, python-format
msgid "Shift account: %(name)s"
msgstr "Conta de turnos: %(name)s"
-#: shifts/views/views.py:207
+#: shifts/views/views.py:208
#, python-format
msgid "Create manual shift account entry for: %(link)s"
msgstr "Criar registo manual na conta de turnos para: %(link)s"
-#: shifts/views/views.py:358
+#: shifts/views/views.py:367
msgid "Frozen statuses updated."
msgstr "Estados suspensos atualizados."
@@ -5019,7 +5000,6 @@ msgstr ""
"\n"
" O seu crédito atual é %(credit)s€.\n"
" "
-
#: statistics/templates/statistics/tags/credit_account_card.html:14
msgid "List of last charged credits"
msgstr "Lista dos últimos créditos carregados"
@@ -6066,7 +6046,7 @@ msgstr "NOME INDISPONÍVEL"
#: welcomedesk/apps.py:21 welcomedesk/apps.py:24
#: welcomedesk/templates/welcomedesk/welcome_desk_search.html:14
msgid "Welcome Desk"
-msgstr ""
+msgstr "Welcome Desk"
#: welcomedesk/services/welcome_desk_reasons_cannot_shop_service.py:44
#, python-format
diff --git a/tapir/translations/locale/pt/LC_MESSAGES/djangojs.po b/tapir/translations/locale/pt/LC_MESSAGES/djangojs.po
index 608ff0348..d9797f6e0 100644
--- a/tapir/translations/locale/pt/LC_MESSAGES/djangojs.po
+++ b/tapir/translations/locale/pt/LC_MESSAGES/djangojs.po
@@ -188,7 +188,7 @@ msgstr ""
#: dist/assets/welcome_desk-OgiTR3jj.js:1
msgid "Welcome Desk"
-msgstr ""
+msgstr "Welcome Desk"
#: dist/assets/welcome_desk-OgiTR3jj.js:1
msgid "Name or member ID"
diff --git a/tapir/urls.py b/tapir/urls.py
index 9e165ff03..388f37159 100644
--- a/tapir/urls.py
+++ b/tapir/urls.py
@@ -23,10 +23,11 @@
from tapir.settings import ENABLE_SILK_PROFILING
urlpatterns = [
- path("", generic.RedirectView.as_view(pattern_name="accounts:index")),
+ path("", generic.RedirectView.as_view(url=settings.LOGIN_REDIRECT_URL)),
path("admin/", admin.site.urls),
path("accounts/", include("tapir.accounts.urls")),
path("shifts/", include("tapir.shifts.urls")),
+ path("rizoma/", include("tapir.rizoma.urls")),
path("coop/", include("tapir.coop.urls")),
path("log/", include("tapir.log.urls")),
path("core/", include("tapir.core.urls")),