# HG changeset patch
# User siwaa
# Date 1782479723 0
# Node ID 40595ca55c78713e84b735fabca029695638fa63
# Parent  996b8019f5d5b8c1121158d354b3b63e9cfc6cab
"planemo upload for repository https://forgemia.inra.fr/redelac/redelac-toolbox/-/tree/fa822bd9c974bf5ffb4e632905dd65c2f097e325/tools/REDELACplanExpander commit fa822bd9c974bf5ffb4e632905dd65c2f097e325-dirty"

diff -r 996b8019f5d5 -r 40595ca55c78 redelacPlanExpander.py
--- a/redelacPlanExpander.py	Tue Feb 17 16:03:29 2026 +0000
+++ b/redelacPlanExpander.py	Fri Jun 26 13:15:23 2026 +0000
@@ -117,9 +117,11 @@
     if typeOfRotation == 'GC' :
         tmpDf['Norg_sols'] = row['Norg_sols_GC']
         tmpDf['nom_sol_sans_point'] = row['nom_sols_GC_dans_USM']
+        tmpDf['nomsol'] = row['nom_sols_GC_dans_sols.xml']
     else : 
         tmpDf['Norg_sols'] = row['Norg_sols_PP']
         tmpDf['nom_sol_sans_point'] = row['nom_sols_PP_dans_USM']
+        tmpDf['nomsol'] = row['nom_sols_PP_dans_sols.xml']
 
     tmpDf['maille_drias'] = drias
     tmpDf['maille_safran'] = safran
@@ -162,9 +164,9 @@
     # Updating the nomsol column
     # alias =CONCATENATE(G2;"_";H2)
 
-    tmpDf['nomsol'] = \
-        tmpDf['num_sol'].astype(str) + '_' + \
-        tmpDf['Norg_sols'].astype(str)
+    #tmpDf['nomsol'] = \
+    #    tmpDf['num_sol'].astype(str) + '_' + \
+    #    tmpDf['Norg_sols'].astype(str)
 
     if SafranOrDrias :    
         # Updating the fstation column
diff -r 996b8019f5d5 -r 40595ca55c78 redelacPlanExpander.xml
--- a/redelacPlanExpander.xml	Tue Feb 17 16:03:29 2026 +0000
+++ b/redelacPlanExpander.xml	Fri Jun 26 13:15:23 2026 +0000
@@ -1,4 +1,4 @@
-<tool id="redelacPlanExpander" name="redelacPlanExpander" version="1.0.4">
+<tool id="redelacPlanExpander" name="redelacPlanExpander" version="1.0.5">
   <description>to expand REDELAC situations according to a plan</description>
   <requirements>
     <container type="singularity">docker://registry.forge.inrae.fr/redelac/redelac-toolbox:latest</container>