Compare commits

..

No commits in common. "4801148a8cc1dc17832ff79cc02a08544b514a2a" and "19bd79c05628fb21142cff59e6ddb9fc96e4244d" have entirely different histories.

15 changed files with 44 additions and 2231 deletions

View File

@ -31,10 +31,6 @@ window.App = { reportCode, fightId, fightStart, fightEnd, phases: [], fights: []
- `onFightsLoaded(fights)` — wird von `app.js` aufgerufen nach Report-Load (befüllt Vergleichs-Dropdown)
- `reset()` — wird von `app.js` aufgerufen wenn ein neuer Report geladen wird
`window.plannerTab` (definiert in `planner.js`) stellt Hooks bereit:
- `onTabOpen()` — wird von `tabs.js` aufgerufen wenn der Planer-Tab geöffnet wird
- `importFromAnalysis(aoeEvents, refEvents, options)` — wird vom Analyse-Tab aufgerufen beim Export
## Dateistruktur
```
index.php — PHP-Logik: Auth-Check, Variablen, require page.php
@ -45,7 +41,6 @@ templates/
topbar.php — Topbar mit Logo + Tab-Navigation + Token-Ablaufzeit
tab-report.php — Report-Tab: includes report-form, fight-select, event-explorer, output-card
tab-analysis.php — Analyse-Tab: Spieler-Grid + Pull-Vergleich + AoE-Timeline HTML
tab-planner.php — Planer-Tab: Plan-Liste, Mechanik-Timeline, Job-Aufstellung (in Entwicklung)
report-form.php — Report-Code-Eingabe Card
fight-select.php — Fight-Auswahl Dropdown Card
event-explorer.php — Event Explorer Card (Ability/DataType/EventType/Spieler-Filter)
@ -55,12 +50,10 @@ css/
layout.css — App-Shell, Topbar, Tabs, Login-Overlay, Form-Helpers
components.css — Cards, Inputs, Buttons, Badges, Terminal
analysis.css — Spieler-Grid, AoE-Timeline, Mitigation-Icons, HP-Bar, Ref-Row
planner.css — Planer-Tab: Plan-Liste, Mechanik-Cards, Job-Slots, Ability-Modal (in Entwicklung)
js/
app.js — Formular, Fight-Dropdown, Fetch, window.App State, Event Explorer
tabs.js — Tab-Switching, ruft window.analysisTab.onTabOpen() auf
analysis.js — Analyse-Tab: Daten laden, Spieler rendern, Timeline rendern, Pull-Vergleich
planner.js — Planer-Tab: localStorage CRUD, Plan-Rendering, Ability-Zuweisung (in Entwicklung)
auth/
start.php — PKCE generieren, Session speichern, Redirect zu FFLogs
callback.php — Code gegen Token tauschen, Token in Session speichern
@ -71,9 +64,6 @@ api/
debug-events.php — POST-Endpunkt: Raw Events für Event Explorer (mit Filterung)
assets/
icons/mitigation/ — Lokal gespeicherte Ability-Icons (PNG, von XIVAPI)
data/
recast-times.json — Recast-Zeiten pro Ability (in Entwicklung)
ability-equivalents.json — Funktionale Äquivalente über Jobs hinweg (in Entwicklung)
debug/
schema.php — Einmaliges Schema-Explorer Tool (nicht produktiv deployen)
```
@ -230,7 +220,7 @@ Vollständiges Schema: siehe `debug/schema.php` oder `fflogs-schema.json`
## Planer-Tab — Konzept & Roadmap
### Ziel
Raid-Cooldown-Planer: Welche Mitigation-Ability wird für welche Mechanik eingesetzt? Basierend auf Log-Daten oder manuell aufgebaut. Überlebt Browser-Neustarts via localStorage. Kein Server-State — alles im Browser.
Raid-Cooldown-Planer: Welche Mitigation-Ability wird für welche Mechanik eingesetzt? Basierend auf Log-Daten oder manuell aufgebaut. Überlebt Browser-Neustarts via localStorage.
### Datenmodell (Plan)
```json
@ -246,9 +236,7 @@ Raid-Cooldown-Planer: Welche Mitigation-Ability wird für welche Mechanik einges
"id": "uuid",
"name": "Fourth-Wall Fusion",
"timestamp": 83000,
"phase": "Phase 1",
"unmitigatedDamage": 280000,
"notes": "",
"assignments": [
{ "ability": "Reprisal", "job": "PLD" },
{ "ability": "Shield Samba", "job": "BRD" }
@ -260,42 +248,31 @@ Raid-Cooldown-Planer: Welche Mitigation-Ability wird für welche Mechanik einges
Mehrere Pläne gespeichert in `localStorage` unter `ff14-planner-plans` als Array.
### Primärer Import-Flow: Export aus dem Analyse-Tab
Der Haupteinstieg ist der Analyse-Tab — der Nutzer hat die Daten bereits geladen und sieht die Timeline.
### Import-Flow (erster Meilenstein)
**Ziel:** Einen bestehenden Log als saubere Mechanik-Vorlage laden — ohne vorhandene Mechaniken zu überschreiben.
1. Button **"In Planer exportieren"** erscheint im Analyse-Tab sobald Daten geladen sind (auch für den Ref-Log separat)
2. Dialog mit zwei Entscheidungen:
- **Was importieren?** "Nur Mechaniken" vs. "Mechaniken + erkannte Mitigations als Startpunkt"
- **Wohin?** Neuen Plan anlegen (Name eingeben) vs. bestehenden Plan überschreiben/mergen (Dropdown)
3. Bei Merge: explizite Bestätigung — niemals implizit überschreiben
4. AoE-Events werden zu Mechaniken; Phase-Information aus `phaseTransitions` wird mitübernommen
5. Weiterarbeiten im Planer-Tab
1. Benutzer wählt Report-Code + Kampf (gleicher Flow wie im Report-Tab, eigenes Mini-Formular im Planer)
2. `api/analysis.php` wird aufgerufen → liefert `aoe_events` mit Name, Timestamp, `unmitigatedAmount`
3. Jedes AoE-Event wird als Mechanik-Kandidat angezeigt (Name + Timestamp + Rohschaden)
4. Benutzer kann einzelne Events auswählen oder alle übernehmen
5. **Merge-Logik:** Beim Import in einen bestehenden Plan werden nur Mechaniken hinzugefügt die noch nicht vorhanden sind — Matching per `abilityName` + Timestamp-Nähe (± 5s). Bestehende Assignments bleiben erhalten.
6. Neue Mechaniken werden an der richtigen Timestamp-Position eingefügt (Timeline bleibt sortiert)
**Merge-Logik:** Mechaniken gelten als identisch wenn `abilityName` gleich und `|timestamp_a - timestamp_b| < 5000ms`. Nur neue Mechaniken werden hinzugefügt, bestehende Assignments bleiben erhalten. Neue Mechaniken werden timestamp-sortiert eingefügt.
**Warum Merge statt Überschreiben:** Progress-Szenario — erster Import enthält Phase 1, späterer Import (weiter im Fight) fügt Phase 2 hinzu ohne Phase-1-Planung zu verlieren.
**Warum Merge statt Überschreiben:** Progress-Szenario — erster Import enthält Phase 1, späterer Import fügt Phase 2 hinzu ohne Phase-1-Planung zu verlieren.
### Geplante Features (Übersicht)
### Implementierungs-Reihenfolge
| Schritt | Feature | Beschreibung |
| Prio | Feature | Beschreibung |
|---|---|---|
| 1 | **Datenfundament** | Plan-Datenmodell + localStorage CRUD (create, read, update, delete, copy) |
| 2 | **Tab-Grundgerüst** | Leere Tab-Hülle wie Analyse-Tab; Plan-Liste; Mechanik-Timeline (read-only) |
| 3 | **Import aus Analyse-Tab** | Export-Button + Dialog (s. oben); `window.plannerTab.importFromAnalysis()` |
| 4 | **Jobaufstellung** | 8 Slots mit Job-Dropdown; bestimmt verfügbare Abilities in Schritt 5 |
| 5 | **Ability-Zuweisung** | Pro Mechanik Abilities per Modal-Picker hinzufügen/entfernen |
| 6 | **Recast-Konflikt** | `data/recast-times.json`; rote Warnung wenn CD zwischen zwei Mechaniken noch läuft |
| 7 | **DR-Simulation** | `simuliert = unmitigated × ∏(1 dr_i)`; grün/rot ob Spieler laut Simulation überlebt |
| 8 | **Job-Äquivalente** | `data/ability-equivalents.json`; auto-substituieren beim Job-Wechsel |
| 9 | **Analyse-Overlay** | Vergleich geplanter vs. tatsächlich genutzter CDs im Analyse-Tab |
Schritte 13 = nutzbarer MVP. Schritte 46 = praktisch einsetzbar. 79 = Power-Features.
### UI-Paradigma
- Visuell dem Analyse-Tab ähneln (Cards, gleiche CSS-Variablen, einheitliches Look & Feel)
- Mechaniken als vertikale Timeline-Cards
- Ability-Picker als **Modal** (kein Inline-Dropdown)
- Nicht für mobile Geräte ausgelegt
| 1 | **Import-Flow** | Log → Mechanik-Timeline, Merge bei Teilimporten |
| 2 | **Jobaufstellung** | 8 Slots (2 Tank, 2 Healer, 4 DPS), Auswahl bestimmt verfügbare Spells |
| 3 | **Cooldown-Zuweisung** | Pro Mechanik Abilities zuweisen/entfernen per Klick |
| 4 | **DR-Simulation** | `simuliert = unmitigated × ∏(1 dr_i)` live berechnet beim Toggle |
| 5 | **Recast-Tracking** | Recast-Datenbank pro Ability; Konflikt-Warnung wenn CD noch läuft |
| 6 | **Coverage-Ansicht** | Gantt-Chart: Mechaniken auf X-Achse, Buff-Dauer als Balken |
| 7 | **Analyse-Overlay** | Planer-Tab: Vergleich geplanter vs. tatsächlich genutzter CDs (Job-basiertes Matching, nicht Spielername) |
| 8 | **Shield-Schätzung** | Empirisch aus Log-Durchschnitt (`absorbed`-Werte), nicht exakt |
| 9 | **JSON-Export/Import** | Plan als Datei teilen mit Raidkollegen |
### Spell-Verfügbarkeit nach Job
Jobaufstellung → verfügbare Abilities (Subset von `MITIGATION_ABILITIES`):
@ -324,31 +301,17 @@ Jobaufstellung → verfügbare Abilities (Subset von `MITIGATION_ABILITIES`):
| RDM | Addle, Magick Barrier |
| PCT | Addle, Tempera Coat, Tempera Grassa |
### Job-Äquivalente (`data/ability-equivalents.json`)
Abilities die funktional gleich sind aber unterschiedliche Namen haben — relevant beim Job-Wechsel im Slot:
| Gruppe | Abilities |
|---|---|
| 15% Party-Mitigation | Troubadour, Tactician, Shield Samba |
| 10% Ground-Barrier | Sacred Soil, Kerachole |
Reprisal, Feint und Addle sind identische Ability-Namen über Jobs hinweg — kein Mapping nötig, die gleiche Ability bleibt einfach bestehen.
**Verhalten beim Job-Wechsel:** Assignment wird auto-substituiert wenn Äquivalent für neuen Job existiert (mit Hinweis "automatisch gemappt"). Kein Äquivalent → Assignment ausgegraut (nicht gelöscht, Nutzer entscheidet).
### Recast-Zeiten (`data/recast-times.json`)
Wird für Konflikt-Erkennung benötigt (Schritt 6). Vollständige Liste wird beim Implementieren vervollständigt, Beispiele:
### Recast-Zeiten (geplante Datenbank)
Wird benötigt für Konflikt-Erkennung. Beispiele:
- Reprisal: 60s
- Feint / Addle: 90s
- Dark Missionary / Heart of Light: 90s
- Troubadour / Tactician / Shield Samba: 120s
- Temperance: 120s
- Dark Missionary / Heart of Light: 90s
### Technische Entscheidungen
- **Persistenz:** `localStorage` unter `ff14-planner-plans` — kein Backend nötig
- **Persistenz:** `localStorage` — kein Backend nötig, mehrere Pläne möglich
- **IDs:** `crypto.randomUUID()` für Plan- und Mechanik-IDs
- **Keine Spielernamen:** Assignments sind Job-basiert (`{ ability, job }`), damit Pläne übertragbar sind
- **Kein Ability-Stacking:** FFXIV erlaubt keine doppelte Anwendung derselben Ability — jede Ability kommt pro Mechanik maximal einmal vor, doppelte Instanzen desselben Jobs im Static sind daher kein Sonderfall
- **Analyse-Overlay (Schritt 9):** Job aus tatsächlichem Pull → lookup welche Ability dieser Job im Plan hatte → Soll/Ist-Vergleich (kein Spielername-Matching nötig)
- **Shield-Attribution:** Aktuell nicht lösbar — `absorbed` im `damage`-Event ist ein Gesamtwert ohne Aufschlüsselung per Shield. Zu untersuchen: ob `calculatedheal`-Events die Shield-Kapazität beim Auftragen mitliefern. Vorerst zurückgestellt.
- **Plan kopieren:** Duplicate-Funktion für Plan-Varianten ("Week 3 v2") ohne Original zu verlieren
- **Merge-Matching:** Mechaniken gelten als identisch wenn `abilityName` gleich und `|timestamp_a - timestamp_b| < 5000ms`
- **Keine Spielernamen im Planer:** Assignments sind Job-basiert (`{ ability, job }`), damit Pläne übertragbar sind
- **Analyse-Tab Overlay (Prio 7):** Job aus tatsächlichem Pull → lookup welche Ability dieser Job im Plan hatte → Soll/Ist-Vergleich

View File

@ -212,12 +212,11 @@ foreach (MITIGATION_ABILITIES as $name => $meta) {
}
}
// statusId set for tracked mitigations — used to resolve localized buff names
// from Buffs events and to build the shield fallback timeline.
$trackedStatusIds = [];
// statusId set for shield abilities — used to filter the buff timeline query
$shieldStatusIds = [];
foreach (MITIGATION_ABILITIES as $meta) {
if (isset($meta['statusId'])) {
$trackedStatusIds[$meta['statusId']] = true;
if ($meta['buffType'] === 'shield' && isset($meta['statusId'])) {
$shieldStatusIds[$meta['statusId']] = true;
}
}
@ -277,9 +276,8 @@ for ($page = 0; $page < 10; $page++) {
// Builds applybuff/removebuff intervals per target so we can detect shields
// that were consumed by a hit (absent from the damage event's buffs snapshot).
$shieldTimeline = []; // targetId → statusId → [[apply, remove|null], ...]
$statusNames = []; // statusId → localized display name from Buffs events
if (!empty($trackedStatusIds)) {
if (!empty($shieldStatusIds)) {
$nextPage = $startTime;
for ($page = 0; $page < 10; $page++) {
$bfResult = fflogs_gql(<<<GQL
@ -306,19 +304,11 @@ if (!empty($trackedStatusIds)) {
$bfEv = $bfResult['data']['reportData']['report']['events'] ?? [];
foreach ($bfEv['data'] ?? [] as $ev) {
$abId = (int)($ev['abilityGameID'] ?? 0);
if (!isset($trackedStatusIds[$abId])) continue;
$evName = $ev['ability']['name'] ?? null;
if (is_string($evName) && $evName !== '') {
$statusNames[$abId] = $evName;
}
if (!isset($shieldStatusIds[$abId])) continue;
$tgtId = (int)($ev['targetID'] ?? 0);
$ts = (float)($ev['timestamp'] ?? 0);
$type = $ev['type'] ?? '';
$meta = $mitigIdMap[$abId] ?? null;
if (($meta['buffType'] ?? null) !== 'shield') continue;
if ($type === 'applybuff') {
$shieldTimeline[$tgtId][$abId][] = ['apply' => $ts, 'remove' => null];
@ -339,20 +329,6 @@ if (!empty($trackedStatusIds)) {
}
}
foreach ($statusNames as $statusId => $displayName) {
if (isset($mitigIdMap[$statusId])) {
$mitigIdMap[$statusId]['name'] = $displayName;
}
}
$mitigationNames = [];
foreach ($mitigIdMap as $meta) {
$key = $meta['key'] ?? null;
if ($key) {
$mitigationNames[$key] = $meta['name'] ?? $key;
}
}
// ── 3. AoE detection — proximity clustering ────────────────────────────────
// Group events by abilityId, then cluster by time proximity (≤ 1000ms from
// the first event in the cluster) to avoid fixed-window boundary splits.
@ -498,8 +474,7 @@ foreach ($clusters as $group) {
usort($aoeEvents, fn($a, $b) => $a['timestamp'] <=> $b['timestamp']);
echo json_encode([
'players' => array_values($players),
'aoe_events' => $aoeEvents,
'fight_start' => (int)$startTime,
'mitigation_names' => $mitigationNames,
'players' => array_values($players),
'aoe_events' => $aoeEvents,
'fight_start' => (int)$startTime,
]);

View File

@ -75,9 +75,8 @@ function localized_graphql_uri(string $language): string {
return preg_replace('#https://[^/]+#', 'https://' . $host, GRAPHQL_URI);
}
// Fight names must be stable regardless of language — always use the English endpoint.
// Localization only matters for ability/player names in analysis.php.
$ch = curl_init(GRAPHQL_URI);
$acceptLanguage = $language === 'jp' ? 'ja' : $language;
$ch = curl_init(localized_graphql_uri($language));
curl_setopt_array($ch, [
CURLOPT_POST => true,
CURLOPT_POSTFIELDS => $payload,
@ -85,6 +84,7 @@ curl_setopt_array($ch, [
CURLOPT_HTTPHEADER => [
'Content-Type: application/json',
'Authorization: Bearer ' . $_SESSION['access_token'],
'Accept-Language: ' . $acceptLanguage,
],
CURLOPT_SSL_VERIFYPEER => !DEV_MODE,
]);

View File

@ -8,7 +8,7 @@ $state = bin2hex(random_bytes(16));
$_SESSION['pkce_verifier'] = $verifier;
$_SESSION['oauth_state'] = $state;
$_SESSION['oauth_return'] = null;
$_SESSION['oauth_return'] = safe_return_path($_GET['return'] ?? ($_SERVER['HTTP_REFERER'] ?? null));
$params = http_build_query([
'response_type' => 'code',

View File

@ -1,599 +0,0 @@
/* ── Planner Layout ──────────────────────────────────────────────────────────── */
.planner-layout {
display: grid;
grid-template-columns: 280px 1fr;
gap: 16px;
align-items: start;
}
/* ── Plan Sidebar ────────────────────────────────────────────────────────────── */
.plan-sidebar {
background: var(--bgcard);
border: 1px solid var(--border);
border-radius: var(--rl);
padding: 18px;
position: sticky;
top: 74px;
}
.plan-sidebar-header {
display: flex;
align-items: center;
margin-bottom: 14px;
}
.plan-sidebar-header .card-title { margin-bottom: 0; flex: 1; }
.plan-new-form {
background: var(--bg2);
border: 1px solid var(--borderem);
border-radius: var(--r);
padding: 10px;
margin-bottom: 12px;
}
.plan-new-form input {
margin-bottom: 8px;
font-size: 14px;
padding: 6px 10px;
}
.plan-new-actions {
display: flex;
gap: 6px;
}
.plan-list-empty {
font-size: 13px;
color: var(--t3);
text-align: center;
padding: 24px 0;
}
/* ── Plan Item ───────────────────────────────────────────────────────────────── */
.plan-item {
display: flex;
align-items: center;
gap: 8px;
padding: 9px 10px;
border-radius: var(--r);
border: 1px solid transparent;
cursor: pointer;
transition: all 0.12s;
margin-bottom: 4px;
}
.plan-item:hover { background: var(--bg2); border-color: var(--border); }
.plan-item.active { background: var(--bg2); border-color: var(--gold); }
.plan-item-info { flex: 1; min-width: 0; }
.plan-item-name {
font-size: 14px;
color: var(--t1);
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.plan-item.active .plan-item-name { color: var(--gold); }
.plan-item-meta {
font-size: 12px;
color: var(--t3);
margin-top: 2px;
}
.plan-item-actions {
display: flex;
gap: 4px;
flex-shrink: 0;
opacity: 0;
transition: opacity 0.12s;
}
.plan-item:hover .plan-item-actions { opacity: 1; }
.plan-btn {
background: none;
border: 1px solid var(--borderem);
border-radius: var(--r);
color: var(--t2);
font-size: 13px;
padding: 2px 7px;
cursor: pointer;
transition: all 0.12s;
line-height: 1.6;
}
.plan-btn:hover { background: var(--bg3); color: var(--t1); }
.plan-btn.plan-btn-danger { color: var(--red); border-color: rgba(224,92,92,0.3); }
.plan-btn.plan-btn-danger:hover { background: var(--redbg); }
/* ── Plan Detail ─────────────────────────────────────────────────────────────── */
.plan-detail-header {
display: flex;
flex-direction: column;
gap: 5px;
}
.plan-name-wrap {
display: flex;
align-items: center;
gap: 8px;
}
.plan-name-text {
font-family: var(--font-d);
font-size: 18px;
color: var(--gold);
letter-spacing: 0.04em;
}
.plan-name-input {
font-size: 18px !important;
font-family: var(--font-d) !important;
padding: 2px 8px !important;
width: auto !important;
min-width: 200px;
color: var(--gold) !important;
}
.plan-detail-meta {
font-size: 13px;
color: var(--t3);
}
/* ── Job Slots ────────────────────────────────────────────────────────────────── */
.job-slots-grid {
display: flex;
gap: 8px;
}
.job-slot {
flex: 1;
min-width: 0;
}
.job-slot select {
width: 100%;
font-size: 13px;
padding: 5px 6px;
border-left: 2px solid var(--border);
}
.job-slot--tank select { border-left-color: var(--blue); }
.job-slot--healer select { border-left-color: var(--green); }
.job-slot--dps select { border-left-color: rgba(200,168,75,.5); }
/* ── Mechanic Cards ──────────────────────────────────────────────────────────── */
.mechanic-card {
display: grid;
grid-template-columns: 52px 1fr auto;
gap: 14px;
padding: 12px 6px;
border-bottom: 1px solid var(--border);
align-items: start;
cursor: pointer;
transition: background 0.12s;
border-radius: var(--r);
margin: 0 -6px;
}
.mechanic-card:last-child { border-bottom: none; }
.mechanic-card:hover { background: var(--bg2); }
.mechanic-delete-btn {
opacity: 0;
transition: opacity 0.12s;
margin-top: 2px;
}
.mechanic-card:hover .mechanic-delete-btn { opacity: 1; }
.mechanic-edit-hint {
font-size: 11px;
color: var(--t3);
margin-top: 2px;
opacity: 0;
transition: opacity 0.12s;
}
.mechanic-card:hover .mechanic-edit-hint { opacity: 1; }
.mechanic-time {
font-family: var(--font-d);
font-size: 14px;
color: var(--gold);
letter-spacing: 0.03em;
padding-top: 3px;
}
.mechanic-body {
display: flex;
flex-direction: column;
gap: 4px;
}
.mechanic-phase {
font-size: 11px;
color: var(--blue);
text-transform: uppercase;
letter-spacing: 0.07em;
}
.mechanic-name {
font-size: 15px;
color: var(--t1);
font-weight: 500;
}
.mechanic-dmg {
font-size: 13px;
color: var(--t2);
}
.mechanic-assignments {
display: flex;
flex-wrap: wrap;
gap: 4px;
margin-top: 2px;
align-items: flex-start;
}
.mechanic-no-assign {
font-size: 12px;
color: var(--t3);
}
.badge-assign {
display: inline-flex;
align-items: center;
gap: 5px;
background: var(--bg2);
border: 1px solid var(--borderem);
border-radius: var(--r);
padding: 4px 10px;
font-size: 13px;
color: var(--t2);
}
.badge-assign-buff { background: rgba(200,168,75,.08); border-color: rgba(200,168,75,.4); color: var(--gold); }
.badge-assign-debuff { background: rgba(224,92,92,.08); border-color: rgba(224,92,92,.4); color: var(--red); }
.badge-assign-shield { background: rgba(74,158,255,.08); border-color: rgba(74,158,255,.4); color: var(--blue); }
.badge-assign--missing-job {
border-style: dashed;
opacity: 0.55;
}
.badge-icon {
width: 20px;
height: 20px;
object-fit: contain;
flex-shrink: 0;
}
.badge-remove {
background: none;
border: none;
color: inherit;
padding: 0;
margin-left: 2px;
cursor: pointer;
font-size: 13px;
line-height: 1;
opacity: 0;
transition: opacity 0.12s;
}
.badge-assign:hover .badge-remove { opacity: 0.6; }
.badge-remove:hover { opacity: 1 !important; }
.mechanic-notes {
font-size: 12px;
color: var(--t3);
font-style: italic;
margin-top: 2px;
}
/* ── Import Modal ────────────────────────────────────────────────────────────── */
.modal-overlay {
position: fixed;
inset: 0;
background: rgba(0, 0, 0, 0.72);
display: flex;
align-items: center;
justify-content: center;
z-index: 200;
padding: 20px;
}
.modal-box {
background: var(--bgcard);
border: 1px solid var(--borderem);
border-radius: var(--rl);
padding: 28px 32px;
max-width: 480px;
width: 100%;
}
.modal-title {
font-family: var(--font-d);
font-size: 15px;
color: var(--gold);
letter-spacing: 0.07em;
text-transform: uppercase;
margin-bottom: 22px;
}
.modal-section {
display: flex;
flex-direction: column;
gap: 8px;
margin-bottom: 20px;
}
.modal-label {
font-size: 12px;
color: var(--t2);
text-transform: uppercase;
letter-spacing: 0.06em;
margin-bottom: 2px;
}
.modal-radio-label {
display: flex;
align-items: center;
gap: 8px;
cursor: pointer;
font-size: 14px;
color: var(--t1);
user-select: none;
}
/* Override global input styles that break radio button layout */
.modal-radio-label input[type="radio"] {
width: auto;
min-width: 0;
padding: 0;
background: none;
border: none;
border-radius: 0;
flex-shrink: 0;
}
.modal-subsection {
margin-left: 24px;
display: flex;
flex-direction: column;
gap: 6px;
}
.modal-subsection input,
.modal-subsection select {
font-size: 14px;
padding: 6px 10px;
}
.modal-hint {
font-size: 12px;
color: var(--t3);
}
.modal-actions {
display: flex;
gap: 8px;
margin-top: 6px;
}
/* ── Ability Assignment Modal ────────────────────────────────────────────────── */
.ability-modal-box {
max-width: 640px;
max-height: 80vh;
overflow-y: auto;
}
.ability-job-group {
margin-bottom: 14px;
}
.ability-job-label {
display: flex;
align-items: center;
gap: 6px;
margin-bottom: 6px;
}
.ability-chips {
display: flex;
flex-wrap: wrap;
gap: 6px;
}
.ability-chip {
display: inline-flex;
align-items: center;
gap: 5px;
background: none;
border: 1px solid var(--borderem);
border-radius: var(--r);
padding: 4px 10px;
font-size: 12px;
color: var(--t2);
cursor: pointer;
transition: all 0.12s;
}
.ability-chip:hover { background: var(--bg3); color: var(--t1); }
.ability-chip.badge-assign-buff.ability-chip--active { background: rgba(200,168,75,.18); border-color: rgba(200,168,75,.6); color: var(--gold); }
.ability-chip.badge-assign-debuff.ability-chip--active { background: rgba(224,92,92,.18); border-color: rgba(224,92,92,.6); color: var(--red); }
.ability-chip.badge-assign-shield.ability-chip--active { background: rgba(74,158,255,.18); border-color: rgba(74,158,255,.6); color: var(--blue); }
.ability-chip--other-job { opacity: 0.45; }
/* ── Equivalents hint ────────────────────────────────────────────────────────── */
.badge-with-hint {
display: inline-flex;
flex-direction: column;
align-items: flex-start;
gap: 2px;
}
.badge-equiv-hint {
font-size: 11px;
color: var(--green);
white-space: nowrap;
padding: 0 2px;
cursor: default;
}
.badge-no-equiv-hint {
font-size: 11px;
color: var(--red);
white-space: nowrap;
padding: 0 2px;
cursor: default;
}
.badge-job-hint {
font-size: 11px;
color: var(--t3);
white-space: nowrap;
padding: 0 2px;
cursor: default;
font-style: italic;
}
/* ── Info Panel ──────────────────────────────────────────────────────────────── */
.planner-info-panel {
margin-top: 14px;
padding-top: 14px;
border-top: 1px solid var(--border);
}
.info-section { margin-bottom: 12px; }
.info-section:last-child { margin-bottom: 0; }
.info-section-title {
font-size: 11px;
color: var(--t3);
text-transform: uppercase;
letter-spacing: 0.06em;
margin-bottom: 8px;
}
.info-legend-items {
display: flex;
flex-direction: column;
gap: 5px;
}
.info-legend-row {
display: flex;
align-items: center;
gap: 8px;
}
.info-legend-dot {
width: 10px;
height: 10px;
border-radius: 2px;
flex-shrink: 0;
}
.info-legend-dot--buff { background: rgba(200,168,75,.8); }
.info-legend-dot--debuff { background: var(--red); }
.info-legend-dot--shield { background: var(--blue); }
.info-legend-label {
font-size: 12px;
color: var(--t2);
}
.info-section--warnings { margin-top: 12px; }
.info-warning {
font-size: 12px;
padding: 3px 0;
}
.info-warning--job { color: var(--t2); }
.info-warning--missing { color: var(--red); }
/* ── Folder Sidebar ──────────────────────────────────────────────────────────── */
.folder-section { margin-bottom: 2px; }
.folder-row {
display: flex;
align-items: center;
gap: 6px;
padding: 7px 10px;
border-radius: var(--r);
cursor: pointer;
transition: background 0.12s;
user-select: none;
}
.folder-row:hover { background: var(--bg2); }
.folder-chevron {
font-size: 9px;
color: var(--t3);
transition: transform 0.15s;
display: inline-block;
width: 10px;
flex-shrink: 0;
}
.folder-chevron.open { transform: rotate(90deg); }
.folder-name-text {
font-size: 13px;
color: var(--t1);
font-weight: 500;
flex: 1;
min-width: 0;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.folder-name-input {
font-size: 13px !important;
padding: 2px 6px !important;
flex: 1;
width: auto !important;
min-width: 80px;
}
.folder-count {
font-size: 11px;
color: var(--t3);
background: var(--bg3);
border-radius: 10px;
padding: 1px 6px;
flex-shrink: 0;
}
.folder-actions {
display: flex;
gap: 4px;
flex-shrink: 0;
opacity: 0;
transition: opacity 0.12s;
}
.folder-row:hover .folder-actions { opacity: 1; }
.folder-plans { padding-left: 10px; }
.folder-plans.collapsed { display: none; }
.folder-empty {
font-size: 12px;
color: var(--t3);
padding: 5px 10px;
font-style: italic;
}
/* ── Folder Picker Dropdown ──────────────────────────────────────────────────── */
.folder-picker {
background: var(--bgcard);
border: 1px solid var(--borderem);
border-radius: var(--r);
box-shadow: 0 4px 16px rgba(0,0,0,0.5);
min-width: 160px;
overflow: hidden;
}
.folder-picker-option {
padding: 7px 14px;
font-size: 13px;
color: var(--t2);
cursor: pointer;
transition: background 0.1s;
white-space: nowrap;
}
.folder-picker-option:hover { background: var(--bg2); color: var(--t1); }
.folder-picker-option.active { color: var(--gold); }

View File

@ -103,7 +103,6 @@
let currentPlayers = [];
let extFights = [];
let extReportCode = '';
let mitigationNames = {};
// ── Player grid ──────────────────────────────────────────────────────────
@ -684,14 +683,10 @@
populateRefFightSelect();
setupPhases(window.App?.phases ?? []);
renderPlayers(json.players ?? []);
mitigationNames = json.mitigation_names ?? {};
renderTimeline(json.aoe_events ?? [], json.fight_start ?? fightStart);
document.getElementById('analysis-loading').style.display = 'none';
document.getElementById('analysis-content').style.display = 'block';
const exportBtn = document.getElementById('export-to-planner-btn');
if (exportBtn) exportBtn.style.display = '';
}
window.analysisTab = {
@ -710,20 +705,6 @@
refFightSelect.dispatchEvent(new Event('change'));
}
},
exportForPlanner() {
const fight = (window.App?.fights ?? []).find(f => f.id === window.App?.fightId);
return {
aoeEvents: lastEvents,
fightStart: lastFightStart,
phases: window.App?.phases ?? [],
players: currentPlayers,
fightName: fight?.name ?? `Fight ${window.App?.fightId ?? '?'}`,
reportCode: window.App?.reportCode ?? '',
fightId: window.App?.fightId ?? 0,
fightEnd: window.App?.fightEnd ?? 0,
mitigationNames,
};
},
reset() {
lastFightId = null;
refEvents = [];
@ -731,7 +712,6 @@
refPlayers = [];
extFights = [];
extReportCode = '';
mitigationNames = {};
document.getElementById('ref-player-section').style.display = 'none';
refFightSelect.value = '';
refFightSelect.style.display = 'none';
@ -740,12 +720,6 @@
refFflogsLink.style.display = 'none';
refFflogsLink.href = '#';
refExtPanel.style.display = 'none';
const exportBtn = document.getElementById('export-to-planner-btn');
if (exportBtn) exportBtn.style.display = 'none';
},
};
document.getElementById('export-to-planner-btn')?.addEventListener('click', () => {
window.plannerTab?.showImportModal(window.analysisTab.exportForPlanner());
});
})();

View File

@ -103,7 +103,6 @@ document.addEventListener('DOMContentLoaded', () => {
window.App.language = normalizeLanguage(languageSelect.value);
localStorage.setItem('ff14-mitigator-language', window.App.language);
setUrlState({ language: window.App.language });
window.dispatchEvent(new CustomEvent('ff14-language-change', { detail: { language: window.App.language } }));
if (window.App.reportCode) {
loadReport(window.App.reportCode, window.App.fightId);
}
@ -137,12 +136,6 @@ document.addEventListener('DOMContentLoaded', () => {
document.querySelector('.tabs .tab[data-tab="analysis"]')?.click();
}
function shouldAutoOpenAnalysis() {
const params = new URLSearchParams(window.location.search);
const requestedTab = params.get('tab') || localStorage.getItem('ff14-mitigator-active-tab');
return requestedTab !== 'planner';
}
function selectFight(id, updateUrl = true) {
const fight = allFights.find(f => f.id === id);
if (!fight) return false;
@ -347,7 +340,7 @@ document.addEventListener('DOMContentLoaded', () => {
if (initialUrlState.reportCode) {
form.elements['report_code'].value = initialUrlState.reportCode;
loadReport(initialUrlState.reportCode, initialUrlState.fightId).then(() => {
if (initialUrlState.fightId && shouldAutoOpenAnalysis()) {
if (initialUrlState.fightId) {
openAnalysisTab();
}
if (initialUrlState.compareFightId) {

File diff suppressed because it is too large Load Diff

View File

@ -1,10 +1,8 @@
document.addEventListener('DOMContentLoaded', () => {
const tabs = document.querySelectorAll('.tabs .tab');
const contents = document.querySelectorAll('.tab-content');
const validTabs = new Set([...tabs].map(btn => btn.dataset.tab));
function showTab(name) {
if (!validTabs.has(name)) name = 'report';
contents.forEach(el => el.style.display = 'none');
tabs.forEach(btn => btn.classList.remove('active'));
@ -15,14 +13,7 @@ document.addEventListener('DOMContentLoaded', () => {
if (btn) btn.classList.add('active');
if (name === 'analysis') window.analysisTab?.onTabOpen?.();
if (name === 'planner') window.plannerTab?.onTabOpen?.();
localStorage.setItem('ff14-mitigator-active-tab', name);
}
tabs.forEach(btn => btn.addEventListener('click', () => showTab(btn.dataset.tab)));
window.showTab = showTab;
const params = new URLSearchParams(window.location.search);
showTab(params.get('tab') || localStorage.getItem('ff14-mitigator-active-tab') || 'report');
});

View File

@ -21,7 +21,7 @@
<?php endif; ?>
</p>
<a href="auth/start.php" class="btn btn-gold btn-login">
<a href="<?= htmlspecialchars(auth_start_href(), ENT_QUOTES) ?>" class="btn btn-gold btn-login">
<?= $tokenExpired ? 'Reconnect to FFLogs' : 'Connect to FFLogs' ?>
</a>

View File

@ -8,7 +8,6 @@
<link rel="stylesheet" href="css/layout.css">
<link rel="stylesheet" href="css/components.css">
<link rel="stylesheet" href="css/analysis.css">
<link rel="stylesheet" href="css/planner.css">
</head>
<body>
@ -29,72 +28,11 @@
<div id="tab-analysis" class="tab-content" style="display:none">
<?php require __DIR__ . '/tab-analysis.php'; ?>
</div>
<div id="tab-planner" class="tab-content" style="display:none">
<?php require __DIR__ . '/tab-planner.php'; ?>
</div>
</main>
</div>
<!-- Planner Import Modal -->
<div id="planner-import-modal" class="modal-overlay" style="display:none">
<div class="modal-box">
<div class="modal-title">In Planer exportieren</div>
<div class="modal-section">
<div class="modal-label">Was importieren?</div>
<label class="modal-radio-label">
<input type="radio" name="import-what" value="with-mitigations" checked>
<span>Mechaniken + Mitigation</span>
</label>
<label class="modal-radio-label">
<input type="radio" name="import-what" value="mechanics">
<span>Nur Mechaniken</span>
</label>
</div>
<div class="modal-section">
<div class="modal-label">Wohin?</div>
<label class="modal-radio-label">
<input type="radio" name="import-where" value="new" checked>
<span>Neuer Plan</span>
</label>
<div id="import-new-section" class="modal-subsection">
<input type="text" id="import-plan-name" placeholder="Plan-Name…">
</div>
<label class="modal-radio-label" id="import-merge-label">
<input type="radio" name="import-where" value="merge">
<span>In bestehenden Plan mergen</span>
</label>
<div id="import-merge-section" class="modal-subsection" style="display:none">
<select id="import-plan-select">
<option value=""> Plan auswählen </option>
</select>
<div class="modal-hint">Neue Mechaniken werden hinzugefügt, bestehende Assignments bleiben erhalten.</div>
</div>
</div>
<div class="modal-actions">
<button id="import-confirm-btn" class="btn btn-gold">Importieren</button>
<button id="import-cancel-btn" class="btn">Abbrechen</button>
</div>
</div>
</div>
<!-- Ability Assignment Modal -->
<div id="planner-ability-modal" class="modal-overlay" style="display:none">
<div class="modal-box ability-modal-box">
<div class="modal-title" id="ability-modal-title">Mitigations</div>
<div id="ability-modal-content"></div>
<div class="modal-actions" style="margin-top:16px">
<button id="ability-modal-close" class="btn">Schließen</button>
</div>
</div>
</div>
<script src="js/app.js"></script>
<script src="js/tabs.js"></script>
<script src="js/analysis.js"></script>
<script src="js/planner.js"></script>
<?php endif; ?>
</body>

View File

@ -23,7 +23,7 @@
</select>
</div>
<button class="btn btn-gold" type="submit" style="align-self:flex-end">Fetch</button>
<a class="btn" href="auth/start.php" style="align-self:flex-end;text-decoration:none">Reconnect</a>
<a class="btn" href="<?= htmlspecialchars(auth_start_href(), ENT_QUOTES) ?>" style="align-self:flex-end;text-decoration:none">Reconnect</a>
</div>
</form>
</div>

View File

@ -40,7 +40,6 @@
<div class="card-title">AoE Timeline</div>
<select id="phase-select" class="filter-input" style="display:none"></select>
<input type="text" id="player-filter" class="filter-input" placeholder="Spieler filtern…">
<button id="export-to-planner-btn" class="btn btn-sm btn-gold" style="display:none">📋 Exportieren</button>
</div>
<div id="aoe-timeline"></div>
</div>

View File

@ -1,42 +0,0 @@
<div class="planner-layout">
<!-- Left: Plan list sidebar -->
<div class="plan-sidebar">
<div class="plan-sidebar-header">
<div class="card-title">Pläne</div>
<button id="planner-new-folder-btn" class="btn btn-sm" title="Neuer Ordner">+ Ordner</button>
<button id="planner-new-btn" class="btn btn-sm btn-gold">+ Neu</button>
</div>
<div id="planner-new-folder-form" class="plan-new-form" style="display:none">
<input type="text" id="planner-new-folder-name" placeholder="Ordner-Name…">
<div class="plan-new-actions">
<button id="planner-new-folder-save" class="btn btn-sm btn-gold">Erstellen</button>
<button id="planner-new-folder-cancel" class="btn btn-sm">Abbrechen</button>
</div>
</div>
<div id="planner-new-form" class="plan-new-form" style="display:none">
<input type="text" id="planner-new-name" placeholder="Plan-Name…">
<div class="plan-new-actions">
<button id="planner-new-save" class="btn btn-sm btn-gold">Erstellen</button>
<button id="planner-new-cancel" class="btn btn-sm">Abbrechen</button>
</div>
</div>
<div id="plan-list"></div>
<div id="planner-info-panel" class="planner-info-panel"></div>
</div>
<!-- Right: Plan detail -->
<div id="plan-detail-panel">
<div id="planner-no-plan" class="empty">
<div class="empty-icon">📋</div>
<h3>Kein Plan ausgewählt</h3>
<p style="font-size:13px;color:var(--t3);margin-top:6px">Erstelle einen neuen Plan oder wähle einen bestehenden aus</p>
</div>
<div id="plan-content" style="display:none"></div>
</div>
</div>

View File

@ -3,7 +3,6 @@
<nav class="tabs">
<button class="tab active" data-tab="report"> Report</button>
<button class="tab" data-tab="analysis"> Analyse</button>
<button class="tab" data-tab="planner">📋 Planer</button>
</nav>
<div class="topbar-user">Token gültig bis: <?= date('Y-m-d H:i:s', $_SESSION['token_expires']) ?></div>
</header>