Ajoute géolocalisation des sites, duplication d'actifs et intégration GLPI
- Coordonnées GPS sur les sites (formulaire + carte Leaflet en direct sur la fiche et sur la liste des sites d'une organisation). - Duplication d'un actif depuis la liste. - Intégration GLPI en lecture seule : panneau "Tickets" sur le tableau de bord de l'organisation (tickets non clos, priorité, catégorie, extrait), organisations liées à leur entité GLPI via glpi_entity_id. - Corrige la mise en cache des permissions Spatie lors du seed (silencée par WithoutModelEvents) et rend le seeder admin idempotent. - Ajoute busy_timeout/WAL à la config SQLite pour éviter les erreurs de verrou sous écritures concurrentes. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Sonnet 5
parent
2d12d3c2b2
commit
01233928cc
@@ -33,6 +33,18 @@ new class extends Component
|
||||
->orderByDesc('is_primary')
|
||||
->orderBy('name')
|
||||
->paginate(15),
|
||||
'mappedLocations' => $this->organization->locations()
|
||||
->whereNotNull('latitude')
|
||||
->whereNotNull('longitude')
|
||||
->orderBy('name')
|
||||
->get(['id', 'name', 'city', 'latitude', 'longitude'])
|
||||
->map(fn ($location) => [
|
||||
'name' => $location->name,
|
||||
'city' => $location->city,
|
||||
'latitude' => $location->latitude,
|
||||
'longitude' => $location->longitude,
|
||||
'edit_url' => route('organizations.locations.edit', [$this->organization, $location]),
|
||||
]),
|
||||
];
|
||||
}
|
||||
};
|
||||
@@ -50,6 +62,11 @@ new class extends Component
|
||||
</a>
|
||||
</div>
|
||||
|
||||
@if ($mappedLocations->isNotEmpty())
|
||||
<div class="mb-6 h-80 w-full overflow-hidden rounded border border-slate-200"
|
||||
x-data="sitesMap(@js($mappedLocations))" wire:ignore></div>
|
||||
@endif
|
||||
|
||||
<input type="text" wire:model.live.debounce.300ms="search" placeholder="Filtrer par nom ou ville..."
|
||||
class="mb-4 w-full max-w-sm rounded border-slate-300 text-sm shadow-sm focus:border-slate-500 focus:ring-slate-500">
|
||||
|
||||
@@ -102,3 +119,60 @@ new class extends Component
|
||||
{{ $locations->links() }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@once
|
||||
<script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js"
|
||||
integrity="sha256-20nQCchB9co0qIjJZRGuk2/Z9VM+kNiyxNV1lvTlZBo=" crossorigin=""></script>
|
||||
<script>
|
||||
(function () {
|
||||
const link = document.createElement('link');
|
||||
link.rel = 'stylesheet';
|
||||
link.href = 'https://unpkg.com/leaflet@1.9.4/dist/leaflet.css';
|
||||
link.integrity = 'sha256-p4NxAoJBhIIN+hmNHrzRCf9tD/miZyoHS5obTRR9BMY=';
|
||||
link.crossOrigin = '';
|
||||
document.head.appendChild(link);
|
||||
|
||||
// Leaflet normally auto-detects its marker image path by scanning
|
||||
// <link> tags already in the document when leaflet.js runs — but
|
||||
// that link is injected above, after leaflet.js has loaded, so
|
||||
// detection fails. Point the icons at the CDN explicitly instead.
|
||||
delete L.Icon.Default.prototype._getIconUrl;
|
||||
L.Icon.Default.mergeOptions({
|
||||
iconRetinaUrl: 'https://unpkg.com/leaflet@1.9.4/dist/images/marker-icon-2x.png',
|
||||
iconUrl: 'https://unpkg.com/leaflet@1.9.4/dist/images/marker-icon.png',
|
||||
shadowUrl: 'https://unpkg.com/leaflet@1.9.4/dist/images/marker-shadow.png',
|
||||
});
|
||||
})();
|
||||
|
||||
function sitesMap(locations) {
|
||||
return {
|
||||
init() {
|
||||
const map = L.map(this.$el);
|
||||
|
||||
L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
|
||||
attribution: '© <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a>',
|
||||
maxZoom: 19,
|
||||
}).addTo(map);
|
||||
|
||||
const markers = locations.map(loc => {
|
||||
const marker = L.marker([loc.latitude, loc.longitude]).addTo(map);
|
||||
|
||||
const link = document.createElement('a');
|
||||
link.href = loc.edit_url;
|
||||
link.className = 'font-medium text-slate-900 hover:underline';
|
||||
link.textContent = loc.city ? `${loc.name} — ${loc.city}` : loc.name;
|
||||
marker.bindPopup(link);
|
||||
|
||||
return marker;
|
||||
});
|
||||
|
||||
if (markers.length === 1) {
|
||||
map.setView(markers[0].getLatLng(), 14);
|
||||
} else {
|
||||
map.fitBounds(L.featureGroup(markers).getBounds().pad(0.2));
|
||||
}
|
||||
},
|
||||
};
|
||||
}
|
||||
</script>
|
||||
@endonce
|
||||
|
||||
Reference in New Issue
Block a user