From c20e3babf982b2f6145cdd66d4752fe6dedb70bb Mon Sep 17 00:00:00 2001
From: suyashnautiyal <138096316+suyashnautiyal@users.noreply.github.com>
Date: Thu, 6 Jul 2023 16:54:24 +0530
Subject: [PATCH 1/7] new popup modal for delete button

---
 .../views/universities/index.blade.php        | 35 +++++++++++++++----
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/Modules/HR/Resources/views/universities/index.blade.php b/Modules/HR/Resources/views/universities/index.blade.php
index cbe883764d..ddef6d8f29 100644
--- a/Modules/HR/Resources/views/universities/index.blade.php
+++ b/Modules/HR/Resources/views/universities/index.blade.php
@@ -61,12 +61,33 @@
                     </div>
                 </td>
                 <td>
-                    <form class="d-flex" action="{{ route('universities.destroy',$university) }}" method="POST">
-                        @csrf
-                        @method('DELETE')
                         <a href="{{ route('universities.edit',$university) }}" title="Edit" class="pr-1 btn btn-link"><i class="text-success fa ffa-lga-edit "></i></a>
-                        <button type="submit" class="pl-1 btn btn-link" title="Delete"><i class="text-danger fa fa-trash fa-lg"></i></button>
-                    </form>
+                        <button type="submit" class="pl-1 btn btn-link" title="Delete" data-toggle="modal" data-target="#DeleteUniversity{{$university->id}}"><i class="text-danger fa fa-trash fa-lg"></i></button>
+
+                        <div class="modal fade" id="DeleteUniversity{{$university->id}}" tabindex="-1" role="dialog" aria-labelledby="deleteUniversityLabel{{$university->id}}" aria-hidden="true">
+                            <div class="modal-dialog" role="document">
+                                <div class="modal-content">
+                                    <div class="modal-header">
+                                        <h5 class="modal-title" id="deleteUniversityLabel{{$university->id}}">Delete University</h5>
+                                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                                            <span aria-hidden="true">&times;</span>
+                                        </button>
+                                    </div>
+                                    <div class="modal-body">
+                                        <p>Are you sure you want to delete this university?</p>
+                                    </div>
+                                    <div class="modal-footer">
+                                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+                                        <form action="{{ route('universities.destroy',$university) }}" method="POST">
+                                            @csrf
+                                            @method('DELETE')
+                                            <button type="submit" class="btn btn-danger">Delete</button>
+                                        </form>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </tr>
                 </td>
             </tr>
         
@@ -75,4 +96,6 @@
     </div>
     {{ $universities->links() }}
 </div>
-@endsection
\ No newline at end of file
+@endsection
+
+@endsection

From ff03b90288096bf58e98938a9017e145b5fd5487 Mon Sep 17 00:00:00 2001
From: suyashnautiyal <138096316+suyashnautiyal@users.noreply.github.com>
Date: Thu, 6 Jul 2023 17:06:08 +0530
Subject: [PATCH 2/7] Update deletepopup

---
 Modules/HR/Resources/views/universities/index.blade.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Modules/HR/Resources/views/universities/index.blade.php b/Modules/HR/Resources/views/universities/index.blade.php
index ddef6d8f29..e59ac23dc5 100644
--- a/Modules/HR/Resources/views/universities/index.blade.php
+++ b/Modules/HR/Resources/views/universities/index.blade.php
@@ -97,5 +97,3 @@
     {{ $universities->links() }}
 </div>
 @endsection
-
-@endsection

From 83bd2c118593fed28c11b20a3a19797c1dcaba72 Mon Sep 17 00:00:00 2001
From: suyashnautiyal <138096316+suyashnautiyal@users.noreply.github.com>
Date: Fri, 7 Jul 2023 13:19:17 +0530
Subject: [PATCH 3/7] Update popup modal for delete button.

---
 .../views/universities/index.blade.php        | 37 +++++--------------
 1 file changed, 9 insertions(+), 28 deletions(-)

diff --git a/Modules/HR/Resources/views/universities/index.blade.php b/Modules/HR/Resources/views/universities/index.blade.php
index e59ac23dc5..3fc8e25ec3 100644
--- a/Modules/HR/Resources/views/universities/index.blade.php
+++ b/Modules/HR/Resources/views/universities/index.blade.php
@@ -61,34 +61,15 @@
                     </div>
                 </td>
                 <td>
