Commit 7aa00a7a authored by Mahmoud Aglan's avatar Mahmoud Aglan

fixed gender mismatch

parent 9084d1f7
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="form-label">النوع</label> <label class="form-label">النوع</label>
<select name="gender" class="form-select" id="genderSelect" disabled> <select class="form-select" id="genderSelect" disabled>
<option value="">-- اختر --</option> <option value="">-- اختر --</option>
<option value="male" <?= old('gender') === 'male' ? 'selected' : '' ?>>ذكر</option> <option value="male" <?= old('gender') === 'male' ? 'selected' : '' ?>>ذكر</option>
<option value="female" <?= old('gender') === 'female' ? 'selected' : '' ?>>أنثى</option> <option value="female" <?= old('gender') === 'female' ? 'selected' : '' ?>>أنثى</option>
......
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="form-label">النوع</label> <label class="form-label">النوع</label>
<select name="gender" id="genderSelect" class="form-select" disabled> <select id="genderSelect" class="form-select" disabled>
<option value="">-- اختر --</option> <option value="">-- اختر --</option>
<option value="male" <?= (old('gender') ?: ($coach->gender ?? '')) === 'male' ? 'selected' : '' ?>>ذكر</option> <option value="male" <?= (old('gender') ?: ($coach->gender ?? '')) === 'male' ? 'selected' : '' ?>>ذكر</option>
<option value="female" <?= (old('gender') ?: ($coach->gender ?? '')) === 'female' ? 'selected' : '' ?>>أنثى</option> <option value="female" <?= (old('gender') ?: ($coach->gender ?? '')) === 'female' ? 'selected' : '' ?>>أنثى</option>
......
...@@ -274,8 +274,9 @@ class DeathController extends Controller ...@@ -274,8 +274,9 @@ class DeathController extends Controller
$data = $request->all(); $data = $request->all();
unset($data['_csrf_token']); unset($data['_csrf_token']);
// Auto-extract DOB and gender from national ID // Auto-extract DOB and gender from national ID (always authoritative)
$nid = $data['national_id'] ?? ''; $nid = trim((string) ($data['national_id'] ?? ''));
$data['national_id'] = $nid;
if ($nid !== '' && strlen($nid) === 14) { if ($nid !== '' && strlen($nid) === 14) {
$parsed = NationalIdParser::parse($nid); $parsed = NationalIdParser::parse($nid);
if ($parsed['is_valid']) { if ($parsed['is_valid']) {
......
...@@ -33,9 +33,9 @@ ...@@ -33,9 +33,9 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="form-label">النوع <span style="color:#DC2626;">*</span></label> <label class="form-label">النوع <span style="color:#DC2626;">*</span></label>
<select name="gender" class="form-select" id="genderDisplay" disabled style="background:#F9FAFB;"> <select class="form-select" id="genderDisplay" disabled style="background:#F9FAFB;">
<option value="male" <?= ($spouse['gender'] ?? '') === 'male' ? 'selected' : '' ?>>ذكر</option> <option value="male" <?= ($spouse['gender'] ?? 'female') === 'male' ? 'selected' : '' ?>>ذكر</option>
<option value="female" <?= ($spouse['gender'] ?? '') === 'female' ? 'selected' : '' ?>>أنثى</option> <option value="female" <?= ($spouse['gender'] ?? 'female') === 'female' ? 'selected' : '' ?>>أنثى</option>
</select> </select>
<input type="hidden" name="gender" id="genderHidden" value="<?= e($spouse['gender'] ?? 'female') ?>"> <input type="hidden" name="gender" id="genderHidden" value="<?= e($spouse['gender'] ?? 'female') ?>">
</div> </div>
......
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
</div> </div>
<div> <div>
<label style="display:block;margin-bottom:4px;font-size:13px;">الجنس</label> <label style="display:block;margin-bottom:4px;font-size:13px;">الجنس</label>
<select name="gender" class="form-control" id="genderDisplay" disabled style="background:#F9FAFB;"> <select class="form-control" id="genderDisplay" disabled style="background:#F9FAFB;">
<?php foreach ($genders as $k => $v): ?> <?php foreach ($genders as $k => $v): ?>
<option value="<?= e($k) ?>" <?= (old('gender') ?? ($isEdit ? $profile->gender : 'male')) === $k ? 'selected' : '' ?>><?= e($v) ?></option> <option value="<?= e($k) ?>" <?= (old('gender') ?? ($isEdit ? $profile->gender : 'male')) === $k ? 'selected' : '' ?>><?= e($v) ?></option>
<?php endforeach; ?> <?php endforeach; ?>
......
...@@ -52,7 +52,7 @@ $__template->layout('Layout.main'); ...@@ -52,7 +52,7 @@ $__template->layout('Layout.main');
</div> </div>
<div> <div>
<label class="form-label">النوع</label> <label class="form-label">النوع</label>
<select name="gender" class="form-select" id="genderInput" disabled style="background:#F9FAFB;"> <select class="form-select" id="genderInput" disabled style="background:#F9FAFB;">
<option value="male" <?= old('gender') === 'male' || old('gender') === '' ? 'selected' : '' ?>>ذكر</option> <option value="male" <?= old('gender') === 'male' || old('gender') === '' ? 'selected' : '' ?>>ذكر</option>
<option value="female" <?= old('gender') === 'female' ? 'selected' : '' ?>>أنثى</option> <option value="female" <?= old('gender') === 'female' ? 'selected' : '' ?>>أنثى</option>
</select> </select>
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="form-label">النوع <span style="color:#DC2626;">*</span></label> <label class="form-label">النوع <span style="color:#DC2626;">*</span></label>
<select name="gender" id="genderSelect" class="form-select" required disabled> <select id="genderSelect" class="form-select" required disabled>
<option value="">-- اختر --</option> <option value="">-- اختر --</option>
<option value="male" <?= old('gender') === 'male' ? 'selected' : '' ?>>ذكر</option> <option value="male" <?= old('gender') === 'male' ? 'selected' : '' ?>>ذكر</option>
<option value="female" <?= old('gender') === 'female' ? 'selected' : '' ?>>أنثى</option> <option value="female" <?= old('gender') === 'female' ? 'selected' : '' ?>>أنثى</option>
......
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