- 🚗 domicile → 1er arrêt : {{ legHome(g, d) }} min
+ 🚗 {{ (legsByKey[g.techId + '|' + d.iso] || {}).kind === 'depot' ? '🏢 bureau TARGO' : '🏠 domicile' }} → 1er arrêt : {{ legHome(g, d) }} min
{{ ei + 1 }}
{{ e.skill }}
@@ -3157,6 +3161,14 @@ const dayNoCoord = computed(() => dayEditor.list.filter(j => !hasLL(j)).length)
// (politique dispatch, lue côté client). La 1re job devient la plus proche de cette origine via « Optimiser depuis le départ ».
const depot = ref(null) // { label, address, lat, lon }
const techHomes = ref({}) // { techId: { address, lat, lon } }
+// Point de DÉPART d'un tech : son DOMICILE s'il est défini, SINON le bureau TARGO (dépôt) — politique par défaut.
+function techOrigin (techId) {
+ const h = techHomes.value[techId]
+ if (h && isFinite(+h.lat) && isFinite(+h.lon) && (Math.abs(+h.lat) > 0.01)) return { lat: +h.lat, lon: +h.lon, kind: 'home', address: h.address || '' }
+ const d = depot.value
+ if (d && isFinite(+d.lat) && isFinite(+d.lon)) return { lat: +d.lat, lon: +d.lon, kind: 'depot', address: d.address || '' }
+ return null
+}
async function loadDispatchPolicy () {
try { const d = await roster.getPolicy(); depot.value = (d.policy && d.policy.depot) || null; techHomes.value = (d.policy && d.policy.tech_homes) || {} } catch (e) { /* non bloquant */ }
}
@@ -3844,8 +3856,8 @@ function techsForJob (job) {
return (visibleTechs.value || []).map(t => {
const load = techLoad(techDayOcc(t.id, iso), hasShiftDay(t.id, iso))
const capable = !reqSkill || (t.skills || []).includes(reqSkill)
- const home = techHomes.value[t.id]
- const distKm = (hasJC && home && isFinite(+home.lat) && isFinite(+home.lon)) ? haversineKm(+home.lat, +home.lon, jlat, jlon) : null
+ const home = techOrigin(t.id) // domicile, sinon bureau TARGO (défaut)
+ const distKm = (hasJC && home) ? haversineKm(home.lat, home.lon, jlat, jlon) : null
return { id: t.id, name: t.name, _t: t, capable, distKm, ...load }
}).sort((a, b) =>
(Number(b.capable) - Number(a.capable)) || // capables d'abord
@@ -3873,8 +3885,8 @@ function techsForSelection () {
return (visibleTechs.value || []).map(t => {
const load = techLoad(techDayOcc(t.id, iso), hasShiftDay(t.id, iso))
const capable = !reqSkills.some(s => !(t.skills || []).includes(s)) // capable de TOUTES les compétences de la sélection
- const home = techHomes.value[t.id]
- const distKm = (cLat != null && home && isFinite(+home.lat) && isFinite(+home.lon)) ? haversineKm(+home.lat, +home.lon, cLat, cLon) : null
+ const home = techOrigin(t.id) // domicile, sinon bureau TARGO (défaut)
+ const distKm = (cLat != null && home) ? haversineKm(home.lat, home.lon, cLat, cLon) : null
return { id: t.id, name: t.name, _t: t, capable, distKm, ...load }
}).sort((a, b) =>
(Number(b.capable) - Number(a.capable)) ||
@@ -3929,14 +3941,13 @@ function setEntryDur (e, v) { // temps révisé : plan (réactif) + mémoire de
async function loadLegTimes () {
for (const g of suggestGroups.value) {
if (g.placeholder) continue
- const home = techHomes.value[g.techId]
- const h = (home && isFinite(+home.lat) && isFinite(+home.lon)) ? home : null
+ const h = techOrigin(g.techId) // domicile, sinon bureau TARGO
for (const d of g.dayList) {
const geo = d.entries.filter(e => e.lat != null && e.lon != null)
if (geo.length < (h ? 1 : 2)) continue
const info = await fetchTechRoute(h, geo.map(e => ({ lat: +e.lat, lon: +e.lon })))
if (!info || !info.legs || !info.legs.length) continue
- const legs = info.legs; const out = { homeTo: null, after: {} }
+ const legs = info.legs; const out = { homeTo: null, after: {}, kind: h ? h.kind : null }
let li = 0
if (h) { out.homeTo = legs[0] ? legs[0].mins : null; li = 1 }
for (let k = 0; k < geo.length - 1; k++) { const L = legs[li + k]; if (L) out.after[geo[k].jobName] = L.mins }
@@ -4019,7 +4030,7 @@ function buildSuggestion () {
const eff = reqSkill ? skillEffOf(t, reqSkill) : (Number(t.efficiency) || 1) // vitesse : <1 = plus rapide pour cette compétence
const effDur = dur * (eff > 0 ? eff : 1) // durée EFFECTIVE = un tech rapide prend moins de capacité pour le même job
const costN = ((Number(t.cost_h) || 0) - cMin) / cRange
- const home = techHomes.value[t.id]
+ const home = techOrigin(t.id) // domicile, sinon bureau TARGO (défaut) — départ de tournée
for (const iso of cand) {
const c = cell(t.id, iso)
const noShift = !hasShiftDay(t.id, iso)
@@ -4198,8 +4209,8 @@ async function optimizeSuggestion () {
const occ = techDayOcc(t.id, iso); const usedMin = occ ? Math.round((occ.usedH || 0) * 60) : 0
const startMin = Math.min(w.end - 15, w.start + usedMin)
const overtimeMin = Math.round(0.2 * (w.end - w.start)) // plafond ~120 % du quart nominal ; au-delà de 100 % = pénalisé (équilibrage)
- const h = techHomes.value[t.id]
- vehicles.push({ id: t.id, name: t.name, skills: t.skills || [], home_lat: (h && isFinite(+h.lat)) ? +h.lat : null, home_lon: (h && isFinite(+h.lon)) ? +h.lon : null, shift_start_min: startMin, shift_end_min: w.end, overtime_min: overtimeMin })
+ const o = techOrigin(t.id) // domicile, sinon bureau TARGO (défaut)
+ vehicles.push({ id: t.id, name: t.name, skills: t.skills || [], home_lat: o ? o.lat : null, home_lon: o ? o.lon : null, shift_start_min: startMin, shift_end_min: w.end, overtime_min: overtimeMin })
}
if (!vehicles.length) { unassigned.push(...entries); continue } // aucun tech éligible ce jour → non assignés
let res
@@ -4251,7 +4262,7 @@ const suggestGroups = computed(() => {
return ''
}
return Object.values(byTech).map(g => {
- const home = techHomes.value[g.techId]; const isPh = isHoldId(g.techId); let tkm = 0
+ const home = isHoldId(g.techId) ? null : techOrigin(g.techId); const isPh = isHoldId(g.techId); let tkm = 0 // départ = domicile, sinon bureau TARGO
const days = Object.values(g.days).sort((a, b) => a.iso.localeCompare(b.iso)).map(d => {
const r = nnOrder(d.entries, home); tkm += r.km
// Jobs DÉJÀ assignés à ce tech ce jour (occupation OPS + tickets legacy F terrain) → visibles + secteur où il est déjà
@@ -4296,8 +4307,8 @@ const suggestRoutes = computed(() => {
const d = (g.dayList || []).find(x => x.iso === day); if (!d || !d.entries.length) continue
const stops = d.entries.filter(e => e.lat != null && e.lon != null).map((e, i) => ({ lat: +e.lat, lon: +e.lon, seq: i + 1, subject: e.subject }))
if (!stops.length) continue
- const home = techHomes.value[g.techId]
- out.push({ techId: g.techId, techName: g.techName, color: ROUTE_COLORS[ci % ROUTE_COLORS.length], km: d.km, mins: d.mins, home: (home && isFinite(+home.lat) && isFinite(+home.lon)) ? { lat: +home.lat, lon: +home.lon } : null, stops })
+ const home = techOrigin(g.techId) // domicile, sinon bureau TARGO
+ out.push({ techId: g.techId, techName: g.techName, color: ROUTE_COLORS[ci % ROUTE_COLORS.length], km: d.km, mins: d.mins, home: home ? { lat: home.lat, lon: home.lon } : null, stops })
ci++
}
return out
@@ -4316,8 +4327,8 @@ const dayRoutes = computed(() => {
const jobs = ((occ && occ.jobs) || []).filter(j => !j.cancelled && j.lat != null && j.lon != null && isFinite(+j.lat) && isFinite(+j.lon) && Math.abs(+j.lat) > 0.01)
if (!jobs.length) continue
jobs.sort((a, b) => (a.route_order || 9999) - (b.route_order || 9999) || ((a.start_h ?? 99) - (b.start_h ?? 99))) // ordre de tournée réel
- const h = techHomes.value[t.id]
- out.push({ id: t.id, name: t.name, color: ROUTE_COLORS[ci++ % ROUTE_COLORS.length], home: (h && isFinite(+h.lat) && isFinite(+h.lon)) ? { lat: +h.lat, lon: +h.lon } : null, stops: jobs.map((j, i) => ({ lat: +j.lat, lon: +j.lon, seq: i + 1, subject: j.subject })) })
+ const h = techOrigin(t.id) // domicile, sinon bureau TARGO
+ out.push({ id: t.id, name: t.name, color: ROUTE_COLORS[ci++ % ROUTE_COLORS.length], home: h ? { lat: h.lat, lon: h.lon } : null, stops: jobs.map((j, i) => ({ lat: +j.lat, lon: +j.lon, seq: i + 1, subject: j.subject })) })
}
return out
})