Merge branch 'develop' into feature/yc-1191

yverdon · Jun 24, 2024 · 8d9720a · 8d9720a
2 parents 03caee6 + bfc0a09
commit 8d9720a
Show file tree

Hide file tree

Showing 36 changed files with 418 additions and 44 deletions.
diff --git a/.env.example b/.env.example
@@ -80,7 +80,7 @@ ALLOW_REMOTE_USER_AUTH=False
 LOCATIONS_SEARCH_API="https://api3.geo.admin.ch/rest/services/api/SearchServer"
 LOCATIONS_SEARCH_API_DETAILS="https://api3.geo.admin.ch/rest/services/api/MapServer/ch.bfs.gebaeude_wohnungs_register/"
 # Local directory on docker host for temporary storage of archive folders
-ARCHIVE_DIR=
+ARCHIVE_DIR=archive
 # Isolated network for print service
 # This has to be unique for multiple instance on same docker host
 ISOLATED_NETWORK_NAME=geocity_isolated_1

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 **[What is Geocity ?](https://geocity-asso.ch)**
 
-**[Features and user guide](https://github.com/yverdon/geocity/wiki)**
+**[Features and user guide](https://gitlab.com/geocity/geocity/-/wikis/home)**
 
 ## Setting up full Docker non persistent demo
 

diff --git a/geocity/apps/accounts/dootix/adapter.py b/geocity/apps/accounts/dootix/adapter.py
@@ -41,6 +41,7 @@ def save_user(self, request, sociallogin: SocialLogin, form=None):
             address=form.cleaned_data["address"],
             zipcode=form.cleaned_data["zipcode"],
             city=form.cleaned_data["city"],
+            country=form.cleaned_data["country"],
             phone_first=form.cleaned_data["phone_first"],
             phone_second=form.cleaned_data["phone_second"],
             company_name=form.cleaned_data["company_name"],

diff --git a/geocity/apps/accounts/forms.py b/geocity/apps/accounts/forms.py
@@ -5,8 +5,9 @@
 from django.conf import settings
 from django.contrib.auth import authenticate
 from django.contrib.auth.forms import AuthenticationForm, BaseUserCreationForm
-from django.core.validators import MaxValueValidator, MinValueValidator, RegexValidator
+from django.core.validators import MinValueValidator, RegexValidator
 from django.utils.translation import gettext_lazy as _
+from django_countries.fields import CountryField
 
 from geocity.fields import AddressWidget
 
@@ -226,8 +227,8 @@ def __init__(self, *args, **kwargs):
     )
 
     zipcode = forms.IntegerField(
-        label=_("NPA"),
-        validators=[MinValueValidator(1000), MaxValueValidator(9999)],
+        label=_("Code postal"),
+        validators=[MinValueValidator(1)],
         widget=forms.NumberInput(attrs={"required": "required"}),
     )
     city = forms.CharField(
@@ -245,6 +246,7 @@ class Meta:
             "address",
             "zipcode",
             "city",
+            "country",
             "phone_first",
             "phone_second",
             "company_name",
@@ -295,26 +297,29 @@ class SocialSignupForm(SignupForm):
     )
 
     zipcode = forms.IntegerField(
-        label=_("NPA"),
-        min_value=1000,
-        max_value=9999,
+        label=_("Code postal"),
+        min_value=1,
         widget=forms.NumberInput(attrs={"required": "required"}),
     )
+
     city = forms.CharField(
         max_length=100,
         label=_("Ville"),
         widget=forms.TextInput(
             attrs={"placeholder": "ex: Yverdon", "required": "required"}
         ),
     )
+
+    country = CountryField().formfield(initial="CH")
+
     phone_first = forms.CharField(
         label=_("Téléphone principal"),
         max_length=20,
         required=True,
         widget=forms.TextInput(attrs={"placeholder": "ex: 024 111 22 22"}),
         validators=[
             RegexValidator(
-                regex=r"^(((\+41)\s?)|(0))?(\d{2})\s?(\d{3})\s?(\d{2})\s?(\d{2})$",
+                regex=r"^(?:\+(?:[0-9] ?){6,14}[0-9]|0\d(?: ?\d){8,13})$",
                 message="Seuls les chiffres et les espaces sont autorisés.",
             )
         ],

diff --git a/geocity/apps/accounts/geomapfish/adapter.py b/geocity/apps/accounts/geomapfish/adapter.py
@@ -42,6 +42,7 @@ def save_user(self, request, sociallogin: SocialLogin, form=None):
             address=form.cleaned_data["address"],
             zipcode=form.cleaned_data["zipcode"],
             city=form.cleaned_data["city"],
+            country=form.cleaned_data["country"],
             phone_first=form.cleaned_data["phone_first"],
             phone_second=form.cleaned_data["phone_second"],
             company_name=form.cleaned_data["company_name"],

diff --git a/geocity/apps/accounts/migrations/0020_historicaluserprofile_country_userprofile_country.py b/geocity/apps/accounts/migrations/0020_historicaluserprofile_country_userprofile_country.py
@@ -0,0 +1,38 @@
+# Generated by Django 4.2.11 on 2024-05-29 09:09
+
+import django_countries.fields
+from django.db import migrations
+
+
+def set_country_to_null(apps, schema_editor):
+    UserProfile = apps.get_model("accounts", "UserProfile")
+    HistoricalUserProfile = apps.get_model("accounts", "HistoricalUserProfile")
+
+    UserProfile.objects.all().update(country=None)
+    HistoricalUserProfile.objects.all().update(country=None)
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("accounts", "0019_administrativeentity_agenda_domain"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="historicaluserprofile",
+            name="country",
+            field=django_countries.fields.CountryField(
+                default="CH", max_length=2, null=True, verbose_name="Pays"
+            ),
+        ),
+        migrations.AddField(
+            model_name="userprofile",
+            name="country",
+            field=django_countries.fields.CountryField(
+                default="CH", max_length=2, null=True, verbose_name="Pays"
+            ),
+        ),
+        # Dont add the default value to the existing users
+        migrations.RunPython(set_country_to_null),
+    ]
diff --git a/geocity/apps/accounts/migrations/0021_alter_administrativeentity_phone_and_more.py b/geocity/apps/accounts/migrations/0021_alter_administrativeentity_phone_and_more.py
@@ -0,0 +1,97 @@
+# Generated by Django 4.2.11 on 2024-05-30 08:58
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("accounts", "0020_historicaluserprofile_country_userprofile_country"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="administrativeentity",
+            name="phone",
+            field=models.CharField(
+                blank=True,
+                max_length=20,
+                validators=[
+                    django.core.validators.RegexValidator(
+                        message="Seuls les chiffres et les espaces sont autorisés.",
+                        regex="^(?:\\+(?:[0-9] ?){6,14}[0-9]|0\\d(?: ?\\d){8,13})$",
+                    )
+                ],
+                verbose_name="Téléphone",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicaluserprofile",
+            name="phone_first",
+            field=models.CharField(
+                max_length=20,
+                validators=[
+                    django.core.validators.RegexValidator(
+                        message="Seuls les chiffres et les espaces sont autorisés.",
+                        regex="^(?:\\+(?:[0-9] ?){6,14}[0-9]|0\\d(?: ?\\d){8,13})$",
+                    )
+                ],
+                verbose_name="Téléphone principal",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicaluserprofile",
+            name="phone_second",
+            field=models.CharField(
+                blank=True,
+                max_length=20,
+                validators=[
+                    django.core.validators.RegexValidator(
+                        message="Seuls les chiffres et les espaces sont autorisés.",
+                        regex="^(?:\\+(?:[0-9] ?){6,14}[0-9]|0\\d(?: ?\\d){8,13})$",
+                    )
+                ],
+                verbose_name="Téléphone secondaire",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicaluserprofile",
+            name="zipcode",
+            field=models.PositiveIntegerField(verbose_name="Code postal"),
+        ),
+        migrations.AlterField(
+            model_name="userprofile",
+            name="phone_first",
+            field=models.CharField(
+                max_length=20,
+                validators=[
+                    django.core.validators.RegexValidator(
+                        message="Seuls les chiffres et les espaces sont autorisés.",
+                        regex="^(?:\\+(?:[0-9] ?){6,14}[0-9]|0\\d(?: ?\\d){8,13})$",
+                    )
+                ],
+                verbose_name="Téléphone principal",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="userprofile",
+            name="phone_second",
+            field=models.CharField(
+                blank=True,
+                max_length=20,
+                validators=[
+                    django.core.validators.RegexValidator(
+                        message="Seuls les chiffres et les espaces sont autorisés.",
+                        regex="^(?:\\+(?:[0-9] ?){6,14}[0-9]|0\\d(?: ?\\d){8,13})$",
+                    )
+                ],
+                verbose_name="Téléphone secondaire",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="userprofile",
+            name="zipcode",
+            field=models.PositiveIntegerField(verbose_name="Code postal"),
+        ),
+    ]
diff --git a/geocity/apps/accounts/models.py b/geocity/apps/accounts/models.py
@@ -3,12 +3,7 @@
 from django.contrib.gis.db import models as geomodels
 from django.contrib.sites.models import Site
 from django.core.exceptions import ObjectDoesNotExist, ValidationError
-from django.core.validators import (
-    FileExtensionValidator,
-    MaxValueValidator,
-    MinValueValidator,
-    RegexValidator,
-)
+from django.core.validators import FileExtensionValidator, RegexValidator
 from django.db import models
 from django.db.models import BooleanField, Count, ExpressionWrapper, Q, UniqueConstraint
 from django.db.models.signals import post_save
@@ -17,6 +12,7 @@
 from django.utils.functional import cached_property
 from django.utils.safestring import mark_safe
 from django.utils.translation import gettext_lazy as _
+from django_countries.fields import CountryField
 from simple_history.models import HistoricalRecords
 from taggit.managers import TaggableManager
 
@@ -293,7 +289,7 @@ class AdministrativeEntity(models.Model):
         max_length=20,
         validators=[
             RegexValidator(
-                regex=r"^(((\+41)\s?)|(0))?(\d{2})\s?(\d{3})\s?(\d{2})\s?(\d{2})$",
+                regex=r"^(?:\+(?:[0-9] ?){6,14}[0-9]|0\d(?: ?\d){8,13})$",
                 message="Seuls les chiffres et les espaces sont autorisés.",
             )
         ],
@@ -583,19 +579,24 @@ class UserProfile(models.Model):
         max_length=100,
     )
     zipcode = models.PositiveIntegerField(
-        _("NPA"),
-        validators=[MinValueValidator(1000), MaxValueValidator(9999)],
+        _("Code postal"),
     )
     city = models.CharField(
         _("Ville"),
         max_length=100,
     )
+    country = CountryField(
+        _("Pays"),
+        null=True,
+        blank=False,
+        default="CH",
+    )
     phone_first = models.CharField(
         _("Téléphone principal"),
         max_length=20,
         validators=[
             RegexValidator(
-                regex=r"^(((\+41)\s?)|(0))?(\d{2})\s?(\d{3})\s?(\d{2})\s?(\d{2})$",
+                regex=r"^(?:\+(?:[0-9] ?){6,14}[0-9]|0\d(?: ?\d){8,13})$",
                 message="Seuls les chiffres et les espaces sont autorisés.",
             )
         ],
@@ -606,7 +607,7 @@ class UserProfile(models.Model):
         max_length=20,
         validators=[
             RegexValidator(
-                regex=r"^(((\+41)\s?)|(0))?(\d{2})\s?(\d{3})\s?(\d{2})\s?(\d{2})$",
+                regex=r"^(?:\+(?:[0-9] ?){6,14}[0-9]|0\d(?: ?\d){8,13})$",
                 message="Seuls les chiffres et les espaces sont autorisés.",
             )
         ],

diff --git a/geocity/apps/api/serializers.py b/geocity/apps/api/serializers.py
@@ -451,6 +451,7 @@ class Meta:
             "zipcode",
             "user_id",
             "city",
+            "country",
             "company_name",
             "vat_number",
             "iban",

diff --git a/geocity/apps/api/services.py b/geocity/apps/api/services.py
@@ -3,6 +3,7 @@
 from io import BytesIO
 
 from django.conf import settings
+from django.core.exceptions import SuspiciousOperation
 from django.db.models import Q
 from django.utils.text import get_valid_filename
 from PIL import Image
@@ -22,7 +23,11 @@ def get_mime_type(content):
     """
     Used to retrieve mime type in response.content of request
     """
-    image = Image.open(BytesIO(content))
+    try:
+        image = Image.open(BytesIO(content))
+    except:
+        raise SuspiciousOperation
+
     image_format = image.format
     mime_type = "image/" + image_format.lower()
     return mime_type

diff --git a/geocity/apps/core/static/css/contactform.css b/geocity/apps/core/static/css/contactform.css
@@ -11,3 +11,8 @@ select[readonly] {
     border: 0;
     font-weight: bold;
 }
+
+.disabled-dropdown {
+  background-color: #e9ecef;
+  pointer-events: none;
+}
diff --git a/geocity/apps/core/static/js/submission_contacts.js b/geocity/apps/core/static/js/submission_contacts.js
@@ -1,23 +1,42 @@
 let update_form_value = function(item, userprofile) {
-
   if (document.getElementById(`self_contact_${parseInt(item) + 1}`).checked == true) {
     document.getElementById(`id_form-${item}-first_name`).value = userprofile.first_name;
     for (const [key, value] of Object.entries(userprofile)) {
-      document.getElementById(`id_form-${item}-${key}`).value = value;
-      document.getElementById(`id_form-${item}-${key}`).readOnly = true;
+      let element = document.getElementById(`id_form-${item}-${key}`);
+      if (element !== null) {
+        element.value = value;
+        // Pseudo disable the dropdown with CSS instead of setting it read-only
+        if (key === "country") {
+          element.classList.add("disabled-dropdown");
+        } else {
+          element.readOnly = true;
+        }
+      }
     }
   } else {
     for (const [key, value] of Object.entries(userprofile)) {
-      document.getElementById(`id_form-${item}-${key}`).value = '';
-      document.getElementById(`id_form-${item}-${key}`).readOnly = false;
+      let element = document.getElementById(`id_form-${item}-${key}`);
+      if (element !== null) {
+        element.value = '';
+        element.readOnly = false;
+        if (key === "country") {
+          element.classList.remove("disabled-dropdown");
+        } else {
+          element.readOnly = false;
+        }
+      }
     }
   }
 }
 
 // Create a label to replace .form-control without .extra-form in classes inside of forms-container
 window.addEventListener('load', function () {
   var forms_control = document.querySelectorAll("[id=forms-container] select[class*=form-control]");
-  for (form_control of forms_control) {
+  for (let form_control of forms_control) {
+    // Skip the country select field
+    if (form_control.classList.contains("country")) {
+      continue;
+    }
     let elem = document.createElement('label');
     let text = form_control.querySelector("option[selected]").text
     let div = form_control.closest('.col-md-9');