Merge remote-tracking branch 'upstream/dev' into map-simplify-centralize-json-call

This commit is contained in:
abarrau 2023-12-19 22:52:33 +01:00
commit 348dcbb0f9
8 changed files with 60 additions and 24287 deletions

View File

@ -22,7 +22,7 @@ $config['migration_enabled'] = TRUE;
|
*/
$config['migration_version'] = 163;
$config['migration_version'] = 164;
/*
|--------------------------------------------------------------------------

View File

@ -0,0 +1,26 @@
<?php
defined('BASEPATH') or exit('No direct script access allowed');
/*
* Create a dxpedition table
*/
class Migration_removing_blue_theme extends CI_Migration
{
public function up()
{
$this->db->query("DELETE FROM themes WHERE foldername = 'blue';");
$this->db->query("DELETE FROM themes WHERE foldername = 'blue_wide';");
$this->db->query("UPDATE users SET user_stylesheet = 'superhero' WHERE user_stylesheet = 'blue'");
$this->db->query("UPDATE users SET user_stylesheet = 'superhero_wide' WHERE user_stylesheet = 'blue_wide'");
$this->db->query("UPDATE options SET option_value = 'superhero' WHERE option_value = 'blue'");
$this->db->query("UPDATE options SET option_value = 'superhero_wide' WHERE option_value = 'blue_wide'");
}
public function down()
{
$this->db->query("INSERT INTO themes (name, foldername) SELECT DISTINCT 'Blue','blue' FROM themes WHERE NOT EXISTS (SELECT 1 FROM themes WHERE foldername = 'blue');");
$this->db->query("INSERT INTO themes (name, foldername) SELECT DISTINCT 'Blue wide','blue_wide' FROM themes WHERE NOT EXISTS (SELECT 1 FROM themes WHERE foldername = 'blue_wide');");
}
}

View File

