Merge branch 'iprsv2_brian' into 'master'

Iprsv2 brian

See merge request !30

app/Livewire/Search/Searchform.php

@@ -112,8 +112,13 @@ class Searchform extends Component
         }
 
         if ($this->role->hasPermissionTo('Basic Search Birth Certificate')) {
-            $this->searchGroups[]='Birth';
+            $this->searchGroups[]='Birth Certificate';
         }
+
+        $this->searchGroups[]='Death Certificate';
+        $this->searchGroups[]='Refugee Card';
+        $this->searchGroups[]='Alien Card';
+
     }
     public function render()
     {

config/adminlte.php

@@ -380,14 +380,14 @@ return [
             'text' => 'Home',
             'url' => 'home',
             'icon' => 'fas fa-home',
-            'can' => 'isClient',
+            'can' => 'isAdmin',
         ],
 
         [
             'text' => 'Home 2 (Management)',
             'url' => 'director',
             'icon' => 'fas fa-home',
-            'can' => 'isClient',
+            'can' => 'isAdmin',
         ],
 
         [

resources/views/livewire/search/searchform.blade.php

@@ -56,10 +56,21 @@
                             </div>
 
                             <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 UPI Number" title="Enter UPI Number" wire:model="searchBirthEntryNum">
+                                <input type="text" class="form-control search-element no-radius" id="searchUPINo" name="searchUPINum" placeholder="Enter UPI Number" title="Enter UPI 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="fieldsContainerRefugee" class="{{ $showFields !== 'Refugee' ? 'd-none' : '' }} d-flex">
+                                <input type="text" class="form-control search-element no-radius" id="searchRefugeeNum" name="searchRefugeeNum" placeholder="Enter Refugee Number" title="Enter Refugee Number">
+                                <input type="text" class="form-control search-element no-radius" id="searchRefugeeSerial" name="searchRefugeeSerial" placeholder="Refugee Serial Number" title="Enter Refugee Serial Number">
+                            </div>
+
+                            <div id="fieldsContainerDeath" class="{{ $showFields !== 'Death' ? 'd-none' : '' }} d-flex">
+                                <input type="text" class="form-control search-element no-radius" id="searchUpiNum" name="searchUpiNum" placeholder="Enter UPI Number" title="Enter UPI Number">
+                                <input type="text" class="form-control search-element no-radius" id="searchDeathEntry" name="searchDeathEntryNum" placeholder="Death Entry Number" title="Enter Birth Entry Number">
+                            </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;">
                             </button>
@@ -77,11 +88,15 @@
                         var fieldsContainerID = document.getElementById('fieldsContainerID');
                         var fieldsContainerBirth = document.getElementById('fieldsContainerBirth');
                         var fieldsContainerPassport = document.getElementById('fieldsContainerPassport');
+                        var fieldsContainerRefugee = document.getElementById('fieldsContainerRefugee');
+                        var fieldsContainerDeath = document.getElementById('fieldsContainerDeath');
                         var searchContainer = document.getElementById('searchContainer');
 
                         fieldsContainerID.classList.add('d-none');
                         fieldsContainerBirth.classList.add('d-none');
                         fieldsContainerPassport.classList.add('d-none');
+                        fieldsContainerRefugee.classList.add('d-none');
+                        fieldsContainerDeath.classList.add('d-none');
                         searchContainer.classList.remove('search-expanded');
 
                         if (this.value === 'ID') {
@@ -93,7 +108,13 @@
                         } else if (this.value === 'Birth') {
                             fieldsContainerBirth.classList.remove('d-none');
                             searchContainer.classList.add('search-expanded');
-                        }
+                        } else if (this.value === 'Refugee') {
+                            fieldsContainerRefugee.classList.remove('d-none');
+                            searchContainer.classList.add('search-expanded');
+                        } else if (this.value === 'Death') {
+                            fieldsContainerDeath.classList.remove('d-none');
+                            searchContainer.classList.add('search-expanded');
+                        }    
                     });
                 </script>
             </div>