chore: bump version to 0.3.6

aFFekopp · aFFekopp · commit 6ef4c2eff2e2 · 2026-02-10T22:08:12.000+01:00
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.3.5
+0.3.6
diff --git a/server.py b/server.py
@@ -451,14 +451,28 @@ def get_library():
 @app.route('/api/library', methods=['POST'])
 def add_library_item():
     data = request.json
+    name = data.get('name')
+    category_id = data.get('categoryId')
+    artist_id = data.get('artistId')
+    
     conn = get_db()
     cursor = conn.cursor()
     
+    # Check for duplicates (case-insensitive)
+    cursor.execute('''
+        SELECT id FROM library_items 
+        WHERE LOWER(name) = LOWER(?) AND category_id = ? AND (artist_id = ? OR (artist_id IS NULL AND ? IS NULL))
+    ''', (name, category_id, artist_id, artist_id))
+    
+    if cursor.fetchone():
+        conn.close()
+        return jsonify({'error': 'An item with this name already exists in this category.'}), 409
+
     item_id = generate_id()
     cursor.execute('''
         INSERT INTO library_items (id, name, category_id, artist_id, star_rating, notes, created_at)
         VALUES (?, ?, ?, ?, ?, ?, ?)
-    ''', (item_id, data.get('name'), data.get('categoryId'), data.get('artistId'),
+    ''', (item_id, name, category_id, artist_id,
           data.get('starRating', 0), data.get('notes', ''), datetime.now().isoformat()))
     
     conn.commit()
@@ -472,6 +486,28 @@ def update_library_item(item_id):
     data = request.json
     conn = get_db()
     cursor = conn.cursor()
+
+    # Check for duplicates if name/category/artist are being changed
+    if any(k in data for k in ['name', 'categoryId', 'artistId']):
+        cursor.execute('SELECT name, category_id, artist_id FROM library_items WHERE id=?', (item_id,))
+        current = cursor.fetchone()
+        if not current:
+            conn.close()
+            return jsonify({'error': 'Item not found'}), 404
+        
+        new_name = data.get('name', current[0])
+        new_cat = data.get('categoryId', current[1])
+        new_art = data.get('artistId', current[2]) if 'artistId' in data else current[2]
+
+        cursor.execute('''
+            SELECT id FROM library_items 
+            WHERE LOWER(name) = LOWER(?) AND category_id = ? AND (artist_id = ? OR (artist_id IS NULL AND ? IS NULL))
+            AND id != ?
+        ''', (new_name, new_cat, new_art, new_art, item_id))
+        
+        if cursor.fetchone():
+            conn.close()
+            return jsonify({'error': 'An item with this name already exists in this category.'}), 409
     
     # Map frontend camelCase to backend snake_case
     field_map = {
diff --git a/templates/library.html b/templates/library.html
@@ -357,6 +357,8 @@ <h3 class="modal-title" id="item-modal-title">Add Library Item</h3>
                 <label class="form-label" id="name-label">Name *</label>
                 <input type="text" class="form-input" id="item-name" placeholder="Enter name...">
                 <span class="form-error hidden" id="name-error">Name is required</span>
+                <span class="form-error hidden" id="duplicate-error">This item already exists in the selected
+                    category</span>
             </div>
             <div class="form-group">
                 <label class="form-label">Progress Rating</label>
@@ -737,11 +739,43 @@ <h4 style="font-size: 1rem; line-height: 1.2; white-space: nowrap; overflow: hid
 
     async function saveItem() {
         const id = document.getElementById('edit-item-id').value;
-        const name = document.getElementById('item-name').value.trim();
-        if (!name) return;
-        const data = { categoryId: document.getElementById('item-category').value, artistId: document.getElementById('item-artist').value || null, name, starRating: selectedRating };
-        if (id) await FretLogData.updateLibraryItem(id, data); else await FretLogData.addLibraryItem(data);
-        closeModal('item-modal'); filterItems(!!id);
+        const nameInput = document.getElementById('item-name');
+        const name = nameInput.value.trim();
+        const nameError = document.getElementById('name-error');
+        const dupError = document.getElementById('duplicate-error');
+
+        // Reset errors
+        nameError.classList.add('hidden');
+        dupError.classList.add('hidden');
+
+        if (!name) {
+            nameError.classList.remove('hidden');
+            return;
+        }
+
+        const data = {
+            categoryId: document.getElementById('item-category').value,
+            artistId: document.getElementById('item-artist').value || null,
+            name,
+            starRating: selectedRating
+        };
+
+        try {
+            if (id) {
+                await FretLogData.updateLibraryItem(id, data);
+            } else {
+                await FretLogData.addLibraryItem(data);
+            }
+            closeModal('item-modal');
+            filterItems(!!id);
+        } catch (error) {
+            if (error.message.includes('409')) {
+                dupError.classList.remove('hidden');
+            } else {
+                console.error('Failed to save library item:', error);
+                alert('An error occurred while saving. Please try again.');
+            }
+        }
     }
 
     function editItem(id) { const item = FretLogData.getLibraryItems().find(i => i.id === id); if (item) openItemModal(item); }
diff --git a/templates/sessions.html b/templates/sessions.html
@@ -388,9 +388,9 @@ <h3 class="modal-title">Delete Session?</h3>
     // Sessions Page Logic
     // ==========================================
 
-    let currentPage = 1;
+    window.currentPage = 1;
     const itemsPerPage = 10;
-    let filteredSessions = [];
+    window.filteredSessions = [];
     let tempSessionItems = [];
     let viewingSessionId = null;
     let deletingSessionId = null;
@@ -477,6 +477,7 @@ <h3 class="modal-title">Delete Session?</h3>
 
     // Filter and sort sessions
     function filterSessions() {
+        window.currentPage = 1;
         let sessions = [...FretLogData.getSessions()];
 
         // Add current session if valid
@@ -520,7 +521,7 @@ <h3 class="modal-title">Delete Session?</h3>
 
         sessions.sort((a, b) => new Date(b.endTime || b.date) - new Date(a.endTime || a.date));
 
-        filteredSessions = sessions;
+        window.filteredSessions = sessions;
         renderSessions();
     }
 
@@ -530,7 +531,7 @@ <h3 class="modal-title">Delete Session?</h3>
         const emptyState = document.getElementById('no-sessions');
         const pagination = document.getElementById('pagination');
 
-        if (filteredSessions.length === 0) {
+        if (window.filteredSessions.length === 0) {
             container.classList.add('hidden');
             emptyState.classList.remove('hidden');
             pagination.classList.add('hidden');
@@ -540,10 +541,10 @@ <h3 class="modal-title">Delete Session?</h3>
         container.classList.remove('hidden');
         emptyState.classList.add('hidden');
 
-        const totalPages = Math.ceil(filteredSessions.length / itemsPerPage);
-        const start = (currentPage - 1) * itemsPerPage;
+        const totalPages = Math.ceil(window.filteredSessions.length / itemsPerPage);
+        const start = (window.currentPage - 1) * itemsPerPage;
         const end = start + itemsPerPage;
-        const paginated = filteredSessions.slice(start, end);
+        const paginated = window.filteredSessions.slice(start, end);
 
         const instruments = FretLogData.getInstruments();
 
@@ -611,11 +612,11 @@ <h3 class="modal-title">Delete Session?</h3>
             </div>`;
         }).join('');
 
-        if (filteredSessions.length > itemsPerPage) {
+        if (window.filteredSessions.length > itemsPerPage) {
             pagination.classList.remove('hidden');
-            document.getElementById('pagination-info').textContent = `Showing ${start + 1}-${Math.min(end, filteredSessions.length)} of ${filteredSessions.length}`;
-            document.getElementById('prev-page').disabled = currentPage === 1;
-            document.getElementById('next-page').disabled = currentPage === totalPages;
+            document.getElementById('pagination-info').textContent = `Showing ${start + 1}-${Math.min(end, window.filteredSessions.length)} of ${window.filteredSessions.length}`;
+            document.getElementById('prev-page').disabled = window.currentPage === 1;
+            document.getElementById('next-page').disabled = window.currentPage === totalPages;
         } else {
             pagination.classList.add('hidden');
         }
@@ -746,6 +747,9 @@ <h3 class="modal-title">Delete Session?</h3>
         const existingIds = new Set(tempSessionItems.map(i => i.libraryItemId || i.library_item_id));
         items = items.filter(i => !existingIds.has(i.id));
 
+        // Sort items alphabetically
+        items.sort((a, b) => a.name.localeCompare(b.name));
+
         document.getElementById('item-select').innerHTML = items.length ?
             '<option value="">Select...</option>' + items.map(i => `<option value="${i.id}">${i.name}</option>`).join('') :
             '<option value="">No items</option>';
@@ -809,6 +813,24 @@ <h3 class="modal-title">Delete Session?</h3>
         await initPromise;
         await render();
 
+        // Pagination listeners
+        document.getElementById('prev-page').addEventListener('click', () => {
+            if (window.currentPage > 1) {
+                window.currentPage--;
+                renderSessions();
+                window.scrollTo({ top: 0, behavior: 'smooth' });
+            }
+        });
+
+        document.getElementById('next-page').addEventListener('click', () => {
+            const totalPages = Math.ceil(window.filteredSessions.length / itemsPerPage);
+            if (window.currentPage < totalPages) {
+                window.currentPage++;
+                renderSessions();
+                window.scrollTo({ top: 0, behavior: 'smooth' });
+            }
+        });
+
         flatpickr('#filter-date-start', { altInput: true, altFormat: 'M j, Y', onChange: filterSessions });
         flatpickr('#filter-date-end', { altInput: true, altFormat: 'M j, Y', onChange: filterSessions });
         flatpickr('#session-date', { altInput: true, altFormat: 'M j, Y' });
diff --git a/templates/statistics.html b/templates/statistics.html
@@ -272,28 +272,42 @@ <h3 class="card-title mb-md">Top Practiced Items</h3>
         const dailyTotals = FretLogData.getDailyTotals();
 
         if (period === 'week') {
-            const weekStart = new Date(now); weekStart.setDate(now.getDate() - (now.getDay() === 0 ? 6 : now.getDay() - 1));
+            const weekStart = new Date(now);
+            weekStart.setDate(now.getDate() - (now.getDay() === 0 ? 6 : now.getDay() - 1));
             weekStart.setHours(0, 0, 0, 0);
             for (let i = 0; i < 7; i++) {
                 const d = new Date(weekStart); d.setDate(weekStart.getDate() + i);
                 labels.push(d.toLocaleDateString('en-US', { weekday: 'short' }));
                 data.push((dailyTotals[FretLogData.formatDateKey(d)] || 0) / 60000);
             }
         } else if (period === 'month') {
+            const baseDate = new Date(now);
+            baseDate.setHours(12, 0, 0, 0); // Mid-day for safe date math
             for (let i = 29; i >= 0; i--) {
-                const d = new Date(now); d.setDate(now.getDate() - i);
-                labels.push(d.getDate().toString());
+                const d = new Date(baseDate);
+                d.setDate(baseDate.getDate() - i);
+                const dayNum = d.getDate();
+                const monthName = d.toLocaleDateString('en-US', { month: 'short' });
+                // Label with month name on the 1st day or the first day of the window
+                labels.push(dayNum === 1 || i === 29 ? `${monthName} ${dayNum}` : dayNum.toString());
                 data.push((dailyTotals[FretLogData.formatDateKey(d)] || 0) / 60000);
             }
         } else if (period === 'year') {
-            for (let i = 51; i >= 0; i--) {
-                const ws = new Date(now); ws.setDate(now.getDate() - (i * 7));
-                let total = 0;
-                for (let j = 0; j < 7; j++) {
-                    const d = new Date(ws); d.setDate(ws.getDate() + j);
-                    total += dailyTotals[FretLogData.formatDateKey(d)] || 0;
+            // Last 12 months
+            for (let i = 11; i >= 0; i--) {
+                const d = new Date(now.getFullYear(), now.getMonth() - i, 1);
+                const monthKey = d.toLocaleDateString('en-US', { month: 'short' });
+                labels.push(monthKey);
+
+                let monthTotal = 0;
+                const m = d.getMonth();
+                const y = d.getFullYear();
+                const lastDay = new Date(y, m + 1, 0).getDate();
+                for (let day = 1; day <= lastDay; day++) {
+                    const check = new Date(y, m, day);
+                    monthTotal += dailyTotals[FretLogData.formatDateKey(check)] || 0;
                 }
-                labels.push(`W${52 - i}`); data.push(total / 60000);
+                data.push(monthTotal / 60000);
             }
         }
 
@@ -310,7 +324,17 @@ <h3 class="card-title mb-md">Top Practiced Items</h3>
                 plugins: { legend: { display: false }, tooltip: { callbacks: { label: c => `${Math.round(c.raw)}m` } } },
                 scales: {
                     y: { beginAtZero: true, grid: { color: isDark ? 'rgba(255,255,255,0.05)' : 'rgba(0,0,0,0.05)' }, ticks: { color: isDark ? '#9CA3AF' : '#4A4A4A' } },
-                    x: { grid: { display: false }, ticks: { color: isDark ? '#9CA3AF' : '#4A4A4A', autoSkip: true, maxTicksLimit: period === 'year' ? 12 : 10 } }
+                    x: {
+                        grid: { display: false },
+                        ticks: {
+                            color: isDark ? '#9CA3AF' : '#4A4A4A',
+                            autoSkip: true,
+                            maxTicksLimit: period === 'month' ? 15 : 12,
+                            align: 'center',
+                            maxRotation: 0,
+                            font: { size: 10 }
+                        }
+                    }
                 }
             }
         });
@@ -352,10 +376,13 @@ <h3 class="card-title mb-md">Top Practiced Items</h3>
         }
 
         labelsContainer.innerHTML = '<span>M</span><span>T</span><span>W</span><span>T</span><span>F</span><span>S</span><span>S</span>';
-        let monthsH = '<div class="heatmap-months-inner">';
+        let monthsH = '<div class="heatmap-months-inner" style="display: flex; gap: 2px;">';
         monthPos.forEach((p, i) => {
             const span = monthPos[i + 1] ? monthPos[i + 1].idx - p.idx : weeks.length - p.idx;
-            monthsH += `<span style="flex:${span}">${p.name}</span>`;
+            // Column width is 12px + 2px gap.
+            // Width should be (span * 14) - 2 (to account for the gap after the last column in span)
+            const width = (span * 14) - 2;
+            monthsH += `<span style="width:${width}px; flex: none; text-align: left;">${p.name}</span>`;
         });
         monthsContainer.innerHTML = monthsH + '</div>';
 
