fix: selected sort not updated first time selected

monicahq · Jun 26, 2023 · 4d50a33 · 4d50a33
1 parent 43f4d0a
commit 4d50a33
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/app/Http/Controllers/ContactsController.php b/app/Http/Controllers/ContactsController.php
@@ -131,6 +131,7 @@ private function contacts(Request $request, bool $active)
             ->withHasArchived($nbArchived > 0)
             ->withArchivedContacts($nbArchived)
             ->withTags($tags)
+            ->withSort($sort)
             ->withTagsCount($tagsCount)
             ->withUrl($url)
             ->withTagCount($count)

diff --git a/app/Models/Contact/Contact.php b/app/Models/Contact/Contact.php
@@ -496,13 +496,13 @@ public function scopeSortedBy(Builder $builder, string $criteria): Builder
     {
         switch ($criteria) {
             case 'firstnameAZ':
-                return $builder->orderBy('first_name', 'asc');
+                return $builder->orderBy('first_name');
             case 'firstnameZA':
-                return $builder->orderBy('first_name', 'desc');
+                return $builder->orderByDesc('first_name');
             case 'lastnameAZ':
-                return $builder->orderBy('last_name', 'asc');
+                return $builder->orderBy('last_name');
             case 'lastnameZA':
-                return $builder->orderBy('last_name', 'desc');
+                return $builder->orderByDesc('last_name');
             case 'lastactivitydateNewtoOld':
                 return $this->sortedByLastActivity($builder, 'desc');
             case 'lastactivitydateOldtoNew':

diff --git a/resources/views/people/index.blade.php b/resources/views/people/index.blade.php
@@ -76,27 +76,27 @@
                     <div class="options-dropdowns dropdown">
                       <a href="" class="dropdown-btn" data-toggle="dropdown" id="dropdownSort">{{ trans('people.people_list_sort') }}</a>
                       <div class="dropdown-menu" aria-labelledby="dropdownSort">
-                        <a class="dropdown-item {{ (auth()->user()->contacts_sort_order == 'firstnameAZ')?'selected':'' }}" href="{{ route('people.index') }}?sort=firstnameAZ">
+                        <a class="dropdown-item {{ ($sort == 'firstnameAZ')?'selected':'' }}" href="{{ route('people.index') }}?sort=firstnameAZ">
                           {{ trans('people.people_list_firstnameAZ') }}
                         </a>
 
-                        <a class="dropdown-item {{ (auth()->user()->contacts_sort_order == 'firstnameZA')?'selected':'' }}" href="{{ route('people.index') }}?sort=firstnameZA">
+                        <a class="dropdown-item {{ ($sort == 'firstnameZA')?'selected':'' }}" href="{{ route('people.index') }}?sort=firstnameZA">
                           {{ trans('people.people_list_firstnameZA') }}
                         </a>
 
-                        <a class="dropdown-item {{ (auth()->user()->contacts_sort_order == 'lastnameAZ')?'selected':'' }}" href="{{ route('people.index') }}?sort=lastnameAZ">
+                        <a class="dropdown-item {{ ($sort == 'lastnameAZ')?'selected':'' }}" href="{{ route('people.index') }}?sort=lastnameAZ">
                           {{ trans('people.people_list_lastnameAZ') }}
                         </a>
 
-                        <a class="dropdown-item {{ (auth()->user()->contacts_sort_order == 'lastnameZA')?'selected':'' }}" href="{{ route('people.index') }}?sort=lastnameZA">
+                        <a class="dropdown-item {{ ($sort == 'lastnameZA')?'selected':'' }}" href="{{ route('people.index') }}?sort=lastnameZA">
                           {{ trans('people.people_list_lastnameZA') }}
                         </a>
 
-                        <a class="dropdown-item {{ (auth()->user()->contacts_sort_order == 'lastactivitydateNewtoOld')?'selected':'' }}" href="{{ route('people.index') }}?sort=lastactivitydateNewtoOld">
+                        <a class="dropdown-item {{ ($sort == 'lastactivitydateNewtoOld')?'selected':'' }}" href="{{ route('people.index') }}?sort=lastactivitydateNewtoOld">
                           {{ trans('people.people_list_lastactivitydateNewtoOld') }}
                         </a>
 
-                        <a class="dropdown-item {{ (auth()->user()->contacts_sort_order == 'lastactivitydateOldtoNew')?'selected':'' }}" href="{{ route('people.index') }}?sort=lastactivitydateOldtoNew">
+                        <a class="dropdown-item {{ ($sort == 'lastactivitydateOldtoNew')?'selected':'' }}" href="{{ route('people.index') }}?sort=lastactivitydateOldtoNew">
                           {{ trans('people.people_list_lastactivitydateOldtoNew') }}
                         </a>
                       </div>