update ftp browser, enable folder downloads (local), reimplemented timer. Enhanced project view

- Updated roster.html to include a new option for Sound Level Meter in the device type selection.
- Added specific fields for Sound Level Meter information, including model, host/IP address, TCP and FTP ports, serial number, frequency weighting, and time weighting.
- Enhanced JavaScript to handle the visibility and state of Sound Level Meter fields based on the selected device type.
- Modified the unit editing functionality to populate Sound Level Meter fields with existing data when editing a unit.
- Updated settings.html to change the deployment status display from badges to radio buttons for better user interaction.
- Adjusted the toggleDeployed function to accept the new state directly instead of the current state.
- Changed the edit button in unit_detail.html to redirect to the roster edit page with the appropriate unit ID.

backend/routers/projects.py

@@ -744,6 +744,132 @@ async def ftp_download_to_server(
         )
 
 
+@router.post("/{project_id}/ftp-download-folder-to-server")
+async def ftp_download_folder_to_server(
+    project_id: str,
+    request: Request,
+    db: Session = Depends(get_db),
+):
+    """
+    Download an entire folder from an SLM to the server via FTP as a ZIP file.
+    Creates a DataFile record and stores the ZIP in data/Projects/{project_id}/
+    """
+    import httpx
+    import os
+    import hashlib
+    from pathlib import Path
+    from backend.models import DataFile
+
+    data = await request.json()
+    unit_id = data.get("unit_id")
+    remote_path = data.get("remote_path")
+    location_id = data.get("location_id")
+
+    if not unit_id or not remote_path:
+        raise HTTPException(status_code=400, detail="Missing unit_id or remote_path")
+
+    # Get or create active session for this location/unit
+    session = db.query(RecordingSession).filter(
+        and_(
+            RecordingSession.project_id == project_id,
+            RecordingSession.location_id == location_id,
+            RecordingSession.unit_id == unit_id,
+            RecordingSession.status.in_(["recording", "paused"])
+        )
+    ).first()
+
+    # If no active session, create one
+    if not session:
+        session = RecordingSession(
+            id=str(uuid.uuid4()),
+            project_id=project_id,
+            location_id=location_id,
+            unit_id=unit_id,
+            status="completed",
+            started_at=datetime.utcnow(),
+            stopped_at=datetime.utcnow(),
+            notes="Auto-created for FTP folder download"
+        )
+        db.add(session)
+        db.commit()
+        db.refresh(session)
+
+    # Download folder from SLMM
+    SLMM_BASE_URL = os.getenv("SLMM_BASE_URL", "http://localhost:8100")
+
+    try:
+        async with httpx.AsyncClient(timeout=600.0) as client:  # Longer timeout for folders
+            response = await client.post(
+                f"{SLMM_BASE_URL}/api/nl43/{unit_id}/ftp/download-folder",
+                json={"remote_path": remote_path}
+            )
+
+            if not response.is_success:
+                raise HTTPException(
+                    status_code=response.status_code,
+                    detail=f"Failed to download folder from SLMM: {response.text}"
+                )
+
+            # Extract folder name from remote_path
+            folder_name = os.path.basename(remote_path.rstrip('/'))
+            filename = f"{folder_name}.zip"
+
+            # Create directory structure: data/Projects/{project_id}/{session_id}/
+            project_dir = Path(f"data/Projects/{project_id}/{session.id}")
+            project_dir.mkdir(parents=True, exist_ok=True)
+
+            # Save ZIP file to disk
+            file_path = project_dir / filename
+            file_content = response.content
+
+            with open(file_path, 'wb') as f:
+                f.write(file_content)
+
+            # Calculate checksum
+            checksum = hashlib.sha256(file_content).hexdigest()
+
+            # Create DataFile record
+            data_file = DataFile(
+                id=str(uuid.uuid4()),
+                session_id=session.id,
+                file_path=str(file_path.relative_to("data")),  # Store relative to data/
+                file_type='archive',  # ZIP archives
+                file_size_bytes=len(file_content),
+                downloaded_at=datetime.utcnow(),
+                checksum=checksum,
+                file_metadata=json.dumps({
+                    "source": "ftp_folder",
+                    "remote_path": remote_path,
+                    "unit_id": unit_id,
+                    "location_id": location_id,
+                    "folder_name": folder_name,
+                })
+            )
+
+            db.add(data_file)
+            db.commit()
+
+            return {
+                "success": True,
+                "message": f"Downloaded folder {folder_name} to server as ZIP",
+                "file_id": data_file.id,
+                "file_path": str(file_path),
+                "file_size": len(file_content),
+            }
+
+    except httpx.TimeoutException:
+        raise HTTPException(
+            status_code=504,
+            detail="Timeout downloading folder from SLM (large folders may take a while)"
+        )
+    except Exception as e:
+        logger.error(f"Error downloading folder to server: {e}")
+        raise HTTPException(
+            status_code=500,
+            detail=f"Failed to download folder to server: {str(e)}"
+        )
+
+
 # ============================================================================
 # Project Types
 # ============================================================================

