Mercurial > repos > siwaa > redelac_stics_e
changeset 6:40595ca55c78 draft
"planemo upload for repository https://forgemia.inra.fr/redelac/redelac-toolbox/-/tree/fa822bd9c974bf5ffb4e632905dd65c2f097e325/tools/REDELACplanExpander commit fa822bd9c974bf5ffb4e632905dd65c2f097e325-dirty"
| author | siwaa |
|---|---|
| date | Fri, 26 Jun 2026 13:15:23 +0000 |
| parents | 996b8019f5d5 |
| children | c8f0edcc1330 |
| files | redelacPlanExpander.py redelacPlanExpander.xml |
| diffstat | 2 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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>