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 les statuts et les codes internes

Browse source
This commit is contained in:
Alexandre NOEL 2026-09-08 00:23:06 +02:00
commit a21f3f2bb4
7 changed files with 56 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

24
app/Controllers/AnimalRecordActions.php
View file

@ -282,12 +282,7 @@ trait AnimalRecordActions
{
$year = date('Y');
$base = strtoupper(trim($name));
$base = preg_replace('/[^A-Z0-9]+/u', '_', $base);
$base = trim($base, '_');
if ($base === '') {
$base = 'ANIMAL';
}
$base = str_replace('-', '_', Ids::slugifyUpper($name));
$db = DB::pdo();
$stmt = $db->prepare('
@ -516,7 +511,22 @@ trait AnimalRecordActions
// Génère le code interne lorsqu'il est absent.
$internal_code = trim((string) ($_POST['internal_code'] ?? ''));
if ($internal_code === '') {
if ($internal_code === '' && $old && !empty($old['internal_code'])) {
$internal_code = (string) $old['internal_code'];
if (preg_match('/^(\d{4}-\d{3})-(.+)$/', $internal_code, $parts)) {
$legacyBase = strtoupper(trim($name));
$legacyBase = trim((string) preg_replace('/[^A-Z0-9]+/u', '_', $legacyBase), '_');
$normalizedBase = str_replace('-', '_', Ids::slugifyUpper($name));
if ($parts[2] === $legacyBase && $legacyBase !== $normalizedBase) {
$candidate = $parts[1] . '-' . $normalizedBase;
$duplicate = $db->prepare('SELECT 1 FROM animals WHERE internal_code=:code AND id<>:id');
$duplicate->execute([':code' => $candidate, ':id' => $id]);
if (!$duplicate->fetchColumn()) {
$internal_code = $candidate;
}
}
}
} elseif ($internal_code === '') {
$internal_code = self::nextInternalCode($name);
}

2
app/Views/animal_form.php
View file

@ -122,7 +122,7 @@ $estMonths = $birth_estimated_months > 0 ? ($birth_estimated_months % 12) : '';
<div class="col-12 col-md-4">
<label class="form-label"><?= h(t('animal.status')) ?></label>
<select class="form-select" name="status_display" id="status"
<select class="form-select" name="status" id="status"
<?= $isArchivedEdit ? 'disabled' : '' ?>>
<?php foreach ($statuses as $k => $label): ?>
<option value="<?= h($k) ?>" <?= ($status === $k) ? 'selected' : '' ?>>

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.9</span>
<h3>Troisième lot de tickets</h3>
<p class="text-muted">Site public enrichi, salles et tarifs clarifiés, et lancement local de la
recherche mieux documenté.</p>
<span class="badge bg-blue-lt mb-2">1.0.0-rc.10</span>
<h3>Fiabilité des fiches animales</h3>
<p class="text-muted">Enregistrement du statut rétabli, codes internes stabilisés et noms accentués
correctement translittérés.</p>
</div>
</section>
</div>