Fix le bug sur les plantes dans le CompositionStep et les preparations viennent du backend

api/serializers/__init__.py

@@ -16,6 +16,7 @@
 from .condition import ConditionSerializer
 from .effect import EffectSerializer
 from .galenic_formulation import GalenicFormulationSerializer
+from .preparation import PreparationSerializer
 from .unit import SubstanceUnitSerializer
 from .autocomplete_item import AutocompleteItemSerializer
 from .declaration import DeclarationSerializer, DeclarationShortSerializer, SimpleDeclarationSerializer

api/serializers/preparation.py

@@ -0,0 +1,15 @@
+from rest_framework import serializers
+
+from data.models import Preparation
+
+
+class PreparationSerializer(serializers.ModelSerializer):
+    # TODO make a unique abstract class for all simple models (Condition, Effect, Preparation, Population...)
+    class Meta:
+        model = Preparation
+        fields = [
+            "id",
+            "name",
+            "name_en",
+        ]
+        read_only_fields = fields

api/urls.py

@@ -24,6 +24,7 @@
     path("conditions/", views.ConditionListView.as_view(), name="condition_list"),
     path("effects/", views.EffectListView.as_view(), name="effect_list"),
     path("galenic-formulations/", views.GalenicFormulationListView.as_view(), name="galenic_formulation_list"),
+    path("preparations/", views.PreparationListView.as_view(), name="preparation_list"),
     path("units/", views.UnitListView.as_view(), name="unit_list"),
     # Authentication
     path("login/", views.LoginView.as_view(), name="login"),

api/views/__init__.py

@@ -23,6 +23,7 @@
 )
 from .effect import EffectListView
 from .galenic_formulation import GalenicFormulationListView
+from .preparation import PreparationListView
 from .ingredient import IngredientRetrieveView
 from .microorganism import MicroorganismRetrieveView
 from .newsletter import SubscribeNewsletter

api/views/preparation.py

@@ -0,0 +1,10 @@
+from rest_framework.generics import ListAPIView
+
+from api.serializers import PreparationSerializer
+from data.models import Preparation
+
+
+class PreparationListView(ListAPIView):
+    model = Preparation
+    serializer_class = PreparationSerializer
+    queryset = Preparation.objects.filter(missing_import_data=False, siccrf_is_obsolete=False)

data/csv_importer.py

@@ -28,6 +28,7 @@
     PlantPart,
     PlantSynonym,
     Population,
+    Preparation,
     Substance,
     SubstanceSynonym,
     SubstanceUnit,
@@ -49,6 +50,7 @@
     "REF_ICA_OBJECTIFS_EFFETS.csv": Effect,
     "REF_ICA_FORME_GALENIQUE.csv": GalenicFormulation,
     "REF_ICA_UNITE.csv": SubstanceUnit,
+    "REF_ICA_TYPE_PREPARATION.csv": Preparation,
     # Les fichiers csv avec les Foreign Keys
     "REF_ICA_INGREDIENT_AUTRE_SYNONYME.csv": IngredientSynonym,
     "REF_ICA_PLANTE_SYNONYME.csv": PlantSynonym,
@@ -82,6 +84,7 @@ class CSVImporter:
         "UNT": SubstanceUnit,
         "OBJEFF": Effect,
         "FRMGAL": GalenicFormulation,
+        "TYPPREP": Preparation,
         "STINGSBS": IngredientStatus,
         "POPRS": Condition,
         "": Population,

data/migrations/0086_preparation_historicalpreparation.py

