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

Merge pull request #31 from AndreasK79/station_location_lba

Browse Source 
[Logbook Advanced] Changed DE filter to be location instead
This commit is contained in:
Andreas Kristiansen
2024-01-25 11:47:40 +01:00
committed by GitHub
parent bd95594aec 2a1aaf82f2
commit 29cf7b6634
3 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
application/controllers/Logbookadvanced.php
View File

@@ -46,6 +46,11 @@ class Logbookadvanced extends CI_Controller {
$data['options'] = $userOptions[0]->option_value;
}
$active_station_id = $this->stations->find_active();
$station_profile = $this->stations->profile($active_station_id);
$pageData = [];
$pageData['datePlaceholder'] = 'DD/MM/YYYY';
$pageData['deOptions'] = $deOptions;
@@ -53,6 +58,8 @@ class Logbookadvanced extends CI_Controller {
$pageData['dxccarray'] = $this->logbook_model->fetchDxcc();
$pageData['iotaarray'] = $this->logbook_model->fetchIota();
$pageData['sats'] = $this->bands->get_worked_sats();
$pageData['station_profile'] = $this->stations->all_of_user();
$pageData['active_station_info'] = $station_profile->row();
$pageData['bands'] = $this->bands->get_worked_bands();

4
application/models/Logbookadvanced_model.php
View File

@@ -34,8 +34,8 @@ class Logbookadvanced_model extends CI_Model {
$conditions[] = "date(COL_TIME_ON) <= ?";
$binding[] = $to;
}
if ($searchCriteria['de'] !== '') {
$conditions[] = "COL_STATION_CALLSIGN = ?";
if ($searchCriteria['de'] !== 'All') {
$conditions[] = "qsos.station_id = ?";
$binding[] = trim($searchCriteria['de']);
}
if ($searchCriteria['dx'] !== '') {

24
application/views/logbookadvanced/index.php
View File

@@ -77,17 +77,6 @@ $options = json_decode($options);
<label class="form-label" for="dateTo"><?php echo lang('filter_general_to') . ": " ?></label>
<input name="dateTo" id="dateTo" type="date" class="form-control form-control-sm w-auto">
</div>
<div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
<label class="form-label" for="de"><?php echo lang('gen_hamradio_de'); ?></label>
<select id="de" name="de" class="form-select form-select-sm">
<option value=""><?php echo lang('general_word_all'); ?></option>
<?php
foreach($deOptions as $deOption){
?><option value="<?php echo htmlentities($deOption);?>"><?php echo htmlspecialchars($deOption);?></option><?php
}
?>
</select>
</div>
<div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
<label class="form-label" for="dx"><?php echo lang('gen_hamradio_dx'); ?></label>
<input type="text" name="dx" id="dx" class="form-control form-control-sm" value="">
@@ -401,6 +390,19 @@ $options = json_decode($options);
<option value="2500">2500</option>
<option value="5000">5000</option>
</select>
<label class="me-2" for="de"><?php echo lang('general_word_location'); ?></label>
<select id="de" name="de" class="form-select form-select-sm me-2 w-auto">
<option value="All"><?php echo lang('general_word_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\"";
} ?>>
<?php echo lang('gen_hamradio_callsign') . ": " ?>
<?php echo $station->station_callsign; ?> (<?php echo $station->station_profile_name; ?>)
</option>
<?php } ?>
</select>
<button type="submit" class="btn btn-sm btn-primary me-1" id="searchButton"><?php echo lang('filter_search'); ?></button>
<button type="button" class="btn btn-sm btn-primary me-1" id="dupeButton"><?php echo lang('filter_dupes'); ?></button>
<button type="button" class="btn btn-sm btn-primary me-1" id="mapButton" onclick="mapQsos(this.form);"><?php echo lang('filter_map'); ?></button>