-                        <a href="{{ route('universities.edit',$university) }}" title="Edit" class="pr-1 btn btn-link"><i class="text-success fa ffa-lga-edit "></i></a>
-                        <button type="submit" class="pl-1 btn btn-link" title="Delete" data-toggle="modal" data-target="#DeleteUniversity{{$university->id}}"><i class="text-danger fa fa-trash fa-lg"></i></button>
-
-                        <div class="modal fade" id="DeleteUniversity{{$university->id}}" tabindex="-1" role="dialog" aria-labelledby="deleteUniversityLabel{{$university->id}}" aria-hidden="true">
-                            <div class="modal-dialog" role="document">
-                                <div class="modal-content">
-                                    <div class="modal-header">
-                                        <h5 class="modal-title" id="deleteUniversityLabel{{$university->id}}">Delete University</h5>
-                                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                                            <span aria-hidden="true">&times;</span>
-                                        </button>
-                                    </div>
-                                    <div class="modal-body">
-                                        <p>Are you sure you want to delete this university?</p>
-                                    </div>
-                                    <div class="modal-footer">
-                                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-                                        <form action="{{ route('universities.destroy',$university) }}" method="POST">
-                                            @csrf
-                                            @method('DELETE')
-                                            <button type="submit" class="btn btn-danger">Delete</button>
-                                        </form>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </tr>
-                </td>
+                        <a href="{{ route('universities.edit', $university) }}" title="Edit" class="pr-1 btn btn-link"><i class="text-success fa ffa-lga-edit "></i></a>
+                        <button type="submit" class="pl-1 btn btn-link" title="Delete" data-toggle="modal" data-target="#DeleteUniversity{{ $university->id }}"><i class="text-danger fa fa-trash fa-lg"></i></button>
+                    @include('component.delete-modal', [
+                        'modalId' => 'DeleteUniversity' . $university->id,
+                        'title' => 'Delete University',
+                        'body' => 'Are you sure you want to delete this university?',
+                        'action' => route('universities.destroy', $university)
+                    ])
+                    </td>
             </tr>
         
             @endforeach

From 68c24b76f224ca6771d23930e5149b1981e13e26 Mon Sep 17 00:00:00 2001
From: suyashnautiyal <138096316+suyashnautiyal@users.noreply.github.com>
Date: Fri, 7 Jul 2023 14:39:31 +0530
Subject: [PATCH 4/7] identation updated

---
 .../HR/Resources/views/universities/index.blade.php    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Modules/HR/Resources/views/universities/index.blade.php b/Modules/HR/Resources/views/universities/index.blade.php
index 3fc8e25ec3..b2902d69e5 100644
--- a/Modules/HR/Resources/views/universities/index.blade.php
+++ b/Modules/HR/Resources/views/universities/index.blade.php
@@ -63,11 +63,11 @@
                 <td>
                         <a href="{{ route('universities.edit', $university) }}" title="Edit" class="pr-1 btn btn-link"><i class="text-success fa ffa-lga-edit "></i></a>
                         <button type="submit" class="pl-1 btn btn-link" title="Delete" data-toggle="modal" data-target="#DeleteUniversity{{ $university->id }}"><i class="text-danger fa fa-trash fa-lg"></i></button>
