@@ -329,8 +360,51 @@
Data Files
-
-
{{ file_count }} files
+
+
{{ file_count }} files
+
+
+
+ Upload Data
+
+
+
+
+
+
+
Upload SD Card Data
+
+ Select a ZIP file, or select all files from inside an Auto_#### folder. File types (.rnd, .rnh) are auto-detected.
+
+
+
+
+ Import Files
+
+
+ Cancel
+
+
+
+
@@ -559,5 +633,112 @@ document.getElementById('assign-modal')?.addEventListener('click', function(e) {
closeAssignModal();
}
});
+
+// ── Upload Data ─────────────────────────────────────────────────────────────
+
+function toggleUploadPanel() {
+ const panel = document.getElementById('upload-panel');
+ const status = document.getElementById('upload-status');
+ panel.classList.toggle('hidden');
+ // Reset state when reopening
+ if (!panel.classList.contains('hidden')) {
+ status.textContent = '';
+ status.className = 'text-sm hidden';
+ document.getElementById('upload-input').value = '';
+ document.getElementById('upload-progress-wrap').classList.add('hidden');
+ document.getElementById('upload-progress-bar').style.width = '0%';
+ }
+}
+
+function submitUpload() {
+ const input = document.getElementById('upload-input');
+ const status = document.getElementById('upload-status');
+ const btn = document.getElementById('upload-btn');
+ const cancelBtn = document.getElementById('upload-cancel-btn');
+ const progressWrap = document.getElementById('upload-progress-wrap');
+ const progressBar = document.getElementById('upload-progress-bar');
+ const progressLabel = document.getElementById('upload-progress-label');
+
+ if (!input.files.length) {
+ alert('Please select files to upload.');
+ return;
+ }
+
+ const fileCount = input.files.length;
+ const formData = new FormData();
+ for (const file of input.files) {
+ formData.append('files', file);
+ }
+
+ // Disable controls and show progress bar
+ btn.disabled = true;
+ btn.textContent = 'Uploading\u2026';
+ btn.classList.add('opacity-60', 'cursor-not-allowed');
+ cancelBtn.disabled = true;
+ cancelBtn.classList.add('opacity-40', 'cursor-not-allowed');
+ status.className = 'text-sm hidden';
+ progressWrap.classList.remove('hidden');
+ progressBar.style.width = '0%';
+ progressLabel.textContent = `Uploading ${fileCount} file${fileCount !== 1 ? 's' : ''}\u2026`;
+
+ const xhr = new XMLHttpRequest();
+
+ xhr.upload.addEventListener('progress', (e) => {
+ if (e.lengthComputable) {
+ const pct = Math.round((e.loaded / e.total) * 100);
+ progressBar.style.width = pct + '%';
+ progressLabel.textContent = `Uploading ${fileCount} file${fileCount !== 1 ? 's' : ''}\u2026 ${pct}%`;
+ }
+ });
+
+ xhr.upload.addEventListener('load', () => {
+ progressBar.style.width = '100%';
+ progressLabel.textContent = 'Processing files on server\u2026';
+ });
+
+ xhr.addEventListener('load', () => {
+ progressWrap.classList.add('hidden');
+ btn.disabled = false;
+ btn.textContent = 'Import Files';
+ btn.classList.remove('opacity-60', 'cursor-not-allowed');
+ cancelBtn.disabled = false;
+ cancelBtn.classList.remove('opacity-40', 'cursor-not-allowed');
+
+ try {
+ const data = JSON.parse(xhr.responseText);
+ if (xhr.status >= 200 && xhr.status < 300) {
+ const parts = [`Imported ${data.files_imported} file${data.files_imported !== 1 ? 's' : ''}`];
+ if (data.leq_files || data.lp_files) {
+ parts.push(`(${data.leq_files} Leq, ${data.lp_files} Lp)`);
+ }
+ if (data.store_name) parts.push(`\u2014 ${data.store_name}`);
+ status.textContent = parts.join(' ');
+ status.className = 'text-sm text-green-600 dark:text-green-400';
+ input.value = '';
+ htmx.trigger(document.getElementById('data-files-list'), 'load');
+ } else {
+ status.textContent = `Error: ${data.detail || 'Upload failed'}`;
+ status.className = 'text-sm text-red-600 dark:text-red-400';
+ }
+ } catch {
+ status.textContent = 'Error: Unexpected server response';
+ status.className = 'text-sm text-red-600 dark:text-red-400';
+ }
+ });
+
+ xhr.addEventListener('error', () => {
+ progressWrap.classList.add('hidden');
+ btn.disabled = false;
+ btn.textContent = 'Import Files';
+ btn.classList.remove('opacity-60', 'cursor-not-allowed');
+ cancelBtn.disabled = false;
+ cancelBtn.classList.remove('opacity-40', 'cursor-not-allowed');
+ status.textContent = 'Error: Network error during upload';
+ status.className = 'text-sm text-red-600 dark:text-red-400';
+ });
+
+ xhr.open('POST', `/api/projects/${projectId}/nrl/${locationId}/upload-data`);
+ xhr.send(formData);
+}
{% endblock %}
diff --git a/templates/partials/project_create_modal.html b/templates/partials/project_create_modal.html
index 3758542..bd34fad 100644
--- a/templates/partials/project_create_modal.html
+++ b/templates/partials/project_create_modal.html
@@ -75,6 +75,32 @@ Include this modal in pages that use the project picker.
+
+
+ Data Collection *
+
+
+
+
+
Manual
+
SD card retrieved daily
+
+
+
+
Remote
+
Modem, data pulled via FTP
+
+
+
+
@@ -98,6 +124,24 @@ Include this modal in pages that use the project picker.
diff --git a/templates/partials/projects/unified_files.html b/templates/partials/projects/unified_files.html
index 2d56854..118c217 100644
--- a/templates/partials/projects/unified_files.html
+++ b/templates/partials/projects/unified_files.html
@@ -23,12 +23,26 @@
+ {% set meta = session.session_metadata|fromjson if session.session_metadata else {} %}
+ {% set is_manual = meta.get('source') in ('manual_upload', 'bulk_upload') %}
- {{ session.started_at|local_datetime if session.started_at else 'Unknown Date' }}
+ {% if location %}{{ location.name }}{% else %}Unknown Location{% endif %}
+ {% if session.started_at %}
+ —
+ {% if session.stopped_at and not same_date(session.started_at, session.stopped_at) %}
+ {{ session.started_at|local_date }} to {{ session.stopped_at|local_date }}
+ {% else %}
+ {{ session.started_at|local_date }}
+ {% endif %}
+ {% endif %}
- {% if unit %}{{ unit.id }}{% else %}Unknown Unit{% endif %}
- {% if location %} @ {{ location.name }}{% endif %}
+ {% if is_manual %}
+ {% set store = meta.get('store_name') %}
+ Manual upload{% if store %} — Store {{ store }}{% endif %}
+ {% elif unit %}
+ {{ unit.id }}
+ {% endif %}
•
{{ files|length }} file{{ 's' if files|length != 1 else '' }}
diff --git a/templates/partials/slm_settings_modal.html b/templates/partials/slm_settings_modal.html
index efc41ee..02e9ac6 100644
--- a/templates/partials/slm_settings_modal.html
+++ b/templates/partials/slm_settings_modal.html
@@ -163,6 +163,25 @@