Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "added operator firstname"

Browse Source 
This reverts commit abba3fddad.
This commit is contained in:
HB9HIL
2024-08-27 20:01:06 +02:00
parent 9ac4819ddd
commit 847327d313
7 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/controllers/Adif.php
View File

@@ -233,7 +233,7 @@ class adif extends CI_Controller {
array_push($alladif,$record);
};
$record=''; // free memory
$custom_errors = $this->logbook_model->import_bulk($alladif, $this->input->post('station_profile'), $this->input->post('skipDuplicate'), $this->input->post('markClublog'),$this->input->post('markLotw'), $this->input->post('dxccAdif'), $this->input->post('markQrz'), $this->input->post('markHrd'), true, $this->input->post('operatorName'), false, $this->input->post('skipStationCheck'), $this->input->post('operatorFirstnameImport'));
$custom_errors = $this->logbook_model->import_bulk($alladif, $this->input->post('station_profile'), $this->input->post('skipDuplicate'), $this->input->post('markClublog'),$this->input->post('markLotw'), $this->input->post('dxccAdif'), $this->input->post('markQrz'), $this->input->post('markHrd'), true, $this->input->post('operatorName'), false, $this->input->post('skipStationCheck'));
} else { // Failure, if no ADIF inside ZIP
$data['max_upload'] = ini_get('upload_max_filesize');
$this->load->view('interface_assets/header', $data);

2
application/controllers/Operator.php
View File

@@ -14,9 +14,7 @@ class Operator extends CI_Controller {
public function saveOperator() {
$operator = ['operator_callsign' => $this->security->xss_clean(strtoupper($this->input->post('operator_callsign')))];
$op_firstname = ['operator_firstname' => $this->security->xss_clean($this->input->post('operator_firstname'))];
$this->session->set_userdata($operator);
$this->session->set_userdata($op_firstname);
}
}

9
application/models/Logbook_model.php
View File

@@ -273,7 +273,7 @@ class Logbook_model extends CI_Model {
'COL_QSL_SENT_VIA' => $this->input->post('qsl_sent_method'),
'COL_QSL_RCVD_VIA' => $this->input->post('qsl_rcvd_method'),
'COL_QSL_VIA' => $this->input->post('qsl_via'),
'COL_QSLMSG' => $this->session->userdata('operator_firstname') ?? '',
'COL_QSLMSG' => $this->input->post('qslmsg'),
'COL_OPERATOR' => $this->input->post('operator_callsign') ?? $this->session->userdata('operator_callsign'),
'COL_QTH' => $qso_qth,
'COL_PROP_MODE' => $prop_mode,
@@ -3456,7 +3456,7 @@ function lotw_last_qsl_date($user_id) {
return '1900-01-01 00:00:00.000';
}
function import_bulk($records, $station_id = "0", $skipDuplicate = false, $markClublog = false, $markLotw = false, $dxccAdif = false, $markQrz = false, $markHrd = false,$skipexport = false, $operatorName = false, $apicall = false, $skipStationCheck = false, $operatorFirstname = NULL) {
function import_bulk($records, $station_id = "0", $skipDuplicate = false, $markClublog = false, $markLotw = false, $dxccAdif = false, $markQrz = false, $markHrd = false,$skipexport = false, $operatorName = false, $apicall = false, $skipStationCheck = false) {
$this->load->model('user_model');
$custom_errors='';
$a_qsos=[];
@@ -3513,8 +3513,7 @@ function lotw_last_qsl_date($user_id) {
* $markHrd - used in ADIF import to mark QSOs as exported to HRDLog.net Logbook when importing QSOs
* $skipexport - used in ADIF import to skip the realtime upload to QRZ Logbook when importing QSOs from ADIF
*/
function import($record, $station_id = "0", $skipDuplicate = false, $markClublog = false, $markLotw = false, $dxccAdif = false, $markQrz = false, $markHrd = false,$skipexport = false, $operatorName = false, $apicall = false, $skipStationCheck = false, $batchmode = false, $station_id_ok = false, $station_profile = null, $operatorFirstname = null) {
function import($record, $station_id = "0", $skipDuplicate = false, $markClublog = false, $markLotw = false, $dxccAdif = false, $markQrz = false, $markHrd = false,$skipexport = false, $operatorName = false, $apicall = false, $skipStationCheck = false, $batchmode = false, $station_id_ok = false, $station_profile = null) {
// be sure that station belongs to user
$this->load->model('stations');
if ($station_id_ok == false) {
@@ -4068,7 +4067,7 @@ function lotw_last_qsl_date($user_id) {
'COL_QSL_SENT' => $input_qsl_sent,
'COL_QSL_SENT_VIA' => $input_qsl_sent_via,
'COL_QSL_VIA' => (!empty($record['qsl_via'])) ? $record['qsl_via'] : '',
'COL_QSLMSG' => $operatorFirstname ?? '',
'COL_QSLMSG' => (!empty($record['qslmsg'])) ? $record['qslmsg'] : '',
'COL_QSLRDATE' => $input_qslrdate,
'COL_QSLSDATE' => $input_qslsdate,
'COL_QSO_COMPLETE' => (!empty($record['qso_complete'])) ? $record['qso_complete'] : '',

1
application/models/User_model.php
View File

@@ -430,7 +430,6 @@ class User_Model extends CI_Model {
'user_type' => $u->row()->user_type,
'user_callsign' => $u->row()->user_callsign,
'operator_callsign' => ((($this->session->userdata('operator_callsign') ?? '') == '') ? $u->row()->user_callsign : $this->session->userdata('operator_callsign')),
'operator_firstname' => $this->session->userdata('operator_firstname') ?? '',
'user_locator' => $u->row()->user_locator,
'user_lotw_name' => $u->row()->user_lotw_name,
'user_clublog_name' => $u->row()->user_clublog_name ?? '',

2
application/views/adif/import.php
View File

@@ -74,8 +74,6 @@
echo '<option value="' . $contest['adifname'] . '">' . $contest['name'] . '</option>';
} ?>
</select>
<label for="operatorFirstnameImport">Vorname des Operators</label>
<input class="form-control mb-2 w-50 w-lg-100" type="text" name="operatorFirstnameImport" id="operatorFirstnameImport" />
<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" />

3
application/views/operator/index.php
View File

@@ -15,9 +15,6 @@
<div class="invalid-feedback">
<?= __("You have to provide your personal callsign."); ?>
</div>
<br>
<p>Dein Vorname: </p>
<input type="text" class="form-control w-auto" id="operator_firstname" name="operator_firstname">
</div>
</div>
</div>

2
assets/js/sections/operator.js
View File

@@ -43,7 +43,6 @@ function closeOperatorDialog() {
function saveOperator() {
var operatorInput = $("#operator_callsign");
var operatorFirstname = $("#operator_firstname").val();
var operatorCallsign = operatorInput.val();
if (operatorCallsign != "" && operatorCallsign != sc_account_call) {
@@ -53,7 +52,6 @@ function saveOperator() {
type: "post",
data: {
operator_callsign: operatorCallsign,
operator_firstname: operatorFirstname
},
});
closeOperatorDialog();