@ -215,7 +215,7 @@ class WAJA extends CI_Model {
* $postdata contains data from the form, in this case Lotw or QSL are used
*/
function getWajaWorked($location_list, $band, $postdata) {
$sql = "SELECT distinct col_state FROM " . $this->config->item('table_name') . " thcv
$sql = "SELECT distinct LPAD(col_state, 2, '0') AS col_state FROM " . $this->config->item('table_name') . " thcv
where station_id in (" . $location_list . ")";
if ($postdata['mode'] != 'All') {
@ -252,7 +252,7 @@ class WAJA extends CI_Model {
* $postdata contains data from the form, in this case Lotw or QSL are used
*/
function getWajaConfirmed($location_list, $band, $postdata) {
$sql = "SELECT distinct col_state FROM " . $this->config->item('table_name') . " thcv
$sql = "SELECT distinct LPAD(col_state, 2, '0') AS col_state FROM " . $this->config->item('table_name') . " thcv
where station_id in (" . $location_list . ")";
if ($postdata['mode'] != 'All') {

View File

@ -152,6 +152,23 @@
<tr>
<td>Gridsquare (Multi):</td>
<td><?php echo $row->COL_VUCC_GRIDS; ?> <a href="javascript:spawnQrbCalculator('<?php echo $row->station_gridsquare . '\',\'' . $row->COL_VUCC_GRIDS; ?>')"><i class="fas fa-globe"></i></a></td>
<?php
// Cacluate Distance
$distance = $this->qra->distance($row->station_gridsquare, $row->COL_VUCC_GRIDS, $measurement_base);
switch ($measurement_base) {
case 'M':
$distance .= " mi";
break;
case 'K':
$distance .= " km";
break;
case 'N':
$distance .= " nmi";
break;
}
echo $distance;
?>
</tr>
<?php } ?>
@ -379,7 +396,7 @@
<?php
if($row->COL_SAT_NAME != null) {
$twitter_band_sat = $row->COL_SAT_NAME;
$twitter_band_sat = $row->COL_SAT_NAME." \u{1F6F0}\u{FE0F}";
$hashtags = "#hamr #cloudlog #amsat";
} else {
$twitter_band_sat = $row->COL_BAND;
@ -408,7 +425,19 @@
if ($row->COL_DXCC != 0) {
$twitter_string .= urlencode("in ".ucwords(strtolower(($row->COL_COUNTRY)))." ");
}
$twitter_string .= urlencode("(Gridsquare: ".$row->COL_GRIDSQUARE." / distance: ".$distance.") on ".$twitter_band_sat." using ".($row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE)." ".$hashtags);
$distancestring = '';
if ($row->COL_VUCC_GRIDS == null) {
$distancestring = "(Gridsquare: ".$row->COL_GRIDSQUARE." / distance: ".$distance.")";
} else {
if (substr_count($row->COL_VUCC_GRIDS, ',') == 1) {
$distancestring = "(Gridline: ".$row->COL_VUCC_GRIDS." / distance: ".$distance.")";
} else if (substr_count($row->COL_VUCC_GRIDS, ',') == 3) {
$distancestring = "(Gridcorner: ".$row->COL_VUCC_GRIDS." / distance: ".$distance.")";
} else {
$distancestring = "(Grids: ".$row->COL_VUCC_GRIDS.")";
}
}
$twitter_string .= urlencode($distancestring." on ".$twitter_band_sat." using ".($row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE)." ".$hashtags);
}
?>

File diff suppressed because it is too large Load Diff

View File

@ -1,193 +0,0 @@
/*!
* No overrides for the default theme as it aligns with general.css
*/
:root {
--cl-bg: #2b3e50;
--cl-border-btn-pwd: var(--cl-bg);
}
body {
background-color: var(--cl-bg);
}
.table {
--bs-table-color: #fff;
--bs-table-striped-color: #fff;
--bs-table-active-color: #fff;
--bs-table-hover-color: #fff;
--bs-table-bg: #3d4e5e;
--bs-table-accent-bg: var(--cl-bg);
}
.table-striped tbody > tr.activeRow {
background-color: #5cb85c !important;
--bs-table-accent-bg: none;
}
.border-top {
--bs-border-color: #253544;
}
/*
* Maps
*/
.leaflet-tile {
filter: invert() hue-rotate(180deg) sepia(100%) hue-rotate(180deg) !important;
}
path.grid-rectangle {
stroke: rgba(200, 200, 200, 0.5);
}
span.grid-text > font {
color: rgba(220, 220, 220, 1) !important;
-webkit-text-stroke: 0.6px black !important;
}
path.grid-confirmed {
fill: rgba(144, 238, 144, 0.4) !important;
stroke: rgba(144, 238, 144, 0.4) !important;
}
path.grid-worked {
fill: rgba(220, 50, 50, 0.4) !important;
stroke: rgba(220, 50, 50, 0.4) !important;
}
.map-leaflet {
background-color: #2e3e50!important;
}
/*
* Dark Navigation
*/
/* Navigation background */
.bg-light {
background-color: #4e5d6c !important;
}
/* Inactive Links */
.navbar-light .navbar-nav .nav-link {
color: rgba(255, 255, 255, 0.6);
}
/* Active Links and Logo */
.navbar-light .navbar-brand,
.navbar-light .navbar-brand:focus,
.navbar-light .navbar-brand:hover,
.navbar-light .navbar-nav .active > .nav-link,
.navbar-light .navbar-nav .nav-link:focus,
.navbar-light .navbar-nav .nav-link:hover {
color: #fff;
}
/* Hamburger Menu */
.navbar-light .navbar-toggler-icon {
background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='30' height='30' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%28255, 255, 255, 0.6%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e");
}
/*
* Dark inputs
*/
.form-control,
.form-control-sm,
.form-control:focus,
.form-control:disabled,
.form-select {
background-color: rgba(20, 41, 62, 0.6);
color: #fff;
}
div.alert-danger {
color: #ffffff;
}
.bootstrap-dialog.type-primary .modal-header {
background-color: var(--cl-bg);
}
.selectize-dropdown,
.selectize-input,
.selectize-input input {
color: #fff;
}
.selectize-input,
.selectize-control.single .selectize-input.input-active {
background: #2b3d51;
color: #fff;
}
.selectize-input {
border-radius: 0;
}
.selectize-input.full {
background-color: #2b3d51;
}
.selectize-dropdown,
.selectize-dropdown.form-control {
background: #737f8b;
}
.selectize-input.focus {
color: #495057;
background-color: #fff;
border-color: #f1b287;
box-shadow: 0 0 0 0.2rem rgba(223, 105, 26, 0.25);
}
.selectize-input.dropdown-active {
border-radius: 0;
}
.selectize-dropdown,
.selectize-dropdown.form-control {
border-radius: 0;
}
.qso_call {
float: left;
width: 140px;
}
.qso_icons {
float: right;
}
#qsoList_wrapper th {
text-align: left !important;
white-space: nowrap;
}
#qsoList_wrapper td {
text-align: left !important;
white-space: nowrap;
}
#lotw_badge {
float: right;
}
#edit_qso:not(.btn) {
float: left;
}
.accordion {
--bs-accordion-bg: var(--cl-bg);
--bs-accordion-btn-bg: #4e5e6c;
--bs-accordion-active-bg: #4e5e6c;
}
.accordion-button.collapsed {
border-bottom: 1px solid var(--cl-bg);
}
.accordion-body {
border: 1px solid #4e5e6c;
}

File diff suppressed because it is too large Load Diff

View File

@ -1,247 +0,0 @@
/*!
* No overrides for the default theme as it aligns with general.css
*/
:root {
--cl-bg: #2b3e50;
--cl-border-btn-pwd: var(--cl-bg);
}
body {
background-color: var(--cl-bg);
}
.table {
--bs-table-color: #fff;
--bs-table-striped-color: #fff;
--bs-table-active-color: #fff;
--bs-table-hover-color: #fff;
--bs-table-bg: #3d4e5e;
--bs-table-accent-bg: var(--cl-bg);
}
.table-striped tbody > tr.activeRow {
background-color: #5cb85c !important;
--bs-table-accent-bg: none;
}
.border-top {
--bs-border-color: #253544;
}
/*
* Maps
*/
.leaflet-tile {
filter: invert() hue-rotate(180deg) sepia(100%) hue-rotate(180deg) !important;
}
path.grid-rectangle {
stroke: rgba(200, 200, 200, 0.5);
}
span.grid-text > font {
color: rgba(220, 220, 220, 1) !important;
-webkit-text-stroke: 0.6px black !important;
}
path.grid-confirmed {
fill: rgba(144, 238, 144, 0.4) !important;
stroke: rgba(144, 238, 144, 0.4) !important;
}
path.grid-worked {
fill: rgba(220, 50, 50, 0.4) !important;
stroke: rgba(220, 50, 50, 0.4) !important;
}
.map-leaflet {
background-color: #2e3e50!important;
}
/*
* Dark Navigation
*/
/* Navigation background */
.bg-light {
background-color: #4e5d6c !important;
}
/* Inactive Links */
.navbar-light .navbar-nav .nav-link {
color: rgba(255, 255, 255, 0.6);
}
/* Active Links and Logo */
.navbar-light .navbar-brand,
.navbar-light .navbar-brand:focus,
.navbar-light .navbar-brand:hover,
.navbar-light .navbar-nav .active > .nav-link,
.navbar-light .navbar-nav .nav-link:focus,
.navbar-light .navbar-nav .nav-link:hover {
color: #fff;
}
/* Hamburger Menu */
.navbar-light .navbar-toggler-icon {
background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='30' height='30' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%28255, 255, 255, 0.6%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e");
}
/*
* Dark inputs
*/
.form-control,
.form-control-sm,
.form-control:focus,
.form-control:disabled,
.form-select {
background-color: rgba(20, 41, 62, 0.6);
color: #fff;
}
div.alert-danger {
color: #ffffff;
}
.bootstrap-dialog.type-primary .modal-header {
background-color: var(--cl-bg);
}
.selectize-dropdown,
.selectize-input,
.selectize-input input {
color: #fff;
}
.selectize-input,
.selectize-control.single .selectize-input.input-active {
background: #2b3d51;
color: #fff;
}
.selectize-input {
border-radius: 0;
}
.selectize-input.full {
background-color: #2b3d51;
}
.selectize-dropdown,
.selectize-dropdown.form-control {
background: #737f8b;
}
.selectize-input.focus {
color: #495057;
background-color: #fff;
border-color: #f1b287;
box-shadow: 0 0 0 0.2rem rgba(223, 105, 26, 0.25);
}
.selectize-input.dropdown-active {
border-radius: 0;
}
.selectize-dropdown,
.selectize-dropdown.form-control {
border-radius: 0;
}
.qso_call {
float: left;
width: 140px;
}
.qso_icons {
float: right;
}
#qsoList_wrapper th {
text-align: left !important;
white-space: nowrap;
}
#qsoList_wrapper td {
text-align: left !important;
white-space: pre-wrap;
}
#lotw_badge {
float: right;
}
#edit_qso:not(.btn) {
float: left;
}
@media (min-width: 1500px) {
.container, .container-lg, .container-md, .container-sm, .container-xl {
max-width: 1400px
}
}
@media (min-width: 1920px) {
.container, .container-lg, .container-md, .container-sm, .container-xl {
max-width: 1800px
}
}
::-webkit-scrollbar {
width: 12px;
}
::-webkit-scrollbar-track {
-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
border-radius: 10px;
}
::-webkit-scrollbar-thumb {
border-radius: 10px;
-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.5);
}
#map {
height: 500px !important;
}
#gridsquare_map {
height: calc(100vh - 380px) !important;
max-height: 900px !important;
}
@media (min-width: 992px) {
.modal-lg, .modal-xl {
max-width: 1300px;
}
}
.modal-body {
max-height: calc(100vh - 200px);
overflow-y: auto;
}
#mapqso {
height: 400px !important;
}
#qsomap {
height: 400px !important;
}
.accordion {
--bs-accordion-bg: var(--cl-bg);
--bs-accordion-btn-bg: #4e5e6c;
--bs-accordion-active-bg: #4e5e6c;
}
.accordion-button.collapsed {
border-bottom: 1px solid var(--cl-bg);
}
.accordion-body {
border: 1px solid #4e5e6c;
}