Skip to content

Commit

Permalink
SQL - Add Coalesce about bipevla
Browse files Browse the repository at this point in the history
  • Loading branch information
Gustry committed Nov 18, 2021
1 parent 53f555e commit a9aa4e8
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 11 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
## Unreleased

* Corrections orthographiques
* Correction sur les "Locaux : Informations détaillées"
* Correction des exports PDF depuis le panneau de recherche
* Amélioration du message d'erreur s'il n'y a pas assez de mémoire sur l'ordinateur
* Amélioration de la documentation concernant les paramètres au niveau global de l'extension

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -206,22 +206,22 @@ string_agg(

'<h4>Taxation</h4>' ||
'<p>' ||
'<b>Commune: </b>' || co_bipevla ||
'<br/><b>Intercommunalité: </b>' || gp_bipevla ||
'<br/><b>Département: </b>' || de_bipevla ||
'<br/><b>Région: </b>' || re_bipevla ||
'<b>Commune: </b>' || Coalesce(co_bipevla, '') ||
'<br/><b>Intercommunalité: </b>' || Coalesce(gp_bipevla, '') ||
'<br/><b>Département: </b>' || Coalesce(de_bipevla, '') ||
'<br/><b>Région: </b>' || Coalesce(re_bipevla, '') ||
'</p>' ||

'<h3>Description détaillée</h3>' ||
'Le local contient ' || nb_pev || ' parties.'
'Le local contient ' || nb_pev || ' parties.' ||
'<p>__________________________<br/> ' ||
replace(infos_pev, '@', '<br/>__________________________</p><p>__________________________<br/>') ||
'<br/>__________________________' ||
'</p>' ||

'<h3>Propriétaires</h3>' ||
'<p>' ||
replace(l10_proprietaires, '|', '<p/><p>') ||
replace( Coalesce(l10_proprietaires, ''), '|', '<p/><p>') ||
'</p>'

)
Expand Down
10 changes: 5 additions & 5 deletions cadastre/templates/parcelle_info_locaux_detail.sql
Original file line number Diff line number Diff line change
Expand Up @@ -278,10 +278,10 @@ SELECT

'<h4>Taxation</h4>' ||
'<p>' ||
'<b>Commune: </b>' || co_bipevla ||
'<br/><b>Intercommunalité: </b>' || gp_bipevla ||
'<br/><b>Département: </b>' || de_bipevla ||
'<br/><b>Région: </b>' || re_bipevla ||
'<b>Commune: </b>' || Coalesce(co_bipevla, '') ||
'<br/><b>Intercommunalité: </b>' || Coalesce(gp_bipevla, '') ||
'<br/><b>Département: </b>' || Coalesce(de_bipevla, '') ||
'<br/><b>Région: </b>' || Coalesce(re_bipevla, '') ||
'</p>' ||

'<h3>Parties d''évaluation</h3>' ||
Expand Down Expand Up @@ -311,7 +311,7 @@ SELECT
'<th>Code droit</th>' ||
'<th>Code démembrement</th>' ||
'</tr>' ||
l10_proprietaires ||
Coalesce(l10_proprietaires, '') ||
'</table>' ||
'</p>'

Expand Down

0 comments on commit a9aa4e8

Please sign in to comment.