@@ -0,0 +1,182 @@
+# Generated by Django 5.1 on 2024-08-26 14:26
+
+import django.db.models.deletion
+import django.db.models.functions.comparison
+import simple_history.models
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("data", "0085_companyaccessclaim_declarant_role_and_more"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="Preparation",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("creation_date", models.DateTimeField(auto_now_add=True)),
+                ("modification_date", models.DateTimeField(auto_now=True)),
+                (
+                    "missing_import_data",
+                    models.BooleanField(
+                        blank=True, default=False, editable=False, null=True
+                    ),
+                ),
+                (
+                    "siccrf_id",
+                    models.IntegerField(
+                        blank=True,
+                        db_index=True,
+                        editable=False,
+                        null=True,
+                        unique=True,
+                        verbose_name="id dans les tables et tables relationnelles SICCRF",
+                    ),
+                ),
+                (
+                    "siccrf_name",
+                    models.TextField(editable=False, verbose_name="nom SICCRF"),
+                ),
+                ("ca_name", models.TextField(blank=True, verbose_name="nom CA")),
+                (
+                    "name",
+                    models.GeneratedField(
+                        db_persist=True,
+                        expression=django.db.models.functions.comparison.Coalesce(
+                            django.db.models.functions.comparison.NullIf(
+                                models.F("ca_name"), models.Value("")
+                            ),
+                            models.F("siccrf_name"),
+                        ),
+                        output_field=models.TextField(verbose_name="nom"),
+                    ),
+                ),
+                (
+                    "siccrf_is_obsolete",
+                    models.BooleanField(
+                        default=False,
+                        editable=False,
+                        verbose_name="objet obsolète selon SICCRF",
+                    ),
+                ),
+                (
+                    "ca_is_obsolete",
+                    models.BooleanField(
+                        default=None, null=True, verbose_name="objet obsolète selon CA"
+                    ),
+                ),
+                (
+                    "is_obsolete",
+                    models.GeneratedField(
+                        db_persist=True,
+                        expression=django.db.models.functions.comparison.Coalesce(
+                            models.F("ca_is_obsolete"), models.F("siccrf_is_obsolete")
+                        ),
+                        output_field=models.BooleanField(verbose_name="objet obsolète"),
+                    ),
+                ),
+                (
+                    "siccrf_name_en",
+                    models.TextField(
+                        blank=True, verbose_name="nom en anglais selon la base SICCRF"
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "préparation de plantes",
+                "verbose_name_plural": "préparations de plantes",
+            },
+        ),
+        migrations.CreateModel(
+            name="HistoricalPreparation",
+            fields=[
+                (
+                    "id",
+                    models.BigIntegerField(
+                        auto_created=True, blank=True, db_index=True, verbose_name="ID"
+                    ),
+                ),
+                ("creation_date", models.DateTimeField(blank=True, editable=False)),
+                ("modification_date", models.DateTimeField(blank=True, editable=False)),
+                (
+                    "missing_import_data",
+                    models.BooleanField(
+                        blank=True, default=False, editable=False, null=True
+                    ),
+                ),
+                (
+                    "siccrf_id",
+                    models.IntegerField(
+                        blank=True,
+                        db_index=True,
+                        editable=False,
+                        null=True,
+                        verbose_name="id dans les tables et tables relationnelles SICCRF",
+                    ),
+                ),
+                (
+                    "siccrf_name",
+                    models.TextField(editable=False, verbose_name="nom SICCRF"),
+                ),
+                ("ca_name", models.TextField(blank=True, verbose_name="nom CA")),
+                (
+                    "siccrf_is_obsolete",
+                    models.BooleanField(
+                        default=False,
+                        editable=False,
+                        verbose_name="objet obsolète selon SICCRF",
+                    ),
+                ),
+                (
+                    "ca_is_obsolete",
+                    models.BooleanField(
+                        default=None, null=True, verbose_name="objet obsolète selon CA"
+                    ),
+                ),
+                (
+                    "siccrf_name_en",
+                    models.TextField(
+                        blank=True, verbose_name="nom en anglais selon la base SICCRF"
+                    ),
+                ),
+                ("history_id", models.AutoField(primary_key=True, serialize=False)),
+                ("history_date", models.DateTimeField(db_index=True)),
+                ("history_change_reason", models.CharField(max_length=100, null=True)),
+                (
+                    "history_type",
+                    models.CharField(
+                        choices=[("+", "Created"), ("~", "Changed"), ("-", "Deleted")],
+                        max_length=1,
+                    ),
+                ),
+                (
+                    "history_user",
+                    models.ForeignKey(
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        related_name="+",
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "historical préparation de plantes",
+                "verbose_name_plural": "historical préparations de plantes",
+                "ordering": ("-history_date", "-history_id"),
+                "get_latest_by": ("history_date", "history_id"),
+            },
+            bases=(simple_history.models.HistoricalChanges, models.Model),
+        ),
+    ]

data/migrations/0088_merge_20240827_1020.py

@@ -0,0 +1,12 @@
+# Generated by Django 5.1 on 2024-08-27 08:20
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("data", "0086_preparation_historicalpreparation"),
+        ("data", "0087_declaration_other_conditions_and_more"),
+    ]
+
+    operations = []

data/models/__init__.py

@@ -12,6 +12,7 @@
 from .condition import Condition
 from .effect import Effect
 from .galenic_formulation import GalenicFormulation
+from .preparation import Preparation
 from .unit import SubstanceUnit
 from .ingredient_status import IngredientStatus
 from .global_roles import InstructionRole, VisaRole
@@ -41,4 +42,4 @@
     SubstanceUnit,
 ]
 
-DECLARATION_MODELS = [Condition, Effect, GalenicFormulation, Population]
+DECLARATION_MODELS = [Condition, Effect, GalenicFormulation, Population, Preparation]

data/models/preparation.py

