Commit 70740c11 authored by Justine FERRON's avatar Justine FERRON
Browse files

Merge branch 'develop_ofag' of...

Merge branch 'develop_ofag' of gitlab.alkante.com:angular/ngpr-visualiseur-prodige into develop_ofag
parents 25d9fa4e eda8b9da
......@@ -182,7 +182,7 @@
<alk-sharing-button *ngIf="tools && tools.Share" i18n-buttonLabel="@@shareButton" buttonLabel="Partager" >
<alk-sharing-modal #modal></alk-sharing-modal>
</alk-sharing-button>
<alk-export-foncier-button i18n-buttonLabel="@@exportFoncierButton" buttonLabel="Export foncier" > <!-- *ngIf="tools && tools.fixedScalesExportPDF" -->
<alk-export-foncier-button *ngIf="tools && tools.fixedScalesExportPDF" i18n-buttonLabel="@@exportFoncierButton" buttonLabel="Export foncier" >
<alk-export-foncier-modal #modal></alk-export-foncier-modal>
</alk-export-foncier-button>
</div>
......
......@@ -49,7 +49,7 @@
</div>
</form>
<div *ngIf="!this.lastFeatureAdded" class="my-3">
<p class="lead"> Vous n'avez aucune donnée d'édition à exporter. </p>
<p class="lead">Veuillez démarrer une session d'édition et créer une parcelle au préalable. </p>
<div class="w-100 text-right">
<button type="button" ngbAutofocus class="btn btn-modal px-3 py-2" (click)="activeModal.close();">OK</button>
</div>
......
......@@ -218,7 +218,7 @@ export class ExportFoncierModalComponent implements OnInit, OnDestroy {
/* this.newContext.properties.extension.maxBbox = feature.getGeometry().getExtent(); */
this.http.post(
`${this.environment.serverUrl}core/print/export?account=${
`${this.environment.serverUrl}core/print/exportOfag?account=${
['fr', 'en'].includes(window.location.pathname.split('/')[1])
? window.location.pathname.split('/')[2]
: window.location.pathname.split('/')[1]}`,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment