Skip to content

I
IPRSv2
Commit 5c8fb931 authored by Brian Wangora's avatar Brian Wangora
Browse files
Options

Search form reset, birth modal working

parent 9464e894
Show whitespace changes
Inline Side-by-side
Showing with 260 additions and 126 deletions
app/Livewire/Search/Searchform.php
View file @ 5c8fb931
......@@ -44,6 +44,8 @@ class Searchform extends Component
public $doctype='';
public $records_found= [];
public $showFields = '';
public function save()
{
$this->store();
......@@ -51,6 +53,7 @@ class Searchform extends Component
public function store()
{
$this->validate();
$this->showFields = $this->searchcategory;
switch ($this->searchcategory){
case 'ID' :
......@@ -259,6 +262,18 @@ class Searchform extends Component
$this->dispatch('viewResults', $this->humans,$this->serial_number,
$this->doctype,$this->records_not_found,
$this->search_count,$this->records_found);
// Clear the search fields
$this->reset([
'docNumber',
'serialNumber',
'passportNum',
'passportIdNum',
'searchBirthEntryNum'
]);
// For Option 1 only:
$this->showFields = $this->searchcategory;
}
......
resources/views/livewire/search/birth-modal.blade.php
View file @ 5c8fb931
<div>
@php
@php
$modalStyle="";
$modalStatus='';
if($isOpen) {
$modalStatus= 'show';
$modalStyle="display: block;";
}
@endphp
$fname = $human['name'] ?? '';
$oname = $human['last_name'] ?? '';
$surname = $human['surn'] ?? '';
@endphp
<x-adminlte-modal id="searchModalBirthBasic" class="{{ $modalStatus }}" style="{{ $modalStyle }}" size="lg"
title="" v-centered static-backdrop scrollable>
<x-adminlte-modal id="searchModalBirth" class="{{ $modalStatus }}" style="{{ $modalStyle }}" size="lg"
title="{{ $fname }} {{ $oname }} {{ $surname }}'s Birth Details" v-centered static-backdrop scrollable>
<div class="modal-body">
<ul class="nav nav-tabs" id="custom-tabs-four-tab" role="tablist">
<ul class="nav nav-tabs" id="custom-tabs-five-tab" role="tablist">
@if($role->hasAnyPermission(["Basic View Birth Details"]))
<li class="nav-item">
@if($modalStatus)
<a class="nav-link active" id="custom-tabs-four-home-tab" data-toggle="pill"
href="#custom-tabs-four-home" role="tab" aria-controls="custom-tabs-four-home"
<a class="nav-link active" id="custom-tabs-five-home-tab" data-toggle="pill"
href="#custom-tabs-five-home" role="tab" aria-controls="custom-tabs-five-home"
aria-selected="true">
Document data
</a>
@else
<a class="nav-link active" id="custom-tabs-four-home-tab" data-toggle="pill" href="#custom-tabs-four-home" role="tab" aria-controls="custom-tabs-four-home" aria-selected="true">
<a class="nav-link active" id="custom-tabs-five-home-tab" data-toggle="pill" href="#custom-tabs-five-home" role="tab" aria-controls="custom-tabs-five-home" aria-selected="true">
<div class="skeleton skeleton-text short" style="width: 10rem;"></div>
</a>
@endif
......@@ -33,13 +37,13 @@
@if($role->hasAnyPermission(["Basic View Birth Family relations"]))
<li class="nav-item">
@if($modalStatus)
<a class="nav-link" id="custom-tabs-four-family-tab" data-toggle="pill"
href="#custom-tabs-four-family" role="tab" aria-controls="custom-tabs-four-family"
<a class="nav-link" id="custom-tabs-five-family-tab" data-toggle="pill"
href="#custom-tabs-five-family" role="tab" aria-controls="custom-tabs-five-family"
aria-selected="false">
Family relations
</a>
@else
<a class="nav-link" id="custom-tabs-four-family-tab" data-toggle="pill" href="#custom-tabs-four-family" role="tab" aria-controls="custom-tabs-four-family" aria-selected="false">
<a class="nav-link" id="custom-tabs-five-family-tab" data-toggle="pill" href="#custom-tabs-five-family" role="tab" aria-controls="custom-tabs-five-family" aria-selected="false">
<div class="skeleton skeleton-text short" style="width: 10rem;"></div>
</a>
@endif
......@@ -49,12 +53,13 @@
@if($role->hasAnyPermission(["Basic View Birth Documents"]))
<li class="nav-item">
@if($modalStatus)
<a class="nav-link" id="custom-tabs-four-history-tab" data-toggle="pill"
href="#custom-tabs-four-documents" role="tab" aria-controls="custom-tabs-four-documents"
<a class="nav-link" id="custom-tabs-five-history-tab" data-toggle="pill"
href="#custom-tabs-five-history" role="tab" aria-controls="custom-tabs-five-history"
aria-selected="false">
Documents</a>
Document History
</a>
@else
<a class="nav-link" id="custom-tabs-four-family-tab" data-toggle="pill" href="#custom-tabs-four-family" role="tab" aria-controls="custom-tabs-four-family" aria-selected="false">
<a class="nav-link" id="custom-tabs-five-family-tab" data-toggle="pill" href="#custom-tabs-five-family" role="tab" aria-controls="custom-tabs-five-family" aria-selected="false">
<div class="skeleton skeleton-text short" style="width: 10rem;"></div>
</a>
@endif
......@@ -64,26 +69,28 @@
@if($role->hasAnyPermission(["Basic View Birth History"]))
<li class="nav-item">
@if($modalStatus)
<a class="nav-link" id="custom-tabs-four-history-tab" data-toggle="pill"
href="#custom-tabs-four-history" role="tab" aria-controls="custom-tabs-four-history"
<a class="nav-link" id="custom-tabs-five-photo-tab" data-toggle="pill"
href="#custom-tabs-five-photo" role="tab" aria-controls="custom-tabs-five-photo"
aria-selected="false">
Document History</a>
Photo & Signature
</a>
@else
<a class="nav-link" id="custom-tabs-four-family-tab" data-toggle="pill" href="#custom-tabs-four-family" role="tab" aria-controls="custom-tabs-four-family" aria-selected="false">
<a class="nav-link" id="custom-tabs-five-family-tab" data-toggle="pill" href="#custom-tabs-five-family" role="tab" aria-controls="custom-tabs-five-family" aria-selected="false">
<div class="skeleton skeleton-text short" style="width: 10rem;"></div>
</a>
@endif
</li>
@endif
<li class="nav-item">
@if($modalStatus)
<a class="nav-link" id="custom-tabs-four-history-tab" data-toggle="pill"
href="#custom-tabs-four-death" role="tab" aria-controls="custom-tabs-four-death"
<a class="nav-link" id="custom-tabs-five-death-tab" data-toggle="pill"
href="#custom-tabs-five-death" role="tab" aria-controls="custom-tabs-five-death"
aria-selected="false">
Date of Death
</a>
@else
<a class="nav-link" id="custom-tabs-four-family-tab" data-toggle="pill" href="#custom-tabs-four-family" role="tab" aria-controls="custom-tabs-four-family" aria-selected="false">
<a class="nav-link" id="custom-tabs-five-family-tab" data-toggle="pill" href="#custom-tabs-five-family" role="tab" aria-controls="custom-tabs-five-family" aria-selected="false">
<div class="skeleton skeleton-text short" style="width: 10rem;"></div>
</a>
@endif
......@@ -92,16 +99,44 @@
</div>
<div class="card card-primary card-outline card-outline-tabs" style="box-shadow: none;">
<div class="card-header p-0 border-bottom-0">
</div>
<div class="card-header p-0 border-bottom-0"></div>
<div class="card-body">
<div class="tab-content" id="custom-tabs-four-tabContent">
<div class="tab-content" id="custom-tabs-five-tabContent">
@if($role->hasAnyPermission(["Basic View Birth Details"]))
<div class="tab-pane fade show active" id="custom-tabs-four-home" role="tabpanel"
aria-labelledby="custom-tabs-four-home-tab">
<div class="tab-pane fade show active" id="custom-tabs-five-home" role="tabpanel"
aria-labelledby="custom-tabs-five-home-tab">
@include('livewire.search.partials.tabs.birth.document_data')
</div>
@endif
@if($role->hasAnyPermission(["Basic View Birth Details"]))
<div class="tab-pane fade" id="custom-tabs-five-family" role="tabpanel"
aria-labelledby="custom-tabs-five-family-tab">
@include('livewire.search.partials.tabs.birth.document_header_details')
</div>
@endif
@if($role->hasAnyPermission(["Basic View Birth Details"]))
<div class="tab-pane fade" id="custom-tabs-five-history" role="tabpanel"
aria-labelledby="custom-tabs-five-history-tab">
@include('livewire.search.partials.tabs.birth.document_history')
</div>
@endif
@if($role->hasAnyPermission(["Basic View Birth Details"]))
<div class="tab-pane fade" id="custom-tabs-five-photo" role="tabpanel"
aria-labelledby="custom-tabs-five-photo-tab">
@include('livewire.search.partials.tabs.birth.family_relation')
</div>
@endif
@if($role->hasAnyPermission(["Basic View Birth Details"]))
<div class="tab-pane fade" id="custom-tabs-five-death" role="tabpanel"
aria-labelledby="custom-tabs-five-death-tab">
@include('livewire.search.partials.tabs.birth.document_data')
</div>
@endif
</div>
</div>
</div>
......@@ -111,11 +146,4 @@
</x-slot>
</x-adminlte-modal>
<style>
#searchModalBirthBasic > .modal-dialog{
max-width: 95vw;
margin: auto;
}
</style>
</div>
resources/views/livewire/search/partials/tabs/birth/document_data.blade.php
View file @ 5c8fb931
......@@ -19,7 +19,9 @@
<div class="col-12 text-center">
@if(isset($human))
<small class="">Birth Entry Number</small>
<h4 class="upi"></h4>
<h4 class="upi">
{{ $docums[0]['SER_NUM'] }}
</h4>
@else
<div class="skeleton skeleton-text short"></div>
@endif
......@@ -27,7 +29,7 @@
<div class="col-12 text-center">
@if(isset($human))
<small class="">Country of Birth</small>
<p class="card-text">KEN </p>
<p class="card-text">KENYA</p>
<span class="fi fi-ke" style="font-size: 2rem;"></span>
@else
<div class="skeleton skeleton-text short"></div>
......
resources/views/livewire/search/partials/tabs/birth/document_header_details.blade.php
View file @ 5c8fb931
<h1>headaer</h1>
@php use Carbon\Carbon;
@endphp
<div class="row">
<div class="col-2" style="text-align: center;border: 1px solid #e2e5e9; border-radius: 10px;">
<img src="{{ asset('images/coat-of-arms.webp') }}"
alt="IPRS Logo" class="brand-image" style=" width: 10em;">
</div>
<div class="col-10">
<div class="row">
<div class="col-3">
<small>PIN</small>
<p class="field-value user-field-data">
{{ $human->pid ?? '-' }}
</p>
</div>
<div class="col-3">
<small>First name</small>
<p class="field-value user-field-data">
{{ $human->name ?? '-' }}
</p>
</div>
<div class="col-3">
<small>Other names</small>
<p class="field-value user-field-data">
{{ $human->last_name ?? '-' }}
</p>
</div>
<div class="col-3">
<small>Sur name</small>
<p class="field-value user-field-data">
{{ $human->surn ?? '-' }}
</p>
</div>
</div>
<div class="row">
<div class="col-3">
<small>ID Number</small>
<p class="field-value user-field-data">
{{ $human->o_pid ?? '-' }}
</p>
</div>
<div class="col-3">
<small>Gender</small>
<p class="field-value user-field-data">
{{ $human->sex ?? '-' }}
</p>
</div>
<div class="col-3">
<small>Date of Birth</small>
<p class="field-value user-field-data">
@if(isset($human->date_birth))
{{ Carbon::parse($human->date_birth)->format("d-m-Y") }}
@else
-
@endif
</p>
</div>
<div class="col-3">
<small>Citizenship</small>
<p class="field-value user-field-data">
KENYAN <span class="fi fi-ke" style="font-size: 1rem;"></span>
</p>
</div>
</div>
</div>
<div style="width: 100%;height: 1px;background-color: #e2e5e9;margin-bottom: 2rem;margin-top: 1rem;"></div>
</div>
resources/views/livewire/search/passport-modal.blade.php
View file @ 5c8fb931
......@@ -6,13 +6,14 @@
$modalStatus= 'show';
$modalStyle="display: block;";
}
$fnames = $passport['first_names'] ?? '';
$lname = $passport['last_names'] ?? '';
$fname = $passport['first_names'] ?? '';
$sname = $passport['last_name'] ?? '';
@endphp
<x-adminlte-modal id="searchModalPassport" class="{{ $modalStatus }}" style="{{ $modalStyle }}" size="lg"
title="{{ $fnames }} {{ $lname }}" v-centered static-backdrop scrollable>
title="{{ $fname }} {{ $sname }}'s Passport Details" v-centered static-backdrop scrollable>
<div class="modal-body">
<ul class="nav nav-tabs" id="custom-tabs-four-tab" role="tablist">
@if($role->hasAnyPermission(["Basic View ID Details", "Basic View Passport Details", "Basic View Birth Details"]))
......@@ -118,10 +119,4 @@
</x-slot>
</x-adminlte-modal>
<style>
#searchModalPassportBasic > .modal-dialog{
max-width: 95vw;
margin: auto;
}
</style>
</div>
resources/views/livewire/search/searchform.blade.php
View file @ 5c8fb931
<div>
<div id="overlaySpinner" wire:loading>
......@@ -37,16 +36,16 @@
@endforeach
</select>
<div id="fieldsContainerID" class="d-none d-flex">
<div id="fieldsContainerID" class="{{ $showFields !== 'ID' ? 'd-none' : '' }} d-flex">
@if($role->hasPermissionTo('Basic Search ID with ID number'))
<input type="text" class="form-control search-element no-radius" id="searchInputID" name="docNumber" placeholder="Enter Maisha Number" title="Enter ID Number" wire:model="docNumber">
<input type="text" class="form-control search-element no-radius" id="searchInputID" name="docNumber" placeholder="Enter Maisha Number" title="Enter Maisha Number" wire:model="docNumber">
@endif
@if($role->hasPermissionTo('Basic Search ID with Serial number'))
<input type="text" class="form-control search-element no-radius" id="searchInputSerial" name="SerialNumber" placeholder="Enter Serial Number" title="Enter Serial Number" wire:model="serialNumber">
@endif
</div>
<div id="fieldsContainerPassport" class="d-none d-flex">
<div id="fieldsContainerPassport" class="{{ $showFields !== 'Passport' ? 'd-none' : '' }} d-flex">
@if($role->hasPermissionTo("Basic Search Passport with Passport number"))
<input type="text" class="form-control search-element no-radius" id="searchInputPassportNo" name="pno" placeholder="Enter Passport Number" title="Enter Passport Number" wire:model="passportNum">
@endif
......@@ -54,28 +53,10 @@
<input type="text" class="form-control search-element no-radius" id="searchInputPassportId" name="pino" placeholder="Enter Maisha Number" title="Enter ID Number" wire:model="passportIdNum">
@endif
</div>
<div id="fieldsContainerPassport" class="form-group col-md-12 d-none d-none mt-3 mb-3 justify-content-center">
@if($role->hasPermissionTo("Basic Search Passport with Passport number"))
<x-adminlte-input type="text" label="Passport Number" fgroup-class="col-md-6 search-form-group"
id="searchInputPassportNo" name="pno"
placeholder="Passport Number" autofocus/>
@endif
@if($role->hasPermissionTo("Basic Search Passport with ID number"))
<x-adminlte-input type="text" label="ID Number" fgroup-class="col-md-6 search-form-group"
id="searchInputPassportId" name="pino"
placeholder="Passport ID Number" autofocus/>
@endif
</div>
<div id="fieldsContainerBirth" class="d-none d-flex">
<div id="fieldsContainerBirth" class="{{ $showFields !== 'Birth' ? 'd-none' : '' }} d-flex">
<input type="text" class="form-control search-element no-radius" id="searchBirthEntry" name="searchBirthEntryNum" placeholder="Enter Birth Entry Number" title="Enter Birth Entry Number" wire:model="searchBirthEntryNum">
</div>
<div id="fieldsContainerBirth" class="form-group d-none mt-3 mb-3 justify-content-center" style="width: 100%;">
<x-adminlte-input type="text" label="Birth Entry Number" fgroup-class="col-md-6 search-form-group"
id="searchBirthEntry" name="searchBirthEntryNum" wire:model="searchBirthEntryNum"
placeholder="Birth Entry Number" autofocus/>
</div>
<button type="submit" id="submitSearch" class="btn search-element search-btn" title="search">
<img src="{{ asset('images/search-white.png') }}" alt="Search" style="width: 24px; height: 24px;">
......@@ -120,10 +101,6 @@
<style>
.row {
margin-top: 20px;
/* display: flex;
justify-content: center;
align-items: center;
height: 80vh; */
}
.search-container {
display: flex;
......
resources/views/livewire/search/tableresult.blade.php
View file @ 5c8fb931
......@@ -126,19 +126,33 @@
@if($doctype === 'Birth')
<tr>
<td><h4 class="text-black">{{ $doc_human['o_pid'] ?? '-' }}</h4></td>
<td><h4 class="text-info">{{ $serial_number[$count] ?? '-' }}</h4></td>
<td>{{ $doc_human['name'] ?? '-' }}</td>
<td>{{ $doc_human['last_name'] ?? '-' }}</td>
<td>{{ $doc_human['surn'] ?? '-' }}</td>
<td>KENYAN <span class="fi fi-ke" style="font-size: 1rem;"></span></td>
<td>{{ $doc_human['sex'] ?? '-' }}</td>
<td>
<h4 class="text-black">{{ $doc_human['o_pid'] ?? '-' }}</h4>
</td>
<td>
<h4 class="text-info">{{ $serial_number[$count] ?? '-' }}</h4>
</td>
<td>
{{ $doc_human['name'] ?? '-' }}
</td>
<td>
{{ $doc_human['last_name'] ?? '-' }}
</td>
<td>
{{ $doc_human['surn'] ?? '-' }}
</td>
<td>
KENYAN <span class="fi fi-ke" style="font-size: 1rem;"></span>
</td>
<td>
{{ $doc_human['sex'] ?? '-' }}
</td>
<td></td>
<td>
<x-adminlte-button
label="Details"
theme="info"
id="humanbtn"
id="birthbtn"
icon="fas fa-info-circle"
wire:click="birthresultsModal('{{ urlencode($serial_number[$count]) ?? '' }}')"
data-toggle="modal"
......@@ -149,15 +163,33 @@
@if($doctype === 'Passport')
<tr>
<td><h4 class="text-black">{{ $human["passport_no"] ?? '-'}}</h4></td>
<td><h4 class="text-info">{{ $human["identity_card_no"] ?? '-' }}</h4></td>
<td>{{ $human["first_names"] ?? '-' }}</td>
<td>{{ $human["last_name"] ?? '-' }}</td>
<td>{{ $human["gender"] ?? '-' }}</td>
<td>KENYAN <span class="fi fi-ke" style="font-size: 1rem;"></span></td>
<td>{{ $human["birth_day"] ?? '-' }} / {{ $human["birth_month"] ?? '-' }} / {{ $human["birth_year"] ?? '-' }}</td>
<td>{{ Carbon::parse($human["issue_date"])->format("d-m-Y") ?? '-' }}</td>
<td>{{ Carbon::parse($human['expiry_date'])->format("d-m-Y") ?? '-' }}</td>
<td>
<h4 class="text-black">{{ $human["passport_no"] ?? '-'}}</h4>
</td>
<td>
<h4 class="text-info">{{ $human["identity_card_no"] ?? '-' }}</h4>
</td>
<td>
{{ $human["first_names"] ?? '-' }}
</td>
<td>
{{ $human["last_name"] ?? '-' }}
</td>
<td>
{{ $human["gender"] ?? '-' }}
</td>
<td>
KENYAN <span class="fi fi-ke" style="font-size: 1rem;"></span>
</td>
<td>
{{ $human["birth_day"] ?? '-' }} / {{ $human["birth_month"] ?? '-' }} / {{ $human["birth_year"] ?? '-' }}
</td>
<td>
{{ Carbon::parse($human["issue_date"])->format("d-m-Y") ?? '-' }}
</td>
<td>
{{ Carbon::parse($human['expiry_date'])->format("d-m-Y") ?? '-' }}
</td>
<td>
<x-adminlte-button
label="Details"
......@@ -186,7 +218,6 @@
</td>
<td>
{{ $doc_human['name'] ?? '-' }}
</td>
<td>
{{ $doc_human['last_name'] ?? '-' }}
......@@ -194,7 +225,9 @@
<td>
{{ $doc_human['surn'] ?? '-' }}
</td>
<td>KENYAN <span class="fi fi-ke" style="font-size: 1rem;"></span></td>
<td>
KENYAN <span class="fi fi-ke" style="font-size: 1rem;"></span>
</td>
<td>
{{ $doc_human['sex'] ?? '-' }}
</td>
......
resources/views/search/search.blade.php
View file @ 5c8fb931
......@@ -54,6 +54,11 @@
margin: auto;
}
#searchModalBirth > .modal-dialog{
max-width: 95vw;
margin: auto;
}
#overlaySpinner{
position: fixed;
top: 0;
......@@ -148,6 +153,11 @@
$('#searchModalPassport').modal('show');
});
//handle passport modal: event delegation
$(document).on('click', '#birthbtn', function(event){
$('#searchModalBirth').modal('show');
});
</script>
@stop
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