gip-inclusion · Guilouf · Feb 14, 2025 · Feb 14, 2025 · Feb 14, 2025 · Feb 14, 2025
diff --git a/config/settings/base.py b/config/settings/base.py
@@ -787,7 +787,7 @@
 TALLY_BUYER_NPS_FORM_ID = env.str("TALLY_BUYER_NPS_FORM_ID", "")
 TALLY_SIAE_NPS_FORM_ID = env.str("TALLY_SIAE_NPS_FORM_ID", "")
 PARTNER_APPROCH_USER_ID = env.int("PARTNER_APPROCH_USER_ID", 0)
-
+GOOGLE_AGENDA_IFRAME_URL = env.str("GOOGLE_AGENDA_IFRAME_URL", "")
 
 # Misc
 # ------------------------------------------------------------------------------

diff --git a/env.default.sh b/env.default.sh
@@ -13,6 +13,7 @@ export POSTGRESQL_ADDON_DB=""
 export SECRET_KEY="coucou"
 export DJANGO_SETTINGS_MODULE="config.settings.dev"
 export TRACKER_HOST="https://example.com"
+export GOOGLE_AGENDA_IFRAME_URL = ""
 
 # APIs
 export API_EMPLOIS_INCLUSION_TOKEN=""

diff --git a/env.docker_default.local b/env.docker_default.local
@@ -29,6 +29,7 @@ ENV=dev
 DEBUG=True
 SECRET_KEY=[YOUR_SECRET]
 TRACKER_HOST=localhost
+GOOGLE_AGENDA_IFRAME_URL=""
 
 # MTCAPTCHA
 MTCAPTCHA_PRIVATE_KEY=

diff --git a/lemarche/cms/migrations/0015_paragraph.py b/lemarche/cms/migrations/0015_paragraph.py
@@ -0,0 +1,38 @@
+# Generated by Django 5.1.6 on 2025-02-18 09:33
+
+import wagtail.fields
+from django.db import migrations, models
+
+
+def paragraph_migration(apps, schema_editor):
+    Paragraph = apps.get_model("cms", "Paragraph")
+    Paragraph.objects.create(
+        title="Prise de rendez vous", slug="rdv-signup", content="Prenez un rendez vous s'il vous plaît"
+    )
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("cms", "0014_homepage_sub_header_custom_message"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="Paragraph",
+            fields=[
+                ("id", models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")),
+                ("title", models.CharField(max_length=255, verbose_name="Titre de l'encart")),
+                (
+                    "slug",
+                    models.SlugField(unique=True, help_text="Identifiant", max_length=255, verbose_name="slug"),
+                ),
+                ("content", wagtail.fields.RichTextField(blank=True, verbose_name="Contenu")),
+            ],
+            options={
+                "verbose_name": "Paragraphe",
+                "verbose_name_plural": "Paragraphes",
+            },
+        ),
+        migrations.RunPython(paragraph_migration, migrations.RunPython.noop),
+    ]
diff --git a/lemarche/cms/snippets.py b/lemarche/cms/snippets.py
@@ -1,5 +1,6 @@
 from django.db import models
 from wagtail.admin.panels import FieldPanel
+from wagtail.fields import RichTextField
 from wagtail.snippets.models import register_snippet
 
 
@@ -88,3 +89,32 @@ class Meta:
 
     def __str__(self):
         return self.title
+
+
+@register_snippet
+class Paragraph(models.Model):
+    title = models.CharField(max_length=255, verbose_name="Titre de l'encart")
+    slug = models.SlugField(
+        verbose_name="slug",
+        unique=True,
+        max_length=255,
+        help_text="Identifiant",
+    )
+
+    content = RichTextField(
+        blank=True,
+        verbose_name="Contenu",
+    )
+
+    panels = [
+        FieldPanel("title"),
+        FieldPanel("slug"),
+        FieldPanel("content"),
+    ]
+
+    class Meta:
+        verbose_name = "Paragraphe"
+        verbose_name_plural = "Paragraphes"
+
+    def __str__(self):
+        return self.title
diff --git a/lemarche/static/itou_marche/itou_marche.scss b/lemarche/static/itou_marche/itou_marche.scss
@@ -231,3 +231,26 @@ p.fr-tag--green-emeraude {
     background-color: var(--background-action-low-green-emeraude);
     color: var(--text-action-high-green-emeraude)
 }
