Update probe related models, routes and templates
This commit is contained in:
Andrew Conlon
@@ -13,11 +13,6 @@
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="mb-3">
|
||||
<label for="serial_number" class="form-label">Serial Number</label>
|
||||
<input type="text" class="form-control" id="serial_number" name="serial_number" required>
|
||||
</div>
|
||||
|
||||
<div class="mb-3">
|
||||
<h4>Channels</h4>
|
||||
<div id="channels-container">
|
||||
@@ -41,9 +36,75 @@
|
||||
<button type="button" class="btn btn-secondary" id="add-channel">Add Another Channel</button>
|
||||
</div>
|
||||
|
||||
<button type="submit" class="btn btn-primary">Create Probe</button>
|
||||
<button type="submit" class="btn btn-primary" id="create-probe">Create Probe</button>
|
||||
|
||||
<script>
|
||||
// Channel serial validation regex
|
||||
const CHANNEL_SERIAL_REGEX = /^[0-9A-F]{16}$/i;
|
||||
|
||||
async function validateChannelSerials() {
|
||||
const serialInputs = document.querySelectorAll('input[name="channel_serials[]"]');
|
||||
const serials = new Set();
|
||||
let hasValidChannel = false;
|
||||
|
||||
// First validate format and duplicates in form
|
||||
for (const input of serialInputs) {
|
||||
const serial = input.value.trim().toUpperCase();
|
||||
if (!serial) continue;
|
||||
|
||||
if (!CHANNEL_SERIAL_REGEX.test(serial)) {
|
||||
input.classList.add('is-invalid');
|
||||
alert(`Invalid channel serial format: ${serial}. Must be 16 hex characters (0-9, A-F)`);
|
||||
return false;
|
||||
}
|
||||
|
||||
if (serials.has(serial)) {
|
||||
input.classList.add('is-invalid');
|
||||
alert(`Duplicate channel serial in form: ${serial}`);
|
||||
return false;
|
||||
}
|
||||
|
||||
serials.add(serial);
|
||||
input.classList.remove('is-invalid');
|
||||
hasValidChannel = true;
|
||||
}
|
||||
|
||||
if (!hasValidChannel) {
|
||||
alert('At least one channel must have a valid serial number');
|
||||
return false;
|
||||
}
|
||||
|
||||
// Check for duplicates in database
|
||||
try {
|
||||
const response = await fetch('/probes/api/check-channel-serials', {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
body: JSON.stringify({serials: Array.from(serials)})
|
||||
});
|
||||
|
||||
const data = await response.json();
|
||||
if (data.duplicates && data.duplicates.length > 0) {
|
||||
alert(`Channel serial already exists in database: ${data.duplicates[0]}`);
|
||||
return false;
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Error checking channel serials:', error);
|
||||
alert('Error validating channel serials. Please try again.');
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
document.getElementById('create-probe').addEventListener('click', async function(e) {
|
||||
e.preventDefault();
|
||||
if (await validateChannelSerials()) {
|
||||
this.form.submit();
|
||||
}
|
||||
});
|
||||
|
||||
document.getElementById('add-channel').addEventListener('click', function() {
|
||||
const container = document.getElementById('channels-container');
|
||||
const count = container.children.length;
|
||||
@@ -61,7 +122,11 @@
|
||||
</div>
|
||||
<div class="col">
|
||||
<label for="channel_serial_${count}" class="form-label">Channel Serial</label>
|
||||
<input type="text" class="form-control" id="channel_serial_${count}" name="channel_serials[]" required>
|
||||
<input type="text" class="form-control" id="channel_serial_${count}" name="channel_serials[]" required
|
||||
pattern="[0-9A-F]{16}" title="16-character hex serial number">
|
||||
<div class="invalid-feedback">
|
||||
Must be a 16-character hex number (0-9, A-F)
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-auto d-flex align-items-end">
|
||||
<button type="button" class="btn btn-danger remove-channel">Remove</button>
|
||||
|
||||
+21
-18
@@ -24,41 +24,44 @@
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Model</th>
|
||||
<th>Serial Number</th>
|
||||
<th>Description</th>
|
||||
<th>Created</th>
|
||||
<th>Status</th>
|
||||
<th>Retired</th>
|
||||
<th>Actions</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% set current_model = none %}
|
||||
{% for probe in probes|sort(attribute='model_name') %}
|
||||
{% if probe.model_name != current_model %}
|
||||
<tr class="table-info">
|
||||
<td colspan="6">
|
||||
<strong>{{ probe.model_name }}</strong>
|
||||
</td>
|
||||
</tr>
|
||||
{% set current_model = probe.model_name %}
|
||||
{% endif %}
|
||||
<tr class="probe-row" data-active="{{ 'true' if not probe.retired_at else 'false' }}">
|
||||
<td></td> <!-- Empty cell under model header -->
|
||||
<td>{{ probe.serial_number }}</td>
|
||||
<td>{{ probe.description }}</td>
|
||||
<td>{{ probe.model_name }}</td>
|
||||
<td>{{ probe.created_at.strftime('%Y-%m-%d') }}</td>
|
||||
<td>
|
||||
{% if probe.retired_at %}
|
||||
<span class="badge bg-secondary">Retired</span>
|
||||
<span class="badge bg-secondary">Yes</span>
|
||||
{% else %}
|
||||
<span class="badge bg-success">Active</span>
|
||||
<span class="badge bg-success">No</span>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>
|
||||
<a href="{{ url_for('probes.view_probe', probe_id=probe.id) }}"
|
||||
class="btn btn-sm btn-outline-primary">View</a>
|
||||
class="btn btn-sm btn-outline-primary">View/Edit</a>
|
||||
</td>
|
||||
</tr>
|
||||
{% if probe.channels %}
|
||||
{% for channel in probe.channels %}
|
||||
<tr class="channel-row">
|
||||
<td colspan="2">
|
||||
<small class="text-muted">
|
||||
Channel: {{ channel.parameter.parameter_name }} ({{ channel.serial_number }})
|
||||
</small>
|
||||
</td>
|
||||
<td></td>
|
||||
<td>
|
||||
<a href="{{ url_for('channels.view_channel', channel_id=channel.id) }}"
|
||||
class="btn btn-sm btn-outline-secondary">View</a>
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
@@ -65,6 +65,33 @@
|
||||
<div class="alert alert-info mt-4">No channels found for this probe</div>
|
||||
{% endif %}
|
||||
|
||||
{% if not probe.retired_at %}
|
||||
<div class="mt-4">
|
||||
<h5>Add Channel</h5>
|
||||
<form method="POST" action="{{ url_for('probes.add_channel', probe_id=probe.id) }}">
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
<label for="parameter_id" class="form-label">Parameter</label>
|
||||
<select class="form-select" id="parameter_id" name="parameter_id" required>
|
||||
{% for param in parameters %}
|
||||
<option value="{{ param.id }}">{{ param.parameter_name }}</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<label for="channel_serial" class="form-label">Channel Serial</label>
|
||||
<input type="text" class="form-control" id="channel_serial" name="channel_serial"
|
||||
required pattern="[0-9A-F]{16}" title="16-character hex serial number">
|
||||
<div class="invalid-feedback">
|
||||
Must be a 16-character hex number (0-9, A-F)
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<button type="submit" class="btn btn-primary mt-3">Add Channel</button>
|
||||
</form>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% if locations %}
|
||||
<div class="mt-4">
|
||||
<h5>Location History</h5>
|
||||
@@ -102,7 +129,41 @@
|
||||
<div class="mt-4">
|
||||
<a href="{{ url_for('probes.list_probes') }}"
|
||||
class="btn btn-outline-secondary">Back to List</a>
|
||||
|
||||
{% if not probe.retired_at %}
|
||||
<form method="POST" action="{{ url_for('probes.retire_probe', probe_id=probe.id) }}" class="d-inline">
|
||||
<button type="submit" class="btn btn-warning ms-2">Retire Probe</button>
|
||||
</form>
|
||||
{% endif %}
|
||||
|
||||
{% if not channels %}
|
||||
<button class="btn btn-danger ms-2" id="delete-probe">Delete Probe</button>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
<script>
|
||||
document.getElementById('delete-probe')?.addEventListener('click', async function() {
|
||||
if (confirm('Are you sure you want to delete this probe?')) {
|
||||
try {
|
||||
const response = await fetch("{{ url_for('probes.delete_probe', probe_id=probe.id) }}", {
|
||||
method: 'DELETE',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
}
|
||||
});
|
||||
|
||||
if (response.ok) {
|
||||
window.location.href = "{{ url_for('probes.list_probes') }}";
|
||||
} else {
|
||||
const error = await response.json();
|
||||
alert(error.error || 'Failed to delete probe');
|
||||
}
|
||||
} catch (error) {
|
||||
alert('Error deleting probe: ' + error.message);
|
||||
}
|
||||
}
|
||||
});
|
||||
</script>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user