Skip to content
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.

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

Affichage de la composition des déclarations historiques #1569

Open
wants to merge 6 commits into
base: staging
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 23 additions & 0 deletions data/etl/teleicare_history/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
## Instruction pour la migration des données de WSSQL à la BDD Compl'Alim

1. Create all table in psql
2. Convert all UTF-16 files to UTF-8 and transform "" to empty fields
~~~
for f in *.csv; do iconv -f UTF-16 -t UTF-8 "$f" | sed 's/""//g' > "${f%.*}_utf8.csv" ; done
~~~
3. Copy all data from csv with
~~~
for f in *_UTF8.csv; do
table_name=${f%_UTF8.csv}
echo "-> Import des données de $f"
psql postgresql://<user>:<passwd>@<ip>:<port>/<database> -c "\copy $table_name from $f delimiter ',' csv header;";
done
~~~


4. Execute migration scripts in shell
~~~
from data.etl.teleicare_history.extractor import match_companies_on_siret_or_vat, create_declarations_from_teleicare_history
match_companies_on_siret_or_vat()
create_declarations_from_teleicare_history()
~~~
25 changes: 25 additions & 0 deletions data/schemas/CHANGELOG_declarations.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,28 @@ Tous les changements notables apportés aux jeux de données exposés sur data.g
- Champ Additifs
- Champ Nutriments
- Champ Autres Ingrédients Actifs

## 2025-01-17

## Augmentation des données
- 56160 déclarations historiques importées de TeleIcare avec leurs champs :
-id
-decision
-nom_commercial
-marque
-gamme
-responsable_mise_sur_marche
-siret_responsable_mise_sur_marche
-forme_galenique
-dose_journaliere
-mode_emploi
-mises_en_garde


## 2025-02-04

## Augmentation des données
- ajout des champs de compositions des 56160 déclarations historiques importées de TeleIcare :
-plantes
-micro_organismes
-substances
43 changes: 22 additions & 21 deletions frontend/src/components/DeclarationSummary/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<SummaryInfoSegment label="Durabilité minimale / DLUO (en mois)" :value="payload.minimumDuration" />
<SummaryInfoSegment label="Objectifs / effets" :value="effectsNames" />
</div>
<div v-if="!payload.siccrfId">
<div>
<h3 class="fr-h6 !mt-8">
Composition
<SummaryModificationButton class="ml-4" v-if="!readonly" @click="router.push(editLink(1))" />
Expand Down Expand Up @@ -83,7 +83,7 @@
:elements="payload.declaredSubstances"
/>

<p class="font-bold mt-8">Substances contenues dans la composition :</p>
<p class="font-bold mt-8" v-if="payload.computedSubstances.length">Substances contenues dans la composition :</p>
<DsfrAlert
v-if="replacedRequestsWithSubstances.length"
type="warning"
Expand All @@ -104,25 +104,26 @@
</ul>
</DsfrAlert>
<SubstancesTable v-model="payload" readonly />

<h3 class="fr-h6 !mt-8">
Adresse sur l'étiquetage
<SummaryModificationButton class="ml-4" v-if="!readonly" @click="router.push(editLink(1))" />
</h3>
<AddressLine :payload="payload" />

<h3 class="fr-h6 !mt-8">
Pièces jointes
<SummaryModificationButton class="ml-4" v-if="!readonly" @click="router.push(editLink(2))" />
</h3>
<div class="grid grid-cols-12 gap-3 mb-8">
<FilePreview
class="col-span-12 sm:col-span-6 md:col-span-4 lg:col-span-3"
v-for="(file, index) in payload.attachments"
:key="`file-${index}`"
:file="file"
readonly
/>
<div v-if="!payload.siccrfId">
<h3 class="fr-h6 !mt-8">
Adresse sur l'étiquetage
<SummaryModificationButton class="ml-4" v-if="!readonly" @click="router.push(editLink(1))" />
</h3>
<AddressLine :payload="payload" />

<h3 class="fr-h6 !mt-8">
Pièces jointes
<SummaryModificationButton class="ml-4" v-if="!readonly" @click="router.push(editLink(2))" />
</h3>
<div class="grid grid-cols-12 gap-3 mb-8">
<FilePreview
class="col-span-12 sm:col-span-6 md:col-span-4 lg:col-span-3"
v-for="(file, index) in payload.attachments"
:key="`file-${index}`"
:file="file"
readonly
/>
</div>
</div>
</div>
</div>
Expand Down
Loading