job folders, selection

This commit is contained in:
zyphlar
2026-02-25 10:25:48 -08:00
parent d617750a46
commit de7789442d
5 changed files with 975 additions and 217 deletions
+115 -7
View File
@@ -164,6 +164,47 @@
margin-bottom: 10px;
font-size: 16px;
}
.button-with-checkbox {
display: flex;
align-items: center;
gap: 10px;
}
.button-with-checkbox label {
display: flex;
align-items: center;
gap: 5px;
font-size: 13px;
color: #666;
cursor: pointer;
white-space: nowrap;
}
.button-with-checkbox input[type="checkbox"] {
cursor: pointer;
}
.cancel-button {
padding: 10px 20px;
background: #dc3545;
color: white;
border: none;
border-radius: 6px;
cursor: pointer;
font-size: 14px;
font-weight: 500;
transition: background 0.2s;
display: none;
}
.cancel-button:hover {
background: #c82333;
}
.cancel-button.active {
display: inline-block;
}
</style>
</head>
<body>
@@ -198,14 +239,30 @@
{# County-specific commands #}
<div class="button-grid">
{% if 'lake' in script_config %}
<button class="script-button lake" onclick="runScript('{{ script_name }}', 'lake')">
{{ script_name|replace('-', ' ')|title }} (Lake)
</button>
<div class="button-with-checkbox">
<button class="script-button lake" onclick="runScript('{{ script_name }}', 'lake')">
{{ script_name|replace('-', ' ')|title }} (Lake)
</button>
{% if script_name == 'diff-addresses' %}
<label>
<input type="checkbox" id="force-redownload-lake">
Force OSM Redownload
</label>
{% endif %}
</div>
{% endif %}
{% if 'sumter' in script_config %}
<button class="script-button sumter" onclick="runScript('{{ script_name }}', 'sumter')">
{{ script_name|replace('-', ' ')|title }} (Sumter)
</button>
<div class="button-with-checkbox">
<button class="script-button sumter" onclick="runScript('{{ script_name }}', 'sumter')">
{{ script_name|replace('-', ' ')|title }} (Sumter)
</button>
{% if script_name == 'diff-addresses' %}
<label>
<input type="checkbox" id="force-redownload-sumter">
Force OSM Redownload
</label>
{% endif %}
</div>
{% endif %}
</div>
{% endif %}
@@ -243,6 +300,7 @@
<div class="log-viewer">
<h2>Script Output</h2>
<div id="status" class="status-message"></div>
<button id="cancelButton" class="cancel-button" onclick="cancelJob()">Cancel Job</button>
<div id="logs" class="log-box"></div>
</div>
</div>
@@ -269,6 +327,19 @@
btn.disabled = true;
});
// Show cancel button
document.getElementById('cancelButton').classList.add('active');
// Check if force redownload is checked (for diff-addresses)
let forceDownload = false;
if (scriptName === 'diff-addresses') {
const checkboxId = `force-redownload-${county}`;
const checkbox = document.getElementById(checkboxId);
if (checkbox) {
forceDownload = checkbox.checked;
}
}
fetch('/api/run-script', {
method: 'POST',
headers: {
@@ -276,7 +347,8 @@
},
body: JSON.stringify({
script: scriptName,
county: county
county: county,
forceDownload: forceDownload
})
})
.then(response => response.json())
@@ -284,6 +356,7 @@
if (data.error) {
showStatus(`Error: ${data.error}`, 'error');
enableButtons();
document.getElementById('cancelButton').classList.remove('active');
return;
}
@@ -300,6 +373,40 @@
.catch(error => {
showStatus(`Error: ${error.message}`, 'error');
enableButtons();
document.getElementById('cancelButton').classList.remove('active');
});
}
function cancelJob() {
if (!currentJobId) return;
if (!confirm('Are you sure you want to cancel this job?')) {
return;
}
fetch('/api/cancel-job', {
method: 'POST',
headers: {
'Content-Type': 'application/json'
},
body: JSON.stringify({
job_id: currentJobId
})
})
.then(response => response.json())
.then(data => {
if (data.success) {
showStatus('Job cancelled', 'info');
clearInterval(logCheckInterval);
enableButtons();
document.getElementById('cancelButton').classList.remove('active');
currentJobId = null;
} else {
showStatus(`Error cancelling job: ${data.error}`, 'error');
}
})
.catch(error => {
showStatus(`Error cancelling job: ${error.message}`, 'error');
});
}
@@ -319,6 +426,7 @@
clearInterval(logCheckInterval);
showStatus('Script completed', 'success');
enableButtons();
document.getElementById('cancelButton').classList.remove('active');
currentJobId = null;
}
})