-                    @include('component.delete-modal', [
-                        'modalId' => 'DeleteUniversity' . $university->id,
-                        'title' => 'Delete University',
-                        'body' => 'Are you sure you want to delete this university?',
-                        'action' => route('universities.destroy', $university)
+                        @include('component.delete-modal', [
+                            'modalId' => 'DeleteUniversity' . $university->id,
+                            'title' => 'Delete University',
+                            'body' => 'Are you sure you want to delete this university?',
+                            'action' => route('universities.destroy', $university)
                     ])
                     </td>
             </tr>

From bb3373b9eee9efb2338f9c8c7a67d18ee38e0d34 Mon Sep 17 00:00:00 2001
From: suyashnautiyal <138096316+suyashnautiyal@users.noreply.github.com>
Date: Fri, 7 Jul 2023 15:51:03 +0530
Subject: [PATCH 5/7] Update indentation

---
 .../HR/Resources/views/universities/index.blade.php    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Modules/HR/Resources/views/universities/index.blade.php b/Modules/HR/Resources/views/universities/index.blade.php
index b2902d69e5..dd824e3d88 100644
--- a/Modules/HR/Resources/views/universities/index.blade.php
+++ b/Modules/HR/Resources/views/universities/index.blade.php
@@ -61,15 +61,15 @@
                     </div>
                 </td>
                 <td>
-                        <a href="{{ route('universities.edit', $university) }}" title="Edit" class="pr-1 btn btn-link"><i class="text-success fa ffa-lga-edit "></i></a>
-                        <button type="submit" class="pl-1 btn btn-link" title="Delete" data-toggle="modal" data-target="#DeleteUniversity{{ $university->id }}"><i class="text-danger fa fa-trash fa-lg"></i></button>
-                        @include('component.delete-modal', [
-                            'modalId' => 'DeleteUniversity' . $university->id,
+                    <a href="{{ route('universities.edit', $university) }}" title="Edit" class="pr-1 btn btn-link"><i class="text-success fa ffa-lga-edit "></i></a>
+                    <button type="submit" class="pl-1 btn btn-link" title="Delete" data-toggle="modal" data-target="#DeleteUniversity{{ $university->id }}"><i class="text-danger fa fa-trash fa-lg"></i></button>
+                    @include('component.delete-modal', [
+                            modalId' => 'DeleteUniversity' . $university->id,
                             'title' => 'Delete University',
                             'body' => 'Are you sure you want to delete this university?',
                             'action' => route('universities.destroy', $university)
                     ])
-                    </td>
+               </td>
             </tr>
         
             @endforeach

From f2167e6959893f59f8bda487cdff089077c4d788 Mon Sep 17 00:00:00 2001
From: suyashnautiyal <138096316+suyashnautiyal@users.noreply.github.com>
Date: Mon, 10 Jul 2023 12:00:15 +0530
Subject: [PATCH 6/7] updated delete popup modal name

I have made the suggested changes.
---
 Modules/HR/Resources/views/universities/index.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Modules/HR/Resources/views/universities/index.blade.php b/Modules/HR/Resources/views/universities/index.blade.php
index dd824e3d88..23926e9eea 100644
--- a/Modules/HR/Resources/views/universities/index.blade.php
+++ b/Modules/HR/Resources/views/universities/index.blade.php
@@ -62,9 +62,9 @@
                 </td>
                 <td>
                     <a href="{{ route('universities.edit', $university) }}" title="Edit" class="pr-1 btn btn-link"><i class="text-success fa ffa-lga-edit "></i></a>
-                    <button type="submit" class="pl-1 btn btn-link" title="Delete" data-toggle="modal" data-target="#DeleteUniversity{{ $university->id }}"><i class="text-danger fa fa-trash fa-lg"></i></button>
+                    <button type="submit" class="pl-1 btn btn-link" title="Delete" data-toggle="modal" data-target="#DeleteUniversityModal{{ $university->id }}"><i class="text-danger fa fa-trash fa-lg"></i></button>
                     @include('component.delete-modal', [
-                            modalId' => 'DeleteUniversity' . $university->id,
+                            modalId' => 'DeleteUniversityModal' . $university->id,
                             'title' => 'Delete University',
                             'body' => 'Are you sure you want to delete this university?',
                             'action' => route('universities.destroy', $university)

From 967d27a96f7b080314f0a571ff977f6fe0a04616 Mon Sep 17 00:00:00 2001
From: suyashnautiyal <138096316+suyashnautiyal@users.noreply.github.com>
Date: Mon, 10 Jul 2023 15:08:33 +0530
Subject: [PATCH 7/7] edited modal file

---
 Modules/HR/Resources/views/universities/index.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Modules/HR/Resources/views/universities/index.blade.php b/Modules/HR/Resources/views/universities/index.blade.php
index 23926e9eea..fa5d4c7d16 100644
--- a/Modules/HR/Resources/views/universities/index.blade.php
+++ b/Modules/HR/Resources/views/universities/index.blade.php
@@ -62,9 +62,9 @@
                 </td>
                 <td>
                     <a href="{{ route('universities.edit', $university) }}" title="Edit" class="pr-1 btn btn-link"><i class="text-success fa ffa-lga-edit "></i></a>
-                    <button type="submit" class="pl-1 btn btn-link" title="Delete" data-toggle="modal" data-target="#DeleteUniversityModal{{ $university->id }}"><i class="text-danger fa fa-trash fa-lg"></i></button>
+                    <button type="submit" class="pl-1 btn btn-link" title="Delete" data-toggle="modal" data-target="#deleteUniversityModal{{ $university->id }}"><i class="text-danger fa fa-trash fa-lg"></i></button>
                     @include('component.delete-modal', [
-                            modalId' => 'DeleteUniversityModal' . $university->id,
+                            'modalId' => 'deleteUniversityModal' . $university->id,
                             'title' => 'Delete University',
                             'body' => 'Are you sure you want to delete this university?',
                             'action' => route('universities.destroy', $university)