Refactor geolocation queries to use AND conditions for better accuracy. Update permission checks for equipment management to utilize unified 'equipment' scope. Enhance user role assignment logic to ensure correct username usage. Improve session error handling in login and index files for clearer user feedback.

api/v2/post/user_role_assignments.php

@@ -48,11 +48,11 @@ if (isset($post_content['batch_update']) && isset($post_content['user_id']) && i
             if ($existing){
                 //Reactivate existing assignment
                 $stmt = $pdo->prepare('UPDATE user_role_assignments SET is_active = 1, assigned_by = ?, assigned_at = ?, updatedby = ?, updated = ? WHERE rowID = ?');
-                $stmt->execute([$username, $date, $username, $date, $existing['rowID']]);
+                $stmt->execute([$username, $date, $username, $date, $$username]);
             } else {
                 //Create new assignment
                 $stmt = $pdo->prepare('INSERT INTO user_role_assignments (user_id, role_id, is_active, assigned_by, assigned_at, created, createdby) VALUES (?, ?, 1, ?, ?, ?, ?)');
-                $stmt->execute([$user_id, $role_id, $username, $date, $date, $userkey]);
+                $stmt->execute([$user_id, $role_id, $username, $date, $date, $username]);
             }
         }
     }