diff --git a/assets/controllers/user_controller.js b/assets/controllers/user_controller.js index fa69658..f6b5ee4 100644 --- a/assets/controllers/user_controller.js +++ b/assets/controllers/user_controller.js @@ -2,6 +2,7 @@ import {Controller} from '@hotwired/stimulus'; import Choices from 'choices.js'; import {TabulatorFull as Tabulator} from 'tabulator-tables'; +// TODO: REFACTOR (doublon de langue ) export default class extends Controller { static values = { rolesArray: Array, @@ -53,6 +54,7 @@ export default class extends Controller { } } + // TODO: vérifier le style des header filter et vertAlign/hozalign table() { const columns = [ { @@ -681,57 +683,56 @@ export default class extends Controller { // You can get other row data like ID for delete endpoint if needed const rowData = cell.getRow().getData(); const deleteId = rowData.id; - + const orgId = this.orgIdValue return `
- - +
`; }, cellClick: function (e, cell) { const target = e.target.closest('a'); - if (target && target.classList.contains('delete-user')) { + if (target?.classList.contains('delete-user')) { e.preventDefault(); const userId = target.getAttribute('data-id'); - if (confirm('Voulez-vous vraiment supprimer cet utilisateur ?')) { + if (confirm('Voulez-vous vraiment désactiver cet utilisateur ?')) { + const formData = new FormData(); + formData.append('organizationId', target.getAttribute('data-org-id')); + fetch(`/user/organization/deactivate/${userId}`, { method: 'POST', + body: formData, + headers: {'X-Requested-With': 'XMLHttpRequest'} }) - .then(response => { + .then(async (response) => { if (response.ok) { - alert('Utilisateur supprimé'); - cell.getRow().delete(); // Remove row from table + cell.getRow().delete(); } else { - alert('Erreur lors de la suppression'); + const text = await response.text(); + alert('Erreur lors de la suppression: ' + text); } }) .catch(() => alert('Erreur lors de la suppression')); diff --git a/assets/styles/app.css b/assets/styles/app.css index 581547f..397f7b6 100644 --- a/assets/styles/app.css +++ b/assets/styles/app.css @@ -132,4 +132,8 @@ body { .btn-warning{ border-radius: 1rem; +} + +.color-secondary{ + color: var(--secondary); } \ No newline at end of file diff --git a/src/Controller/UserController.php b/src/Controller/UserController.php index b32c0d2..f702897 100644 --- a/src/Controller/UserController.php +++ b/src/Controller/UserController.php @@ -556,6 +556,7 @@ class UserController extends AbstractController 'id' => $user->getId(), 'organizationId' => $uo->getOrganization()->getId(), ]), + 'id' => $user->getId(), ]; }, $rows);