Skip to content

I
IPRSv2
Commit 0e4b99ea authored by Michael Ngei's avatar Michael Ngei
Browse files
Options

Merge branch 'master' into 'iprsv2_mike' 

# Conflicts:
#   app/Livewire/Search/Searchform.php
#   resources/views/livewire/search/birth-modal.blade.php
#   resources/views/livewire/search/partials/tabs/birth/document_data.blade.php
#   resources/views/livewire/search/passport-modal.blade.php
parents ff68a722 559c6ca4
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 182 deletions
app/Livewire/Search/Searchform.php
View file @ 0e4b99ea
...@@ -65,9 +65,9 @@ class Searchform extends Component ...@@ -65,9 +65,9 @@ class Searchform extends Component
break; break;
case 'Passport' : case 'Passport' :
if(!empty($this->passportNum) || !empty($this->passportIdNum)){ if(!empty($this->passportNum) || !empty($this->passportIdNum)){
$this->getPassportHuman($this->passportNum,$this->passportIdNum); $this->getPassportHuman($this->passportNum);
}else{ }else{
session()->flash('error', 'Either Document Number or Serial Number must be provided.'); session()->flash('error', 'Either Passport Number or ID Number must be provided.');
} }
break; break;
case 'Birth' : case 'Birth' :
...@@ -197,9 +197,9 @@ class Searchform extends Component ...@@ -197,9 +197,9 @@ class Searchform extends Component
} }
} }
private function getPassportHuman($passportNum, $idnum) private function getPassportHuman($passportNum)
{ {
$passport= Doi_date::where('passport_no', $passportNum)->where('identity_card_no', $idnum)->get()->toArray(); $passport= Doi_date::where('passport_no', $passportNum)->get()->toArray();
if($passport){ if($passport){
$this->search_count=1; $this->search_count=1;
...@@ -230,7 +230,10 @@ class Searchform extends Component ...@@ -230,7 +230,10 @@ class Searchform extends Component
$this->serial_number[]=$this->searchBirthEntryNum; $this->serial_number[]=$this->searchBirthEntryNum;
$this->humans[] = $human; $this->humans[] = $human;
$this->showTableResults(); $this->dispatch('viewResults', $this->humans,$this->serial_number,
$this->doctype,$this->records_not_found,
$this->search_count,$this->records_found);
}else{ }else{
session()->flash('error', 'Search parameter is missing..'); session()->flash('error', 'Search parameter is missing..');
}*/ }*/
......
resources/views/livewire/search/birth-modal.blade.php
View file @ 0e4b99ea
...@@ -14,14 +14,14 @@ ...@@ -14,14 +14,14 @@
<x-adminlte-modal id="searchModalBirth" class="{{ $modalStatus }}" style="{{ $modalStyle }}" size="lg" <x-adminlte-modal id="searchModalBirth" class="{{ $modalStatus }}" style="{{ $modalStyle }}" size="lg"
title="{{ $fname }} {{ $oname }} {{ $surname }}'s Birth Details" v-centered static-backdrop scrollable> title="Birth Details: {{ $fname }} {{ $oname }} {{ $surname }}" v-centered static-backdrop scrollable>
<div class="modal-body"> <div class="modal-body">
<ul class="nav nav-tabs" id="custom-tabs-five-tab" role="tablist"> <ul class="nav nav-tabs" id="custom-tabs-five-tab" role="tablist">
@if($role->hasAnyPermission(["Basic View Birth Details"])) @if($role->hasAnyPermission(["Basic View Birth Details"]))
<li class="nav-item"> <li class="nav-item">
@if($modalStatus) @if($modalStatus)
<a class="nav-link active" id="custom-tabs-five-home-tab" data-toggle="pill" <a class="nav-link active" id="custom-tabs-one-home-tab" data-toggle="pill"
href="#custom-tabs-five-home" role="tab" aria-controls="custom-tabs-five-home" href="#custom-tabs-five-home" role="tab" aria-controls="custom-tabs-five-home"
aria-selected="true"> aria-selected="true">
Document data Document data
...@@ -34,67 +34,9 @@ ...@@ -34,67 +34,9 @@
</li> </li>
@endif @endif
@if($role->hasAnyPermission(["Basic View Birth Family relations"]))
<li class="nav-item">
@if($modalStatus)
<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-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
@if($role->hasAnyPermission(["Basic View Birth Documents"]))
<li class="nav-item">
@if($modalStatus)
<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">
Document History
</a>
@else
<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
@if($role->hasAnyPermission(["Basic View Birth History"]))
<li class="nav-item">
@if($modalStatus)
<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">
Photo & Signature
</a>
@else
<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-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-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>
</ul> </ul>
</div> </div>
...@@ -109,33 +51,9 @@ ...@@ -109,33 +51,9 @@
</div> </div>
@endif @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> </div>
......
resources/views/livewire/search/partials/tabs/birth/document_data.blade.php
View file @ 0e4b99ea
...@@ -6,14 +6,6 @@ ...@@ -6,14 +6,6 @@
<div class="row"> <div class="row">
<div class="col-2"> <div class="col-2">
<div class="row"> <div class="row">
<x-adminlte-card>
@if($modalStatus)
<img class="card-img-top"
src="{{ asset('../images/imgplaceholder.png') }}" alt="Card image cap">
@else
<div class="skeleton skeleton-text short skeleton-img"></div>
@endif
</x-adminlte-card>
<div class="row" style="width: 100%;"> <div class="row" style="width: 100%;">
@if($role->hasPermissionTo("Basic View Birth Details")) @if($role->hasPermissionTo("Basic View Birth Details"))
<div class="col-12 text-center"> <div class="col-12 text-center">
...@@ -29,7 +21,7 @@ ...@@ -29,7 +21,7 @@
<div class="col-12 text-center"> <div class="col-12 text-center">
@if(isset($birth_human)) @if(isset($birth_human))
<small class="">Country of Birth</small> <small class="">Country of Birth</small>
<p class="card-text">KENYA</p> <p class="card-text">{{ $human->birth_country }}</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/id/document_data.blade.php
View file @ 0e4b99ea
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<x-adminlte-card> <x-adminlte-card>
@if($modalStatus) @if($modalStatus)
<img class="card-img-top" <img class="card-img-top"
src="{{ asset('../images/imgplaceholder.png') }}" alt="Card image cap"> src="{{ asset('../images/passport-photo.jpg') }}" alt="Card image cap">
@else @else
<div class="skeleton skeleton-text short skeleton-img"></div> <div class="skeleton skeleton-text short skeleton-img"></div>
@endif @endif
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<div class="col-12 text-center"> <div class="col-12 text-center">
@if(isset($human->o_pid)) @if(isset($human->o_pid))
<small class="">Country of Birth</small> <small class="">Country of Birth</small>
<p class="card-text">KEN </p> <p class="card-text">{{ $human->birth_country }} </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>
...@@ -60,20 +60,6 @@ ...@@ -60,20 +60,6 @@
</div> </div>
</div> </div>
@if($doctype == 'ID')
@if($role->hasPermissionTo("Basic View ID Details"))
<div class="row">
@if(isset($human->name))
<x-adminlte-card style="margin: 1rem auto;">
<img class="card-img-top" height="100"
src="{{ asset('../images/fingerprints/biometric.png') }}" alt="Card image cap">
</x-adminlte-card>
@else
<div class="skeleton skeleton-text short"></div>
@endif
</div>
@endif
@endif
</div> </div>
...@@ -333,21 +319,9 @@ ...@@ -333,21 +319,9 @@
</div> </div>
</div> </div>
</div> </div>
<div class="row">
<div class="idDocimg">
</div>
</div>
</div> </div>
<style> <style>
.idDocimg{
background-image:url("../images/national_ID.png");
background-size: 30rem;
width: 80vw;
height: 25vh;
background-repeat: no-repeat
}
.skeleton-img{ .skeleton-img{
padding: 8rem; padding: 8rem;
} }
......
resources/views/livewire/search/partials/tabs/id/document_history.blade.php
View file @ 0e4b99ea
...@@ -206,6 +206,14 @@ ...@@ -206,6 +206,14 @@
border-radius: 6.25rem; border-radius: 6.25rem;
opacity: .5 opacity: .5
} }
.table td{
font-size: 1.2rem !important;
}
.field-value-text{
font-size: 1.2rem !important;
}
</style> </style>
</div> </div>
resources/views/livewire/search/partials/tabs/passport_tabs/document_data.blade.php
View file @ 0e4b99ea
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<x-adminlte-card> <x-adminlte-card>
@if($modalStatus) @if($modalStatus)
<img class="card-img-top" <img class="card-img-top"
src="{{ asset('../images/imgplaceholder.png') }}" alt="Card image cap"> src="{{ asset('../images/passport-photo.jpg') }}" alt="Card image cap">
@else @else
<div class="skeleton skeleton-text short skeleton-img"></div> <div class="skeleton skeleton-text short skeleton-img"></div>
@endif @endif
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<div class="col-12 text-center"> <div class="col-12 text-center">
@if(isset($human_passport->identity_card_no)) @if(isset($human_passport->identity_card_no))
<small class="">Country of Birth</small> <small class="">Country of Birth</small>
<p class="card-text">KEN </p> <p class="card-text">{{ $human_passport->birth_country }}</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>
...@@ -40,18 +40,7 @@ ...@@ -40,18 +40,7 @@
</div> </div>
</div> </div>
@if($role->hasPermissionTo("Basic View ID Details"))
<div class="row">
@if(isset($human_passport->identity_card_no))
<x-adminlte-card style="margin: 1rem auto;">
<img class="card-img-top" height="100"
src="{{ asset('../images/fingerprints/biometric.png') }}" alt="Card image cap">
</x-adminlte-card>
@else
<div class="skeleton skeleton-text short"></div>
@endif
</div>
@endif
</div> </div>
<div class="col-6" style="padding-left: 27px;"> <div class="col-6" style="padding-left: 27px;">
...@@ -68,7 +57,7 @@ ...@@ -68,7 +57,7 @@
@endif @endif
</div> </div>
<div class="col-6"> <div class="col-6">
<small>Sur name</small> <small>Nationality</small>
@if(isset($human_passport->mother_passport_no)) @if(isset($human_passport->mother_passport_no))
- -
@else @else
...@@ -108,7 +97,7 @@ ...@@ -108,7 +97,7 @@
<div class="cardLine2"></div> <div class="cardLine2"></div>
<div class="row"> <div class="row">
<div class="col-8"> <div class="col-8">
<small>Mother</small> <small>Place of Birth</small>
@if(isset($human_passport->mother_name)) @if(isset($human_passport->mother_name))
<p class="field-value"> <p class="field-value">
<i class="fas fa-female" style="color: #008500;"></i> <i class="fas fa-female" style="color: #008500;"></i>
...@@ -120,7 +109,7 @@ ...@@ -120,7 +109,7 @@
</div> </div>
@if($role->hasPermissionTo("Basic View Passport Details")) @if($role->hasPermissionTo("Basic View Passport Details"))
<div class="col-4"> <div class="col-4">
<small>UPI no.</small> <small>Signature</small>
@if(isset($human_passport->mother_identity_card_no)) @if(isset($human_passport->mother_identity_card_no))
<p class="field-value"> <p class="field-value">
{{ $human_passport->mother_identity_card_no }} {{ $human_passport->mother_identity_card_no }}
...@@ -130,7 +119,7 @@ ...@@ -130,7 +119,7 @@
@endif @endif
</div> </div>
<div class="col-12"> <div class="col-12">
<small>Passport No.</small> <small>Biometric details</small>
@if(isset($human_passport->mother_passport_no)) @if(isset($human_passport->mother_passport_no))
<p class="field-value"> <p class="field-value">
{{ $human_passport->mother_passport_no }} {{ $human_passport->mother_passport_no }}
...@@ -140,40 +129,6 @@ ...@@ -140,40 +129,6 @@
@endif @endif
</div> </div>
@endif @endif
<div class="col-8">
<small>Father</small>
@if($human_passport->father_name)
<p class="field-value">
<i class="fas fa-male" style="color: #008500;"></i>
{{ $human_passport->father_name }}
</p>
@else
<div class="skeleton skeleton-text short"></div>
@endif
</div>
@if($role->hasPermissionTo("Basic View Passport Details"))
<div class="col-4">
<small>UPI no.</small>
@if($human_passport->father_identity_card_no)
<p class="field-value">
{{ $human_passport->father_identity_card_no }}
</p>
@else
<div class="skeleton skeleton-text short"></div>
@endif
</div>
<div class="col-12">
<small>Passport no.</small>
@if($human_passport->father_passport_no)
<p class="field-value">
$human_passport->father_passport_no
</p>
@else
<div class="skeleton skeleton-text short"></div>
@endif
</div>
@endif
</div> </div>
@endif @endif
</div> </div>
......
resources/views/livewire/search/passport-modal.blade.php
View file @ 0e4b99ea
...@@ -19,8 +19,7 @@ ...@@ -19,8 +19,7 @@
@if($role->hasAnyPermission(["Basic View ID Details", "Basic View Passport Details", "Basic View Birth Details"])) @if($role->hasAnyPermission(["Basic View ID Details", "Basic View Passport Details", "Basic View Birth Details"]))
<li class="nav-item"> <li class="nav-item">
@if($modalStatus) @if($modalStatus)
<a class="nav-link active" id="custom-tabs-four-home-tab" data-toggle="pill" <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">
href="#custom-tabs-four-home" role="tab" aria-controls="custom-tabs-four-home" aria-selected="true">
Document data Document data
</a> </a>
@else @else
...@@ -118,5 +117,5 @@ ...@@ -118,5 +117,5 @@
<x-adminlte-button theme="danger" label="Close" data-dismiss="modal" wire:click="$refresh"/> <x-adminlte-button theme="danger" label="Close" data-dismiss="modal" wire:click="$refresh"/>
</x-slot> </x-slot>
</x-adminlte-modal> </x-adminlte-modal>
</div> </div>
resources/views/livewire/search/resultsmodal.blade.php
View file @ 0e4b99ea
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
@endphp @endphp
<x-adminlte-modal id="searchModalBasic" class="{{ $modalStatus }}" style="{{ $modalStyle }}" size="lg" <x-adminlte-modal id="searchModalBasic" class="{{ $modalStatus }}" style="{{ $modalStyle }}" size="lg"
title="{{ $fname }} {{ $mname }} {{ $sname }}" v-centered static-backdrop scrollable> title="ID Details: {{ $fname }} {{ $mname }} {{ $sname }}" v-centered static-backdrop scrollable>
<div class="modal-body"> <div class="modal-body">
<ul class="nav nav-tabs" id="custom-tabs-six-tab" role="tablist"> <ul class="nav nav-tabs" id="custom-tabs-six-tab" role="tablist">
@if($role->hasAnyPermission(["Basic View ID Details", "Basic View Passport Details", "Basic View Birth Details"])) @if($role->hasAnyPermission(["Basic View ID Details", "Basic View Passport Details", "Basic View Birth Details"]))
......
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