Skip to content

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

Merge branch 'iprsv2_mike' into 'master' 

Iprsv2 mike

See merge request !14
parents db0192d1 51a93464
Hide whitespace changes
Inline Side-by-side
Showing with 126 additions and 275 deletions
resources/views/livewire/search/partials/tabs/passport_tabs/document_data.blade.php
View file @ d0cf9aae
@php use Carbon\Carbon; @php use Carbon\Carbon;
@endphp @endphp
@foreach($passport as $human_passport)
<div class="row"> <div class="row">
<div class="col-2"> <div class="col-2">
<div class="row"> <div class="row">
...@@ -13,41 +15,19 @@ ...@@ -13,41 +15,19 @@
</x-adminlte-card> </x-adminlte-card>
<div class="row" style="width: 100%;"> <div class="row" style="width: 100%;">
@if($doctype == 'Birth')
@if($role->hasPermissionTo("Basic View Birth Details"))
<div class="col-12 text-center">
@if(isset($human))
<small class="">Birth Entry Number</small>
<h4 class="upi">{{ $serialNum }}</h4>
@else
<div class="skeleton skeleton-text short"></div>
@endif
</div>
<div class="col-12 text-center">
@if(isset($human))
<small class="">Country of Birth</small>
<p class="card-text">KEN </p>
<span class="fi fi-ke" style="font-size: 2rem;"></span>
@else
<div class="skeleton skeleton-text short"></div>
@endif
</div>
@endif
@endif
@if($doctype == 'ID')
@if($role->hasPermissionTo("Basic View ID Details")) @if($role->hasPermissionTo("Basic View ID Details"))
<div class="col-12 text-center"> <div class="col-12 text-center">
@if(isset($human->o_pid)) @if(isset($human_passport->identity_card_no))
<small class="">UPI Number</small> <small class="">UPI Number</small>
<h4 class="upi">{{ $human->o_pid }}</h4> <h4 class="upi">{{ $human_passport->identity_card_no }}</h4>
@else @else
<div class="skeleton skeleton-text short"></div> <div class="skeleton skeleton-text short"></div>
@endif @endif
</div> </div>
<div class="col-12 text-center"> <div class="col-12 text-center">
@if(isset($human->o_pid)) @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">KEN </p>
<span class="fi fi-ke" style="font-size: 2rem;"></span> <span class="fi fi-ke" style="font-size: 2rem;"></span>
...@@ -56,14 +36,13 @@ ...@@ -56,14 +36,13 @@
@endif @endif
</div> </div>
@endif @endif
@endif
</div> </div>
</div> </div>
@if($doctype == 'ID')
@if($role->hasPermissionTo("Basic View ID Details")) @if($role->hasPermissionTo("Basic View ID Details"))
<div class="row"> <div class="row">
@if(isset($human->name)) @if(isset($human_passport->identity_card_no))
<x-adminlte-card style="margin: 1rem auto;"> <x-adminlte-card style="margin: 1rem auto;">
<img class="card-img-top" height="100" <img class="card-img-top" height="100"
src="{{ asset('../images/fingerprints/biometric.png') }}" alt="Card image cap"> src="{{ asset('../images/fingerprints/biometric.png') }}" alt="Card image cap">
...@@ -73,207 +52,131 @@ ...@@ -73,207 +52,131 @@
@endif @endif
</div> </div>
@endif @endif
@endif
</div> </div>
<div class="col-6" style="padding-left: 27px;"> <div class="col-6" style="padding-left: 27px;">
@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"]))
<p>Citizen's Information</p> <p>Passport Information</p>
<div class="cardLine"></div> <div class="cardLine"></div>
<div class="row"> <div class="row">
<div class="col-6"> <div class="col-6">
<small>First name</small> <small>First names</small>
@if(isset($human->name)) @if(isset($human_passport->first_names))
<p class="field-value">{{ $human->name }}</p> <p class="field-value">{{ $human_passport->first_names}}</p>
@else @else
<div class="skeleton skeleton-text short"></div> <div class="skeleton skeleton-text short"></div>
@endif @endif
</div> </div>
<div class="col-6"> <div class="col-6">
<small>Sur name</small> <small>Sur name</small>
@if(isset($human->surn)) @if(isset($human_passport->mother_passport_no))
<p class="field-value">{{ $human->surn }}</p> -
@else @else
<div class="skeleton skeleton-text short"></div> <div class="skeleton skeleton-text short"></div>
@endif @endif
</div> </div>
<div class="col-6"> <div class="col-6">
<small>Other name</small> <small>Other names</small>
@if(isset($human->last_name)) @if(isset($human_passport->last_name))
<p class="field-value">{{ $human->last_name }}</p> <p class="field-value">{{ $human_passport->last_name }}</p>
@else @else
<div class="skeleton skeleton-text short"></div> <div class="skeleton skeleton-text short"></div>
@endif @endif
</div> </div>
<div class="col-6"> <div class="col-6">
</div> </div>
<div class="col-6"> <div class="col-6">
<small>Date of Birth</small> <small>Date of Birth</small>
@if(isset($human->date_birth)) @if(isset($human_passport->birth_date))
<p class="field-value">{{ Carbon::parse($human->date_birth)->format("d-m-Y") }}</p> <p class="field-value">{{ Carbon::parse($human_passport->birth_date)->format("d-m-Y") }}</p>
@else @else
<div class="skeleton skeleton-text short"></div> <div class="skeleton skeleton-text short"></div>
@endif @endif
</div> </div>
<div class="col-6"> <div class="col-6">
<small>Gender</small> <small>Gender</small>
@if(isset($human->sex)) @if(isset($human_passport->gender))
<p class="field-value">{{ $human->sex }}</p> -
@else
<div class="skeleton skeleton-text short"></div>
@endif
</div>
@if($doctype == 'ID')
@if($role->hasPermissionTo("Basic View ID Family"))
<div class="col-6">
<small>Family</small>
@if(isset($human->family))
<p class="field-value">{{ $human->family }}</p>
@else @else
<div class="skeleton skeleton-text short"></div> <div class="skeleton skeleton-text short"></div>
@endif @endif
</div> </div>
@endif
@if($role->hasPermissionTo("Basic View ID Clan"))
<div class="col-6">
<small>Clan</small>
@if(isset($human->clan))
<p class="field-value">{{ $human->clan }}</p>
@else
<div class="skeleton skeleton-text short"></div>
@endif
</div>
@endif
@endif
</div> </div>
@endif @endif
@if($doctype == 'Birth') @if($role->hasPermissionTo("Basic View Passport Details"))
@if($role->hasPermissionTo("Basic View Birth Details")) <p>Parent(s) Information</p>
<p>Parent(s) Information</p> <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>Mother</small> @if(isset($human_passport->mother_name))
@if(isset($docums[0]['M_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> {{ $human_passport->mother_name }}
{{ $docums[0]['M_NAME'] }} {{ $docums[0]['M_OTHNAME'] }} {{ $docums[0]['M_SURN'] }} </p>
</p> @else
@else <div class="skeleton skeleton-text short"></div>
<div class="skeleton skeleton-text short"></div> @endif
@endif </div>
</div> @if($role->hasPermissionTo("Basic View Passport Details"))
@if($role->hasPermissionTo("Basic View Birth Mother ID number")) <div class="col-4">
<div class="col-4"> <small>UPI no.</small>
<small>ID no.</small> @if(isset($human_passport->mother_identity_card_no))
@if(isset($docums[0]['MOTHER_DOC_NUMBER'])) <p class="field-value">
<p class="field-value"> {{ $human_passport->mother_identity_card_no }}
{{ $docums[0]['MOTHER_DOC_NUMBER'] }} </p>
</p> @else
@else <div class="skeleton skeleton-text short"></div>
<div class="skeleton skeleton-text short"></div> @endif
@endif </div>
</div> <div class="col-12">
@endif <small>Passport No.</small>
<div class="col-8"> @if(isset($human_passport->mother_passport_no))
<small>Father</small> <p class="field-value">
@if(isset($docums[0]['F_NAME'])) {{ $human_passport->mother_passport_no }}
<p class="field-value"> </p>
<i class="fas fa-male" style="color: #008500;"></i> @else
{{ $docums[0]['F_NAME'] }} {{ $docums[0]['F_OTHNAME'] }} {{ $docums[0]['F_SURN'] }} <div class="skeleton skeleton-text short"></div>
</p> @endif
@else </div>
<div class="skeleton skeleton-text short"></div>
@endif
</div>
@if($role->hasPermissionTo("Basic View Birth Father ID number"))
<div class="col-4">
@if(isset($docums[0]['F_NAME']))
<small>ID no.</small>
-
@endif @endif
</div>
@endif
</div>
@endif
@endif
@if($role->hasAnyPermission(["Basic View ID Details", "Basic View Passport Details", "Basic View Birth Details"]))
<p>Location</p>
<div class="cardLine2"></div>
<div class="row">
@if($doctype == 'Birth') <div class="col-8">
<div class="col-6"> <small>Father</small>
<small>District</small> @if($human_passport->father_name)
@if(isset($human->addressBirth->adresComp)) <p class="field-value">
<p class="field-value">{{ $human->addressBirth->adresComp->name }}</p> <i class="fas fa-male" style="color: #008500;"></i>
@else {{ $human_passport->father_name }}
<div class="skeleton skeleton-text short"></div> </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 @endif
</div> </div>
<div class="col-6">
<small>Division</small>
<p class="field-value">-</p>
</div>
@endif
@if($doctype == 'ID')
<div class="col-6">
<small>District</small>
@if(isset($human->addressLive->adresComp->name))
<p class="field-value">{{ $human->addressLive->adresComp->name }}</p>
@else
<div class="skeleton skeleton-text short"></div>
@endif
</div>
<div class="col-6">
<small>Division</small>
<p class="field-value">-</p>
</div>
<div class="col-6">
<small>Location</small>
@if(isset($human->addressLive->addressLocation->name))
<p class="field-value">{{ $human->addressLive->addressLocation->name }}</p>
@else
<div class="skeleton skeleton-text short"></div>
@endif
</div>
<div class="col-6">
<small>Sub Location</small>
@if(isset($human->addressLive->sublocat))
<p class="field-value">{{ $human->addressLive->sublocat }}</p>
@else
<div class="skeleton skeleton-text short"></div>
@endif
</div>
@if($role->hasAnyPermission(["Basic View ID Place of Residence","Basic View Birth Place of Residence","Basic View Passport Place of Residence"]))
<div class="col-6">
<small>Village</small>
@if(isset($human->addressLive->village))
<p class="field-value">{{ $human->addressLive->village }}</p>
@else
<div class="skeleton skeleton-text short"></div>
@endif
</div>
<div class="col-6">
<small>Home Address</small>
@if(isset($human->addressLive->home_adr))
<p class="field-value">{{ $human->addressLive->home_adr }}</p>
@else
<div class="skeleton skeleton-text short"></div>
@endif
</div>
@endif
@endif
</div>
@endif @endif
</div> </div>
<div class="col-4"> <div class="col-4">
<div class="row"> <div class="row">
<p>Document Information</p> <p>Document Information</p>
...@@ -281,62 +184,51 @@ ...@@ -281,62 +184,51 @@
<div class="row" style="width: 100%;"> <div class="row" style="width: 100%;">
<div class="col-12"> <div class="col-12">
@php @php
if($doctype == 'Birth'){
$tbl_doc='Entry No.';
}else{
$tbl_doc='Serial No.';
}
$headings = [ $headings = [
'ID No.', 'Passport No.',
$tbl_doc, 'Issued Date.',
'Issued on.', 'Expiry Date.',
'Status.' 'Status.'
]; ];
$count=0; $count=0;
@endphp @endphp
<x-adminlte-datatable id="clients-table searchResultsCard" :heads="$headings"> <x-adminlte-datatable id="clients-table searchResultsCard" :heads="$headings">
<tr> <tr>
<td> <td>
@if(isset($docums[0]['O_PID'])) @if(isset($human_passport->passport_no))
<p class="field-value">{{ $docums[0]['O_PID'] }}</p> <p class="field-value">{{ $human_passport->passport_no }}</p>
@else @else
- -
@endif @endif
</td> </td>
<td> <td>
@if(isset($docums[0]['SER_NUM'])) @if(isset($human_passport->issue_date))
<p class="field-value">{{ $docums[0]['SER_NUM'] }}</p> <p class="field-value">{{ Carbon::parse($human_passport->issue_date)->format("d-m-Y") }}</p>
@else @else
<div class="skeleton skeleton-text short"></div> -
@endif @endif
</td> </td>
<td> <td>
@if(isset($docums[0]['O_DATE'])) @if(isset($human_passport->expiry_date))
{{ Carbon::parse($human->data_scan)->format("d-m-Y") }} <p class="field-value">{{ Carbon::parse($human_passport->expiry_date)->format("d-m-Y") }}</p>
@else @else
<div class="skeleton skeleton-text short"></div> -
@endif @endif
</td> </td>
<td> <td>
@if(isset($docums[0]['SER_NUM'])) @if(isset($human_passport->expiry_date))
<span class="badge badge-success"> <span class="badge badge-secondary">
<i class="fa fa-check-circle"></i>Current</span> <i class="fa fa-check-circle"></i>Current</span>
@else @else
<div class="skeleton skeleton-text short"></div> <div class="skeleton skeleton-text short"></div>
@endif @endif
</td> </td>
</tr> </tr>
@if(isset($docums))<p>Replaced: <strong>{{ count($docums)-1 }}</strong> times</p>@endif
</x-adminlte-datatable> </x-adminlte-datatable>
</div> </div>
</div>
</div>
<div class="row">
<div class="idDocimg">
</div>
</div> </div>
</div> </div>
...@@ -398,3 +290,4 @@ ...@@ -398,3 +290,4 @@
} }
</style> </style>
</div> </div>
@endforeach
resources/views/livewire/search/passport-modal.blade.php
View file @ d0cf9aae
...@@ -26,21 +26,7 @@ ...@@ -26,21 +26,7 @@
@endif @endif
</li> </li>
@endif @endif
@if($role->hasAnyPermission(["Basic View ID Family relations","Basic View Passport Family relations", "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"
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">
<div class="skeleton skeleton-text short" style="width: 10rem;"></div>
</a>
@endif
</li>
@endif
@if($role->hasPermissionTo("Basic View ID Photo and Signature")) @if($role->hasPermissionTo("Basic View ID Photo and Signature"))
<li class="nav-item"> <li class="nav-item">
@if($modalStatus) @if($modalStatus)
...@@ -83,19 +69,6 @@ ...@@ -83,19 +69,6 @@
@endif @endif
</li> </li>
@endif @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"
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">
<div class="skeleton skeleton-text short" style="width: 10rem;"></div>
</a>
@endif
</li>
</ul> </ul>
<div class="card card-primary card-outline card-outline-tabs" style="box-shadow: none;"> <div class="card card-primary card-outline card-outline-tabs" style="box-shadow: none;">
<div class="card-header p-0 border-bottom-0"> <div class="card-header p-0 border-bottom-0">
...@@ -105,22 +78,13 @@ ...@@ -105,22 +78,13 @@
@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"]))
<div class="tab-pane fade show active" id="custom-tabs-four-home" role="tabpanel" <div class="tab-pane fade show active" id="custom-tabs-four-home" role="tabpanel"
aria-labelledby="custom-tabs-four-home-tab"> aria-labelledby="custom-tabs-four-home-tab">
@include('livewire.search.partials.tabs.passport_tabs.document_header_details') @include('livewire.search.partials.tabs.passport_tabs.document_data')
</div>
@endif
@if($role->hasAnyPermission(["Basic View ID Family relations","Basic View Passport Family relations", "Basic View Birth Family relations"]))
<div class="tab-pane fade" id="custom-tabs-four-family" role="tabpanel"
aria-labelledby="custom-tabs-four-family-tab">
@include('livewire.search.partials.tabs.passport_tabs.document_header_details')
</div> </div>
@endif @endif
@if($role->hasPermissionTo("Basic View ID Photo and Signature")) @if($role->hasPermissionTo("Basic View ID Photo and Signature"))
<div class="tab-pane fade" id="custom-tabs-four-photo" role="tabpanel" <div class="tab-pane fade" id="custom-tabs-four-photo" role="tabpanel"
aria-labelledby="custom-tabs-four-photo-tab"> aria-labelledby="custom-tabs-four-photo-tab">
@include('livewire.search.partials.tabs.passport_tabs.document_header_details') @include('livewire.search.partials.tabs.passport_tabs.document_header_details')
</div> </div>
@endif @endif
...@@ -135,15 +99,9 @@ ...@@ -135,15 +99,9 @@
<div class="tab-pane fade" id="custom-tabs-four-history" role="tabpanel" <div class="tab-pane fade" id="custom-tabs-four-history" role="tabpanel"
aria-labelledby="custom-tabs-four-history-tab"> aria-labelledby="custom-tabs-four-history-tab">
@include('livewire.search.partials.tabs.passport_tabs.document_header_details') @include('livewire.search.partials.tabs.passport_tabs.document_header_details')
</div> </div>
@endif @endif
<div class="tab-pane fade" id="custom-tabs-four-death" role="tabpanel"
aria-labelledby="custom-tabs-four-death-tab">
@include('livewire.search.partials.tabs.passport_tabs.document_header_details')
<h2>No results!</h2>
</div>
</div> </div>
</div> </div>
</div> </div>
......
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