mirror
/
Cloudlog
kopia lustrzana https://github.com/magicbug/Cloudlog
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Merge pull request #2742 from AndreasK79/oqrs_bs5

pull/2748/head
Andreas Kristiansen 2023-11-29 19:41:31 +01:00 zatwierdzone przez GitHub
rodzic 5178849a2b 6875c3f822
commit e5bfa97009
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
7 zmienionych plików z 24 dodań i 20 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
application/views/oqrs/index.php
Wyświetl plik

@ -46,7 +46,7 @@
<form class="d-flex align-items-center" enctype="multipart/form-data"> <form class="d-flex align-items-center" enctype="multipart/form-data">
<label class="my-1 me-2" for="station">Select station: </label> <label class="my-1 me-2" for="station">Select station: </label>
<select id="station" class="form-select my-1 me-sm-2" name="station"> <select id="station" class="form-select w-auto my-1 me-sm-2" name="station">
<?php foreach($stations->result() as $station) { <?php foreach($stations->result() as $station) {
echo '<option value="' . $station->station_id . '">' . $station->station_profile_name . ' - ' . $station->station_callsign . '</option>'."\n"; echo '<option value="' . $station->station_id . '">' . $station->station_profile_name . ' - ' . $station->station_callsign . '</option>'."\n";
} ?> } ?>
@ -57,7 +57,7 @@
<div class="resulttable"></div> <div class="resulttable"></div>
<div class="searchinfo"></div> <div class="searchinfo"></div>
<?php <?php
} }
else { else {
@ -68,4 +68,4 @@
</div> </div>
</div> </div>
</div> </div>

2
application/views/oqrs/notinlogform.php
Wyświetl plik

@ -16,7 +16,7 @@ checked.<br />
<tr> <tr>
<td>1</td> <td>1</td>
<td><input class="form-control" type="date" name="date" value="" id="date"></td> <td><input class="form-control" type="date" name="date" value="" id="date"></td>
<td><input class="form-control qsotime" type="text" name="time" value="" id="time" maxlength="5" placeholder="HH:MM"></td> <td><input class="form-control qsotime" type="text" name="time" value="" id="time" maxlength="5" placeholder="hh:mm"></td>
<td><input class="form-control" type="text" name="band" value="" id="band"></td> <td><input class="form-control" type="text" name="band" value="" id="band"></td>
<td><input class="form-control" type="text" name="mode" value="" id="mode"></td> <td><input class="form-control" type="text" name="mode" value="" id="mode"></td>
</tr> </tr>

2
application/views/oqrs/request.php
Wyświetl plik

@ -25,7 +25,7 @@ The following QSO(s) were found. Please fill out the date and time and submit yo
echo '<tr>'; echo '<tr>';
echo '<td>'. $i++ .'</td>'; echo '<td>'. $i++ .'</td>';
echo '<td><input class="form-control" type="date" name="date" value="" id="date"></td>'; echo '<td><input class="form-control" type="date" name="date" value="" id="date"></td>';
echo '<td><input class="form-control qsotime" type="text" name="time" value="" id="time" maxlength="5" placeholder="HH:MM"></td>'; echo '<td><input class="form-control qsotime" type="text" name="time" value="" id="time" maxlength="5" placeholder="hh:mm"></td>';
echo '<td id="band">'. $qso->col_band .'</td>'; echo '<td id="band">'. $qso->col_band .'</td>';
echo '<td id="mode">'; echo $qso->col_submode == null ? strtoupper($qso->col_mode) : strtoupper($qso->col_submode); echo '</td>'; echo '<td id="mode">'; echo $qso->col_submode == null ? strtoupper($qso->col_mode) : strtoupper($qso->col_submode); echo '</td>';
echo '</tr>'; echo '</tr>';

2
application/views/oqrs/request_grouped.php
Wyświetl plik

@ -20,7 +20,7 @@ The following QSO(s) were found. Please fill out the date and time and submit yo
echo '<tr stationid="'. $qso->station_id.'">'; echo '<tr stationid="'. $qso->station_id.'">';
echo '<td>'. $i++ .'</td>'; echo '<td>'. $i++ .'</td>';
echo '<td><input class="form-control" type="date" name="date" value="" id="date"></td>'; echo '<td><input class="form-control" type="date" name="date" value="" id="date"></td>';
echo '<td><input class="form-control qsotime" type="text" name="time" value="" id="time" maxlength="5" placeholder="HH:MM"></td>'; echo '<td><input class="form-control qsotime" type="text" name="time" value="" id="time" maxlength="5" placeholder="hh:mm"></td>';
echo '<td id="band">'. $qso->col_band .'</td>'; echo '<td id="band">'. $qso->col_band .'</td>';
echo '<td id="mode">'; echo $qso->col_submode == null ? strtoupper($qso->col_mode) : strtoupper($qso->col_submode); echo '</td>'; echo '<td id="mode">'; echo $qso->col_submode == null ? strtoupper($qso->col_mode) : strtoupper($qso->col_submode); echo '</td>';
echo '<td>'. $qso->station_callsign .'</td>'; echo '<td>'. $qso->station_callsign .'</td>';

2
application/views/oqrs/result.php
Wyświetl plik

@ -29,8 +29,10 @@ echo '</tbody></table>';
echo strtoupper($callsign) . ' has ' . $count . ' band slot(s) and has ' . $qsocount . ' QSO(s) in the log.<br /><br />'; echo strtoupper($callsign) . ' has ' . $count . ' band slot(s) and has ' . $qsocount . ' QSO(s) in the log.<br /><br />';
?> ?>
<button onclick="requestOqrs();" class="btn btn-primary btn-sm" type="button"> Request QSL</button> <button onclick="requestOqrs();" class="btn btn-primary btn-sm" type="button"> Request QSL</button>
<br>
<?php } else { <?php } else {
echo '<br />No QSOs found in the log.<br />'; echo '<br />No QSOs found in the log.<br />';
} }
?> ?>
<br>
<button onclick="notInLog();" class="btn btn-primary btn-sm" type="button"> Not in log?</button> <button onclick="notInLog();" class="btn btn-primary btn-sm" type="button"> Not in log?</button>

26
application/views/visitor/layout/header.php
Wyświetl plik

@ -72,18 +72,20 @@
</li> </li>
<?php } ?> <?php } ?>
</ul> </ul>
<div class="m-2">
<div style="paddling-left: 0.5rem; padding-right: 0.5rem"></div> <?php if (!empty($slug)) {
<?php if (!empty($slug)) { $this->CI =& get_instance();
$this->CI =& get_instance(); if ($this->CI->public_search_enabled($slug) || $this->session->userdata('user_type') >= 2) { ?>
if ($this->CI->public_search_enabled($slug) || $this->session->userdata('user_type') >= 2) { ?> <form method="post" name="searchForm" action="<?php echo site_url('visitor/search'); ?>" onsubmit="return validateForm()" class="d-flex align-items-center">
<form method="post" name="searchForm" action="<?php echo site_url('visitor/search'); ?>" onsubmit="return validateForm()" class="form-inline"> <input class="form-control me-sm-2" id="searchcall" type="search" name="callsign" placeholder="<?php echo lang('menu_search_text'); ?>" <?php if (isset($callsign) && $callsign != '') { echo 'value="'.strtoupper($callsign).'"'; } ?> aria-label="Search" data-toogle="tooltip" data-bs-placement="bottom" title="Please enter a callsign!">
<input class="form-control me-sm-2" id="searchcall" type="search" name="callsign" placeholder="<?php echo lang('menu_search_text'); ?>" <?php if (isset($callsign) && $callsign != '') { echo 'value="'.strtoupper($callsign).'"'; } ?> aria-label="Search" data-toogle="tooltip" data-bs-placement="bottom" title="Please enter a callsign!"> <input type="hidden" name="public_slug" value="<?php echo $slug; ?>">
<input type="hidden" name="public_slug" value="<?php echo $slug; ?>"> <button title="<?php echo lang('menu_search_button'); ?>" class="btn btn-outline-success my-2 my-sm-0" type="submit"><i class="fas fa-search"></i>
<button class="btn btn-outline-success my-2 my-sm-0" type="submit"><i class="fas fa-search"></i> <?php echo lang('menu_search_button'); ?></button> <div class="d-inline d-lg-none" style="padding-left: 10px"><?php echo lang('menu_search_button'); ?></div>
</form> </button>
<?php } </form>
} ?> <?php }
} ?>
</div>
</div> </div>
</div> </div>
</nav> </nav>

4
assets/js/sections/oqrs.js
Wyświetl plik

@ -11,7 +11,7 @@ function loadStationInfo() {
success: function (data) { success: function (data) {
if (data.count > 0) { if (data.count > 0) {
$(".resulttable").append('<br />' + data.count + ' Qsos logged between ' + data.mindate + ' and ' + data.maxdate + '.<br /><br />'); $(".resulttable").append('<br />' + data.count + ' Qsos logged between ' + data.mindate + ' and ' + data.maxdate + '.<br /><br />');
$(".resulttable").append('<form class="form-inline" onsubmit="return false;"><label class="my-1 mr-2" for="oqrssearch">Enter your callsign: </label><input class="form-control mr-sm-2" id="oqrssearch" type="search" name="callsign" placeholder="Search Callsign" aria-label="Search" required="required"><button onclick="searchOqrs();" class="btn btn-sm btn-primary" id="stationbuttonsubmit" type="button"><i class="fas fa-search"></i> Search</button></form>'); $(".resulttable").append('<form class="d-flex align-items-center" onsubmit="return false;"><label for="oqrssearch">Enter your callsign: </label><input class="form-control m-2 w-auto" id="oqrssearch" type="search" name="callsign" placeholder="Search Callsign" aria-label="Search" required="required"><button onclick="searchOqrs();" class="btn btn-sm btn-primary" id="stationbuttonsubmit" type="button"><i class="fas fa-search"></i> Search</button></form>');
// Get the input field // Get the input field
var input = document.getElementById("oqrssearch"); var input = document.getElementById("oqrssearch");
@ -160,7 +160,7 @@ function oqrsAddLine() {
var $iterator = $('<td></td>').html(rowCount); var $iterator = $('<td></td>').html(rowCount);
var $date = $('<td></td>').html('<input class="form-control" type="date" name="date" value="" id="date" placeholder="YYYY-MM-DD">'); var $date = $('<td></td>').html('<input class="form-control" type="date" name="date" value="" id="date" placeholder="YYYY-MM-DD">');
var $time = $('<td></td>').html('<input class="form-control qsotime" type="text" name="time" value="" id="time" maxlength="5" placeholder="HH:MM">'); var $time = $('<td></td>').html('<input class="form-control qsotime" type="text" name="time" value="" id="time" maxlength="5" placeholder="hh:mm">');
var $band = $('<td></td>').html('<input class="form-control" type="text" name="band" value="" id="band">'); var $band = $('<td></td>').html('<input class="form-control" type="text" name="band" value="" id="band">');
var $mode = $('<td></td>').html('<input class="form-control" type="text" name="mode" value="" id="mode">'); var $mode = $('<td></td>').html('<input class="form-control" type="text" name="mode" value="" id="mode">');