@@ -0,0 +1,18 @@
+from django.db import models
+
+from simple_history.models import HistoricalRecords
+
+from .abstract_models import CommonModel
+
+
+class Preparation(CommonModel):
+    class Meta:
+        verbose_name = "préparation de plantes"
+        verbose_name_plural = "préparations de plantes"
+
+    siccrf_name_en = models.TextField(blank=True, verbose_name="nom en anglais selon la base SICCRF")
+    history = HistoricalRecords(inherit=True, excluded_fields=["name", "is_obsolete"])
+
+    @property
+    def name_en(self):
+        return self.siccrf_name_en

files/REF_ICA_TYPE_PREPARATION.csv

@@ -0,0 +1,29 @@
+"TYPPREP_IDENT","TYPPREP_LIBELLE","TYPPREP_LIBELLE_EN","TYPPREP_ORDRE","TYPPREP_OBSOLET","TYPPREP_EST_SOLVANT"
+1,"Alcoolat","Alcoholate",,"False","False"
+2,"Alcoolature","Alcoholature",,"False","False"
+3,"Autre extrait fluide","Other liquid extract",,"False","False"
+4,"Autre extrait sec","Other dry extract",,"False","False"
+5,"Autre macérât","Other macerate",,"False","False"
+6,"Baume","Balm",,"False","False"
+7,"Extrait au CO2 supercritique","Supercritical CO2 extract",,"False","False"
+8,"Extrait fluide alcoolique","Alcohol liquid extract",,"False","False"
+9,"Extrait fluide aqueux","Water liquid extract",,"False","False"
+10,"Extrait fluide hydroalcoolique","Water & alcohol liquid extract",,"False","False"
+11,"Extrait fluide hydroglycériné","Water & glycerine liquid extract",,"False","False"
+12,"Extrait mou","Soft extract",,"False","False"
+13,"Extrait sec alcoolique","Alcohol dry extract",,"False","False"
+14,"Extrait sec aqueux","Water dry extract",,"False","False"
+15,"Extrait sec hydroalcoolique","Water & alcohol dry extract",,"False","False"
+16,"Extrait sec hydroglycériné","Water & glycerine dry extract",,"False","False"
+17,"Huile essentielle","Essential oil",,"True","False"
+18,"Hydrolât (eau florale)","Hydrolat (plant water essence)",,"False","False"
+19,"Macérât alcoolique","Alcohol macerate",,"False","False"
+20,"Macérât aqueux","Water macerate",,"False","False"
+21,"Macérât huileux","Oil macerate",,"False","False"
+22,"Macérât hydroalcoolique","Water & alcohol macerate",,"False","False"
+23,"Macérât hydroglycériné","Water & glycerine macerate",,"False","False"
+24,"Oléorésine et gomme-oléorésine","Oleoresin and gum-oleoresin",,"False","False"
+25,"Poudre (de plantes séchées ou broyées)","Powder (Communited or dried herbs)",,"False","False"
+26,"Teinture","Tincture",,"False","False"
+27,"Pression à froid","Cold pressing",,"False","False"
+28,"Distillation","Distillation",,"False","False"

frontend/src/components/DeclarationSummary/SummaryElementItem.vue

@@ -23,13 +23,16 @@ import { useRootStore } from "@/stores/root"
 import { storeToRefs } from "pinia"
 import ElementCommentModal from "@/components/ElementCommentModal"
 
-const { plantParts, units } = storeToRefs(useRootStore())
+const { plantParts, units, preparations } = storeToRefs(useRootStore())
 
 const model = defineModel()
 const props = defineProps({ objectType: { type: String } })
 
 const plantPartName = computed(() => plantParts.value?.find((x) => x.id === model.value.usedPart)?.name || "Aucune")
 const unitName = computed(() => units.value?.find((x) => x.id === model.value.unit)?.name || "")
+const preparationName = computed(
+  () => preparations.value?.find((x) => x.id === parseInt(model.value.preparation))?.name || ""
+)
 
 const elementInfo = computed(() => {
   if (props.objectType === "microorganism") {
@@ -40,7 +43,7 @@ const elementInfo = computed(() => {
   if (props.objectType === "plant") {
     const used_part_label = `Partie utilisée : « ${plantPartName.value} »`
     const quantity_label = model.value.quantity ? `Qté par DJR : ${model.value.quantity} ${unitName.value}` : null
-    const preparation_label = model.value.preparation ? `Préparation : ${model.value.preparation}` : null
+    const preparation_label = model.value.preparation ? `Préparation : ${preparationName.value}` : null
     return [used_part_label, quantity_label, preparation_label].filter(Boolean).join(` | `)
   }
   if (props.objectType === "form_of_supply" || props.objectType === "active_ingredient")