Skip to content

Release 08/01/2026 #648

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Doniaab merged 5 commits into from
Jan 8, 2026
Merged

Release 08/01/2026 #648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0c832ae
fix(emails,invitations): wording + add login button in invitation email
tristan-gueguen Dec 22, 2025
670b59f
fix(controllers,exports): fixed import function excel export
tristan-gueguen Dec 22, 2025
e1a8e55
Merge pull request #642 from MTES-MCT/fix/invitation-email-wording-an…
tristan-gueguen Jan 5, 2026
92a2f27
Merge pull request #643 from MTES-MCT/fix/controllers-export-excel
tristan-gueguen Jan 5, 2026
9136f3e
fix(exports,controls): fixed merging excel error
tristan-gueguen Jan 6, 2026
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
3 changes: 3 additions & 0 deletions app/helpers/mail.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,6 +380,8 @@ def generate_employee_invite(
else:
invitation_link = f"{app.config['FRONTEND_URL']}/invite?token={employment.invite_token}"

login_link = f"{app.config['FRONTEND_URL']}/login"

company_name = employment.company.name
if scheduled_reminder:
subject = (
Expand Down Expand Up @@ -411,6 +413,7 @@ def generate_employee_invite(
first_name=employment.user.first_name if employment.user else None,
custom_id=employment.invite_token,
invitation_link=Markup(invitation_link),
login_link=Markup(login_link),
company_name=company_name,
reminder=reminder,
scheduled_reminder=scheduled_reminder,
Expand Down
2 changes: 1 addition & 1 deletion app/helpers/xls/controllers/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def send_control_as_one_excel_file(control):
if control.control_type == ControlType.mobilic:
max_date = control.history_end_date
min_date = control.history_start_date
from app import group_user_events_by_day_with_limit
from app.domain.work_days import group_user_events_by_day_with_limit

work_days_data = group_user_events_by_day_with_limit(
control.user,
Expand Down
6 changes: 3 additions & 3 deletions app/helpers/xls/controllers/tab_details_single_control.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ def write_details_sheet(wb, control, work_days_data):
merge_cells_if_needed(
wb,
sheet,
workday_starting_row_idx,
mission_starting_row_idx,
row_idx,
2,
to_fr_tz(wday.start_time),
Expand All @@ -164,7 +164,7 @@ def write_details_sheet(wb, control, work_days_data):
merge_cells_if_needed(
wb,
sheet,
workday_starting_row_idx,
mission_starting_row_idx,
row_idx,
1,
COLUMN_SIREN.lambda_value(wday),
Expand All @@ -173,7 +173,7 @@ def write_details_sheet(wb, control, work_days_data):
merge_cells_if_needed(
wb,
sheet,
workday_starting_row_idx,
mission_starting_row_idx,
row_idx,
0,
COLUMN_ENTREPRISE.lambda_value(wday),
Expand Down
4 changes: 3 additions & 1 deletion app/templates/invitation_email.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@
Vous avez été invité(e) par l’entreprise <strong>{{ company_name | upper }}</strong>
{% endif %} à créer un compte Mobilic pour enregistrer votre temps de travail.</p>
<p>Mobilic est la plateforme gouvernementale qui simplifie <strong>l'enregistrement et le suivi du temps de travail</strong> des travailleurs mobiles du transport routier léger et du déménagement.</p>
<p>Pour créer votre compte ou rattacher votre compte existant à l'entreprise <strong>{{ company_name | upper }}</strong> cliquez sur le bouton d'activation suivant :</p>
<p>Pour créer votre compte ou rattacher votre compte existant à l'entreprise <strong>{{ company_name | upper }}</strong> cliquez sur le bouton d'activation suivant (valable une fois) :</p>
{{ button.button('Activer mon compte', invitation_link) }}
<p>Une fois le compte activé, connectez-vous en cliquant ici :</p>
{{ button.button('Je me connecte', login_link) }}
<p>Cordialement,</p>
{% endblock %}