+
+.fr-background-alt--orange {
+    background: linear-gradient(to bottom, #fc5455 50%, transparent 50%);
+}
+
+.fr-background-alt--white {
+    background:  #ffffff;
+}
+
+.rounded-iframe {
+    width: 100%;
+    height: 650px;
+    border: none;
+    border-radius: 15px;
+}
+
+.text-white {
+    color: #ffffff;
+}
+
+.text-white * {
+    color: inherit;
+}
diff --git a/lemarche/templates/auth/meeting_calendar.html b/lemarche/templates/auth/meeting_calendar.html
@@ -0,0 +1,29 @@
+{% extends BASE_TEMPLATE %}
+{% load dsfr_tags process_dict static humanize wagtailcore_tags advert_cms %}
+{% block page_title %}
+    Prise de rendez-vous
+{% endblock page_title %}
+
+{% block breadcrumb %}
+    {% process_dict root_dir=HOME_PAGE_PATH current="Prise de rendez-vous" as breadcrumb_data %}
+    {% dsfr_breadcrumb breadcrumb_data %}
+{% endblock breadcrumb %}
+{% block content %}
+        <div class="fr-container fr-background-alt--orange fr-card--shadow">
+            <div class="fr-grid-row text-white">
+                <div class="fr-col-4 fr-mt-2w">
+                    {{ wagtail_paragraph.content | safe }}
+                </div>
+                <div class="fr-col-8 fr-mt-2w">
+                    <h2>Prenez rendez-vous pour activer votre compte</h2>
+                    <!-- Google Calendar Appointment Scheduling begin -->
+                    <iframe
+                            class="fr-background-alt--white rounded-iframe fr-mb-2w"
+                            src="{{ agenda_iframe_url }}"
+                    >
+                    </iframe>
+                    <!-- end Google Calendar Appointment Scheduling -->
+                </div>
+            </div>
+        </div>
+{% endblock content %}
diff --git a/lemarche/templates/includes/_dropdown_menu.html b/lemarche/templates/includes/_dropdown_menu.html
@@ -2,19 +2,21 @@
     <button id="my-account" class="fr-btn fr-btn--tertiary fr-icon-account-line fr-btn--icon-left fr-m-md-0" aria-controls="menu-profile" @click="openMenu()">Mon espace</button>
     <div id="menu-profile" x-show="isOpen" @click.away="closeMenu()" x-cloak class="fr-menu dropdown-menu__menu">
         <ul class="fr-menu__list dropdown-menu__list">
+            {% if user.is_onboarded %}
             <li>
                 <a id="header-dashboard" class="fr-nav__link fr-icon-table-line fr-btn--icon-left" href="{% url 'dashboard:home' %}" target="_self">
                     Tableau de bord
                 </a>
             </li>
             <li>
-                <a id="header-profile" class="fr-nav__link fr-icon-user-line fr-btn--icon-left" href="{% url 'dashboard:profile_edit' %}" target="_self">
-                    Mon profil
+                <a id="header-favorites" class="fr-nav__link fr-icon-star-line fr-btn--icon-left" href="{% url 'dashboard_favorites:list' %}" target="_self">
+                    Favoris <span class="fr-badge fr-badge--sm fr-ml-2v">{{ user.favorite_list_count }}</span>
                 </a>
             </li>
+            {% endif %}
             <li>
-                <a id="header-favorites" class="fr-nav__link fr-icon-star-line fr-btn--icon-left" href="{% url 'dashboard_favorites:list' %}" target="_self">
-                    Favoris <span class="fr-badge fr-badge--sm fr-ml-2v">{{ user.favorite_list_count }}</span>
+                <a id="header-profile" class="fr-nav__link fr-icon-user-line fr-btn--icon-left" href="{% url 'dashboard:profile_edit' %}" target="_self">
+                    Mon profil
                 </a>
             </li>
             {% if user.kind == user.KIND_SIAE or user.kind == user.KIND_BUYER %}

diff --git a/lemarche/templates/layouts/_header_dsfr.html b/lemarche/templates/layouts/_header_dsfr.html
diff --git a/lemarche/templates/layouts/_header_nav_primary_items.html b/lemarche/templates/layouts/_header_nav_primary_items.html
@@ -6,12 +6,18 @@
 				Demandes reçues{% if tender_siae_unread_count %}&nbsp;<span class="fr-badge fr-badge--sm fr-ml-2v fr-badge--green-emeraude">{{ tender_siae_unread_count }}</span>{% endif %}
 			</a>
 		</li>
-		{% else %}
-			<li>
-				<a class="fr-btn fr-icon-add-circle-line fr-btn--icon-left" href="{% url 'tenders:create' %}" id="header-demande" target="_self">
-					<span>Publier un besoin d'achat</span>
-				</a>
-			</li>
+		{% elif user.is_onboarded %}
+        <li>
+            <a class="fr-btn fr-icon-add-circle-line fr-btn--icon-left" href="{% url 'tenders:create' %}" id="header-demande" target="_self">
+                <span>Publier un besoin d'achat</span>
+            </a>
+        </li>
+        {% else %}
+        <li>
+            <a class="fr-btn fr-btn--icon-left" href="{% url 'auth:booking-meeting-view' %}" id="header-meeting">
+                <span>Activer mon compte</span>
+            </a>
+        </li>
 		{% endif %}
 		<li>
 			{% include "includes/_dropdown_menu.html" %}
@@ -46,4 +52,4 @@
 			</li>
 		{% endif %}
 	{% endif %}
-</ul>
+</ul>
diff --git a/lemarche/users/admin.py b/lemarche/users/admin.py
@@ -3,7 +3,8 @@
 from ckeditor.widgets import CKEditorWidget
 from django import forms
 from django.contrib import admin
-from django.contrib.auth.admin import UserAdmin
+from django.contrib.auth.admin import GroupAdmin, UserAdmin
+from django.contrib.auth.models import Group
 from django.contrib.contenttypes.admin import GenericTabularInline
 from django.core.exceptions import ValidationError
 from django.db import models
@@ -22,6 +23,11 @@
 from lemarche.utils.fields import pretty_print_readonly_jsonfield
 
 
+@admin.register(Group, site=admin_site)
+class GroupAdmin(GroupAdmin):
+    pass
+
+
 class HasCompanyFilter(admin.SimpleListFilter):
     """Custom admin filter to target users who are linked to a Company."""
 
@@ -308,7 +314,7 @@ class UserAdmin(FieldsetsInlineMixin, UserAdmin):
         ("API", {"fields": ("api_key", "api_key_last_updated")}),
         (
             "Permissions",
-            {"classes": ["collapse"], "fields": ("is_active", "is_staff", "is_superuser", "groups")},
+            {"classes": ["collapse"], "fields": ("is_onboarded", "is_active", "is_staff", "is_superuser", "groups")},
         ),
         (
             "Stats",

diff --git a/lemarche/users/migrations/0045_user_is_onboarded.py b/lemarche/users/migrations/0045_user_is_onboarded.py
@@ -0,0 +1,18 @@
+# Generated by Django 5.1.6 on 2025-02-14 09:24
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("users", "0044_alter_user_api_key"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="user",
+            name="is_onboarded",
+            field=models.BooleanField(default=True, verbose_name="L'utilisateur a suivi la procédure d'onboarding"),
+        ),
+    ]
diff --git a/lemarche/users/models.py b/lemarche/users/models.py
@@ -301,6 +301,7 @@ class User(AbstractUser):
 
     # is_active, is_staff, is_superuser
     is_anonymized = models.BooleanField(verbose_name="L'utilisateur à été anonymisé", default=False)
+    is_onboarded = models.BooleanField(verbose_name="L'utilisateur a suivi la procédure d'onboarding", default=True)
 
     # date_joined, last_login
     created_at = models.DateTimeField(verbose_name="Date de création", default=timezone.now)

diff --git a/lemarche/www/auth/tests.py b/lemarche/www/auth/tests.py
@@ -1,10 +1,12 @@
 from django.contrib.staticfiles.testing import StaticLiveServerTestCase
+from django.test import override_settings
 from django.urls import reverse
 from selenium import webdriver
 from selenium.webdriver.common.by import By
 from selenium.webdriver.firefox.options import Options
 from selenium.webdriver.support.select import Select
 
+from lemarche.cms.snippets import Paragraph
 from lemarche.users.factories import DEFAULT_PASSWORD, UserFactory
 from lemarche.users.models import User
 
@@ -31,6 +33,7 @@ def element_select_option(driver, element, option=""):
     field_select.select_by_visible_text(option)
 
 
+@override_settings(GOOGLE_AGENDA_IFRAME_URL="some_google_url")
 class SignupFormTest(StaticLiveServerTestCase):
     @classmethod
     def setUpClass(cls):
@@ -43,6 +46,11 @@ def setUpClass(cls):
 
     def setUp(self):
         EXAMPLE_PASSWORD = "c*[gkp`0="
+        # Static server tests cases erases data from migrations
+        Paragraph.objects.get_or_create(
+            slug="rdv-signup",
+            defaults={"title": "Prise de rendez vous"},
+        )
 
         self.SIAE = {
             "id_kind": 0,  # required
@@ -125,7 +133,7 @@ def _complete_form(self, user_profile: dict, signup_url=reverse("auth:signup"),
             scroll_to_and_click_element(self.driver, submit_element)
 
     def _assert_signup_success(self, redirect_url: str, user_kind=None) -> list:
-        """Assert the success signup and returns the sucess messages
+        """Assert the success signup and returns the success messages
 
         Args:
             redirect_url (str): redirect url after signup
@@ -142,9 +150,6 @@ def _assert_signup_success(self, redirect_url: str, user_kind=None) -> list:
         menu_button = self.driver.find_element(By.ID, "my-account")
         menu_button.click()
 
-        dashboard_link = self.driver.find_element(By.LINK_TEXT, "Tableau de bord")
-        self.assertIsNotNone(dashboard_link)
-
         notifications_link = self.driver.find_elements(By.LINK_TEXT, "Notifications")
         if user_kind in [User.KIND_SIAE, User.KIND_BUYER]:
             self.assertTrue(len(notifications_link) > 0)
@@ -198,7 +203,7 @@ def test_buyer_submits_signup_form_success(self):
         scroll_to_and_click_element(self.driver, submit_element)
 
         # should redirect BUYER to search
-        self._assert_signup_success(redirect_url=reverse("siae:search_results"), user_kind=User.KIND_BUYER)
+        self._assert_signup_success(redirect_url=reverse("auth:booking-meeting-view"), user_kind=User.KIND_BUYER)
 
     def test_buyer_submits_signup_form_success_extra_data(self):
         self._complete_form(user_profile=self.BUYER, with_submit=False)

diff --git a/lemarche/www/auth/urls.py b/lemarche/www/auth/urls.py
@@ -1,7 +1,7 @@
 from django.contrib.auth import views as auth_views
 from django.urls import path, reverse_lazy
 
-from lemarche.www.auth.views import LoginView, PasswordResetView, SignupView
+from lemarche.www.auth.views import LoginView, MeetingCalendarView, PasswordResetView, SignupView
 
 
 # https://docs.djangoproject.com/en/dev/topics/http/urls/#url-namespaces-and-included-urlconfs
@@ -11,6 +11,7 @@
     path("login/", LoginView.as_view(), name="login"),
     path("logout/", auth_views.LogoutView.as_view(template_name="auth/logged_out.html"), name="logout"),
     path("signup/", SignupView.as_view(), name="signup"),
+    path("rendez-vous/", MeetingCalendarView.as_view(), name="booking-meeting-view"),
     path("password-reset/", PasswordResetView.as_view(), name="password_reset"),
     path(
         "password-reset/sent/",