mirror of
https://github.com/nfonteyne/octane-website.git
synced 2026-09-03 23:24:48 +02:00
update: better view concert history
This commit is contained in:
parent
0773f39763
commit
a09d16238b
7 changed files with 80 additions and 26 deletions
|
|
@ -675,24 +675,40 @@ button:disabled {
|
||||||
.timeline-concert { margin-bottom: 1.5rem; }
|
.timeline-concert { margin-bottom: 1.5rem; }
|
||||||
|
|
||||||
.timeline-songs {
|
.timeline-songs {
|
||||||
display: grid;
|
display: flex;
|
||||||
grid-template-columns: repeat(auto-fill, minmax(220px, 1fr));
|
flex-direction: column;
|
||||||
gap: 0.9rem;
|
gap: 0.6rem;
|
||||||
margin-top: 0.5rem;
|
margin-top: 0.5rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.timeline-song-card {
|
.timeline-song-row {
|
||||||
|
display: flex;
|
||||||
|
align-items: flex-start;
|
||||||
|
gap: 0.9rem;
|
||||||
background: var(--surface-alt);
|
background: var(--surface-alt);
|
||||||
border: 1px solid var(--border);
|
border: 1px solid var(--border);
|
||||||
border-radius: var(--radius-sm);
|
border-radius: var(--radius-sm);
|
||||||
padding: 0.7rem;
|
padding: 0.7rem 0.9rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.timeline-song-row .row-index { margin-top: 0.15rem; }
|
||||||
|
|
||||||
|
.timeline-song-main { flex: 1 1 auto; min-width: 0; }
|
||||||
|
|
||||||
.timeline-song-title { font-weight: 600; }
|
.timeline-song-title { font-weight: 600; }
|
||||||
|
|
||||||
.timeline-embed {
|
.timeline-embed {
|
||||||
max-width: none;
|
width: 200px;
|
||||||
margin-top: 0.5rem;
|
max-width: 200px;
|
||||||
|
flex: 0 0 auto;
|
||||||
|
margin-top: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.timeline-no-embed {
|
||||||
|
flex: 0 0 auto;
|
||||||
|
width: 200px;
|
||||||
|
text-align: center;
|
||||||
|
margin: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ---------- Setlist ---------- */
|
/* ---------- Setlist ---------- */
|
||||||
|
|
@ -1060,4 +1076,8 @@ a.back-link:hover { color: var(--accent); }
|
||||||
.calendar-header-row span:nth-child(n) { font-size: 0.7rem; }
|
.calendar-header-row span:nth-child(n) { font-size: 0.7rem; }
|
||||||
|
|
||||||
.cal-cell { min-height: 64px; font-size: 0.7rem; }
|
.cal-cell { min-height: 64px; font-size: 0.7rem; }
|
||||||
|
|
||||||
|
.timeline-song-row { flex-wrap: wrap; }
|
||||||
|
.timeline-embed,
|
||||||
|
.timeline-no-embed { width: 100%; max-width: none; }
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -210,7 +210,7 @@ function pollWorkflowStatus(btn, maxMs = 180000, intervalMs = 4000) {
|
||||||
const data = await api.get('/api/calendar/workflow-status');
|
const data = await api.get('/api/calendar/workflow-status');
|
||||||
if (data.status === 'success') {
|
if (data.status === 'success') {
|
||||||
clearInterval(timer);
|
clearInterval(timer);
|
||||||
showToast('Calendrier mis à jour !');
|
showToast('Calendrier mis à jour !' + (data.message ? ' ' + data.message : ''), false, 10000);
|
||||||
resetRefreshButton(btn);
|
resetRefreshButton(btn);
|
||||||
await loadSlots();
|
await loadSlots();
|
||||||
await loadLastChecked();
|
await loadLastChecked();
|
||||||
|
|
|
||||||
|
|
@ -11,17 +11,20 @@ function formatDateShort(dateStr) {
|
||||||
return d.toLocaleDateString('fr-FR', { year: 'numeric', month: 'long', day: 'numeric' });
|
return d.toLocaleDateString('fr-FR', { year: 'numeric', month: 'long', day: 'numeric' });
|
||||||
}
|
}
|
||||||
|
|
||||||
function timelineSongCard(song) {
|
function timelineSongRow(song) {
|
||||||
const embed = youtubeEmbedUrl(song.youtube_url);
|
const embed = youtubeEmbedUrl(song.youtube_url);
|
||||||
return `
|
return `
|
||||||
<div class="timeline-song-card">
|
<div class="timeline-song-row">
|
||||||
|
<div class="row-index">${song.position}</div>
|
||||||
|
<div class="timeline-song-main">
|
||||||
<div class="timeline-song-title">${escapeHtml(song.title)}</div>
|
<div class="timeline-song-title">${escapeHtml(song.title)}</div>
|
||||||
<div class="card-subtitle">${escapeHtml(song.artist)}</div>
|
<div class="card-subtitle">${escapeHtml(song.artist)}</div>
|
||||||
|
${song.note ? `<p class="note">${escapeHtml(song.note)}</p>` : ''}
|
||||||
|
${song.spotify_url ? `<div class="song-links"><a class="pill-link spotify" href="${escapeHtml(song.spotify_url)}" target="_blank" rel="noopener">♫ Spotify</a></div>` : ''}
|
||||||
|
</div>
|
||||||
${embed
|
${embed
|
||||||
? `<div class="youtube-embed timeline-embed"><iframe src="${embed}" loading="lazy" allowfullscreen></iframe></div>`
|
? `<div class="youtube-embed timeline-embed"><iframe src="${embed}" loading="lazy" allowfullscreen></iframe></div>`
|
||||||
: `<p class="empty">Pas de lien YouTube</p>`}
|
: `<p class="empty timeline-no-embed">Pas de lien YouTube</p>`}
|
||||||
${song.spotify_url ? `<div class="song-links"><a class="pill-link spotify" href="${escapeHtml(song.spotify_url)}" target="_blank" rel="noopener">♫ Spotify</a></div>` : ''}
|
|
||||||
${song.note ? `<p class="note">${escapeHtml(song.note)}</p>` : ''}
|
|
||||||
</div>
|
</div>
|
||||||
`;
|
`;
|
||||||
}
|
}
|
||||||
|
|
@ -37,14 +40,14 @@ function timelineConcertBlock(concert) {
|
||||||
<div class="setlist-section">
|
<div class="setlist-section">
|
||||||
<h3>Setlist</h3>
|
<h3>Setlist</h3>
|
||||||
${main.length
|
${main.length
|
||||||
? `<div class="timeline-songs">${main.map(timelineSongCard).join('')}</div>`
|
? `<div class="timeline-songs">${main.map(timelineSongRow).join('')}</div>`
|
||||||
: '<p class="empty">Aucun morceau enregistré.</p>'}
|
: '<p class="empty">Aucun morceau enregistré.</p>'}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
${encore.length ? `
|
${encore.length ? `
|
||||||
<div class="setlist-section">
|
<div class="setlist-section">
|
||||||
<h3>Rappel</h3>
|
<h3>Rappel</h3>
|
||||||
<div class="timeline-songs">${encore.map(timelineSongCard).join('')}</div>
|
<div class="timeline-songs">${encore.map(timelineSongRow).join('')}</div>
|
||||||
</div>` : ''}
|
</div>` : ''}
|
||||||
|
|
||||||
<a class="back-link" href="/history-detail.html?id=${concert.id}">Voir / modifier ce concert →</a>
|
<a class="back-link" href="/history-detail.html?id=${concert.id}">Voir / modifier ce concert →</a>
|
||||||
|
|
|
||||||
|
|
@ -14,8 +14,8 @@ function setRunning() {
|
||||||
state = { status: 'running', triggeredAt: new Date().toISOString(), message: null, node: null };
|
state = { status: 'running', triggeredAt: new Date().toISOString(), message: null, node: null };
|
||||||
}
|
}
|
||||||
|
|
||||||
function setSuccess() {
|
function setSuccess(message) {
|
||||||
state = { ...state, status: 'success', message: null, node: null };
|
state = { ...state, status: 'success', message: message || null, node: null };
|
||||||
}
|
}
|
||||||
|
|
||||||
function setError(message, node) {
|
function setError(message, node) {
|
||||||
|
|
|
||||||
|
|
@ -29,8 +29,15 @@ async function upsertPerson(client, name) {
|
||||||
return rows[0].id;
|
return rows[0].id;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Returns ingestion counts so callers can surface a diagnostic (e.g. "12
|
||||||
|
// slots but 0 availability rows" points at a payload-shape mismatch from
|
||||||
|
// n8n, since a slot with no matching calendar_availability rows is silently
|
||||||
|
// excluded from getSlots() below — it would otherwise look like "nothing
|
||||||
|
// happened" with no error anywhere.
|
||||||
async function ingestSlots(slots) {
|
async function ingestSlots(slots) {
|
||||||
const client = await pool.connect();
|
const client = await pool.connect();
|
||||||
|
let availabilityRows = 0;
|
||||||
|
let slotsWithNoPeople = 0;
|
||||||
try {
|
try {
|
||||||
await client.query('BEGIN');
|
await client.query('BEGIN');
|
||||||
for (const slot of slots) {
|
for (const slot of slots) {
|
||||||
|
|
@ -51,10 +58,23 @@ async function ingestSlots(slots) {
|
||||||
const slotId = slotRows[0].id;
|
const slotId = slotRows[0].id;
|
||||||
|
|
||||||
// people may arrive as a JSON string from n8n's Set-node serialization.
|
// people may arrive as a JSON string from n8n's Set-node serialization.
|
||||||
const people = typeof slot.people === 'string' ? JSON.parse(slot.people) : slot.people || [];
|
let people = typeof slot.people === 'string' ? JSON.parse(slot.people) : slot.people || [];
|
||||||
|
if (!Array.isArray(people)) people = [];
|
||||||
|
|
||||||
|
if (people.length === 0) {
|
||||||
|
slotsWithNoPeople += 1;
|
||||||
|
console.warn('[calendar] ingest: slot has no people entries', {
|
||||||
|
lower: slot.lower,
|
||||||
|
upper: slot.upper,
|
||||||
|
rawPeopleType: typeof slot.people,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
for (const person of people) {
|
for (const person of people) {
|
||||||
if (!person || !person.name) continue;
|
if (!person || !person.name) {
|
||||||
|
console.warn('[calendar] ingest: skipped a person entry with no "name" field', person);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
const personId = await upsertPerson(client, person.name);
|
const personId = await upsertPerson(client, person.name);
|
||||||
await client.query(
|
await client.query(
|
||||||
`INSERT INTO calendar_availability (slot_id, person_id, is_available, checked_at)
|
`INSERT INTO calendar_availability (slot_id, person_id, is_available, checked_at)
|
||||||
|
|
@ -64,6 +84,7 @@ async function ingestSlots(slots) {
|
||||||
checked_at = excluded.checked_at`,
|
checked_at = excluded.checked_at`,
|
||||||
[slotId, personId, !!person.available]
|
[slotId, personId, !!person.available]
|
||||||
);
|
);
|
||||||
|
availabilityRows += 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
await client.query('COMMIT');
|
await client.query('COMMIT');
|
||||||
|
|
@ -73,6 +94,10 @@ async function ingestSlots(slots) {
|
||||||
} finally {
|
} finally {
|
||||||
client.release();
|
client.release();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const summary = { slotsProcessed: slots.length, availabilityRows, slotsWithNoPeople };
|
||||||
|
console.log('[calendar] ingest summary:', summary);
|
||||||
|
return summary;
|
||||||
}
|
}
|
||||||
|
|
||||||
async function getSlots({ minPeople = 1, personIds = null, weeks = 3 } = {}) {
|
async function getSlots({ minPeople = 1, personIds = null, weeks = 3 } = {}) {
|
||||||
|
|
|
||||||
|
|
@ -78,12 +78,16 @@ router.post('/refresh', (req, res) => {
|
||||||
|
|
||||||
const data = await response.json();
|
const data = await response.json();
|
||||||
if (!Array.isArray(data.slots)) {
|
if (!Array.isArray(data.slots)) {
|
||||||
|
console.error('[calendar] n8n response had no "slots" array. Raw body:', JSON.stringify(data).slice(0, 500));
|
||||||
workflowState.setError('Unexpected response format from n8n');
|
workflowState.setError('Unexpected response format from n8n');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
await calendarRepo.ingestSlots(data.slots);
|
const summary = await calendarRepo.ingestSlots(data.slots);
|
||||||
workflowState.setSuccess();
|
workflowState.setSuccess(
|
||||||
|
`${summary.slotsProcessed} créneaux reçus, ${summary.availabilityRows} disponibilités enregistrées` +
|
||||||
|
(summary.slotsWithNoPeople > 0 ? ` (${summary.slotsWithNoPeople} créneaux sans aucune personne — voir les logs serveur)` : '')
|
||||||
|
);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
clearTimeout(watchdog);
|
clearTimeout(watchdog);
|
||||||
const message = err.name === 'AbortError' ? 'n8n did not respond within 5 minutes' : err.message;
|
const message = err.name === 'AbortError' ? 'n8n did not respond within 5 minutes' : err.message;
|
||||||
|
|
|
||||||
|
|
@ -21,9 +21,11 @@ router.post(
|
||||||
return res.status(400).json({ error: 'expected_array_of_slots' });
|
return res.status(400).json({ error: 'expected_array_of_slots' });
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
await calendarRepo.ingestSlots(slots);
|
const summary = await calendarRepo.ingestSlots(slots);
|
||||||
workflowState.setSuccess();
|
workflowState.setSuccess(
|
||||||
res.json({ ok: true, count: slots.length });
|
`${summary.slotsProcessed} créneaux reçus, ${summary.availabilityRows} disponibilités enregistrées`
|
||||||
|
);
|
||||||
|
res.json({ ok: true, ...summary });
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
workflowState.setError(err.message);
|
workflowState.setError(err.message);
|
||||||
res.status(500).json({ error: err.message });
|
res.status(500).json({ error: err.message });
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue