mirror of
https://github.com/magicbug/Cloudlog
synced 2026-08-13 17:49:35 -04:00
df8dc163ff
Validate and harden SIG handling across controllers and views. Awards: trim and validate requested SIG type, guard against empty types and wrap SIG data loading in try/catch with error logging and user notice. Callhistory: tighten input trimming and validation for proposed SIG info, reject proposals without membership numbers and enforce per-organization SIG-info rules (e.g. numeric for CWOPS). Add scan_remove action to perform reverse/bulk SIG clears for matched QSOs, and filter/validate batch changes before applying. Improve CSV/header parsing by normalizing header keys, aligning rows to headers (handles N1MM !!Order!! cases), extracting exch1 robustly, and adding helpers (looks_like_callsign, is_valid_sig_info_for_organization). View: add Reverse Bulk SIG Update UI, confirmation modal and JS helpers, and convert several forms to use JS-driven confirm dialogs. Misc: various trimming/safety fixes and UX messages.
459 lines
23 KiB
PHP
459 lines
23 KiB
PHP
<div class="container">
|
|
<h2>Call History</h2>
|
|
<p class="text-muted">Upload N1MM call history files (.txt/.csv), assign an organization label (e.g., FOC), and set file priority for matching.</p>
|
|
|
|
<?php if (!empty($preview)) { ?>
|
|
<div class="card mb-3 border-warning">
|
|
<div class="card-header bg-warning text-dark">
|
|
<strong><i class="fas fa-search"></i> Scan Preview — <?php echo htmlspecialchars($scan_file->original_filename); ?></strong>
|
|
<span class="badge bg-dark ms-2"><?php echo count($preview); ?> QSO(s) with blank SIG fields found</span>
|
|
</div>
|
|
<div class="card-body">
|
|
<p class="text-muted small mb-2">Only QSOs with <strong>no existing SIG data</strong> are shown. Review the proposed values below, then click <strong>Apply Selected</strong> to write them.</p>
|
|
<form method="post" action="<?php echo site_url('callhistory/scan_apply'); ?>" id="apply-form">
|
|
<input type="hidden" name="file_id" value="<?php echo (int)$scan_file->id; ?>">
|
|
<input type="hidden" name="changes_json" id="changes_json" value="">
|
|
<div class="mb-2 d-flex gap-2">
|
|
<button type="button" class="btn btn-sm btn-outline-secondary" id="select-all-btn"><i class="fas fa-check-double"></i> Select All</button>
|
|
<button type="button" class="btn btn-sm btn-outline-secondary" id="deselect-all-btn"><i class="fas fa-times"></i> Deselect All</button>
|
|
<button type="submit" class="btn btn-sm btn-success" id="apply-btn"><i class="fas fa-save"></i> Apply Selected (<span id="selected-count"><?php echo count($preview); ?></span>)</button>
|
|
</div>
|
|
<div class="table-responsive">
|
|
<table id="callhistory-preview-table" class="table table-sm table-striped table-hover w-100">
|
|
<thead>
|
|
<tr>
|
|
<th style="width:30px;"><input type="checkbox" id="check-all" checked></th>
|
|
<th>Callsign</th>
|
|
<th>Date/Time</th>
|
|
<th>Band</th>
|
|
<th>Mode</th>
|
|
<th>Station Location</th>
|
|
<th>SIG →</th>
|
|
<th>SIG Info →</th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
<?php foreach ($preview as $i => $row) { ?>
|
|
<tr>
|
|
<td>
|
|
<input
|
|
type="checkbox"
|
|
class="row-check"
|
|
value="<?php echo (int)$row['qso_id']; ?>"
|
|
data-station-id="<?php echo (int)$row['station_id']; ?>"
|
|
data-new-sig="<?php echo htmlspecialchars($row['new_sig']); ?>"
|
|
data-new-sig-info="<?php echo htmlspecialchars($row['new_sig_info']); ?>"
|
|
checked
|
|
>
|
|
</td>
|
|
<td><?php echo htmlspecialchars($row['callsign']); ?></td>
|
|
<td><?php echo htmlspecialchars($row['time_on']); ?></td>
|
|
<td><?php echo htmlspecialchars($row['band']); ?></td>
|
|
<td><?php echo htmlspecialchars($row['mode']); ?></td>
|
|
<td><?php echo htmlspecialchars($row['station_location']); ?></td>
|
|
<td><span class="badge bg-primary"><?php echo htmlspecialchars($row['new_sig']); ?></span></td>
|
|
<td><span class="badge bg-secondary"><?php echo htmlspecialchars($row['new_sig_info']); ?></span></td>
|
|
</tr>
|
|
<?php } ?>
|
|
</tbody>
|
|
</table>
|
|
</div>
|
|
</form>
|
|
</div>
|
|
</div>
|
|
<?php } elseif (isset($scan_file)) { ?>
|
|
<div class="alert alert-info"><i class="fas fa-info-circle"></i> No blank-SIG matches found for <strong><?php echo htmlspecialchars($scan_file->original_filename); ?></strong> in the selected station location scope<?php if (!empty($selected_start_date)) { echo ' from <strong>' . htmlspecialchars($selected_start_date) . '</strong> onward'; } ?>.</div>
|
|
<?php } ?>
|
|
|
|
<div class="card mb-3">
|
|
<div class="card-header">
|
|
<strong>Upload Call History File</strong>
|
|
</div>
|
|
<div class="card-body">
|
|
<form method="post" action="<?php echo site_url('callhistory/upload'); ?>" enctype="multipart/form-data" class="row g-3">
|
|
<div class="col-md-4">
|
|
<label for="history_file" class="form-label">File</label>
|
|
<input type="file" class="form-control" id="history_file" name="history_file" accept=".txt,.csv" required>
|
|
</div>
|
|
<div class="col-md-3">
|
|
<label for="file_label" class="form-label">File Label (optional)</label>
|
|
<input type="text" class="form-control" id="file_label" name="file_label" maxlength="100" placeholder="FOC CW List 2026">
|
|
</div>
|
|
<div class="col-md-3">
|
|
<label for="organization_label" class="form-label">Organization Label</label>
|
|
<input type="text" class="form-control" id="organization_label" name="organization_label" maxlength="40" placeholder="FOC" required>
|
|
</div>
|
|
<div class="col-md-2">
|
|
<label for="priority" class="form-label">Priority</label>
|
|
<input type="number" class="form-control" id="priority" name="priority" value="0">
|
|
</div>
|
|
<div class="col-12">
|
|
<button type="submit" class="btn btn-primary"><i class="fas fa-upload"></i> Upload</button>
|
|
</div>
|
|
</form>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="card">
|
|
<div class="card-header">
|
|
<strong>Your Call History Files</strong>
|
|
</div>
|
|
<div class="card-body p-0">
|
|
<div class="table-responsive">
|
|
<table class="table table-sm table-striped mb-0">
|
|
<thead>
|
|
<tr>
|
|
<th>ID</th>
|
|
<th>File</th>
|
|
<th>Label</th>
|
|
<th>Org</th>
|
|
<th>Priority</th>
|
|
<th>Status</th>
|
|
<th>Uploaded</th>
|
|
<th>Actions</th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
<?php if (!empty($files)) { ?>
|
|
<?php foreach ($files as $file) { ?>
|
|
<tr>
|
|
<td><?php echo (int)$file->id; ?></td>
|
|
<td><?php echo htmlspecialchars($file->original_filename); ?></td>
|
|
<td><?php echo htmlspecialchars($file->file_label); ?></td>
|
|
<td><?php echo htmlspecialchars($file->organization_label); ?></td>
|
|
<td>
|
|
<form method="post" action="<?php echo site_url('callhistory/set_priority'); ?>" class="d-flex gap-2">
|
|
<input type="hidden" name="id" value="<?php echo (int)$file->id; ?>">
|
|
<input type="number" name="priority" class="form-control form-control-sm" style="max-width: 90px;" value="<?php echo (int)$file->priority; ?>">
|
|
<button type="submit" class="btn btn-sm btn-outline-secondary">Save</button>
|
|
</form>
|
|
</td>
|
|
<td>
|
|
<?php if ((int)$file->is_active === 1) { ?>
|
|
<span class="badge text-bg-success">Active</span>
|
|
<?php } else { ?>
|
|
<span class="badge text-bg-secondary">Disabled</span>
|
|
<?php } ?>
|
|
</td>
|
|
<td><?php echo htmlspecialchars($file->uploaded_at); ?></td>
|
|
<td>
|
|
<form method="post" action="<?php echo site_url('callhistory/set_active'); ?>" class="d-inline">
|
|
<input type="hidden" name="id" value="<?php echo (int)$file->id; ?>">
|
|
<input type="hidden" name="is_active" value="<?php echo (int)$file->is_active === 1 ? '0' : '1'; ?>">
|
|
<button type="submit" class="btn btn-sm btn-outline-primary">
|
|
<?php echo (int)$file->is_active === 1 ? 'Disable' : 'Enable'; ?>
|
|
</button>
|
|
</form>
|
|
<form method="post" action="<?php echo site_url('callhistory/delete'); ?>" class="d-inline js-confirm-form" data-confirm-title="Delete Call History File" data-confirm-message="Delete this call history file?" data-confirm-button="Delete">
|
|
<input type="hidden" name="id" value="<?php echo (int)$file->id; ?>">
|
|
<button type="submit" class="btn btn-sm btn-outline-danger">Delete</button>
|
|
</form>
|
|
</td>
|
|
</tr>
|
|
<?php } ?>
|
|
<?php } else { ?>
|
|
<tr>
|
|
<td colspan="8" class="text-center p-3 text-muted">No call history files uploaded yet.</td>
|
|
</tr>
|
|
<?php } ?>
|
|
</tbody>
|
|
</table>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
<?php if (!empty($files)) { ?>
|
|
<div class="card mb-3">
|
|
<div class="card-header">
|
|
<strong><i class="fas fa-search-plus"></i> Scan Logbook</strong>
|
|
</div>
|
|
<div class="card-body">
|
|
<form method="post" action="<?php echo site_url('callhistory/scan_preview'); ?>" class="row g-3 align-items-end">
|
|
<div class="col-md-4">
|
|
<label for="scan_file_id" class="form-label">Call History File</label>
|
|
<select class="form-select" id="scan_file_id" name="file_id" required>
|
|
<?php foreach ($files as $f) { ?>
|
|
<option value="<?php echo (int)$f->id; ?>" <?php echo (isset($scan_file) && (int)$scan_file->id === (int)$f->id) ? 'selected' : ''; ?>>
|
|
<?php echo htmlspecialchars($f->file_label ?: $f->original_filename); ?>
|
|
<?php if (!empty($f->organization_label)) { echo '(' . htmlspecialchars($f->organization_label) . ')'; } ?>
|
|
</option>
|
|
<?php } ?>
|
|
</select>
|
|
</div>
|
|
<div class="col-md-4">
|
|
<label for="scan_logbook_id" class="form-label">Station Location Scope</label>
|
|
<select class="form-select" id="scan_logbook_id" name="logbook_id">
|
|
<option value="">All my station locations</option>
|
|
<?php if (!empty($logbooks)) { foreach ($logbooks as $lb) { ?>
|
|
<option value="<?php echo (int)$lb->logbook_id; ?>" <?php echo (isset($selected_logbook_id) && (int)$selected_logbook_id === (int)$lb->logbook_id) ? 'selected' : ''; ?>>
|
|
<?php echo htmlspecialchars($lb->logbook_name); ?>
|
|
</option>
|
|
<?php } } ?>
|
|
</select>
|
|
</div>
|
|
<div class="col-md-2">
|
|
<label for="scan_start_date" class="form-label">Start Date</label>
|
|
<input type="date" class="form-control" id="scan_start_date" name="start_date" value="<?php echo isset($selected_start_date) ? htmlspecialchars($selected_start_date) : ''; ?>">
|
|
</div>
|
|
<div class="col-md-2">
|
|
<button type="submit" class="btn btn-warning"><i class="fas fa-search"></i> Preview Changes</button>
|
|
</div>
|
|
</form>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="card mb-3 border-danger">
|
|
<div class="card-header bg-danger text-white">
|
|
<strong><i class="fas fa-undo"></i> Reverse Bulk SIG Update</strong>
|
|
</div>
|
|
<div class="card-body">
|
|
<p class="text-muted small mb-2">Use this to undo a previous Call History SIG fill. Cloudlog will use the selected file's organization label and clear <strong>SIG</strong> and <strong>SIG Info</strong> for matching callsigns where current SIG equals that org label.</p>
|
|
<form method="post" action="<?php echo site_url('callhistory/scan_remove'); ?>" class="row g-3 align-items-end js-confirm-form" data-confirm-title="Reverse Bulk SIG Update" data-confirm-message="This will clear SIG and SIG Info for matching QSOs in the selected scope. Continue?" data-confirm-button="Clear Matching SIG">
|
|
<div class="col-md-4">
|
|
<label for="remove_file_id" class="form-label">Call History File</label>
|
|
<select class="form-select" id="remove_file_id" name="file_id" required>
|
|
<?php foreach ($files as $f) { ?>
|
|
<option value="<?php echo (int)$f->id; ?>">
|
|
<?php echo htmlspecialchars($f->file_label ?: $f->original_filename); ?>
|
|
<?php if (!empty($f->organization_label)) { echo '(' . htmlspecialchars($f->organization_label) . ')'; } ?>
|
|
</option>
|
|
<?php } ?>
|
|
</select>
|
|
</div>
|
|
<div class="col-md-4">
|
|
<label for="remove_logbook_id" class="form-label">Station Location Scope</label>
|
|
<select class="form-select" id="remove_logbook_id" name="logbook_id">
|
|
<option value="">All my station locations</option>
|
|
<?php if (!empty($logbooks)) { foreach ($logbooks as $lb) { ?>
|
|
<option value="<?php echo (int)$lb->logbook_id; ?>">
|
|
<?php echo htmlspecialchars($lb->logbook_name); ?>
|
|
</option>
|
|
<?php } } ?>
|
|
</select>
|
|
</div>
|
|
<div class="col-md-2">
|
|
<label for="remove_start_date" class="form-label">Start Date</label>
|
|
<input type="date" class="form-control" id="remove_start_date" name="start_date">
|
|
</div>
|
|
<div class="col-md-2">
|
|
<button type="submit" class="btn btn-danger"><i class="fas fa-eraser"></i> Clear Matching SIG</button>
|
|
</div>
|
|
</form>
|
|
</div>
|
|
</div>
|
|
<?php } ?>
|
|
</div>
|
|
|
|
<div class="modal fade" id="callhistoryActionModal" tabindex="-1" aria-labelledby="callhistoryActionModalLabel" aria-hidden="true">
|
|
<div class="modal-dialog modal-dialog-centered">
|
|
<div class="modal-content">
|
|
<div class="modal-header">
|
|
<h5 class="modal-title" id="callhistoryActionModalLabel">Confirm Action</h5>
|
|
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
|
|
</div>
|
|
<div class="modal-body" id="callhistoryActionModalBody"></div>
|
|
<div class="modal-footer">
|
|
<button type="button" class="btn btn-secondary" id="callhistoryActionModalCancelBtn" data-bs-dismiss="modal">Cancel</button>
|
|
<button type="button" class="btn btn-primary" id="callhistoryActionModalConfirmBtn">Continue</button>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
<script>
|
|
(function () {
|
|
function bindConfirmForms() {
|
|
document.querySelectorAll('form.js-confirm-form').forEach(function (form) {
|
|
if (form.dataset.confirmBound === '1') {
|
|
return;
|
|
}
|
|
|
|
form.dataset.confirmBound = '1';
|
|
form.addEventListener('submit', function (e) {
|
|
if (form.dataset.confirmed === '1') {
|
|
form.dataset.confirmed = '0';
|
|
return;
|
|
}
|
|
|
|
e.preventDefault();
|
|
window.callhistoryShowConfirm(
|
|
form.dataset.confirmTitle || 'Confirm Action',
|
|
form.dataset.confirmMessage || 'Continue?',
|
|
form.dataset.confirmButton || 'Continue',
|
|
function () {
|
|
form.dataset.confirmed = '1';
|
|
form.submit();
|
|
}
|
|
);
|
|
});
|
|
});
|
|
}
|
|
|
|
function setFallbackDialogHandlers() {
|
|
window.callhistoryShowMessage = function (title, message) {
|
|
alert((title ? title + '\n\n' : '') + (message || ''));
|
|
};
|
|
|
|
window.callhistoryShowConfirm = function (title, message, confirmText, callback) {
|
|
var prompt = (title ? title + '\n\n' : '') + (message || '');
|
|
if (window.confirm(prompt) && typeof callback === 'function') {
|
|
callback();
|
|
}
|
|
};
|
|
}
|
|
|
|
function tryInitBootstrapModalHandlers() {
|
|
var modalEl = document.getElementById('callhistoryActionModal');
|
|
if (!modalEl || typeof bootstrap === 'undefined' || !bootstrap.Modal) {
|
|
return false;
|
|
}
|
|
|
|
var modal = bootstrap.Modal.getOrCreateInstance(modalEl);
|
|
var titleEl = document.getElementById('callhistoryActionModalLabel');
|
|
var bodyEl = document.getElementById('callhistoryActionModalBody');
|
|
var cancelBtn = document.getElementById('callhistoryActionModalCancelBtn');
|
|
var confirmBtn = document.getElementById('callhistoryActionModalConfirmBtn');
|
|
var onConfirm = null;
|
|
|
|
window.callhistoryShowMessage = function (title, message) {
|
|
titleEl.textContent = title || 'Notice';
|
|
bodyEl.textContent = message || '';
|
|
confirmBtn.classList.add('d-none');
|
|
cancelBtn.textContent = 'Close';
|
|
modal.show();
|
|
};
|
|
|
|
window.callhistoryShowConfirm = function (title, message, confirmText, callback) {
|
|
titleEl.textContent = title || 'Confirm Action';
|
|
bodyEl.textContent = message || '';
|
|
cancelBtn.textContent = 'Cancel';
|
|
confirmBtn.textContent = confirmText || 'Continue';
|
|
confirmBtn.classList.remove('d-none');
|
|
onConfirm = typeof callback === 'function' ? callback : null;
|
|
modal.show();
|
|
};
|
|
|
|
confirmBtn.addEventListener('click', function () {
|
|
if (onConfirm) {
|
|
onConfirm();
|
|
}
|
|
onConfirm = null;
|
|
modal.hide();
|
|
});
|
|
|
|
modalEl.addEventListener('hidden.bs.modal', function () {
|
|
onConfirm = null;
|
|
});
|
|
|
|
return true;
|
|
}
|
|
|
|
setFallbackDialogHandlers();
|
|
bindConfirmForms();
|
|
|
|
function initDialogs() {
|
|
tryInitBootstrapModalHandlers();
|
|
}
|
|
|
|
if (document.readyState === 'complete') {
|
|
initDialogs();
|
|
} else {
|
|
window.addEventListener('load', initDialogs, { once: true });
|
|
}
|
|
})();
|
|
</script>
|
|
|
|
<?php if (!empty($preview)) { ?>
|
|
<script>
|
|
(function () {
|
|
function initCallhistoryPreviewTable() {
|
|
if (!window.jQuery || !window.jQuery.fn || !window.jQuery.fn.DataTable) {
|
|
window.setTimeout(initCallhistoryPreviewTable, 50);
|
|
return;
|
|
}
|
|
|
|
var $ = window.jQuery;
|
|
if ($.fn.dataTable.isDataTable('#callhistory-preview-table')) {
|
|
return;
|
|
}
|
|
|
|
var table = $('#callhistory-preview-table').DataTable({
|
|
"pageLength": 100,
|
|
"lengthMenu": [[25, 50, 100, 250, -1], [25, 50, 100, 250, "All"]],
|
|
"pagingType": "full_numbers",
|
|
"order": [[2, "asc"]],
|
|
"columnDefs": [
|
|
{ "orderable": false, "targets": 0 },
|
|
{ "orderable": false, "targets": 6 },
|
|
{ "orderable": false, "targets": 7 }
|
|
],
|
|
"language": {
|
|
url: getDataTablesLanguageUrl()
|
|
}
|
|
});
|
|
|
|
function getAllRowChecks() {
|
|
return $(table.rows().nodes()).find('.row-check');
|
|
}
|
|
|
|
function updateSelectedCount() {
|
|
var count = getAllRowChecks().filter(':checked').length;
|
|
$('#selected-count').text(count);
|
|
}
|
|
|
|
$('#check-all').on('change', function () {
|
|
var checked = $(this).prop('checked');
|
|
getAllRowChecks().prop('checked', checked);
|
|
updateSelectedCount();
|
|
});
|
|
|
|
$('#select-all-btn').on('click', function () {
|
|
getAllRowChecks().prop('checked', true);
|
|
$('#check-all').prop('checked', true);
|
|
updateSelectedCount();
|
|
});
|
|
|
|
$('#deselect-all-btn').on('click', function () {
|
|
getAllRowChecks().prop('checked', false);
|
|
$('#check-all').prop('checked', false);
|
|
updateSelectedCount();
|
|
});
|
|
|
|
$('#callhistory-preview-table tbody').on('change', '.row-check', function () {
|
|
updateSelectedCount();
|
|
});
|
|
|
|
$('#apply-form').on('submit', function (e) {
|
|
var selectedChanges = [];
|
|
|
|
getAllRowChecks().filter(':checked').each(function () {
|
|
selectedChanges.push({
|
|
qso_id: parseInt(this.value, 10) || 0,
|
|
station_id: parseInt($(this).data('station-id'), 10) || 0,
|
|
new_sig: $(this).data('new-sig') || '',
|
|
new_sig_info: $(this).data('new-sig-info') || ''
|
|
});
|
|
});
|
|
|
|
if (selectedChanges.length === 0) {
|
|
e.preventDefault();
|
|
if (typeof window.callhistoryShowMessage === 'function') {
|
|
window.callhistoryShowMessage('No rows selected', 'Please select at least one row before applying changes.');
|
|
}
|
|
return;
|
|
}
|
|
|
|
$('#changes_json').val(JSON.stringify(selectedChanges));
|
|
});
|
|
|
|
updateSelectedCount();
|
|
}
|
|
|
|
if (document.readyState === 'complete') {
|
|
initCallhistoryPreviewTable();
|
|
} else {
|
|
window.addEventListener('load', initCallhistoryPreviewTable, { once: true });
|
|
}
|
|
})();
|
|
</script>
|
|
<?php } ?>
|