backend/routers/slm_dashboard.py

@@ -158,7 +158,7 @@ async def get_live_view(request: Request, unit_id: str, db: Session = Depends(ge
     is_measuring = False
 
     try:
-        async with httpx.AsyncClient(timeout=5.0) as client:
+        async with httpx.AsyncClient(timeout=10.0) as client:
             # Get measurement state
             state_response = await client.get(
                 f"{SLMM_BASE_URL}/api/nl43/{unit_id}/measurement-state"
@@ -168,7 +168,23 @@ async def get_live_view(request: Request, unit_id: str, db: Session = Depends(ge
                 measurement_state = state_data.get("measurement_state", "Unknown")
                 is_measuring = state_data.get("is_measuring", False)
 
-            # Get live status
+            # If measuring, sync start time from FTP to database (fixes wrong timestamps)
+            if is_measuring:
+                try:
+                    sync_response = await client.post(
+                        f"{SLMM_BASE_URL}/api/nl43/{unit_id}/sync-start-time",
+                        timeout=10.0
+                    )
+                    if sync_response.status_code == 200:
+                        sync_data = sync_response.json()
+                        logger.info(f"Synced start time for {unit_id}: {sync_data.get('message')}")
+                    else:
+                        logger.warning(f"Failed to sync start time for {unit_id}: {sync_response.status_code}")
+                except Exception as e:
+                    # Don't fail the whole request if sync fails
+                    logger.warning(f"Could not sync start time for {unit_id}: {e}")
+
+            # Get live status (now with corrected start time)
             status_response = await client.get(
                 f"{SLMM_BASE_URL}/api/nl43/{unit_id}/live"
             )

templates/partials/projects/ftp_browser.html

@@ -1,4 +1,4 @@
-<!-- FTP File Browser for SLMs -->
+<!-- FTP File Browser for SLMs v2.0 - Folder Download Support -->
 <div class="bg-white dark:bg-slate-800 rounded-xl shadow-lg p-6 mb-6">
     <h2 class="text-xl font-semibold text-gray-900 dark:text-white mb-4">Download Files from SLMs</h2>
 
@@ -34,7 +34,7 @@
                                 disabled>
                             Disable FTP
                         </button>
-                        <button onclick="loadFTPFiles('{{ unit_item.unit.id }}', '/NL43_DATA')"
+                        <button onclick="loadFTPFiles('{{ unit_item.unit.id }}', '/NL-43')"
                                 id="browse-ftp-{{ unit_item.unit.id }}"
                                 class="px-3 py-1 text-xs bg-seismo-orange text-white rounded-lg hover:bg-seismo-navy transition-colors"
                                 disabled>
@@ -50,8 +50,8 @@
                             <svg class="w-5 h-5 text-gray-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                                 <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 7v10a2 2 0 002 2h14a2 2 0 002-2V9a2 2 0 00-2-2h-6l-2-2H5a2 2 0 00-2 2z"></path>
                             </svg>
-                            <span id="current-path-{{ unit_item.unit.id }}" class="text-sm font-mono text-gray-600 dark:text-gray-400">/NL43_DATA</span>
-                            <button onclick="loadFTPFiles('{{ unit_item.unit.id }}', '/NL43_DATA')"
+                            <span id="current-path-{{ unit_item.unit.id }}" class="text-sm font-mono text-gray-600 dark:text-gray-400">/NL-43</span>
+                            <button onclick="loadFTPFiles('{{ unit_item.unit.id }}', '/NL-43')"
                                     class="ml-auto text-xs px-2 py-1 bg-gray-100 dark:bg-gray-700 rounded hover:bg-gray-200 dark:hover:bg-gray-600">
                                 <svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                                     <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 4v5h.582m15.356 2A8.001 8.001 0 004.582 9m0 0H9m11 11v-5h-.581m0 0a8.003 8.003 0 01-15.357-2m15.357 2H15"></path>
@@ -127,7 +127,7 @@ async function enableFTP(unitId) {
         if (response.ok) {
             await checkFTPStatus(unitId);
             // Auto-load files after enabling
-            setTimeout(() => loadFTPFiles(unitId, '/NL43_DATA'), 1000);
+            setTimeout(() => loadFTPFiles(unitId, '/NL-43'), 1000);
         } else {
             alert('Failed to enable FTP');
         }
@@ -200,18 +200,34 @@ async function loadFTPFiles(unitId, path) {
                 : '<svg class="w-5 h-5 text-gray-400" fill="currentColor" viewBox="0 0 20 20"><path fill-rule="evenodd" d="M4 4a2 2 0 012-2h4.586A2 2 0 0112 2.586L15.414 6A2 2 0 0116 7.414V16a2 2 0 01-2 2H6a2 2 0 01-2-2V4z" clip-rule="evenodd"></path></svg>';
 
             const sizeStr = file.is_dir ? '' : formatFileSize(file.size);
-            const clickAction = file.is_dir
-                ? `onclick="loadFTPFiles('${unitId}', '${file.path}')"`
-                : '';
 
             html += `
-                <div class="flex items-center gap-3 px-3 py-2 hover:bg-gray-50 dark:hover:bg-gray-800 rounded ${file.is_dir ? 'cursor-pointer' : ''}" ${clickAction}>
+                <div class="flex items-center gap-3 px-3 py-2 hover:bg-gray-50 dark:hover:bg-gray-800 rounded">
                     ${icon}
-                    <div class="flex-1 min-w-0">
+                    <div class="flex-1 min-w-0 ${file.is_dir ? 'cursor-pointer' : ''}" ${file.is_dir ? `onclick="loadFTPFiles('${unitId}', '${file.path}')"` : ''}>
                         <div class="text-sm font-medium text-gray-900 dark:text-white truncate">${file.name}</div>
                         <div class="text-xs text-gray-500 dark:text-gray-400">${file.modified}${sizeStr ? ' • ' + sizeStr : ''}</div>
                     </div>
-                    ${!file.is_dir ? `
+                    ${file.is_dir ? `
+                    <div class="flex items-center gap-2">
+                        <button onclick="event.stopPropagation(); downloadFolderToServer('${unitId}', '${file.path}', '${file.name}')"
+                                class="px-3 py-1 text-xs bg-green-600 text-white rounded hover:bg-green-700 transition-colors"
+                                title="Download entire folder to server and add to database">
+                            <svg class="w-3 h-3 inline mr-1" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 12h14M5 12a2 2 0 01-2-2V6a2 2 0 012-2h14a2 2 0 012 2v4a2 2 0 01-2 2M5 12a2 2 0 00-2 2v4a2 2 0 002 2h14a2 2 0 002-2v-4a2 2 0 00-2-2m-2-4h.01M17 16h.01"></path>
+                            </svg>
+                            To Server (ZIP)
+                        </button>
+                        <button onclick="event.stopPropagation(); downloadFTPFolder('${unitId}', '${file.path}', '${file.name}')"
+                                class="px-3 py-1 text-xs bg-blue-600 text-white rounded hover:bg-blue-700 transition-colors"
+                                title="Download entire folder as ZIP to your computer">
+                            <svg class="w-3 h-3 inline mr-1" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 16v1a3 3 0 003 3h10a3 3 0 003-3v-1m-4-4l-4 4m0 0l-4-4m4 4V4"></path>
+                            </svg>
+                            To Browser (ZIP)
+                        </button>
+                    </div>
+                    ` : `
                     <div class="flex items-center gap-2">
                         <button onclick="downloadToServer('${unitId}', '${file.path}', '${file.name}')"
                                 class="px-3 py-1 text-xs bg-green-600 text-white rounded hover:bg-green-700 transition-colors"
@@ -230,7 +246,7 @@ async function loadFTPFiles(unitId, path) {
                             To Browser
                         </button>
                     </div>
-                    ` : ''}
+                    `}
                 </div>
             `;
         }
@@ -280,6 +296,90 @@ async function downloadFTPFile(unitId, remotePath, fileName) {
     }
 }
 
+async function downloadFTPFolder(unitId, remotePath, folderName) {
+    const btn = event.target;
+    const originalHTML = btn.innerHTML;
+    btn.disabled = true;
+    btn.innerHTML = '<svg class="w-3 h-3 inline mr-1 animate-spin" fill="none" stroke="currentColor" viewBox="0 0 24 24"><circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle><path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path></svg>Downloading...';
+
+    try {
+        const response = await fetch(`/api/slmm/${unitId}/ftp/download-folder`, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+            },
+            body: JSON.stringify({
+                remote_path: remotePath
+            })
+        });
+
+        if (response.ok) {
+            const blob = await response.blob();
+            const url = window.URL.createObjectURL(blob);
+            const a = document.createElement('a');
+            a.href = url;
+            a.download = `${folderName}.zip`;
+            document.body.appendChild(a);
+            a.click();
+            window.URL.revokeObjectURL(url);
+            document.body.removeChild(a);
+
+            // Show success message
+            alert(`✓ Folder "${folderName}" downloaded successfully as ZIP file!`);
+        } else {
+            const errorData = await response.json();
+            alert('Folder download failed: ' + (errorData.detail || 'Unknown error'));
+        }
+    } catch (error) {
+        alert('Error downloading folder: ' + error);
+    } finally {
+        btn.disabled = false;
+        btn.innerHTML = originalHTML;
+    }
+}
+
+async function downloadFolderToServer(unitId, remotePath, folderName) {
+    const btn = event.target;
+    const originalHTML = btn.innerHTML;
+    btn.disabled = true;
+    btn.innerHTML = '<svg class="w-3 h-3 inline mr-1 animate-spin" fill="none" stroke="currentColor" viewBox="0 0 24 24"><circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle><path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path></svg>Downloading...';
+
+    // Get location_id from the unit's data attribute
+    const unitContainer = btn.closest('[id^="ftp-files-"]');
+    const locationId = unitContainer.dataset.locationId;
+
+    try {
+        const response = await fetch(`/api/projects/{{ project_id }}/ftp-download-folder-to-server`, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+            },
+            body: JSON.stringify({
+                unit_id: unitId,
+                remote_path: remotePath,
+                location_id: locationId
+            })
+        });
+
+        const data = await response.json();
+
+        if (response.ok) {
+            // Show success message
+            alert(`✓ Folder "${folderName}" downloaded to server successfully as ZIP!\n\nFile ID: ${data.file_id}\nSize: ${formatFileSize(data.file_size)}`);
+
+            // Refresh the downloaded files list
+            htmx.trigger('#project-files', 'refresh');
+        } else {
+            alert('Folder download to server failed: ' + (data.detail || 'Unknown error'));
+        }
+    } catch (error) {
+        alert('Error downloading folder to server: ' + error);
+    } finally {
+        btn.disabled = false;
+        btn.innerHTML = originalHTML;
+    }
+}
+
 async function downloadToServer(unitId, remotePath, fileName) {
     const btn = event.target;
     const originalText = btn.innerHTML;

templates/roster.html

@@ -288,6 +288,7 @@
                     class="w-full px-4 py-2 rounded-lg border border-gray-300 dark:border-gray-600 bg-white dark:bg-slate-700 text-gray-900 dark:text-white focus:ring-2 focus:ring-seismo-orange">
                     <option value="seismograph">Seismograph</option>
                     <option value="modem">Modem</option>
+                    <option value="sound_level_meter">Sound Level Meter</option>
                 </select>
             </div>
             <div>
@@ -351,6 +352,56 @@
                 </div>
             </div>
 
+            <!-- Sound Level Meter-specific fields -->
+            <div id="editSlmFields" class="hidden space-y-4 border-t border-gray-200 dark:border-gray-700 pt-4">
+                <p class="text-sm font-semibold text-gray-700 dark:text-gray-300">Sound Level Meter Information</p>
+                <div>
+                    <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">SLM Model</label>
+                    <input type="text" name="slm_model" id="editSlmModel" placeholder="NL-43"
+                        class="w-full px-4 py-2 rounded-lg border border-gray-300 dark:border-gray-600 bg-white dark:bg-slate-700 text-gray-900 dark:text-white focus:ring-2 focus:ring-seismo-orange">
+                </div>
+                <div>
+                    <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">Host/IP Address</label>
+                    <input type="text" name="slm_host" id="editSlmHost" placeholder="192.168.1.100"
+                        class="w-full px-4 py-2 rounded-lg border border-gray-300 dark:border-gray-600 bg-white dark:bg-slate-700 text-gray-900 dark:text-white focus:ring-2 focus:ring-seismo-orange">
+                </div>
+                <div>
+                    <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">TCP Port</label>
+                    <input type="number" name="slm_tcp_port" id="editSlmTcpPort" placeholder="2255"
+                        class="w-full px-4 py-2 rounded-lg border border-gray-300 dark:border-gray-600 bg-white dark:bg-slate-700 text-gray-900 dark:text-white focus:ring-2 focus:ring-seismo-orange">
+                </div>
+                <div>
+                    <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">FTP Port</label>
+                    <input type="number" name="slm_ftp_port" id="editSlmFtpPort" placeholder="21"
+                        class="w-full px-4 py-2 rounded-lg border border-gray-300 dark:border-gray-600 bg-white dark:bg-slate-700 text-gray-900 dark:text-white focus:ring-2 focus:ring-seismo-orange">
+                </div>
+                <div>
+                    <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">Serial Number</label>
+                    <input type="text" name="slm_serial_number" id="editSlmSerialNumber" placeholder="SN123456"
+                        class="w-full px-4 py-2 rounded-lg border border-gray-300 dark:border-gray-600 bg-white dark:bg-slate-700 text-gray-900 dark:text-white focus:ring-2 focus:ring-seismo-orange">
+                </div>
+                <div>
+                    <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">Frequency Weighting</label>
+                    <select name="slm_frequency_weighting" id="editSlmFrequencyWeighting"
+                        class="w-full px-4 py-2 rounded-lg border border-gray-300 dark:border-gray-600 bg-white dark:bg-slate-700 text-gray-900 dark:text-white focus:ring-2 focus:ring-seismo-orange">
+                        <option value="">Not set</option>
+                        <option value="A">A-weighting</option>
+                        <option value="C">C-weighting</option>
+                        <option value="Z">Z-weighting (Flat)</option>
+                    </select>
+                </div>
+                <div>
+                    <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">Time Weighting</label>
+                    <select name="slm_time_weighting" id="editSlmTimeWeighting"
+                        class="w-full px-4 py-2 rounded-lg border border-gray-300 dark:border-gray-600 bg-white dark:bg-slate-700 text-gray-900 dark:text-white focus:ring-2 focus:ring-seismo-orange">
+                        <option value="">Not set</option>
+                        <option value="F">F (Fast)</option>
+                        <option value="S">S (Slow)</option>
+                        <option value="I">I (Impulse)</option>
+                    </select>
+                </div>
+            </div>
+
             <div class="flex items-center gap-4">
                 <label class="flex items-center gap-2 cursor-pointer">
                     <input type="checkbox" name="deployed" id="editDeployedCheckbox" value="true" onchange="toggleEditModemPairing()"
@@ -648,20 +699,30 @@
         const deviceType = document.getElementById('editDeviceTypeSelect').value;
         const seismoFields = document.getElementById('editSeismographFields');
         const modemFields = document.getElementById('editModemFields');
+        const slmFields = document.getElementById('editSlmFields');
 
         if (deviceType === 'seismograph') {
             seismoFields.classList.remove('hidden');
             modemFields.classList.add('hidden');
-            // Enable seismograph fields, disable modem fields
+            slmFields.classList.add('hidden');
             setFieldsDisabled(seismoFields, false);
             setFieldsDisabled(modemFields, true);
+            setFieldsDisabled(slmFields, true);
             toggleEditModemPairing();
-        } else {
+        } else if (deviceType === 'modem') {
             seismoFields.classList.add('hidden');
             modemFields.classList.remove('hidden');
-            // Enable modem fields, disable seismograph fields
+            slmFields.classList.add('hidden');
             setFieldsDisabled(seismoFields, true);
             setFieldsDisabled(modemFields, false);
+            setFieldsDisabled(slmFields, true);
+        } else if (deviceType === 'sound_level_meter') {
+            seismoFields.classList.add('hidden');
+            modemFields.classList.add('hidden');
+            slmFields.classList.remove('hidden');
+            setFieldsDisabled(seismoFields, true);
+            setFieldsDisabled(modemFields, true);
+            setFieldsDisabled(slmFields, false);
         }
     }
 
@@ -711,6 +772,15 @@
             document.getElementById('editPhoneNumber').value = unit.phone_number;
             document.getElementById('editHardwareModel').value = unit.hardware_model;
 
+            // SLM fields
+            document.getElementById('editSlmModel').value = unit.slm_model || '';
+            document.getElementById('editSlmHost').value = unit.slm_host || '';
+            document.getElementById('editSlmTcpPort').value = unit.slm_tcp_port || '';
+            document.getElementById('editSlmFtpPort').value = unit.slm_ftp_port || '';
+            document.getElementById('editSlmSerialNumber').value = unit.slm_serial_number || '';
+            document.getElementById('editSlmFrequencyWeighting').value = unit.slm_frequency_weighting || '';
+            document.getElementById('editSlmTimeWeighting').value = unit.slm_time_weighting || '';
+
             // Store unit ID for form submission
             document.getElementById('editUnitForm').dataset.unitId = unitId;
 
@@ -1206,6 +1276,18 @@
             alert(`Error renaming unit: ${error.message}`);
         }
     });
