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

Fix missing span and remove not needed SQL column

pull/2167/head
phl0 2023-05-25 18:25:49 +02:00
rodzic b048671c5e
commit d4ad7412f3
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 48EA1E640798CA9A
2 zmienionych plików z 3 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
application/models/Activated_grids_model.php
Wyświetl plik

@ -11,7 +11,7 @@ class Activated_grids_model extends CI_Model {
return null;
}
$sql = 'SELECT DISTINCT station_gridsquare AS SAT_SQUARE, COL_SAT_NAME FROM '
$sql = 'SELECT DISTINCT station_gridsquare AS SAT_SQUARE FROM '
. 'station_profile JOIN '.$this->config->item('table_name').' on '.$this->config->item('table_name').'.station_id = station_profile.station_id '
. 'WHERE station_profile.station_gridsquare != "" AND '.$this->config->item('table_name').'.COL_SAT_NAME != ""';
@ -29,7 +29,7 @@ class Activated_grids_model extends CI_Model {
$location_list = "'".implode("','",$logbooks_locations_array)."'";
$sql = 'SELECT DISTINCT station_gridsquare AS SAT_SQUARE, COL_SAT_NAME FROM '
$sql = 'SELECT DISTINCT station_gridsquare AS SAT_SQUARE FROM '
. 'station_profile JOIN '.$this->config->item('table_name').' on '.$this->config->item('table_name').'.station_id = station_profile.station_id '
. 'WHERE station_profile.station_gridsquare != "" AND '.$this->config->item('table_name').'.COL_SAT_NAME != "" '
. 'AND (COL_LOTW_QSL_SENT = "Y" OR COL_QSL_SENT = "Y");';

2
application/views/activated_grids/index.php
Wyświetl plik

@ -25,7 +25,7 @@
<div class="container">
<?php if ($this->uri->segment(2) == "satellites") { ?>
<div class="alert alert-success" role="alert">
<?php echo lang('gridsquares_confirmed_is_green'); ?> <span id="confirmed_grids"></span>| <?php echo lang('gridsquares_worked_but_not_confirmed_is_red'); ?> <span id="worked_grids"></span>|<span id="sum_grids"></span><br>
<?php echo lang('gridsquares_confirmed_is_green'); ?> <span id="confirmed_grids"></span>| <?php echo lang('gridsquares_worked_but_not_confirmed_is_red'); ?> <span id="activated_grids"></span>|<span id="sum_grids"></span><br>
</div>
<?php } ?>