Skip to content

ajout d'un espace entre dlign4 et dling 5 quand nécessaire #540

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.

Sign up for GitHub

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

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

ajout d'un espace entre dlign4 et dling 5 quand nécessaire #540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bcf06ca
Correction for parcelle_info in edigeo_create_table_parcelle_info_maj…
ThT12 Oct 29, 2025
1dd2307
fix adresse space issue in parcelle_info_proprietaires.sql
ThT12 Oct 30, 2025
fab920f
fix adresse space issue in parcelle_info_locaux_detail.sql
ThT12 Oct 30, 2025
7d44481
Fix adresse space issue in parcelle_info_indivisions.sql
ThT12 Oct 30, 2025
9a048ce
Fix adresse space issue in proprietaires_line.tpl.sql
ThT12 Oct 30, 2025
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
8 changes: 6 additions & 2 deletions cadastre/scripts/plugin/edigeo_create_table_parcelle_info_majic.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,12 @@ string_agg(
trim(
pr.dnuper || ' - ' ||
ltrim(trim(coalesce(pr.dlign4, '')), '0') ||
trim(coalesce(pr.dlign5, '')) || ' ' ||
trim(coalesce(pr.dlign6, '')) ||
CASE
WHEN trim(coalesce(pr.dlign5, '')) = ''
THEN ''
ELSE ' ' || trim(coalesce(pr.dlign5, ''))
END
|| ' ' || trim(coalesce(pr.dlign6, '')) ||
trim(
CASE
WHEN pr.jdatnss IS NOT NULL
Expand Down
2 changes: 1 addition & 1 deletion cadastre/templates/parcelle_info_indivisions.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ FROM (
'<td>' || l.dnulot || '</td>' ||
'<td>' || l.comptecommunal || '</td>' ||
'<td>' || trim(coalesce(p.dqualp, '')) || ' ' || trim(coalesce(p.ddenom, '')) || '</td>' ||
'<td>' || trim(trim(coalesce(p.dlign3, '')) || ' ' || ltrim(trim(coalesce(p.dlign4, '')), '0') || trim(coalesce(p.dlign5, '')) || ' ' || trim(coalesce(p.dlign6, ''))) || '</td>' ||
'<td>' || replace(trim(trim(coalesce(p.dlign3, '')) || ' ' || ltrim(trim(coalesce(p.dlign4, '')), '0') || ' ' || trim(coalesce(p.dlign5, '')) || ' ' || trim(coalesce(p.dlign6, ''))), ' ', ' ') || '</td>' ||
CASE WHEN {not_for_third_part} THEN '<td>' || Coalesce( trim(cast(p.jdatnss AS text) ), '-') || '</td>' ELSE '' END ||
'<td>' || coalesce(p.ccodem, '') || '</td>' ||
'<td>' || coalesce(p.ccodro, '') || '</td>' ||
Expand Down
2 changes: 1 addition & 1 deletion cadastre/templates/parcelle_info_locaux_detail.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ WITH infos AS (
CASE WHEN trim(pr.dnomus) != trim(pr.dnomlp) THEN Coalesce( trim(pr.dnomus) || '/' || trim(pr.dprnus) || ', née ', '' ) ELSE '' END ||
trim(coalesce(pr.ddenom, '')) ||
'</td>' ||
'<td>' || ltrim(trim(coalesce(pr.dlign4, '')), '0') || trim(coalesce(pr.dlign5, '')) || ' ' || trim(coalesce(pr.dlign6, '')) || '</td>' ||
'<td>' || replace(ltrim(trim(coalesce(pr.dlign4, '')), '0') || ' ' || trim(coalesce(pr.dlign5, '')) || ' ' || trim(coalesce(pr.dlign6, '')), ' ',' ') || '</td>' ||
CASE WHEN {not_for_third_part} THEN '<td>' || Coalesce( trim(cast(pr.jdatnss AS text) ), '-') || '</td>' ELSE '' END ||
CASE WHEN {not_for_third_part} THEN '<td>' || coalesce(trim(pr.dldnss), '-') || '</td>' ELSE '' END ||
'<td>' || Coalesce(ccodro_lib, '') || '</td>' ||
Expand Down
2 changes: 1 addition & 1 deletion cadastre/templates/parcelle_info_proprietaires.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ FROM (
CASE WHEN trim(p.dnomus) != trim(p.dnomlp) THEN Coalesce( trim(p.dnomus) || '/' || trim(p.dprnus) || ', née ', '' ) ELSE '' END ||
trim(coalesce(p.ddenom, '')) ||
'</td>' ||
'<td>' || trim(trim(coalesce(p.dlign3, '')) || ' ' || ltrim(trim(coalesce(p.dlign4, '')), '0') || trim(coalesce(p.dlign5, '')) || ' ' || trim(coalesce(p.dlign6, ''))) || '</td>' ||
'<td>' || replace(trim(trim(coalesce(p.dlign3, '')) || ' ' || ltrim(trim(coalesce(p.dlign4, '')), '0') || ' ' || trim(coalesce(p.dlign5, '')) || ' ' || trim(coalesce(p.dlign6, ''))), ' ',' ') || '</td>' ||
CASE WHEN {not_for_third_part} THEN '<td>' || Coalesce( trim(cast(p.jdatnss AS text) ), '-') || '</td>' ELSE '' END ||
CASE WHEN {not_for_third_part} THEN '<td>' || coalesce(trim(p.dldnss), '-') || '</td>' ELSE '' END ||
'<td>' || Coalesce(ccodro_lib, '') || '</td>' ||
Expand Down
2 changes: 1 addition & 1 deletion cadastre/templates/proprietaires_line.tpl.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

SELECT Coalesce(ccodro_lib, '') || ' - ' || p.dnuper || ' - ' || trim(Coalesce(p.dqualp, '')) || ' ' || trim(Coalesce(p.ddenom, '')) AS mainprop,
CASE WHEN epxnee = 'NEE' THEN 'EP ' || trim(Coalesce(dnomlp, '')) || ' ' || trim(Coalesce(dprnlp, '')) ELSE '' END AS epousede,
trim(Coalesce(p.dlign3, '')) || ' / ' || ltrim(trim(Coalesce(p.dlign4, '')), '0') || trim(Coalesce(p.dlign5, '')) || ' ' || trim(Coalesce(p.dlign6, '')) AS adrprop,
trim(Coalesce(p.dlign3, '')) || ' / ' || replace(ltrim(trim(Coalesce(p.dlign4, '')), '0') || ' ' || trim(Coalesce(p.dlign5, '')) || ' ' || trim(Coalesce(p.dlign6, '')), ' ', ' ') AS adrprop,
CASE
WHEN jdatnss IS NOT NULL AND NOT $for_third_party
THEN ' Né(e) le ' || jdatnss || ' à ' || coalesce(p.dldnss, '')
Expand Down