+
+    // Auto-open edit modal if ?edit=UNIT_ID query parameter is present
+    document.addEventListener('DOMContentLoaded', function() {
+        const urlParams = new URLSearchParams(window.location.search);
+        const editUnitId = urlParams.get('edit');
+        if (editUnitId) {
+            // Wait a bit for the page to fully load, then open the edit modal
+            setTimeout(() => {
+                editUnit(editUnitId);
+            }, 500);
+        }
+    });
 </script>
 
 <style>

templates/settings.html

@@ -859,11 +859,6 @@ async function loadRosterTable() {
 
 function createRosterRow(unit) {
     const statusBadges = [];
-    if (unit.deployed) {
-        statusBadges.push('<span class="inline-flex items-center px-2 py-1 rounded text-xs font-medium bg-green-100 text-green-800 dark:bg-green-900 dark:text-green-300">Deployed</span>');
-    } else {
-        statusBadges.push('<span class="inline-flex items-center px-2 py-1 rounded text-xs font-medium bg-gray-100 text-gray-800 dark:bg-gray-700 dark:text-gray-300">Benched</span>');
-    }
     if (unit.retired) {
         statusBadges.push('<span class="inline-flex items-center px-2 py-1 rounded text-xs font-medium bg-purple-100 text-purple-800 dark:bg-purple-900 dark:text-purple-300">Retired</span>');
     }
@@ -880,8 +875,24 @@ function createRosterRow(unit) {
                 <div class="text-xs text-gray-500 dark:text-gray-400">${unit.unit_type}</div>
             </td>
             <td class="px-4 py-3">
-                <div class="flex flex-wrap gap-1">
-                    ${statusBadges.join('')}
+                <div class="flex flex-col gap-2">
+                    <div class="flex gap-3">
+                        <label class="flex items-center gap-2 cursor-pointer">
+                            <input type="radio" name="deployed-${unit.id}" value="true"
+                                   ${unit.deployed ? 'checked' : ''}
+                                   onchange="toggleDeployed('${unit.id}', true)"
+                                   class="w-4 h-4 text-green-600 focus:ring-green-500">
+                            <span class="text-sm text-gray-700 dark:text-gray-300">Deployed</span>
+                        </label>
+                        <label class="flex items-center gap-2 cursor-pointer">
+                            <input type="radio" name="deployed-${unit.id}" value="false"
+                                   ${!unit.deployed ? 'checked' : ''}
+                                   onchange="toggleDeployed('${unit.id}', false)"
+                                   class="w-4 h-4 text-gray-600 focus:ring-gray-500">
+                            <span class="text-sm text-gray-700 dark:text-gray-300">Benched</span>
+                        </label>
+                    </div>
+                    ${statusBadges.length > 0 ? '<div class="flex flex-wrap gap-1">' + statusBadges.join('') + '</div>' : ''}
                 </div>
             </td>
             <td class="px-4 py-3">
@@ -896,13 +907,6 @@ function createRosterRow(unit) {
             </td>
             <td class="px-4 py-3 whitespace-nowrap text-right text-sm">
                 <div class="flex justify-end gap-1">
-                    <button onclick="toggleDeployed('${unit.id}', ${unit.deployed})"
-                        class="p-2 hover:bg-gray-100 dark:hover:bg-gray-600 rounded transition-colors"
-                        title="${unit.deployed ? 'Bench Unit' : 'Deploy Unit'}">
-                        <svg class="w-4 h-4 ${unit.deployed ? 'text-green-600 dark:text-green-400' : 'text-gray-400'}" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z"></path>
-                        </svg>
-                    </button>
                     <button onclick="toggleRetired('${unit.id}', ${unit.retired})"
                         class="p-2 hover:bg-gray-100 dark:hover:bg-gray-600 rounded transition-colors"
                         title="${unit.retired ? 'Unretire Unit' : 'Retire Unit'}">
@@ -930,12 +934,12 @@ function createRosterRow(unit) {
     `;
 }
 
-async function toggleDeployed(unitId, currentState) {
+async function toggleDeployed(unitId, newState) {
     try {
         const response = await fetch(`/api/roster/set-deployed/${unitId}`, {
             method: 'POST',
             headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-            body: `deployed=${!currentState}`
+            body: `deployed=${newState}`
         });
 
         if (response.ok) {
@@ -969,7 +973,7 @@ async function toggleRetired(unitId, currentState) {
 }
 
 function editUnit(unitId) {
-    window.location.href = `/unit/${unitId}`;
+    window.location.href = `/roster?edit=${unitId}`;
 }
 
 async function confirmDeleteUnit(unitId) {

templates/unit_detail.html

@@ -43,7 +43,7 @@
             </button>
         </div>
         <div class="flex gap-3">
-            <button id="editButton" onclick="enterEditMode()" class="px-4 py-2 bg-seismo-orange hover:bg-orange-600 text-white rounded-lg transition-colors flex items-center gap-2">
+            <button id="editButton" onclick="window.location.href='/roster?edit=' + unitId" class="px-4 py-2 bg-seismo-orange hover:bg-orange-600 text-white rounded-lg transition-colors flex items-center gap-2">
                 <svg class="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                     <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M11 5H6a2 2 0 00-2 2v11a2 2 0 002 2h11a2 2 0 002-2v-5m-1.414-9.414a2 2 0 112.828 2.828L11.828 15H9v-2.828l8.586-8.586z"></path>
                 </svg>