mirror of
https://github.com/wavelog/wavelog.git
synced 2026-03-22 10:24:14 +00:00
c70c2ec5cd
* feat[clubstations]: New DB structure
* feat[clubstations]: Add clubstationstable in user managment
* feat[clubstations]: Show last operator
* feat[clubstations]: Better solution for last operator. tnx for the hint @int2001
* feat[clubstations]: New Club Model and Controller
* feat[clubstations]: Add "Add User" and "Edit User" functionality
* docs[clubstations]: move comment
* feat[clubstations]: Add "Delete Member" functionality
* feat[clubstations]: some enhancements and javascript
* fix[clubstations]: Wrong message class for flashmessages
* feat[clubstations]: Added Switch in the Header menu (not functional yet)
* feat[clubstations]: clubswitch modal
* fix[clubstations]: Load encryption library if not already loaded
* fix[clubstations]: Prevent direct login attempts to clubstations and enhance impersonation authorization
* fix[clubstations]: Typo
* feat[clubstations]: Only show the operator dialog if there is something fishy
* fix[user]: little UI bug
* feat[impersonate]: Add source uid to session data
* fix[impersonate]: logic adjustment
* feat[clubstations]: Add manage button in header menu for club officers
* fix[clubstations]: typo in permission level check
* fix[clubstations]: Full rights for the admin
* feat[impersonate]: Custom sessiondata
* feat[impersonate]: Implement stop impersonation feature with modal confirmation; "the way back"
* fix(modal): Fix bug where modal was hidden when mouse leaved the browser content
* docs(config): Adjust config description for special callsigns and clubstations
* feat(club): Add club access check helper
* typo
* fix[impersonation]: Better text
* feat(club): Selectize for a efficient user search
* feat(clubstations): Restrict clubstations based on users permission level part 1/x
* adjustments for dev merge
* Adjusted club right for the advanced logbook
* feat[user]: Refactoring of the Action Buttons in the user table
* fix[club_permissions]: normal button instead small one for club permissions
* remove unnecessary line break in modal body
* feat[clubstations]: Add Club Mode badge to the header
* fix[clubstations]: fix maintenance mode
* allow switch back on http
* feat(simplefle): display operator input based on club_access
* small UI adjustments
* small UI adjustments
* moved api page to a index.php file and added support for clubstations
* removed unused stuff
* typo
* radios and api keys
* missed one binding
* fix qso view, even officers do just see their own radios in QSO logging
* omit the need for a relogin to see the changes as an admin
* Omit the need for relogin after club changes in general. It's a question of UX. It's better to accept a little higher DB load (if clubstations are enabled) then the need of an user to relogin. There is some room for improvement by changing user_model->get_by_id() and adding a join there. This can be done later if we see that the load is too high
* If the user is not the creator of the API key, it's likely a clubstation. In this case the callsign of the clubstation can not be the same as the callsign of the user (operator call provided by the user). If this is the case, we need to use the callsign of the creator of the API key
* remove debug messages
* better UI in header
* found a typo
* full access in clubstations for admins (if accessed via admin usertable)
* adjusted text
* adjusted text
* adjust text
* reduce required chars
* bugfix: missing the correct authentication in case the admin was not member of the club. he wasn't able to switch back
* reduce debug messages
* fixed UI bug related to tooltips
* load js in controller
* upps..
* some UI adjustments
* corrected permissions
* if user gets delete we need to remove data in club_permissions and also api keys which were created by this user
* Notify members about new memberships or changes in permission level
* add spinner to save button
* make login/logout process more bulletproof
* remove the relogin cookie after the attempt
* better strategy
* bug where switch back failed if user is no admin
* make api keys more secure
* mask not owned api keys
* removed annoying link
* if a user gets removed from a club we also should delete the corresponding api keys and cat radios
* adjusted wiki link
* Auto creation of logbook and location when new user is created
* store and display locator in uppercase
* same for callsign
* fixed a bug in user/club creation
* Revert "Auto creation of logbook and location when new user is created"
We found another solution to which will be addressed in a second PR
This reverts commit f05f4b7bf0.
* Optimized SQL for stats at userlist
* Source query for lastop "out", because mysql<9.0 can't handle Windowed functions
* adjust migration
* add new columns to users table to get created_at and modified_at
* added a partial down function
* add operator dropdown for clubstations
* fix mig version
* Add some backend restrictions in case a user wants to try something funny with the club
---------
Co-authored-by: Andreas Kristiansen <6977712+AndreasK79@users.noreply.github.com>
Co-authored-by: int2001 <joerg@dj7nt.de>
319 lines
23 KiB
PHP
319 lines
23 KiB
PHP
<div class="container adif" id="adif_import">
|
|
|
|
<h2><?php echo $page_title; ?></h2>
|
|
<?php
|
|
$showtab = '';
|
|
if (isset($tab)) {
|
|
$showtab = $tab;
|
|
}
|
|
?>
|
|
|
|
<div class="card">
|
|
<div class="card-header">
|
|
<ul class="nav nav-tabs card-header-tabs pull-right" role="tablist">
|
|
<li class="nav-item">
|
|
<a class="nav-link <?php if ($showtab == '' || $showtab == 'adif') {
|
|
echo 'active';
|
|
} ?>" id="import-tab" data-bs-toggle="tab" href="#import" role="tab" aria-controls="import" aria-selected="<?php if ($showtab == '' || $showtab == 'adif') {
|
|
echo 'true';
|
|
} else {
|
|
echo 'false';
|
|
} ?>"><?= __("ADIF Import") ?></a>
|
|
</li>
|
|
<li class="nav-item">
|
|
<a class="nav-link" id="export-tab" data-bs-toggle="tab" href="#export" role="tab" aria-controls="export" aria-selected="false"><?= __("ADIF Export") ?></a>
|
|
</li>
|
|
<li class="nav-item">
|
|
<a class="nav-link" id="lotw-tab" data-bs-toggle="tab" href="#lotw" role="tab" aria-controls="lotw" aria-selected="false"><?= __("Logbook of the World") ?></a>
|
|
</li>
|
|
<li class="nav-item">
|
|
<a class="nav-link <?php if ($showtab == 'dcl') {
|
|
echo 'active';
|
|
} ?>" id="dcl-tab" data-bs-toggle="tab" href="#dcl" role="tab" aria-controls="dcl" aria-selected="<?php if ($showtab == 'dcl') {
|
|
echo 'true';
|
|
} else {
|
|
echo 'false';
|
|
} ?>"><?= __("DARC DCL") ?></a>
|
|
</li>
|
|
</ul>
|
|
</div>
|
|
|
|
<div class="card-body">
|
|
<div class="tab-content">
|
|
<div class="tab-pane <?php if ($showtab == '' || $showtab == 'adif') {
|
|
echo 'active';
|
|
} else {
|
|
echo 'fade';
|
|
} ?>" id="import" role="tabpanel" aria-labelledby="home-tab">
|
|
|
|
<?php if (isset($error) && ($showtab == '' || $showtab == 'adif')) { ?>
|
|
<div class="alert alert-danger" role="alert">
|
|
<?php echo $error; ?>
|
|
</div>
|
|
<?php } ?>
|
|
|
|
<p><span class="badge text-bg-warning"><?= __("Important") ?></span> <?= __("Log Files must have the file type *.adi") ?></p>
|
|
<p><span class="badge text-bg-warning"><?= __("Warning") ?></span> <?= __("Maximum file upload size is ") ?><?php echo $max_upload; ?>B.</p>
|
|
|
|
<form class="form" id="upform" action="<?php echo site_url('adif/import'); ?>" method="post" enctype="multipart/form-data">
|
|
<input type="hidden" name="fhash" id="fhash" value="<?php echo hash('sha256', $this->session->userdata('user_callsign')); ?>">
|
|
<div class="small form-text text-muted"><?= __("Select Station Location") ?></div>
|
|
<select name="station_profile" class="form-select mb-2 me-sm-2 w-50 w-lg-100">
|
|
<option value="0"><?= __("Select Station Location") ?></option>
|
|
<?php foreach ($station_profile->result() as $station) { ?>
|
|
<option value="<?php echo $station->station_id; ?>" <?php if ($station->station_id == $active_station_id) {
|
|
echo " selected =\"selected\"";
|
|
} ?>><?= __("Callsign") . ": " ?><?php echo $station->station_callsign; ?> (<?php echo $station->station_profile_name; ?>)</option>
|
|
<?php } ?>
|
|
</select>
|
|
<?php
|
|
$show_operator_question = true;
|
|
if ($this->config->item('special_callsign') && $club_operators != false) {
|
|
$show_operator_question = false; ?>
|
|
<div class="small form-text text-muted"><?= __("Select the operator of the imported QSOs") ?></div>
|
|
<select name="club_operator" class="form-select mb-2 me-sm-2 w-50 w-lg-100">
|
|
<?php foreach ($club_operators as $operator) { ?>
|
|
<option value="<?php echo $operator->user_callsign; ?>"
|
|
<?php if ($operator->user_callsign == $this->session->userdata('cd_src_call')) {
|
|
echo ' selected="selected"';
|
|
} ?>>
|
|
<?php echo $operator->user_callsign; ?>
|
|
</option>
|
|
<?php } ?>
|
|
</select>
|
|
<?php } ?>
|
|
<div class="small form-text text-muted"><?= __("Add QSOs to Contest") ?></div>
|
|
<select name="contest" id="contest" class="form-select mb-2 me-sm-2 w-50 w-lg-100">
|
|
<option value="" selected><?= __("No Contest"); ?></option>
|
|
<?php
|
|
foreach ($contests as $contest) {
|
|
echo '<option value="' . $contest['adifname'] . '">' . $contest['name'] . '</option>';
|
|
} ?>
|
|
</select>
|
|
<label class="visually-hidden" for="inlineFormInputName2"><?= __("ADIF File") ?></label>
|
|
<input class="form-control mb-2 me-sm-2 mt-1 w-50 w-lg-100" type="file" name="userfile" id="userfile" />
|
|
|
|
<div class="mb-3 row">
|
|
<div class="col-md-10">
|
|
<div class="form-check-inline">
|
|
<input class="form-check-input" type="checkbox" name="skipDuplicate" value="1" id="skipDuplicate">
|
|
<label class="form-check-label" for="skipDuplicate"><?= __("Import duplicate QSOs") ?></label>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="mb-3 row">
|
|
<div class="col-md-10">
|
|
<div class="form-check-inline">
|
|
<input class="form-check-input" type="checkbox" name="markLotw" value="1" id="markLotwImport">
|
|
<label class="form-check-label" for="markLotwImport"><?= __("Mark imported QSOs as uploaded to LoTW") ?></label>
|
|
</div>
|
|
<div class="small form-text text-muted"><?= __("Select if ADIF being imported does not contain this information.") ?></div>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="mb-3 row">
|
|
<div class="col-md-10">
|
|
<div class="form-check-inline">
|
|
<input class="form-check-input" type="checkbox" name="markEqsl" value="1" id="markEqslImport">
|
|
<label class="form-check-label" for="markEqslImport"><?= __("Mark imported QSOs as uploaded to eQSL Logbook") ?></label>
|
|
</div>
|
|
<div class="small form-text text-muted"><?= __("Select if ADIF being imported does not contain this information.") ?></div>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="mb-3 row">
|
|
<div class="col-md-10">
|
|
<div class="form-check-inline">
|
|
<input class="form-check-input" type="checkbox" name="markHrd" value="1" id="markHrdImport">
|
|
<label class="form-check-label" for="markHrdImport"><?= __("Mark imported QSOs as uploaded to HRDLog.net Logbook") ?></label>
|
|
</div>
|
|
<div class="small form-text text-muted"><?= __("Select if ADIF being imported does not contain this information.") ?></div>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="mb-3 row">
|
|
<div class="col-md-10">
|
|
<div class="form-check-inline">
|
|
<input class="form-check-input" type="checkbox" name="markQrz" value="1" id="markQrzImport">
|
|
<label class="form-check-label" for="markQrzImport"><?= __("Mark imported QSOs as uploaded to QRZ Logbook") ?></label>
|
|
</div>
|
|
<div class="small form-text text-muted"><?= __("Select if ADIF being imported does not contain this information.") ?></div>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="mb-3 row">
|
|
<div class="col-md-10">
|
|
<div class="form-check-inline">
|
|
<input class="form-check-input" type="checkbox" name="markClublog" value="1" id="markClublogImport">
|
|
<label class="form-check-label" for="markClublogImport"><?= __("Mark imported QSOs as uploaded to Clublog Logbook") ?></label>
|
|
</div>
|
|
<div class="small form-text text-muted"><?= __("Select if ADIF being imported does not contain this information.") ?></div>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="mb-3 row">
|
|
<div class="col-md-10">
|
|
<div class="form-check-inline">
|
|
<input class="form-check-input" type="checkbox" name="markDcl" value="1" id="markDclImport">
|
|
<label class="form-check-label" for="markDclImport"><?= __("Mark imported QSOs as uploaded to DCL Logbook") ?></label>
|
|
</div>
|
|
<div class="small form-text text-muted"><?= __("Select if ADIF being imported does not contain this information.") ?></div>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="mb-3 row">
|
|
<div class="col-md-10">
|
|
<div class="form-check-inline">
|
|
<input class="form-check-input" type="checkbox" name="dxccAdif" value="1" id="dxccAdif">
|
|
<label class="form-check-label" for="dxccAdif"><?= __("Use DXCC information from ADIF") ?></label>
|
|
</div>
|
|
<div class="small form-text text-muted"><?= __("If not selected, Wavelog will attempt to determine DXCC information automatically.") ?></div>
|
|
</div>
|
|
</div>
|
|
|
|
<?php if ($show_operator_question) { ?>
|
|
<div class="mb-3 row">
|
|
<div class="col-md-10">
|
|
<div class="form-check-inline">
|
|
<input class="form-check-input" type="checkbox" name="operatorName" value="1" id="operatorName">
|
|
<label class="form-check-label" for="operatorName"><?= __("Always use the logged-in account callsign as the operator call during import") ?></label>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<?php } ?>
|
|
|
|
<div class="mb-3 row">
|
|
<div class="col-md-10">
|
|
<div class="form-check-inline">
|
|
<input class="form-check-input" type="checkbox" name="skipStationCheck" value="1" id="skipStationCheck">
|
|
<label class="form-check-label" for="skipStationCheck"><span class="badge text-bg-warning"><?= __("DANGER") ?></span> <?= __("Ignore Stationcallsign on import") ?></label>
|
|
</div>
|
|
<div class="small form-text text-muted"><?= sprintf(__("If selected, Wavelog will try to import %sall%s QSO's of the ADIF, regardless if they match to the chosen station-location."), '<b>', '</b>'); ?></div>
|
|
</div>
|
|
</div>
|
|
|
|
<button id="prepare_sub" class="btn btn-sm btn-primary mb-2" value="Upload"><?= __("Upload") ?></button>
|
|
</form>
|
|
</div>
|
|
|
|
<div class="tab-pane fade" id="export" role="tabpanel" aria-labelledby="home-tab">
|
|
|
|
<form class="form" action="<?php echo site_url('adif/export_custom'); ?>" method="post" enctype="multipart/form-data">
|
|
<h5 class="card-title"><?= __("Take your logbook file anywhere!") ?> </h5>
|
|
<p class="card-text"><?= __("Exporting ADIFs allows you to import contacts into third party applications like LoTW, Awards or just for keeping a backup.") ?> </p>
|
|
<div class="small form-text text-muted"><?= __("Select Station Location") ?></div>
|
|
<select name="station_profile" class="form-select mb-2 me-sm-2 w-50 w-lg-100">
|
|
<option value="0"><?= __("All") ?></option>
|
|
<?php foreach ($station_profile->result() as $station) { ?>
|
|
<option value="<?php echo $station->station_id; ?>" <?php if ($station->station_id == $this->stations->find_active()) {
|
|
echo " selected =\"selected\"";
|
|
} ?>><?= __("Callsign") . ": " ?><?php echo $station->station_callsign; ?> (<?php echo $station->station_profile_name; ?>)</option>
|
|
<?php } ?>
|
|
</select>
|
|
<br>
|
|
<div class="small form-text text-muted"><?= __("From date") . ":"; ?></div>
|
|
<input name="from" id="from" type="date" class="form-control w-auto">
|
|
<br>
|
|
<div class="small form-text text-muted"><?= __("To date") . ":"; ?></div>
|
|
<input name="to" id="to" type="date" class="form-control w-auto">
|
|
|
|
<br>
|
|
<div class="mb-3 row">
|
|
<div class="col-md-10">
|
|
<div class="form-check-inline">
|
|
<input class="form-check-input" type="checkbox" name="markLotw" value="1" id="markLotwExport">
|
|
<label class="form-check-label" for="markLotwExport"><?= __("Mark exported QSOs as uploaded to LoTW") ?></label>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div class="mb-3 row">
|
|
<div class="col-md-10">
|
|
<div class="form-check-inline">
|
|
<input class="form-check-input" type="checkbox" name="exportLotw" value="1" id="exportLotw">
|
|
<label class="form-check-label" for="exportLotw"><?= __("Export QSOs not uploaded to LoTW") ?></label>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
<button type="submit" class="btn btn-sm btn-primary" value="Export"><?= __("Export QSO's") ?></button>
|
|
</form>
|
|
|
|
<br><br>
|
|
|
|
<h5><?= __("Export Satellite-Only QSOs") ?></h5>
|
|
<p><a href="<?php echo site_url('adif/exportsat'); ?>" title="Export All Satellite Contacts" target="_blank" class="btn btn-sm btn-primary"><?= __("Export All Satellite QSOs") ?></a></p>
|
|
|
|
<p><a href="<?php echo site_url('adif/exportsatlotw'); ?>" title="Export All Satellite QSOs Confirmed on LoTW" target="_blank" class="btn btn-sm btn-primary"><?= __("Export All Satellite QSOs Confirmed on LoTW") ?></a></p>
|
|
</div>
|
|
|
|
|
|
<div class="tab-pane fade" id="lotw" role="tabpanel" aria-labelledby="home-tab">
|
|
<form class="form" action="<?php echo site_url('adif/mark_lotw'); ?>" method="post" enctype="multipart/form-data">
|
|
<select name="station_profile" class="form-select mb-2 me-sm-2 w-50 w-lg-100">
|
|
<option value="0"><?= __("Select Station Location") ?></option>
|
|
<?php foreach ($station_profile->result() as $station) { ?>
|
|
<option value="<?php echo $station->station_id; ?>"><?= __("Callsign") . ": " ?><?php echo $station->station_callsign; ?> (<?php echo $station->station_profile_name; ?>)</option>
|
|
<?php } ?>
|
|
</select>
|
|
<p><span class="badge text-bg-warning"><?= __("Warning") ?></span> <?= __("If a date range is not selected then all QSOs will be marked!") ?></p>
|
|
<br>
|
|
<label for="from"><?= __("From date") . ": " ?></label>
|
|
<input name="from" id="from" type="date" class="form-control w-auto">
|
|
<br>
|
|
<label for="to"><?= __("To date") . ": " ?></label>
|
|
<input name="to" id="to" type="date" class="form-control w-auto">
|
|
<br>
|
|
<button type="button" class="btn btn-sm btn-primary" id="markExportedToLotw" value="Export"><?= __("Mark QSOs as exported to LoTW") ?></button>
|
|
</form>
|
|
</div>
|
|
<div class="tab-pane <?php if ($showtab == 'dcl') {
|
|
echo 'active';
|
|
} else {
|
|
echo 'fade';
|
|
} ?>" id="dcl" role="tabpanel" aria-labelledby="home-tab">
|
|
<?php if (isset($error) && $showtab == 'dcl') { ?>
|
|
<div class="alert alert-danger" role="alert">
|
|
<?php echo $error; ?>
|
|
</div>
|
|
<?php } ?>
|
|
|
|
<p class="card-text"><?= sprintf(__("Go to %s and export your logbook with confirmed DOKs. To speed up the process you can select only DL QSOs to download (i.e. put 'DL' into Prefix List). The downloaded ADIF file can be uploaded here in order to update QSOs with DOK info."), "<a href='http://dcl.darc.de/dml/export_adif_form.php' target='_blank'>" . __("DARC DCL") . "</a>") ?></p>
|
|
<form class="form" action="<?php echo site_url('adif/dcl'); ?>" method="post" enctype="multipart/form-data">
|
|
|
|
<div class="mb-3 row">
|
|
<div class="col-md-10">
|
|
<div class="form-check-inline">
|
|
<input class="form-check-input" type="checkbox" name="onlyConfirmed" value="1" id="onlyConfirmed" checked>
|
|
<label class="form-check-label" for="onlyConfirmed"><?= __("Only import DOK data from QSOs confirmed on DCL.") ?></label>
|
|
</div>
|
|
<div class="small form-text text-muted"><?= __("Uncheck if you also want to update DOK with data from unconfirmed QSOs in DCL.") ?></div>
|
|
</div>
|
|
</div>
|
|
<div class="mb-3 row">
|
|
<div class="col-md-10">
|
|
<div class="form-check-inline">
|
|
<input class="form-check-input" type="checkbox" name="overwriteDok" value="1" id="overwriteDok">
|
|
<label class="form-check-label" for="overwriteDok"><span class="badge text-bg-warning"><?= __("Warning") ?></span> <?= __("Overwrites exisiting DOK in log by DCL (if different).") ?></label>
|
|
</div>
|
|
<div class="small form-text text-muted"><?= __("If checked Wavelog will forcibly overwrite existing DOK with DOK from DCL log.") ?></div>
|
|
</div>
|
|
</div>
|
|
<div class="mb-3 row">
|
|
<div class="col-md-10">
|
|
<div class="form-check-inline">
|
|
<input class="form-check-input" type="checkbox" name="ignoreAmbiguous" value="1" id="ignoreAmbiguous" checked>
|
|
<label class="form-check-label" for="ignoreAmbiguous"><?= __("Ignore QSOs that cannot be matched.") ?></label>
|
|
</div>
|
|
<div class="small form-text text-muted"><?= __("If unchecked, information about QSOs which could not be found in Wavelog will be displayed.") ?></div>
|
|
</div>
|
|
</div>
|
|
<input class="form-control w-auto mb-2 me-sm-2" type="file" name="userfile" size="20" />
|
|
<button type="submit" class="btn btn-sm btn-primary mb-2" value="Upload"><?= __("Upload") ?></button>
|
|
</form>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|