Skip to content

I
IPRSv2
Commit 49f4c19d authored by Michael Ngei's avatar Michael Ngei
Browse files
Options

Merge branch 'iprsv2_brian' into 'master' 

Iprsv2 brian

See merge request !19
parents bcef16fd 5c8fb931
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 509 additions and 332 deletions
app/Livewire/Search/Searchform.php
View file @ 49f4c19d
...@@ -44,6 +44,8 @@ class Searchform extends Component ...@@ -44,6 +44,8 @@ class Searchform extends Component
public $doctype=''; public $doctype='';
public $records_found= []; public $records_found= [];
public $showFields = '';
public function save() public function save()
{ {
$this->store(); $this->store();
...@@ -51,6 +53,7 @@ class Searchform extends Component ...@@ -51,6 +53,7 @@ class Searchform extends Component
public function store() public function store()
{ {
$this->validate(); $this->validate();
$this->showFields = $this->searchcategory;
switch ($this->searchcategory){ switch ($this->searchcategory){
case 'ID' : case 'ID' :
...@@ -256,9 +259,21 @@ class Searchform extends Component ...@@ -256,9 +259,21 @@ class Searchform extends Component
*/ */
public function showTableResults(): void public function showTableResults(): void
{ {
$this->dispatch('viewResults', $this->humans,$this->serial_number, $this->dispatch('viewResults', $this->humans,$this->serial_number,
$this->doctype,$this->records_not_found, $this->doctype,$this->records_not_found,
$this->search_count,$this->records_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;
} }
......
public/vendor/adminlte/dist/css/adminlte.css
View file @ 49f4c19d
...@@ -12829,7 +12829,7 @@ body:not(.layout-fixed) .main-sidebar .sidebar { ...@@ -12829,7 +12829,7 @@ body:not(.layout-fixed) .main-sidebar .sidebar {
} }
[class*="sidebar-light-"] .nav-treeview > .nav-item > .nav-link { [class*="sidebar-light-"] .nav-treeview > .nav-item > .nav-link {
color: #777; color: #454444;
} }
[class*="sidebar-light-"] .nav-treeview > .nav-item > .nav-link:hover, [class*="sidebar-light-"] .nav-treeview > .nav-item > .nav-link:focus { [class*="sidebar-light-"] .nav-treeview > .nav-item > .nav-link:hover, [class*="sidebar-light-"] .nav-treeview > .nav-item > .nav-link:focus {
resources/views/layouts/app.blade.php
View file @ 49f4c19d
...@@ -16,6 +16,9 @@ ...@@ -16,6 +16,9 @@
<!-- Bootstrap --> <!-- Bootstrap -->
<link href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" rel="stylesheet"> <link href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" rel="stylesheet">
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/4.6.0/js/bootstrap.bundle.min.js"></script>
<!-- Include Select2 CSS --> <!-- Include Select2 CSS -->
<link href="{{ asset('public/vendor/select2/css/select2.min.css') }}" rel="stylesheet"> <link href="{{ asset('public/vendor/select2/css/select2.min.css') }}" rel="stylesheet">
......
resources/views/livewire/search/partials/tabs/birth/document_data.blade.php
View file @ 49f4c19d
...@@ -19,7 +19,9 @@ ...@@ -19,7 +19,9 @@
<div class="col-12 text-center"> <div class="col-12 text-center">
@if(isset($human)) @if(isset($human))
<small class="">Birth Entry Number</small> <small class="">Birth Entry Number</small>
<h4 class="upi"></h4> <h4 class="upi">
{{ $docums[0]['SER_NUM'] }}
</h4>
@else @else
<div class="skeleton skeleton-text short"></div> <div class="skeleton skeleton-text short"></div>
@endif @endif
...@@ -27,7 +29,7 @@ ...@@ -27,7 +29,7 @@
<div class="col-12 text-center"> <div class="col-12 text-center">
@if(isset($human)) @if(isset($human))
<small class="">Country of Birth</small> <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> <span class="fi fi-ke" style="font-size: 2rem;"></span>
@else @else
<div class="skeleton skeleton-text short"></div> <div class="skeleton skeleton-text short"></div>
......
resources/views/livewire/search/partials/tabs/birth/document_header_details.blade.php
View file @ 49f4c19d
<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/searchform.blade.php
View file @ 49f4c19d
<div> <div>
<div id="overlaySpinner" wire:loading> <div id="overlaySpinner" wire:loading>
...@@ -27,60 +26,42 @@ ...@@ -27,60 +26,42 @@
@method('POST') @method('POST')
@if($role->hasAnyPermission(["Basic Search ID with Serial number","Basic Search ID with ID number", "Basic Search Passport with Passport number", "Basic Search Passport with ID number", "Basic Search Birth with Certificate number", "Basic Search Birth with ID number"])) @if($role->hasAnyPermission(["Basic Search ID with Serial number","Basic Search ID with ID number", "Basic Search Passport with Passport number", "Basic Search Passport with ID number", "Basic Search Birth with Certificate number", "Basic Search Birth with ID number"]))
<div id="searchContainer" class="d-flex align-items-center search-container"> <div id="searchContainer" class="d-flex align-items-center search-container">
<select wire:model="searchcategory" name="searchcategory" <select wire:model="searchcategory" name="searchcategory"
class="form-control search-element text-center fw-bold custom-select" title="Select document type" class="form-control search-element text-center fw-bold custom-select" title="Select document type"
id="category" required> id="category" required>
<option value="">Choose Document</option> <option value="">Choose Document</option>
@foreach($searchGroups as $searchGroup) @foreach($searchGroups as $searchGroup)
<option value={{ $searchGroup }} >{{ $searchGroup }}</option> <option value={{ $searchGroup }} >{{ $searchGroup }}</option>
@endforeach @endforeach
</select> </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')) @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 @endif
@if($role->hasPermissionTo('Basic Search ID with Serial number')) @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"> <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 @endif
</div> </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
@if($role->hasPermissionTo("Basic Search Passport with ID number"))
<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")) @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" <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">
id="searchInputPassportNo" name="pno"
placeholder="Passport Number" autofocus/>
@endif @endif
@if($role->hasPermissionTo("Basic Search Passport with ID number")) @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" <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">
id="searchInputPassportId" name="pino"
placeholder="Passport ID Number" autofocus/>
@endif @endif
</div> </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"> <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> </div>
<button type="submit" id="submitSearch" class="btn search-element search-btn" title="search"> <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;"> <img src="{{ asset('images/search-white.png') }}" alt="Search" style="width: 24px; height: 24px;">
</button> </button>
</div> </div>
@else @else
<div class="alert alert-dark w-100"> <div class="alert alert-dark w-100">
<i class="fas fa-fw fa-info-circle"></i> <i class="fas fa-fw fa-info-circle"></i>
...@@ -120,10 +101,6 @@ ...@@ -120,10 +101,6 @@
<style> <style>
.row { .row {
margin-top: 20px; margin-top: 20px;
/* display: flex;
justify-content: center;
align-items: center;
height: 80vh; */
} }
.search-container { .search-container {
display: flex; display: flex;
......
resources/views/livewire/search/tableresult.blade.php
View file @ 49f4c19d
...@@ -126,19 +126,33 @@ ...@@ -126,19 +126,33 @@
@if($doctype === 'Birth') @if($doctype === 'Birth')
<tr> <tr>
<td><h4 class="text-black">{{ $doc_human['o_pid'] ?? '-' }}</h4></td> <td>
<td><h4 class="text-info">{{ $serial_number[$count] ?? '-' }}</h4></td> <h4 class="text-black">{{ $doc_human['o_pid'] ?? '-' }}</h4>
<td>{{ $doc_human['name'] ?? '-' }}</td> </td>
<td>{{ $doc_human['last_name'] ?? '-' }}</td> <td>
<td>{{ $doc_human['surn'] ?? '-' }}</td> <h4 class="text-info">{{ $serial_number[$count] ?? '-' }}</h4>
<td>KENYAN <span class="fi fi-ke" style="font-size: 1rem;"></span></td> </td>
<td>{{ $doc_human['sex'] ?? '-' }}</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></td>
<td> <td>
<x-adminlte-button <x-adminlte-button
label="Details" label="Details"
theme="info" theme="info"
id="humanbtn" id="birthbtn"
icon="fas fa-info-circle" icon="fas fa-info-circle"
wire:click="birthresultsModal('{{ urlencode($serial_number[$count]) ?? '' }}')" wire:click="birthresultsModal('{{ urlencode($serial_number[$count]) ?? '' }}')"
data-toggle="modal" data-toggle="modal"
...@@ -147,54 +161,92 @@ ...@@ -147,54 +161,92 @@
</tr> </tr>
@endif @endif
@if($doctype === 'Passport') @if($doctype === 'Passport')
<tr> <tr>
<td><h4 class="text-black">{{ $human["passport_no"] ?? '-'}}</h4></td> <td>
<td><h4 class="text-info">{{ $human["identity_card_no"] ?? '-' }}</h4></td> <h4 class="text-black">{{ $human["passport_no"] ?? '-'}}</h4>
<td>{{ $human["first_names"] ?? '-' }}</td> </td>
<td>{{ $human["last_name"] ?? '-' }}</td> <td>
<td>{{ $human["gender"] ?? '-' }}</td> <h4 class="text-info">{{ $human["identity_card_no"] ?? '-' }}</h4>
<td>KENYAN <span class="fi fi-ke" style="font-size: 1rem;"></span></td> </td>
<td>{{ $human["birth_day"] ?? '-' }} / {{ $human["birth_month"] ?? '-' }} / {{ $human["birth_year"] ?? '-' }}</td> <td>
<td>{{ Carbon::parse($human["issue_date"])->format("d-m-Y") ?? '-' }}</td> {{ $human["first_names"] ?? '-' }}
<td>{{ Carbon::parse($human['expiry_date'])->format("d-m-Y") ?? '-' }}</td> </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> <td>
<x-adminlte-button <x-adminlte-button
label="Details" label="Details"
theme="info" theme="info"
id="humanbtn" id="passportbtn"
icon="fas fa-info-circle" icon="fas fa-info-circle"
wire:click="passportresultsModal({{ $human['identity_card_no'] ?? 0 }},'{{ $human['passport_no'] ?? 0 }}','{{ $doctype ?? 0 }}')" wire:click="passportresultsModal({{ $human['identity_card_no'] ?? 0 }},'{{ $human['passport_no'] ?? 0 }}','{{ $doctype ?? 0 }}')"
data-toggle="modal" data-toggle="modal"
/> />
</td> </td>
</tr> </tr>
@endif @endif
@if($doctype === 'ID') @if($doctype === 'ID')
@foreach($human as $doc_human) @foreach($human as $doc_human)
<tr> <tr>
<td><h4 class="text-black">{{ $doc_human['o_pid'] ?? '-' }}</h4></td> <td>
<td><h4 class="text-info">{{ $serial_number[$count] ?? '-' }}</h4></td> <h4 class="text-black">
<td>{{ $doc_human['name'] ?? '-' }}</td> {{ $doc_human['o_pid'] ?? '-' }}
<td>{{ $doc_human['last_name'] ?? '-' }}</td> </h4>
<td>{{ $doc_human['surn'] ?? '-' }}</td> </td>
<td>KENYAN <span class="fi fi-ke" style="font-size: 1rem;"></span></td> <td>
<td>{{ $doc_human['sex'] ?? '-' }}</td> <h4 class="text-info">
<td>{{ Carbon::parse($doc_human['date_birth'])->format("d-m-Y") ?? '-' }}</td> {{ $serial_number[$count] ?? '-' }}
<td> </h4>
<x-adminlte-button </td>
label="Details" <td>
theme="info" {{ $doc_human['name'] ?? '-' }}
id="humanbtn" </td>
icon="fas fa-info-circle" <td>
wire:click="triggerResultsModal({{ $doc_human['o_pid'] ?? 0 }},'{{ $serial_number[$count] ?? 0 }}','{{ $doctype ?? 0 }}')" {{ $doc_human['last_name'] ?? '-' }}
data-toggle="modal" </td>
/> <td>
</td> {{ $doc_human['surn'] ?? '-' }}
</tr> </td>
@php $count++; @endphp <td>
@endforeach KENYAN <span class="fi fi-ke" style="font-size: 1rem;"></span>
</td>
<td>
{{ $doc_human['sex'] ?? '-' }}
</td>
<td>
{{ Carbon::parse($doc_human['date_birth'])->format("d-m-Y") ?? '-' }}
</td>
<td>
<x-adminlte-button
label="Details"
theme="info"
id="humanbtn"
icon="fas fa-info-circle"
wire:click="triggerResultsModal({{ $doc_human['o_pid'] ?? 0 }},'{{ $serial_number[$count] ?? 0 }}','{{ $doctype ?? 0 }}')"
data-toggle="modal"
/>
</td>
</tr>
@php $count++; @endphp
@endforeach
@endif @endif
@endforeach @endforeach
......
resources/views/search/search.blade.php
View file @ 49f4c19d
...@@ -39,14 +39,26 @@ ...@@ -39,14 +39,26 @@
color:red; color:red;
} }
#submitSearch{ #submitSearch{
border-top-right-radius: 15px; border-top-right-radius: 20px;
border-bottom-right-radius: 15px; border-bottom-right-radius: 20px;
width: 20%; width: 20%;
} }
#searchModalBasic > .modal-dialog{ #searchModalBasic > .modal-dialog{
max-width: 95vw; max-width: 95vw;
margin: auto; margin: auto;
} }
#searchModalPassport > .modal-dialog{
max-width: 95vw;
margin: auto;
}
#searchModalBirth > .modal-dialog{
max-width: 95vw;
margin: auto;
}
#overlaySpinner{ #overlaySpinner{
position: fixed; position: fixed;
top: 0; top: 0;
...@@ -131,9 +143,21 @@ ...@@ -131,9 +143,21 @@
@section('js') @section('js')
<script> <script>
//handle modal: event delegation //handle basic modal: event delegation
$(document).on('click', '#humanbtn',function(event){ $(document).on('click', '#humanbtn',function(event){
$('#searchModalBasic').modal('show'); $('#searchModalBasic').modal('show');
}); });
//handle passport modal: event delegation
$(document).on('click', '#passportbtn', function(event){
$('#searchModalPassport').modal('show');
});
//handle passport modal: event delegation
$(document).on('click', '#birthbtn', function(event){
$('#searchModalBirth').modal('show');
});
</script> </script>
@stop @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