Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
02f5fcf
Remove the fcp code on the weather-time component
Shayan105 Nov 7, 2025
c590ae1
Refactor container in CSS and fix maxwidth
Shayan105 Nov 7, 2025
2e4b89b
Add ellipsis when text are too long for the container.
Shayan105 Nov 7, 2025
5ae6d96
Add dynamic downscaling to componenent
Shayan105 Nov 7, 2025
45a380d
Allow 2 lines for the info. text
Shayan105 Nov 10, 2025
fbb73e0
Set map height of map and round its corners
Shayan105 Nov 10, 2025
1898394
Fix translated pegman button
Shayan105 Nov 10, 2025
ac45681
Refactor comments and remove useless code
Shayan105 Nov 10, 2025
11d7b5b
Run precommit
Shayan105 Nov 10, 2025
6c6b7cb
Merge branch 'T2728---Make-the-weather-time-component-more-responsibl…
Shayan105 Nov 11, 2025
e90c36b
Add max height to 60% of the screen to the map
Shayan105 Nov 11, 2025
d998389
Changes the clamp values or the font size + Remove useless comments
Shayan105 Nov 11, 2025
6118f3c
Merge branch '14.0-MyCompassion2.0' into T2728---Make-the-weather-tim…
Shayan105 Nov 25, 2025
57a5f6d
[FIX] use CSC name instead of the local church name on the map view
Shayan105 Nov 26, 2025
0720134
[FIX] Use obfuscated location of the map
Shayan105 Nov 26, 2025
8e3aa05
[STYLE] Refactor and make translatable
Shayan105 Nov 27, 2025
4c97a28
[FIX] Make translatable strings
Shayan105 Nov 27, 2025
55b5b93
Merge remote-tracking branch 'origin/14.0-MyCompassion2.0' into T2792…
Shayan105 Dec 19, 2025
618c14b
[T2792][STYLE] Refactor the code
Shayan105 Jan 8, 2026
43eda5c
Merge branch '14.0-MyCompassion2.0' into T2792---Ensure-Child-Protect…
Shayan105 Jan 8, 2026
a9da4bc
Merge branch 'T2792---Ensure-Child-Protection-on-Children-Page' of ht…
Shayan105 Jan 8, 2026
2d4248f
[T2792][FIX] Add pre-migration script to add columns to add obfuscate…
Shayan105 Jan 8, 2026
ae62a29
[T2792][STYLE] Refactor
Shayan105 Jan 8, 2026
3ab5ea2
[T2792] [STYLE] Refactor
Shayan105 Jan 9, 2026
6f7addd
[T2792][STYLE] Refactor
Shayan105 Jan 13, 2026
f28287f
[T2792][FIX] Update the module to add the gps_obfuscation
Shayan105 Jan 14, 2026
d845522
[T2792][STYLE] Refactor
Shayan105 Jan 14, 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
2 changes: 1 addition & 1 deletion my_compassion/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
# pylint: disable=C8101
{
"name": "MyCompassion - Sponsor portal website",
"version": "14.0.1.0.1",
"version": "14.0.1.0.2",
"category": "Website",
"author": "Compassion CH",
"license": "AGPL-3",
Expand Down
3 changes: 3 additions & 0 deletions my_compassion/controllers/my2_children.py
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,9 @@ def my2_render_child_timeline_page(self, child, **kwargs):
request.env["ir.config_parameter"].sudo().get_param("google_custom_map_id")
)

# Generate the obfuscated if necessary (eg: the first time the values are read)
child.sudo().project_id._compute_gps_obfuscated()

return request.render(
"my_compassion.my2_child_timeline_page",
{
Expand Down
12 changes: 12 additions & 0 deletions my_compassion/migrations/14.0.1.0.2/pre-migration.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
from openupgradelib import openupgrade


def migrate(cr, version):
openupgrade.logged_query(
cr,
"""
ALTER TABLE compassion_project
ADD COLUMN IF NOT EXISTS gps_latitude_obfuscated DECIMAL(10, 6),
ADD COLUMN IF NOT EXISTS gps_longitude_obfuscated DECIMAL(10, 6)
""",
)
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
Injected data:
- timezone (string): timezone of the center.
- fcp_id (string): Identifier of the compassion project.
- church_name (string): name of the local church associated with the center.
- city_country (string): represents where the center is located in the following format city,country.
Expand All @@ -23,10 +24,10 @@
<template id="WeatherTimeContainer" name="Weather and Time Container">
<link rel="stylesheet" href="/my_compassion/static/src/css/my2_weather_time_container.css" />
<div class="center-info-card d-none">
<t t-if="church_name">
<t t-if="cdc_name">
<div class="center-info-card__header">
<p class="center-info-card__project-info">
<t t-esc="church_name" />
<t t-esc="cdc_name" />
</p>
</div>
</t>
Expand Down
10 changes: 7 additions & 3 deletions my_compassion/templates/pages/my2_child_timeline.xml
Original file line number Diff line number Diff line change
Expand Up @@ -453,8 +453,8 @@
>
<t t-if="google_api_key">
<t t-call="theme_compassion_2025.MapComponent">
<t t-set="long" t-value="compassion_child.project_id.gps_longitude" />
<t t-set="lat" t-value="compassion_child.project_id.gps_latitude" />
<t t-set="long" t-value="compassion_child.project_id.gps_longitude_obfuscated" />
<t t-set="lat" t-value="compassion_child.project_id.gps_latitude_obfuscated" />
<t t-set="api_key" t-value="google_api_key" />
<t t-set="custom_map_id" t-value="google_custom_map_id" />
</t>
Expand All @@ -463,7 +463,11 @@
<t t-call="my_compassion.WeatherTimeContainer">
<t t-set="timezone" t-value="timezone" />
<t t-set="fcp_id" t-value="compassion_child.project_id.fcp_id" />
<t t-set="church_name" t-value="compassion_child.project_id.local_church_name" />
<t t-set="church_default_name">Compassion center</t>
<t
t-set="cdc_name"
t-value="compassion_child.project_id.child_center_original_name or compassion_child.project_id.name or church_default_name "
/>
<t
t-set="city_country"
t-value="', '.join(list(filter(None, [compassion_child.project_id.closest_city, compassion_child.project_id.country_id.name])))"
Expand Down