oversu/Globinours
oversu/Globinours
Watch
1
0
Fork
You've already forked Globinours
 0
Code Issues 2 Pull requests Projects Releases 13 Packages Wiki Activity

Corrige la localisation actuelle des animaux

Browse source
This commit is contained in:
Alexandre NOEL 2026-09-13 15:57:57 +02:00
commit 68590eddbb
9 changed files with 80 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/Views/_animal_show_identity.php
View file

@ -178,11 +178,11 @@
<?php
$rescueAddr = trim((string)($animal['rescue_address'] ?? ''));
$rescueAddr = trim((string)($animal['rescue_address'] ?: $animal['rescue_location_name'] ?? ''));
$rescueLat = isset($animal['rescue_lat']) && $animal['rescue_lat'] !== '' ? (float)$animal['rescue_lat'] : null;
$rescueLng = isset($animal['rescue_lng']) && $animal['rescue_lng'] !== '' ? (float)$animal['rescue_lng'] : null;
$currentAddr = trim((string)($animal['current_address'] ?? '5 RUE NOTRE DAME 29260 LESNEVEN'));
$currentAddr = trim((string)($animal['current_address'] ?? ''));
$currentLat = isset($animal['current_lat']) && $animal['current_lat'] !== '' ? (float)$animal['current_lat'] : null;
$currentLng = isset($animal['current_lng']) && $animal['current_lng'] !== '' ? (float)$animal['current_lng'] : null;
@ -212,7 +212,7 @@ $hasCurrent = ($currentLat !== null && $currentLng !== null);
<div class="col-md-6">
<div class="text-muted mb-1"><?= h(t('animal.form.current_location')) ?></div>
<div class="fw-bold"><?= h($currentAddr) ?></div>
<div class="fw-bold"><?= $currentAddr !== '' ? h($currentAddr) : '—' ?></div>
<?php if (!$hasCurrent): ?>
<div class="text-muted small mt-1"><?= h(t('animal.coordinates_missing')) ?></div>

37
app/Views/animal_form.php
View file

@ -422,22 +422,6 @@ $estMonths = $birth_estimated_months > 0 ? ($birth_estimated_months % 12) : '';
</div>
</div>
<div class="row">
<div class="col-md-8">
<div class="text-muted"><?= h(t('animal.rescue_location')) ?></div>
<input class="form-control" type="text" name="rescue_address"
value="<?= h($animal['rescue_address'] ?? '') ?>"
placeholder="<?= h(t('animal.rescue_location_placeholder')) ?>">
<div class="text-muted small mt-1"><?= h(t('animal.geocode_help')) ?></div>
</div>
<div class="col-md-4">
<div class="text-muted"><?= h(t('animal.form.current_location')) ?></div>
<input class="form-control" type="text" name="current_address"
value="<?= h($animal['current_address'] ?? '5 RUE NOTRE DAME 29260 LESNEVEN') ?>"
<?= $isArchivedEdit ? 'readonly' : '' ?> disabled>
</div>
</div>
</div>
</div>
</div>
@ -534,7 +518,7 @@ $estMonths = $birth_estimated_months > 0 ? ($birth_estimated_months % 12) : '';
</div>
<div class="row g-3">
<div class="col-md-6">
<div class="col-md-4">
<label class="form-label"><?= h(t('animal.form.origin_city')) ?></label>
<input type="text" name="rescue_location_name" class="form-control"
value="<?= h($animal['rescue_location_name'] ?? '') ?>"
@ -547,17 +531,20 @@ $estMonths = $birth_estimated_months > 0 ? ($birth_estimated_months % 12) : '';
value="<?= h($animal['rescue_lng'] ?? '') ?>">
</div>
<div class="col-md-6">
<div class="col-md-4">
<label class="form-label"><?= h(t('animal.rescue_location')) ?></label>
<input class="form-control" type="text" name="rescue_address"
value="<?= h($animal['rescue_address'] ?? '') ?>"
placeholder="<?= h(t('animal.rescue_location_placeholder')) ?>">
<div class="form-hint"><?= h(t('animal.geocode_help')) ?></div>
</div>
<div class="col-md-4">
<label class="form-label"><?= h(t('animal.form.current_location')) ?></label>
<input type="text" name="location_name" class="form-control"
value="<?= h($animal['location_name'] ?? '5 Rue Notre Dame 29260 LESNEVEN') ?>"
<input type="text" name="current_address" class="form-control"
value="<?= h($animal['current_address'] ?? '') ?>"
readonly>
<div class="form-hint"><?= h(t('animal.form.current_location_hint')) ?></div>
<input type="hidden" name="location_lat"
value="<?= h($animal['location_lat'] ?? '') ?>">
<input type="hidden" name="location_lng"
value="<?= h($animal['location_lng'] ?? '') ?>">
</div>
</div>
</div>

8
app/Views/evolutions.php
View file

@ -31,10 +31,10 @@
<div class="col-lg-6">
<section class="card h-100">
<div class="card-body">
<span class="badge bg-blue-lt mb-2">1.0.0-rc.19</span>
<h3>Suivi des soins</h3>
<p class="text-muted">Date et heure modifiables pour distinguer précisément plusieurs contrôles et
mesures réalisés au cours d’une même journée.</p>
<span class="badge bg-blue-lt mb-2">1.0.0-rc.20</span>
<h3>Localisations cohérentes</h3>
<p class="text-muted">Lieu de récupération et lieu actuel clairement distingués, avec réparation
des coordonnées manquantes après un import ou un placement.</p>
</div>
</section>
</div>