goodspeed/Cloudlog
1
0
派生 0
代码 工单 合并请求 项目 版本发布 软件包 百科 动态 Actions

Merge branch 'master' into qsl_card_upload

浏览代码
这个提交包含在：
Andreas Kristiansen 2020-10-29 17:55:23 +01:00 提交者 GitHub
当前提交 b22ed135b3
找不到此签名对应的密钥
GPG 密钥 ID: 4AEE18F83AFDEB23
共有 45 个文件被更改，包括 717 次插入 和 199 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

3
application/config/migration.php
查看文件

@ -21,8 +21,7 @@ $config['migration_enabled'] = TRUE;
| be upgraded / downgraded to.
|
*/
$config['migration_version'] = 54;
$config['migra
/*
|--------------------------------------------------------------------------
| Migrations Path

4
application/controllers/Awards.php
查看文件

@ -164,7 +164,9 @@ class Awards extends CI_Controller {
public function vucc_band(){
$this->load->model('vucc');
$band = str_replace('"', "", $this->input->get("Band"));
$data['vucc_array'] = $this->vucc->vucc_details($band);
$type = str_replace('"', "", $this->input->get("Type"));
$data['vucc_array'] = $this->vucc->vucc_details($band, $type);
$data['type'] = $type;
// Render Page
$data['page_title'] = "VUCC - band";

20
application/controllers/Eqsl.php
查看文件

@ -400,7 +400,7 @@ class eqsl extends CI_Controller {
// adding prop mode if it isn't blank
if ($qsl['COL_PROP_MODE']){
$adif .= "%3C";
$adif .= "PROP_MODE";
$adif .= "PROP%5FMODE";
$adif .= "%3A";
$adif .= strlen($qsl['COL_PROP_MODE']);
$adif .= "%3E";
@ -409,20 +409,20 @@ class eqsl extends CI_Controller {
}
// adding sat name if it isn't blank
if ($qsl['COL_SAT_NAME'] = ''){
if ($qsl['COL_SAT_NAME'] != ''){
$adif .= "%3C";
$adif .= "SAT_NAME";
$adif .= "SAT%5FNAME";
$adif .= "%3A";
$adif .= strlen($qsl['COL_SAT_NAME']);
$adif .= "%3E";
$adif .= $qsl['COL_SAT_NAME'];
$adif .= str_replace('-', '%2D', $qsl['COL_SAT_NAME']);
$adif .= "%20";
}
// adding sat mode if it isn't blank
if ($qsl['COL_SAT_MODE'] = ''){
if ($qsl['COL_SAT_MODE'] != ''){
$adif .= "%3C";
$adif .= "SAT_MODE";
$adif .= "SAT%5FMODE";
$adif .= "%3A";
$adif .= strlen($qsl['COL_SAT_MODE']);
$adif .= "%3E";
@ -430,9 +430,9 @@ class eqsl extends CI_Controller {
$adif .= "%20";
}
if ($qsl['eqslqthnickname'] = ''){
if ($qsl['eqslqthnickname'] != ''){
$adif .= "%3C";
$adif .= "APP_EQSL_QTH_NICKNAME";
$adif .= "APP%5FEQSL%5FQTH%5FNICKNAME";
$adif .= "%3A";
$adif .= strlen($qsl['eqslqthnickname']);
$adif .= "%3E";
@ -441,9 +441,9 @@ class eqsl extends CI_Controller {
}
// adding sat mode if it isn't blank
if ($qsl['station_gridsquare'] = ''){
if ($qsl['station_gridsquare'] != ''){
$adif .= "%3C";
$adif .= "MY_GRIDSQUARE";
$adif .= "MY%5FGRIDSQUARE";
$adif .= "%3A";
$adif .= strlen($qsl['station_gridsquare']);
$adif .= "%3E";

52
application/controllers/Timeline.php
查看文件

@ -14,7 +14,7 @@ class Timeline extends CI_Controller {
public function index()
{
// Render Page
$data['page_title'] = "DXCC Timeline";
$data['page_title'] = "Timeline";
$this->load->model('Timeline_model');
@ -25,9 +25,28 @@ class Timeline extends CI_Controller {
$band = 'All';
}
$data['dxcc_timeline_array'] = $this->Timeline_model->get_dxcc_timeline($band);
if ($this->input->post('mode') != NULL) { // Band is not set when page first loads.
$mode = $this->input->post('mode');
}
else {
$mode = 'All';
}
if ($this->input->post('awardradio') != NULL) { // Band is not set when page first loads.
$award = $this->input->post('awardradio');
}
else {
$award = 'dxcc';
}
$this->load->model('modes');
$data['modes'] = $this->modes->active();
$data['timeline_array'] = $this->Timeline_model->get_timeline($band, $mode, $award);
$data['worked_bands'] = $this->Timeline_model->get_worked_bands();
$data['bandselect'] = $band;
$data['modeselect'] = $mode;
$this->load->view('interface_assets/header', $data);
$this->load->view('timeline/index');
@ -37,14 +56,29 @@ class Timeline extends CI_Controller {
public function details() {
$this->load->model('logbook_model');
$adif = str_replace('"', "", $this->input->post("Adif"));
$country = $this->logbook_model->get_entity($adif);
$band = str_replace('"', "", $this->input->post("Band"));
$data['results'] = $this->logbook_model->timeline_qso_details($adif, $band);
$querystring = str_replace('"', "", $this->input->post("Querystring"));
// Render Page
$data['page_title'] = "Log View - DXCC";
$data['filter'] = "country ". $country['name'];
$band = str_replace('"', "", $this->input->post("Band"));
$mode = str_replace('"', "", $this->input->post("Mode"));
$type = str_replace('"', "", $this->input->post("Type"));
$data['results'] = $this->logbook_model->timeline_qso_details($querystring, $band, $mode, $type);
switch($type) {
case 'dxcc': $country = $this->logbook_model->get_entity($querystring);
$data['page_title'] = "Log View - DXCC";
$data['filter'] = "country ". $country['name'];
break;
case 'was' : $data['page_title'] = "Log View - WAS";
$data['filter'] = "state ". $querystring;
break;
case 'iota': $data['page_title'] = "Log View - IOTA";
$data['filter'] = "iota ". $querystring;
break;
case 'waz' : $data['page_title'] = "Log View - WAZ";
$data['filter'] = "CQ zone ". $querystring;
break;
}
if ($band != "All") {
$data['filter'] .= " and " . $band;

17
application/migrations/053_gridsquare_index.php 普通文件
查看文件

@ -0,0 +1,17 @@
<?php
defined('BASEPATH') OR exit('No direct script access allowed');
class Migration_gridsquare_index extends CI_Migration {
public function up()
{
$sql = "ALTER TABLE ".$this->config->item('table_name')." ADD INDEX `gridsquares` (`COL_GRIDSQUARE`);";
$this->db->query($sql);
}
public function down()
{
}
}

33
application/models/Logbook_model.php
查看文件

@ -232,19 +232,10 @@ class Logbook_model extends CI_Model {
$CI =& get_instance();
$CI->load->model('Stations');
$station_id = $CI->Stations->find_active();
$sql = "select * from " . $this->config->item('table_name') . " where station_id =" . $station_id . " and col_gridsquare like '" . $gridsquare. "%'";
if ($band != 'All') {
if ($band == 'SAT') {
$sql .= " and col_prop_mode ='" . $band . "'";
} else {
$sql .= " and col_prop_mode !='SAT'";
$sql .= " and col_band ='" . $band . "'";
}
}
$sql .= " union ";
$sql .= "select * from " . $this->config->item('table_name') . " where station_id =" . $station_id . " and col_vucc_grids like '%" . $gridsquare. "%'";
$sql = "select * from " . $this->config->item('table_name') .
" where station_id =" . $station_id .
" and (col_gridsquare like '" . $gridsquare. "%'
or col_vucc_grids like '%" . $gridsquare. "%')";
if ($band != 'All') {
if ($band == 'SAT') {
@ -278,7 +269,7 @@ class Logbook_model extends CI_Model {
return $this->db->get($this->config->item('table_name'));
}
public function timeline_qso_details($adif, $band){
public function timeline_qso_details($querystring, $band, $mode, $type){
$CI =& get_instance();
$CI->load->model('Stations');
$station_id = $CI->Stations->find_active();
@ -292,8 +283,18 @@ class Logbook_model extends CI_Model {
}
}
if ($mode != 'All') {
$this->db->where('col_mode', $mode);
}
$this->db->where('station_id', $station_id);
$this->db->where('COL_DXCC', $adif);
switch($type) {
case 'dxcc': $this->db->where('COL_DXCC', $querystring); break;
case 'was': $this->db->where('COL_STATE', $querystring); break;
case 'iota': $this->db->where('COL_IOTA', $querystring); break;
case 'waz': $this->db->where('COL_CQZ', $querystring); break;
}
return $this->db->get($this->config->item('table_name'));
}
@ -1474,7 +1475,7 @@ class Logbook_model extends CI_Model {
// Show all QSOs we need to send to eQSL
function eqsl_not_yet_sent() {
$this->db->select('station_profile.*, '.$this->config->item('table_name').'.COL_PRIMARY_KEY, '.$this->config->item('table_name').'.COL_TIME_ON, '.$this->config->item('table_name').'.COL_CALL, '.$this->config->item('table_name').'.COL_MODE, '.$this->config->item('table_name').'.COL_SUBMODE, '.$this->config->item('table_name').'.COL_BAND, '.$this->config->item('table_name').'.COL_COMMENT, '.$this->config->item('table_name').'.COL_RST_SENT, '.$this->config->item('table_name').'.COL_PROP_MODE');
$this->db->select('station_profile.*, '.$this->config->item('table_name').'.COL_PRIMARY_KEY, '.$this->config->item('table_name').'.COL_TIME_ON, '.$this->config->item('table_name').'.COL_CALL, '.$this->config->item('table_name').'.COL_MODE, '.$this->config->item('table_name').'.COL_SUBMODE, '.$this->config->item('table_name').'.COL_BAND, '.$this->config->item('table_name').'.COL_COMMENT, '.$this->config->item('table_name').'.COL_RST_SENT, '.$this->config->item('table_name').'.COL_PROP_MODE, '.$this->config->item('table_name').'.COL_SAT_NAME, '.$this->config->item('table_name').'.COL_SAT_MODE');
$this->db->from('station_profile');
$this->db->join($this->config->item('table_name'),'station_profile.station_id = '.$this->config->item('table_name').'.station_id AND station_profile.eqslqthnickname != ""','left');
$this->db->where($this->config->item('table_name').'.COL_EQSL_QSL_SENT !=', 'Y');

103
application/models/Timeline_model.php
查看文件

@ -9,12 +9,22 @@ class Timeline_model extends CI_Model
parent::__construct();
}
function get_dxcc_timeline($band)
{
function get_timeline($band, $mode, $award) {
$CI =& get_instance();
$CI->load->model('Stations');
$station_id = $CI->Stations->find_active();
switch ($award) {
case 'dxcc': $result = $this->get_timeline_dxcc($band, $mode, $station_id); break;
case 'was': $result = $this->get_timeline_was($band, $mode, $station_id); break;
case 'iota': $result = $this->get_timeline_iota($band, $mode, $station_id); break;
case 'waz': $result = $this->get_timeline_waz($band, $mode, $station_id); break;
}
return $result;
}
public function get_timeline_dxcc($band, $mode, $station_id) {
$sql = "select min(date(COL_TIME_ON)) date, prefix, col_country, end, adif from "
.$this->config->item('table_name'). " thcv
join dxcc_entities on thcv.col_dxcc = dxcc_entities.adif
@ -30,6 +40,10 @@ class Timeline_model extends CI_Model
}
}
if ($mode != 'All') {
$sql .= " and col_mode ='" . $mode . "'";
}
$sql .= " group by col_dxcc, col_country
order by date desc";
@ -38,6 +52,91 @@ class Timeline_model extends CI_Model
return $query->result();
}
public function get_timeline_was($band, $mode, $station_id) {
$sql = "select min(date(COL_TIME_ON)) date, col_state from "
.$this->config->item('table_name'). " thcv
where station_id = " . $station_id;
if ($band != 'All') {
if ($band == 'SAT') {
$sql .= " and col_prop_mode ='" . $band . "'";
}
else {
$sql .= " and col_prop_mode !='SAT'";
$sql .= " and col_band ='" . $band . "'";
}
}
if ($mode != 'All') {
$sql .= " and col_mode ='" . $mode . "'";
}
$sql .= " and COL_DXCC in ('291', '6', '110')";
$sql .= " and COL_STATE in ('AK','AL','AR','AZ','CA','CO','CT','DE','FL','GA','HI','IA','ID','IL','IN','KS','KY','LA','MA','MD','ME','MI','MN','MO','MS','MT','NC','ND','NE','NH','NJ','NM','NV','NY','OH','OK','OR','PA','RI','SC','SD','TN','TX','UT','VA','VT','WA','WI','WV','WY')";
$sql .= " group by col_state
order by date desc";
$query = $this->db->query($sql);
return $query->result();
}
public function get_timeline_iota($band, $mode, $station_id) {
$sql = "select min(date(COL_TIME_ON)) date, col_iota, name, prefix from "
.$this->config->item('table_name'). " thcv
join iota on thcv.col_iota = iota.tag
where station_id = " . $station_id;
if ($band != 'All') {
if ($band == 'SAT') {
$sql .= " and col_prop_mode ='" . $band . "'";
}
else {
$sql .= " and col_prop_mode !='SAT'";
$sql .= " and col_band ='" . $band . "'";
}
}
if ($mode != 'All') {
$sql .= " and col_mode ='" . $mode . "'";
}
$sql .= " and col_iota <> '' group by col_iota
order by date desc";
$query = $this->db->query($sql);
return $query->result();
}
public function get_timeline_waz($band, $mode, $station_id) {
$sql = "select min(date(COL_TIME_ON)) date, col_cqz from "
.$this->config->item('table_name'). " thcv
where station_id = " . $station_id;
if ($band != 'All') {
if ($band == 'SAT') {
$sql .= " and col_prop_mode ='" . $band . "'";
}
else {
$sql .= " and col_prop_mode !='SAT'";
$sql .= " and col_band ='" . $band . "'";
}
}
if ($mode != 'All') {
$sql .= " and col_mode ='" . $mode . "'";
}
$sql .= " and col_cqz <> '' group by col_cqz
order by date desc";
$query = $this->db->query($sql);
return $query->result();
}
public $bandslots = array("160m" => 0,
"80m" => 0,
"60m" => 0,

108
application/models/Vucc.php
查看文件

@ -164,7 +164,7 @@ class VUCC extends CI_Model
$sql = "select col_vucc_grids
from " . $this->config->item('table_name') .
" where station_id =" . $station_id .
" and (LENGTH(col_vucc_grids) > 0) ";
" and col_vucc_grids <> '' ";
if ($confirmationMethod == 'both') {
$sql .= " and (col_qsl_rcvd='Y' or col_lotw_qsl_rcvd='Y')";
@ -199,7 +199,7 @@ class VUCC extends CI_Model
$sql = "select distinct upper(substring(col_gridsquare, 1, 4)) gridsquare
from " . $this->config->item('table_name') .
" where station_id =" . $station_id .
" and (LENGTH(col_gridsquare) > 0)";
" and col_gridsquare <> ''";
if ($confirmationMethod == 'both') {
$sql .= " and (col_qsl_rcvd='Y' or col_lotw_qsl_rcvd='Y')";
@ -228,27 +228,81 @@ class VUCC extends CI_Model
/*
* Makes a list of all gridsquares on chosen band with info about lotw and qsl
*/
function vucc_details($band) {
$col_gridsquare_worked = $this->get_vucc_summary($band, 'none');
function vucc_details($band, $type) {
$workedGridArray = array();
foreach ($col_gridsquare_worked as $workedgrid) {
array_push($workedGridArray, $workedgrid['gridsquare']);
if ($type == 'worked') {
$workedGridArray = $this->getWorkedGridsList($band, 'none');
$vuccBand = $this->removeConfirmedGrids($band, $workedGridArray);
} else if ($type == 'confirmed') {
$workedGridArray = $this->getWorkedGridsList($band, 'both');
$vuccBand = $this->markConfirmedGrids($band, $workedGridArray);
} else {
$workedGridArray = $this->getWorkedGridsList($band, 'none');
$vuccBand = $this->markConfirmedGrids($band, $workedGridArray);
}
$col_vucc_grids_worked = $this->get_vucc_summary_col_vucc($band, 'none');
if (count($vuccBand) == 0) {
return 0;
} else {
ksort($vuccBand);
return $vuccBand;
}
}
foreach ($col_vucc_grids_worked as $gridSplit) {
function removeConfirmedGrids($band, $workedGridArray) {
$vuccDataQsl = $this->get_vucc_summary($band, 'qsl');
foreach ($vuccDataQsl as $grid) {
if (($key = array_search($grid['gridsquare'], $workedGridArray)) !== false) {
unset($workedGridArray[$key]);
}
}
$vuccDataLotw = $this->get_vucc_summary($band, 'lotw');
foreach ($vuccDataLotw as $grid) {
if (($key = array_search($grid['gridsquare'], $workedGridArray)) !== false) {
unset($workedGridArray[$key]);
}
}
$col_vucc_grids_confirmed_qsl = $this->get_vucc_summary_col_vucc($band, 'lotw');
foreach ($col_vucc_grids_confirmed_qsl as $gridSplit) {
$grids = explode(",", $gridSplit['col_vucc_grids']);
foreach($grids as $key) {
$grid_four = strtoupper(substr(trim($key),0,4));
if(!in_array($grid_four, $workedGridArray)){
array_push($workedGridArray, $grid_four);
if (($key = array_search($grid_four, $workedGridArray)) !== false) {
unset($workedGridArray[$key]);
}
}
}
$col_vucc_grids_confirmed_lotw = $this->get_vucc_summary_col_vucc($band, 'qsl');
foreach ($col_vucc_grids_confirmed_lotw as $gridSplit) {
$grids = explode(",", $gridSplit['col_vucc_grids']);
foreach($grids as $key) {
$grid_four = strtoupper(substr(trim($key),0,4));
if (($key = array_search($grid_four, $workedGridArray)) !== false) {
unset($workedGridArray[$key]);
}
}
}
foreach ($workedGridArray as $grid) {
$this->load->model('logbook_model');
$result = $this->logbook_model->vucc_qso_details($grid, $band);
$callsignlist = '';
foreach($result->result() as $call) {
$callsignlist .= $call->COL_CALL . '<br/>';
}
$vuccBand[$grid]['call'] = $callsignlist;
}
return $vuccBand;
}
function markConfirmedGrids($band, $workedGridArray) {
foreach ($workedGridArray as $grid) {
$vuccBand[$grid]['qsl'] = '';
$vuccBand[$grid]['lotw'] = '';
@ -286,12 +340,32 @@ class VUCC extends CI_Model
}
}
if (count($vuccBand) == 0) {
return 0;
} else {
ksort($vuccBand);
return $vuccBand;
return $vuccBand;
}
function getWorkedGridsList($band, $confirmationMethod) {
$col_gridsquare_worked = $this->get_vucc_summary($band, $confirmationMethod);
$workedGridArray = array();
foreach ($col_gridsquare_worked as $workedgrid) {
array_push($workedGridArray, $workedgrid['gridsquare']);
}
$col_vucc_grids_worked = $this->get_vucc_summary_col_vucc($band, $confirmationMethod);
foreach ($col_vucc_grids_worked as $gridSplit) {
$grids = explode(",", $gridSplit['col_vucc_grids']);
foreach($grids as $key) {
$grid_four = strtoupper(substr(trim($key),0,4));
if(!in_array($grid_four, $workedGridArray)){
array_push($workedGridArray, $grid_four);
}
}
}
return $workedGridArray;
}
function get_station_id() {

2
application/views/accumulate/index.php
查看文件

@ -83,7 +83,7 @@
<!-- Button (Double) -->
<div class="form-group row">
<div class="col-md-10">
<button id="button1id" type="button" name="button1id" class="btn btn-success btn-primary ld-ext-right" onclick="accumulatePlot(this.form)">Show<div class="ld ld-ring ld-spin"></div></button>
<button id="button1id" type="button" name="button1id" class="btn btn-primary ld-ext-right" onclick="accumulatePlot(this.form)">Show<div class="ld ld-ring ld-spin"></div></button>
</div>
</div>

14
application/views/adif/import.php
查看文件

@ -115,11 +115,11 @@
</div>
</div>
<button type="submit" class="btn btn-outline-secondary btn-sm" value="Export">Export QSOs</button>
<button type="submit" class="btn btn-primary" value="Export">Export QSOs</button>
</form>
<br><br>
<h6>Logbook of The World</h6>
<h5>Logbook of The World</h5>
<p>If no date are chosen, that means all QSOs will be marked!</p>
<form class="form" action="<?php echo site_url('adif/mark_lotw'); ?>" method="post" enctype="multipart/form-data">
<p class="card-text">From date:</p>
@ -141,14 +141,14 @@
</div>
</div>
<br>
<button type="submit" class="btn btn-outline-secondary btn-sm" value="Export">Mark QSOs as exported to LoTW</button>
<button type="submit" class="btn btn-primary" value="Export">Mark QSOs as exported to LoTW</button>
</form>
<br><br>
<h6>Export Satellite Only QSOs</h6>
<a href="<?php echo site_url('adif/exportsat'); ?>" title="Export All Satellite Contacts" target="_blank" class="btn btn-outline-secondary btn-sm">Export All Satellite QSOs</a>
<a href="<?php echo site_url('adif/exportsatlotw'); ?>" title="Export All Satellite QSOS Confirmed on LoTW" target="_blank" class="btn btn-outline-secondary btn-sm">Export All Satellite QSOs Confirmed on LoTW</a>
<h5>Export Satellite Only QSOs</h5>
<p><a href="<?php echo site_url('adif/exportsat'); ?>" title="Export All Satellite Contacts" target="_blank" class="btn btn-primary">Export All Satellite QSOs</a></p>
<p><a href="<?php echo site_url('adif/exportsatlotw'); ?>" title="Export All Satellite QSOS Confirmed on LoTW" target="_blank" class="btn btn-primary">Export All Satellite QSOs Confirmed on LoTW</a></p>
</div>
</div>

6
application/views/api/help.php
查看文件

@ -32,7 +32,7 @@
<tbody>
<?php foreach ($api_keys->result() as $row) { ?>
<tr>
<td><?php echo $row->key; ?></td>
<td><i class="fas fa-key"></i> <?php echo $row->key; ?></td>
<td><?php echo $row->description; ?></td>
<td>
<?php
@ -67,8 +67,8 @@
<?php } ?>
<p>
<a href="<?php echo site_url('api/generate/rw'); ?>" class="btn btn-outline-primary btn-sm">Generate Key with Read & Write Access</a>
<a href="<?php echo site_url('api/generate/r'); ?>" class="btn btn-outline-primary btn-sm">Generate Key with Read Only Access</a>
<a href="<?php echo site_url('api/generate/rw'); ?>" class="btn btn-primary "><i class="fas fa-plus"></i> Create a read & write key</a>
<a href="<?php echo site_url('api/generate/r'); ?>" class="btn btn-primary"><i class="fas fa-plus"></i> Create a read-only key</a>
</p>
</div>

4
application/views/awards/cq/index.php
查看文件

@ -134,8 +134,8 @@
<div class="form-group row">
<label class="col-md-2 control-label" for="button1id"></label>
<div class="col-md-10">
<button id="button2id" type="reset" name="button2id" class="btn btn-danger">Reset</button>
<button id="button1id" type="submit" name="button1id" class="btn btn-success btn-primary">Show</button>
<button id="button2id" type="reset" name="button2id" class="btn btn-warning">Reset</button>
<button id="button1id" type="submit" name="button1id" class="btn btn-primary">Show</button>
</div>
</div>

4
application/views/awards/dxcc/index.php
查看文件

@ -101,8 +101,8 @@
<div class="form-group row">
<label class="col-md-2 control-label" for="button1id"></label>
<div class="col-md-10">
<button id="button2id" type="reset" name="button2id" class="btn btn-danger">Reset</button>
<button id="button1id" type="submit" name="button1id" class="btn btn-success btn-primary">Show</button>
<button id="button2id" type="reset" name="button2id" class="btn btn-warning">Reset</button>
<button id="button1id" type="submit" name="button1id" class="btn btn-primary">Show</button>
</div>
</div>

4
application/views/awards/iota/index.php
查看文件

@ -88,8 +88,8 @@
<div class="form-group row">
<label class="col-md-2 control-label" for="button1id"></label>
<div class="col-md-10">
<button id="button2id" type="reset" name="button2id" class="btn btn-danger">Reset</button>
<button id="button1id" type="submit" name="button1id" class="btn btn-success btn-primary">Show</button>
<button id="button2id" type="reset" name="button2id" class="btn btn-warning">Reset</button>
<button id="button1id" type="submit" name="button1id" class="btn btn-primary">Show</button>
</div>
</div>

35
application/views/awards/vucc/band.php
查看文件

@ -9,24 +9,35 @@
<thead>
<tr>
<td>#</td>
<td>Gridsquare</td>
<td>QSL</td>
<td>LoTW</td>
</tr>
<td>Gridsquare</td>';
if ($type != 'worked') {
echo '<td>QSL</td>
<td>LoTW</td>';
} else {
echo '<td>Call</td>';
}
echo '</tr>
</thead>
<tbody>';
foreach ($vucc_array as $vucc => $value) { // Fills the table with the data
echo '<tr>
foreach ($vucc_array as $vucc => $value) { // Fills the table with the data
echo '<tr>
<td>'. $i++ .'</td>
<td><a href=\'javascript:displayVuccContacts("'. $vucc .'","'. $band . '")\'>'. $vucc .'</td>
<td>'. $value['qsl'] . '</td>
<td>'. $value['lotw'] .'</td>
</tr>';
<td><a href=\'javascript:displayVuccContacts("'. $vucc .'","'. $band . '")\'>'. $vucc .'</td>';
if ($type != 'worked') {
echo '<td>'. $value['qsl'] . '</td>
<td>'. $value['lotw'] .'</td>';
} else {
echo '<td>'. $value['call'] .'</td>';
}
echo '</tr>';
}
echo '</tfoot></table></div>';
echo '</tbody></table></div>';
}
else {
echo '<div class="alert alert-danger" role="alert"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>Nothing found!</div>';
}
?>
?>

4
application/views/awards/vucc/index.php
查看文件

@ -13,8 +13,8 @@
<?php foreach($vucc_array as $band => $vucc) {
echo '<tr>';
echo '<td><a href=\'vucc_band?Band="'. $band . '"\'>'. $band .'</td>';
echo '<td>' . $vucc['worked'] . '</td>';
echo '<td>' . $vucc['confirmed'] . '</td>';
echo '<td><a href=\'vucc_band?Band="'. $band . '"&Type="worked"\'>'. $vucc['worked'] .'</td>';
echo '<td><a href=\'vucc_band?Band="'. $band . '"&Type="confirmed"\'>'. $vucc['confirmed'] .'</td>';
echo '</tr>';
}
?>

4
application/views/awards/was/index.php
查看文件

@ -57,8 +57,8 @@
<div class="form-group row">
<label class="col-md-2 control-label" for="button1id"></label>
<div class="col-md-10">
<button id="button2id" type="reset" name="button2id" class="btn btn-danger">Reset</button>
<button id="button1id" type="submit" name="button1id" class="btn btn-success btn-primary">Show</button>
<button id="button2id" type="reset" name="button2id" class="btn btn-warning">Reset</button>
<button id="button1id" type="submit" name="button1id" class="btn btn-primary">Show</button>
</div>
</div>

9
application/views/backup/main.php
查看文件

@ -15,12 +15,9 @@
</div>
<div class="card-body">
<p class="card-text">Some of the data stored in Cloudlog can be exported so that you can keep a backup copy elsewhere.</p>
<p class="card-text">It's recommended to create backups on a regular basis to protect your data.</p>
<p class="card-text">Choose an option from the list below:</p>
<ul>
<li><a href="<?php echo site_url('backup/adif'); ?>">Backup ADIF</a></li>
<li><a href="<?php echo site_url('backup/notes'); ?>">Backup Notes</a></li>
</ul>
<p class="card-text">It's recommended to create backups on a regular basis to protect your data.</p>
<p><a href="<?php echo site_url('backup/adif'); ?>" title="Export a backup copy of your ADIF data" class="btn btn-primary">Backup ADIF data</a></p>
<p><a href="<?php echo site_url('backup/notes'); ?>" title="Export a backup copy of your notes" class="btn btn-primary">Backup Notes</a></p>
</div>
</div>

2
application/views/distances/index.php
查看文件

@ -10,7 +10,7 @@
<select class="custom-select my-1 mr-sm-2" id="distplot_bands">
<option value="sat">SAT</option>
</select>
<button id="plot" type="button" name="plot" class="btn btn-success btn-primary" onclick="distPlot(this.form)">Plot</button>
<button id="plot" type="button" name="plot" class="btn btn-primary" onclick="distPlot(this.form)">Plot</button>
</form>
</div>

2
application/views/eqsl/export.php
查看文件

@ -30,7 +30,7 @@
echo "<p>Clicking \"Upload QSOs\" will send QSO information to eQSL.cc.</p>";
echo form_open('eqsl/export');
echo "<input type=\"hidden\" name=\"eqslexport\" id=\"eqslexport\" value=\"export\" />";
echo "<input class=\"btn primary\" type=\"submit\" value=\"Upload QSOs\" /></form>";
echo "<input class=\"btn btn-primary\" type=\"submit\" value=\"Upload QSOs\" /></form>";
}
else
{

10
application/views/interface_assets/footer.php
查看文件

@ -1428,7 +1428,7 @@ $(document).ready(function(){
message: html,
onshown: function(dialog) {
var qsoid = $("#qsoid").text();
$(".editButton").html('<a class="btn btn-success" id="edit_qso" href="javascript:qso_edit('+qsoid+')"><i class="fas fa-edit"></i> Edit QSO</a>');
$(".editButton").html('<a class="btn btn-primary" id="edit_qso" href="javascript:qso_edit('+qsoid+')"><i class="fas fa-edit"></i> Edit QSO</a>');
var lat = $("#lat").text();
var long = $("#long").text();
var callsign = $("#callsign").text();
@ -1903,13 +1903,15 @@ $(document).ready(function(){
$(".buttons-csv").css("color", "white");
}
function displayTimelineContacts(adif, band) {
function displayTimelineContacts(querystring, band, mode, type) {
var baseURL= "<?php echo base_url();?>";
$.ajax({
url: baseURL + 'index.php/timeline/details',
type: 'post',
data: {'Adif': adif,
'Band': band
data: {'Querystring': querystring,
'Band': band,
'Mode': mode,
'Type': type
},
success: function(html) {
BootstrapDialog.show({

4
application/views/interface_assets/header.php
查看文件

@ -86,9 +86,9 @@
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="<?php echo site_url('dayswithqso');?>" title="Dayswithqso">Days with QSOs</a>
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="<?php echo site_url('timeline');?>" title="Dxcctimeline">DXCC Timeline</a>
<a class="dropdown-item" href="<?php echo site_url('timeline');?>" title="Timeline">Timeline</a>
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="<?php echo site_url('accumulated');?>" title="Dxcctimeline">Accumulated statistics</a>
<a class="dropdown-item" href="<?php echo site_url('accumulated');?>" title="Accumulated statistics">Accumulated statistics</a>
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="<?php echo site_url('timeplotter');?>" title="View time when worked">Timeplotter</a>
</div>

16
application/views/mode/index.php
查看文件

@ -16,7 +16,6 @@
</div>
<div class="card-body">
<p class="card-text">This is the place you can customize your modes-list by activating/deactivating modes to be shown in the select-list.</p>
<p><button onclick="createModeDialog();" class="btn btn-primary"><i class="fas fa-plus"></i> Create a Mode</button></p>
<div class="table-responsive">
<table style="width:100%" class="modetable table table-striped">
<thead>
@ -37,15 +36,15 @@
<td><?php echo $row->submode;?></td>
<td><?php echo $row->qrgmode;?></td>
<td class='mode_<?php echo $row->id ?>'><?php if ($row->active == 1) { echo "active";} else { echo "not active";};?></td>
<td>
<td style="text-align: center">
<?php if ($row->active == 1) {
echo "<button onclick='javascript:deactivateMode(". $row->id . ")' class='btn_" . $row->id . " btn btn-success btn-sm'><i class='fas fa-edit-alt'></i> Deactivate</button>";
echo "<button onclick='javascript:deactivateMode(". $row->id . ")' class='btn_" . $row->id . " btn btn-secondary btn-sm'>Deactivate</button>";
} else {
echo "<button onclick='javascript:activateMode(". $row->id . ")' class='btn_" . $row->id . " btn btn-success btn-sm'><i class='fas fa-edit-alt'></i> Activate</button>";
echo "<button onclick='javascript:activateMode(". $row->id . ")' class='btn_" . $row->id . " btn btn-primary btn-sm'>Activate</button>";
};?>
</td>
<td>
<a href="<?php echo site_url('mode/edit')."/".$row->id; ?>" class="btn btn-info btn-sm"><i class="fas fa-edit-alt"></i> Edit</a>
<a href="<?php echo site_url('mode/edit')."/".$row->id; ?>" class="btn btn-outline-primary btn-sm"><i class="fas fa-edit"></i> Edit</a>
</td>
<td>
<a href="javascript:deleteMode('<?php echo $row->id; ?>', '<?php echo $row->mode; ?>');" class="btn btn-danger btn-sm" ><i class="fas fa-trash-alt"></i> Delete</a>
@ -55,11 +54,8 @@
<?php } ?>
</tbody>
<table>
</table>
</div>
<br/>
<p><button onclick="createModeDialog();" class="btn btn-primary"><i class="fas fa-plus"></i> Create a Mode</button></p>
</div>
</div>

2
application/views/notes/add.php
查看文件

@ -45,7 +45,7 @@
<textarea name="content" style="display:none" id="hiddenArea"></textarea>
</div>
<button type="submit" value="Submit" class="btn btn-primary">Submit</button>
<button type="submit" value="Submit" class="btn btn-primary">Save</button>
</form>
</div>
</div>

2
application/views/notes/edit.php
查看文件

@ -47,7 +47,7 @@
</div>
<input type="hidden" name="id" value="<?php echo $id; ?>" />
<button type="submit" value="Submit" class="btn btn-primary">Submit</button>
<button type="submit" value="Submit" class="btn btn-primary">Save</button>
</form>
</div>

4
application/views/qrz/export.php
查看文件

@ -26,7 +26,7 @@
<td>Edited QSOs not uploaded</td>
<td>Total QSOs not uploaded</td>
<td>Total QSOs uploaded</td>
<td></td>
<td>Actions</td>
</thead>
<tbody>';
foreach ($station_profile->result() as $station) { // Fills the table with the data
@ -36,7 +36,7 @@
echo '<td id ="modcount'.$station->station_id.'">' . $station->modcount . '</td>';
echo '<td id ="notcount'.$station->station_id.'">' . $station->notcount . '</td>';
echo '<td id ="totcount'.$station->station_id.'">' . $station->totcount . '</td>';
echo '<td><button id="qrzUpload" type="button" name="qrzUpload" class="btn btn-primary btn-sm ld-ext-right" onclick="ExportQrz('. $station->station_id .')">Export<div class="ld ld-ring ld-spin"></div></button></td>';
echo '<td><button id="qrzUpload" type="button" name="qrzUpload" class="btn btn-primary btn-sm ld-ext-right" onclick="ExportQrz('. $station->station_id .')"><i class="fas fa-cloud-upload-alt"></i> Upload<div class="ld ld-ring ld-spin"></div></button></td>';
echo '</tr>';
}
echo '</tfoot></table></div>';

10
application/views/qslprint/index.php
查看文件

@ -20,13 +20,11 @@
<p class="card-text">Requested QSLs are any QSOs with a value of "Requested" or "Queued" in their "QSL Sent" field.</p>
<p class="card-text">Only QSOs under the active station profile will be exported.</p>
<a href="<?php echo site_url('qslprint/exportcsv'); ?>" title="Export CSV-file" target="_blank" class="btn btn-outline-secondary btn-sm">Export requested QSLs to CSV-file</a>
<a href="<?php echo site_url('qslprint/exportadif'); ?>" title="Export ADIF" target="_blank" class="btn btn-outline-secondary btn-sm">Export requested QSLs to ADIF-file</a>
<p><a href="<?php echo site_url('qslprint/exportcsv'); ?>" title="Export CSV-file" target="_blank" class="btn btn-primary">Export requested QSLs to CSV-file</a></p>
<a href="<?php echo site_url('qslprint/qsl_printed'); ?>" title="Mark QSLs as printed" target="_blank" class="btn btn-outline-secondary btn-sm">Mark requested QSLs as sent</a>
<p><a href="<?php echo site_url('qslprint/exportadif'); ?>" title="Export ADIF" target="_blank" class="btn btn-primary">Export requested QSLs to ADIF-file</a></p>
<p><a href="<?php echo site_url('qslprint/qsl_printed'); ?>" title="Mark QSLs as printed" target="_blank" class="btn btn-primary">Mark requested QSLs as sent</a></p>
</div>
</div>
</div>

2
application/views/qso/edit.php
查看文件

@ -511,7 +511,7 @@
<input type="hidden" name="id" value="<?php echo $this->uri->segment(3); ?>" />
<div class="actions">
<input type="submit" class="btn btn-success" value="Save changes" onclick="closeME();">
<input type="submit" class="btn btn-primary" value="Save changes" onclick="closeME();">
<a class="btn btn-danger float-right" href="<?php echo site_url('qso/delete'); ?>/<?php echo $qso->COL_PRIMARY_KEY; ?>" onclick="return confirm('Are you sure you want the delete QSO?');"><i class="fas fa-trash-alt"></i> Delete QSO</a>
</div>
</div>

2
application/views/qso/edit_ajax.php
查看文件

@ -557,7 +557,7 @@
<input type="hidden" name="id" value="<?php echo $qso->COL_PRIMARY_KEY; ?>" />
<div class="actions">
<button id="show" type="button" name="download" class="btn btn-success btn-primary" onclick="qso_save();">Save changes</button>
<button id="show" type="button" name="download" class="btn btn-primary" onclick="qso_save();">Save changes</button>
<a class="btn btn-danger float-right" href="javascript:qso_delete(<?php echo $qso->COL_PRIMARY_KEY; ?>, '<?php echo $qso->COL_CALL; ?>')"><i class="fas fa-trash-alt"></i> Delete QSO</a>
</div>
</div>

2
application/views/qso/index.php
查看文件

@ -405,7 +405,7 @@
</div>
<button type="reset" class="btn btn-light" onclick="reset_fields()">Reset</button>
<button type="submit" class="btn btn-success"><i class="fas fa-save"></i> Save QSO</button>
<button type="submit" class="btn btn-primary"><i class="fas fa-save"></i> Save QSO</button>
</div>
</form>
</div>

4
application/views/station_profile/index.php
查看文件

@ -59,7 +59,7 @@
<td><?php echo $row->station_gridsquare;?></td>
<td><?php echo $row->station_city;?></td>
<td><?php echo $row->qso_total;?></td>
<td>
<td style="text-align: center">
<?php if($row->station_active != 1) { ?>
<a href="<?php echo site_url('station/set_active/').$current_active."/".$row->station_id; ?>" class="btn btn-outline-secondary btn-sm" onclick="return confirm('Are you sure you want to make logbook <?php echo $row->station_profile_name; ?> the active logbook?');">Set Active</a>
<?php } else { ?>
@ -71,7 +71,7 @@
<?php } ?>
</td>
<td>
<a href="<?php echo site_url('station/edit')."/".$row->station_id; ?>" class="btn btn-info btn-sm"><i class="fas fa-edit"></i> Edit</a>
<a href="<?php echo site_url('station/edit')."/".$row->station_id; ?>" class="btn btn-outline-primary btn-sm"><i class="fas fa-edit"></i> Edit</a>
</td>
<td>
<a href="<?php echo site_url('station/deletelog')."/".$row->station_id; ?>" class="btn btn-danger btn-sm" onclick="return confirm('Are you sure you want to delete all QSOs within this station profile?');"><i class="fas fa-trash-alt"></i> Empty Log</a></td>

5
application/views/timeline/details.php
查看文件

@ -1,7 +1,4 @@
<div class="container">
<h2>Logbook</h2>
<h3>Filtering on <?php echo $filter ?></h3>
<h5>Filtering on <?php echo $filter ?></h5>
<?php $this->load->view('view_log/partial/log_ajax') ?>

203
application/views/timeline/index.php
查看文件

@ -2,31 +2,79 @@
<h1><?php echo $page_title; ?></h1>
<form class="form" action="<?php echo site_url('timeline'); ?>" method="post" enctype="multipart/form-data">
<fieldset>
<!-- Select Basic -->
<div class="form-group row">
<label class="col-md-1 control-label" for="band">Band</label>
<div class="col-md-2">
<select id="band2" name="band" class="form-control">
<option value="All" <?php if ($this->input->post('band') == "All" || $this->input->method() !== 'post') echo ' selected'; ?> >All</option>
<?php foreach($worked_bands as $band) {
echo '<option value="' . $band . '"';
if ($this->input->post('band') == $band) echo ' selected';
echo '>' . $band . '</option>'."\n";
} ?>
</select>
<!-- Select Basic -->
<div class="form-group row">
<label class="col-md-1 control-label" for="band">Band</label>
<div class="col-md-3">
<select id="band" name="band" class="form-control custom-select">
<option value="All" <?php if ($this->input->post('band') == "All" || $this->input->method() !== 'post') echo ' selected'; ?> >All</option>
<?php foreach($worked_bands as $band) {
echo '<option value="' . $band . '"';
if ($this->input->post('band') == $band) echo ' selected';
echo '>' . $band . '</option>'."\n";
} ?>
</select>
</div>
<label class="col-md-1 control-label" for="mode">Mode</label>
<div class="col-md-3">
<select id="mode" name="mode" class="form-control custom-select">
<option value="All" <?php if ($this->input->post('band') == "All" || $this->input->method() !== 'post') echo ' selected'; ?> >All</option>
<?php
foreach($modes->result() as $mode){
if ($mode->submode == null) {
echo '<option value="' . $mode->mode . '"';
if ($this->input->post('mode') == $mode->mode) echo ' selected';
echo '>' . $mode->mode . '</option>'."\n";
} else {
echo '<option value="' . $mode->submode . '"';
if ($this->input->post('mode') == $mode->submode) echo ' selected';
echo '>' . $mode->submode . '</option>'."\n";
}
}
?>
</select>
</div>
</div>
<div class="form-group row">
<label class="col-md-1 control-label" for="radio">Award</label>
<div class="col-md-3">
<div class="form-check">
<input class="form-check-input" type="radio" name="awardradio" id="dxcc" value="dxcc" <?php if ($this->input->post('awardradio') == 'dxcc' || $this->input->method() !== 'post') echo ' checked'?>>
<label class="form-check-label" for="dxcc">
DX Century Club (DXCC)
</label>
</div>
<div class="form-check">
<input class="form-check-input" type="radio" name="awardradio" id="was" value="was" <?php if ($this->input->post('awardradio') == 'was') echo ' checked'?>>
<label class="form-check-label" for="was">
Worked all states (WAS)
</label>
</div>
<div class="form-check">
<input class="form-check-input" type="radio" name="awardradio" id="iota" value="iota" <?php if ($this->input->post('awardradio') == 'iota') echo ' checked'?>>
<label class="form-check-label" for="iota">
Islands on the air (IOTA)
</label>
</div>
<div class="form-check">
<input class="form-check-input" type="radio" name="awardradio" id="waz" value="waz" <?php if ($this->input->post('awardradio') == 'waz') echo ' checked'?>>
<label class="form-check-label" for="waz">
Worked all zones (WAZ)
</label>
</div>
</div>
</div>
<!-- Button (Double) -->
<div class="form-group row">
<label class="col-md-1 control-label" for="button1id"></label>
<div class="col-md-10">
<button id="button1id" type="submit" name="button1id" class="btn btn-success btn-primary">Show</button>
<button id="button1id" type="submit" name="button1id" class="btn btn-primary">Show</button>
</div>
</div>
</fieldset>
</form>
<?php
@ -41,9 +89,27 @@
?>
<?php
$i = count($dxcc_timeline_array);
if ($dxcc_timeline_array) {
echo '<table style="width:100%" class="table timelinetable table-bordered table-hover table-striped table-condensed text-center">
if ($timeline_array) {
switch ($this->input->post('awardradio')) {
case 'dxcc': $result = write_dxcc_timeline($timeline_array, $custom_date_format, $bandselect, $modeselect, $this->input->post('awardradio')); break;
case 'was': $result = write_was_timeline($timeline_array, $custom_date_format, $bandselect, $modeselect, $this->input->post('awardradio')); break;
case 'iota': $result = write_iota_timeline($timeline_array, $custom_date_format, $bandselect, $modeselect, $this->input->post('awardradio')); break;
case 'waz': $result = write_waz_timeline($timeline_array, $custom_date_format, $bandselect, $modeselect, $this->input->post('awardradio')); break;
}
}
else {
echo '<div class="alert alert-danger" role="alert"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>Nothing found!</div>';
}
?>
</div>
<?php
function write_dxcc_timeline($timeline_array, $custom_date_format, $bandselect, $modeselect, $award) {
$i = count($timeline_array);
echo '<table style="width:100%" class="table table-sm timelinetable table-bordered table-hover table-striped table-condensed text-center">
<thead>
<tr>
<td>#</td>
@ -57,25 +123,98 @@
</thead>
<tbody>';
foreach ($dxcc_timeline_array as $line) {
$date_as_timestamp = strtotime($line->date);
echo '<tr>
foreach ($timeline_array as $line) {
$date_as_timestamp = strtotime($line->date);
echo '<tr>
<td>' . $i-- . '</td>
<td>' . date($custom_date_format, $date_as_timestamp) . '</td>
<td>' . $line->prefix . '</td>
<td>' . $line->col_country . '</td>
<td>';
if (!empty($line->end)) echo 'Yes';
echo '</td>
if (!empty($line->end)) echo 'Yes';
echo '</td>
<td>' . $line->end . '</td>
<td><a href=javascript:displayTimelineContacts("' . $line->adif . '","'. $bandselect . '")>Show</a></td>
<td><a href=javascript:displayTimelineContacts("' . $line->adif . '","'. $bandselect . '","'. $modeselect . '","' . $award .'")>Show</a></td>
</tr>';
}
echo '</tfoot></table></div>';
}
else {
echo '<div class="alert alert-danger" role="alert"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>Nothing found!</div>';
}
?>
echo '</tfoot></table></div>';
}
</div>
function write_was_timeline($timeline_array, $custom_date_format, $bandselect, $modeselect, $award) {
$i = count($timeline_array);
echo '<table style="width:100%" class="table table-sm timelinetable table-bordered table-hover table-striped table-condensed text-center">
<thead>
<tr>
<td>#</td>
<td>Date</td>
<td>State</td>
<td>Show QSOs</td>
</tr>
</thead>
<tbody>';
foreach ($timeline_array as $line) {
$date_as_timestamp = strtotime($line->date);
echo '<tr>
<td>' . $i-- . '</td>
<td>' . date($custom_date_format, $date_as_timestamp) . '</td>
<td>' . $line->col_state . '</td>
<td><a href=javascript:displayTimelineContacts("' . $line->col_state . '","'. $bandselect . '","'. $modeselect . '","' . $award .'")>Show</a></td>
</tr>';
}
echo '</tfoot></table></div>';
}
function write_iota_timeline($timeline_array, $custom_date_format, $bandselect, $modeselect, $award) {
$i = count($timeline_array);
echo '<table style="width:100%" class="table table-sm timelinetable table-bordered table-hover table-striped table-condensed text-center">
<thead>
<tr>
<td>#</td>
<td>Date</td>
<td>Iota</td>
<td>Name</td>
<td>Prefix</td>
<td>Show QSOs</td>
</tr>
</thead>
<tbody>';
foreach ($timeline_array as $line) {
$date_as_timestamp = strtotime($line->date);
echo '<tr>
<td>' . $i-- . '</td>
<td>' . date($custom_date_format, $date_as_timestamp) . '</td>
<td>' . $line->col_iota . '</td>
<td>' . $line->name . '</td>
<td>' . $line->prefix . '</td>
<td><a href=javascript:displayTimelineContacts("' . $line->col_iota . '","'. $bandselect . '","'. $modeselect . '","' . $award .'")>Show</a></td>
</tr>';
}
echo '</tfoot></table></div>';
}
function write_waz_timeline($timeline_array, $custom_date_format, $bandselect, $modeselect, $award) {
$i = count($timeline_array);
echo '<table style="width:100%" class="table table-sm timelinetable table-bordered table-hover table-striped table-condensed text-center">
<thead>
<tr>
<td>#</td>
<td>Date</td>
<td>CQ Zone</td>
<td>Show QSOs</td>
</tr>
</thead>
<tbody>';
foreach ($timeline_array as $line) {
$date_as_timestamp = strtotime($line->date);
echo '<tr>
<td>' . $i-- . '</td>
<td>' . date($custom_date_format, $date_as_timestamp) . '</td>
<td>' . $line->col_cqz . '</td>
<td><a href=javascript:displayTimelineContacts("' . $line->col_cqz . '","'. $bandselect . '","'. $modeselect . '","' . $award .'")>Show</a></td>
</tr>';
}
echo '</tfoot></table></div>';
}

2
application/views/timeplotter/index.php
查看文件

@ -49,7 +49,7 @@
<div class="form-group row">
<div class="col-md-3">
<button id="button1id" type="button" name="button1id" class="btn btn-success btn-primary ld-ext-right" onclick="timeplot(this.form);">Show<div class="ld ld-ring ld-spin"></div></button>
<button id="button1id" type="button" name="button1id" class="btn btn-primary ld-ext-right" onclick="timeplot(this.form);">Show<div class="ld ld-ring ld-spin"></div></button>
</div>
</div>

15
application/views/update/index.php
查看文件

@ -14,14 +14,21 @@
You must install php-xml for this to work.
</div>
<?php } else { ?>
<input type="submit" id="btn_update_dxcc" value="Update Dxcc" />
<h5>Check for DXCC Data Updates</h5>
<input type="submit" class="btn btn-primary" id="btn_update_dxcc" value="Update DXCC Data" />
<div id="dxcc_update_status">Status:</br></div>
<br/>
<a href="<?php echo site_url('update/check_missing_dxcc');?>">Check missing DXCC/Countries values</a>
<a href="<?php echo site_url('update/check_missing_dxcc/all');?>">[Re-Check ALL]</a>
<br/>
<h5>Apply DXCC Data to Logbook</h5>
<p class="card-text">
After updating, Cloudlog can fill in missing callsign information in the logbook using the newly-obtained DXCC data.
You can choose to check just the QSOs in the logbook that are missing DXCC metadata or to re-check the entire logbook
and update existing metadata as well, in case it has changed.
</p>
<p><a class="btn btn-primary" href="<?php echo site_url('update/check_missing_dxcc');?>">Check QSOs missing DXCC data</a></p>
<p><a class="btn btn-primary" href="<?php echo site_url('update/check_missing_dxcc/all');?>">Re-check all QSOs in logbook</a></p>
<style>
#dxcc_update_status{

2
application/views/user/edit.php
查看文件

@ -262,7 +262,7 @@
<input type="hidden" name="id" value="<?php echo $this->uri->segment(3); ?>" />
<br>
<button type="submit" class="btn btn-success"><i class="fas fa-save"></i> Save Account Changes</button>
<button type="submit" class="btn btn-primary"><i class="fas fa-save"></i> Save Account Changes</button>
<br>
<br>
</form>

4
application/views/user/main.php
查看文件

@ -37,14 +37,14 @@
<td><a href="<?php echo site_url('user/edit')."/".$row->user_id; ?>"><?php echo $row->user_name; ?></a></td>
<td><?php echo $row->user_email; ?></td>
<td><?php $l = $this->config->item('auth_level'); echo $l[$row->user_type]; ?></td>
<td><a href="<?php echo site_url('user/edit')."/".$row->user_id; ?>" class="btn btn-primary btn-sm"><i class="fas fa-user-edit"></i> Edit</a> <a href="<?php echo site_url('user/delete')."/".$row->user_id; ?>" class="btn btn-danger btn-sm"><i class="fas fa-user-minus"></i> Delete</a></td>
<td><a href="<?php echo site_url('user/edit')."/".$row->user_id; ?>" class="btn btn-outline-primary btn-sm"><i class="fas fa-user-edit"></i> Edit</a> <a href="<?php echo site_url('user/delete')."/".$row->user_id; ?>" class="btn btn-danger btn-sm"><i class="fas fa-user-minus"></i> Delete</a></td>
</tr>
<?php $i++; } ?>
</tbody>
</table>
</div>
<p>
<a class="btn btn-primary" href="<?php echo site_url('user/add'); ?>">Add user</a>
<a class="btn btn-primary" href="<?php echo site_url('user/add'); ?>"><i class="fas fa-user-plus"></i> Create user</a>
</p>
</div>
</div>

2
application/views/view_log/qso.php
查看文件

@ -270,7 +270,7 @@
<?php if(($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) { ?>
<br>
<p class="editButton"><a class="btn btn-success" href="<?php echo site_url('qso/edit'); ?>/<?php echo $row->COL_PRIMARY_KEY; ?>" href="javascript:;"><i class="fas fa-edit"></i> Edit QSO</a></p>
<p class="editButton"><a class="btn btn-primary" href="<?php echo site_url('qso/edit'); ?>/<?php echo $row->COL_PRIMARY_KEY; ?>" href="javascript:;"><i class="fas fa-edit"></i> Edit QSO</a></p>
<?php } ?>
<?php

2
assets/plugins/quill/quill.bubble.css
查看文件

@ -1,5 +1,5 @@
/*!
* Quill Editor v1.3.6
* Quill Editor v1.3.7
* https://quilljs.com/
* Copyright (c) 2014, Jason Chen
* Copyright (c) 2013, salesforce.com

2
assets/plugins/quill/quill.core.css
查看文件

@ -1,5 +1,5 @@
/*!
* Quill Editor v1.3.6
* Quill Editor v1.3.7
* https://quilljs.com/
* Copyright (c) 2014, Jason Chen
* Copyright (c) 2013, salesforce.com

90
assets/plugins/quill/quill.core.js
查看文件

@ -1,5 +1,5 @@
/*!
* Quill Editor v1.3.6
* Quill Editor v1.3.7
* https://quilljs.com/
* Copyright (c) 2014, Jason Chen
* Copyright (c) 2013, salesforce.com
@ -439,7 +439,19 @@ Delta.prototype.slice = function (start, end) {
Delta.prototype.compose = function (other) {
var thisIter = op.iterator(this.ops);
var otherIter = op.iterator(other.ops);
var delta = new Delta();
var ops = [];
var firstOther = otherIter.peek();
if (firstOther != null && typeof firstOther.retain === 'number' && firstOther.attributes == null) {
var firstLeft = firstOther.retain;
while (thisIter.peekType() === 'insert' && thisIter.peekLength() <= firstLeft) {
firstLeft -= thisIter.peekLength();
ops.push(thisIter.next());
}
if (firstOther.retain - firstLeft > 0) {
otherIter.next(firstOther.retain - firstLeft);
}
}
var delta = new Delta(ops);
while (thisIter.hasNext() || otherIter.hasNext()) {
if (otherIter.peekType() === 'insert') {
delta.push(otherIter.next());
@ -460,6 +472,13 @@ Delta.prototype.compose = function (other) {
var attributes = op.attributes.compose(thisOp.attributes, otherOp.attributes, typeof thisOp.retain === 'number');
if (attributes) newOp.attributes = attributes;
delta.push(newOp);
// Optimization if rest of other is just retain
if (!otherIter.hasNext() && equal(delta.ops[delta.ops.length - 1], newOp)) {
var rest = new Delta(thisIter.rest());
return delta.concat(rest).chop();
}
// Other op should be delete, we could be an insert or retain
// Insert + delete cancels out
} else if (typeof otherOp['delete'] === 'number' && typeof thisOp.retain === 'number') {
@ -617,6 +636,8 @@ module.exports = Delta;
var hasOwn = Object.prototype.hasOwnProperty;
var toStr = Object.prototype.toString;
var defineProperty = Object.defineProperty;
var gOPD = Object.getOwnPropertyDescriptor;
var isArray = function isArray(arr) {
if (typeof Array.isArray === 'function') {
@ -646,6 +667,35 @@ var isPlainObject = function isPlainObject(obj) {
return typeof key === 'undefined' || hasOwn.call(obj, key);
};
// If name is '__proto__', and Object.defineProperty is available, define __proto__ as an own property on target
var setProperty = function setProperty(target, options) {
if (defineProperty && options.name === '__proto__') {
defineProperty(target, options.name, {
enumerable: true,
configurable: true,
value: options.newValue,
writable: true
});
} else {
target[options.name] = options.newValue;
}
};
// Return undefined instead of __proto__ if '__proto__' is not an own property
var getProperty = function getProperty(obj, name) {
if (name === '__proto__') {
if (!hasOwn.call(obj, name)) {
return void 0;
} else if (gOPD) {
// In early versions of node, obj['__proto__'] is buggy when obj has
// __proto__ as an own property. Object.getOwnPropertyDescriptor() works.
return gOPD(obj, name).value;
}
}
return obj[name];
};
module.exports = function extend() {
var options, name, src, copy, copyIsArray, clone;
var target = arguments[0];
@ -670,8 +720,8 @@ module.exports = function extend() {
if (options != null) {
// Extend the base object
for (name in options) {
src = target[name];
copy = options[name];
src = getProperty(target, name);
copy = getProperty(options, name);
// Prevent never-ending loop
if (target !== copy) {
@ -685,11 +735,11 @@ module.exports = function extend() {
}
// Never move original objects, clone them
target[name] = extend(deep, clone, copy);
setProperty(target, { name: name, newValue: extend(deep, clone, copy) });
// Don't bring in undefined values
} else if (typeof copy !== 'undefined') {
target[name] = copy;
setProperty(target, { name: name, newValue: copy });
}
}
}
@ -1533,7 +1583,7 @@ Quill.DEFAULTS = {
Quill.events = _emitter4.default.events;
Quill.sources = _emitter4.default.sources;
// eslint-disable-next-line no-undef
Quill.version = false ? 'dev' : "1.3.6";
Quill.version = false ? 'dev' : "1.3.7";
Quill.imports = {
'delta': _quillDelta2.default,
@ -3682,8 +3732,8 @@ var LeafBlot = /** @class */ (function (_super) {
return [this.parent.domNode, offset];
};
LeafBlot.prototype.value = function () {
return _a = {}, _a[this.statics.blotName] = this.statics.value(this.domNode) || true, _a;
var _a;
return _a = {}, _a[this.statics.blotName] = this.statics.value(this.domNode) || true, _a;
};
LeafBlot.scope = Registry.Scope.INLINE_BLOT;
return LeafBlot;
@ -3832,6 +3882,22 @@ Iterator.prototype.peekType = function () {
return 'retain';
};
Iterator.prototype.rest = function () {
if (!this.hasNext()) {
return [];
} else if (this.offset === 0) {
return this.ops.slice(this.index);
} else {
var offset = this.offset;
var index = this.index;
var next = this.next();
var rest = this.ops.slice(this.index);
this.offset = offset;
this.index = index;
return [next].concat(rest);
}
};
module.exports = lib;
@ -3946,7 +4012,13 @@ function clone(parent, circular, depth, prototype, includeNonEnumerable) {
} else if (clone.__isDate(parent)) {
child = new Date(parent.getTime());
} else if (useBuffer && Buffer.isBuffer(parent)) {
child = new Buffer(parent.length);
if (Buffer.allocUnsafe) {
// Node.js >= 4.5.0
child = Buffer.allocUnsafe(parent.length);
} else {
// Older Node.js versions
child = new Buffer(parent.length);
}
parent.copy(child);
return child;
} else if (_instanceof(parent, Error)) {

93
assets/plugins/quill/quill.js
查看文件

@ -1,5 +1,5 @@
/*!
* Quill Editor v1.3.6
* Quill Editor v1.3.7
* https://quilljs.com/
* Copyright (c) 2014, Jason Chen
* Copyright (c) 2013, salesforce.com
@ -439,7 +439,19 @@ Delta.prototype.slice = function (start, end) {
Delta.prototype.compose = function (other) {
var thisIter = op.iterator(this.ops);
var otherIter = op.iterator(other.ops);
var delta = new Delta();
var ops = [];
var firstOther = otherIter.peek();
if (firstOther != null && typeof firstOther.retain === 'number' && firstOther.attributes == null) {
var firstLeft = firstOther.retain;
while (thisIter.peekType() === 'insert' && thisIter.peekLength() <= firstLeft) {
firstLeft -= thisIter.peekLength();
ops.push(thisIter.next());
}
if (firstOther.retain - firstLeft > 0) {
otherIter.next(firstOther.retain - firstLeft);
}
}
var delta = new Delta(ops);
while (thisIter.hasNext() || otherIter.hasNext()) {
if (otherIter.peekType() === 'insert') {
delta.push(otherIter.next());
@ -460,6 +472,13 @@ Delta.prototype.compose = function (other) {
var attributes = op.attributes.compose(thisOp.attributes, otherOp.attributes, typeof thisOp.retain === 'number');
if (attributes) newOp.attributes = attributes;
delta.push(newOp);
// Optimization if rest of other is just retain
if (!otherIter.hasNext() && equal(delta.ops[delta.ops.length - 1], newOp)) {
var rest = new Delta(thisIter.rest());
return delta.concat(rest).chop();
}
// Other op should be delete, we could be an insert or retain
// Insert + delete cancels out
} else if (typeof otherOp['delete'] === 'number' && typeof thisOp.retain === 'number') {
@ -617,6 +636,8 @@ module.exports = Delta;
var hasOwn = Object.prototype.hasOwnProperty;
var toStr = Object.prototype.toString;
var defineProperty = Object.defineProperty;
var gOPD = Object.getOwnPropertyDescriptor;
var isArray = function isArray(arr) {
if (typeof Array.isArray === 'function') {
@ -646,6 +667,35 @@ var isPlainObject = function isPlainObject(obj) {
return typeof key === 'undefined' || hasOwn.call(obj, key);
};
// If name is '__proto__', and Object.defineProperty is available, define __proto__ as an own property on target
var setProperty = function setProperty(target, options) {
if (defineProperty && options.name === '__proto__') {
defineProperty(target, options.name, {
enumerable: true,
configurable: true,
value: options.newValue,
writable: true
});
} else {
target[options.name] = options.newValue;
}
};
// Return undefined instead of __proto__ if '__proto__' is not an own property
var getProperty = function getProperty(obj, name) {
if (name === '__proto__') {
if (!hasOwn.call(obj, name)) {
return void 0;
} else if (gOPD) {
// In early versions of node, obj['__proto__'] is buggy when obj has
// __proto__ as an own property. Object.getOwnPropertyDescriptor() works.
return gOPD(obj, name).value;
}
}
return obj[name];
};
module.exports = function extend() {
var options, name, src, copy, copyIsArray, clone;
var target = arguments[0];
@ -670,8 +720,8 @@ module.exports = function extend() {
if (options != null) {
// Extend the base object
for (name in options) {
src = target[name];
copy = options[name];
src = getProperty(target, name);
copy = getProperty(options, name);
// Prevent never-ending loop
if (target !== copy) {
@ -685,11 +735,11 @@ module.exports = function extend() {
}
// Never move original objects, clone them
target[name] = extend(deep, clone, copy);
setProperty(target, { name: name, newValue: extend(deep, clone, copy) });
// Don't bring in undefined values
} else if (typeof copy !== 'undefined') {
target[name] = copy;
setProperty(target, { name: name, newValue: copy });
}
}
}
@ -1533,7 +1583,7 @@ Quill.DEFAULTS = {
Quill.events = _emitter4.default.events;
Quill.sources = _emitter4.default.sources;
// eslint-disable-next-line no-undef
Quill.version = false ? 'dev' : "1.3.6";
Quill.version = false ? 'dev' : "1.3.7";
Quill.imports = {
'delta': _quillDelta2.default,
@ -3682,8 +3732,8 @@ var LeafBlot = /** @class */ (function (_super) {
return [this.parent.domNode, offset];
};
LeafBlot.prototype.value = function () {
return _a = {}, _a[this.statics.blotName] = this.statics.value(this.domNode) || true, _a;
var _a;
return _a = {}, _a[this.statics.blotName] = this.statics.value(this.domNode) || true, _a;
};
LeafBlot.scope = Registry.Scope.INLINE_BLOT;
return LeafBlot;
@ -3832,6 +3882,22 @@ Iterator.prototype.peekType = function () {
return 'retain';
};
Iterator.prototype.rest = function () {
if (!this.hasNext()) {
return [];
} else if (this.offset === 0) {
return this.ops.slice(this.index);
} else {
var offset = this.offset;
var index = this.index;
var next = this.next();
var rest = this.ops.slice(this.index);
this.offset = offset;
this.index = index;
return [next].concat(rest);
}
};
module.exports = lib;
@ -3946,7 +4012,13 @@ function clone(parent, circular, depth, prototype, includeNonEnumerable) {
} else if (clone.__isDate(parent)) {
child = new Date(parent.getTime());
} else if (useBuffer && Buffer.isBuffer(parent)) {
child = new Buffer(parent.length);
if (Buffer.allocUnsafe) {
// Node.js >= 4.5.0
child = Buffer.allocUnsafe(parent.length);
} else {
// Older Node.js versions
child = new Buffer(parent.length);
}
parent.copy(child);
return child;
} else if (_instanceof(parent, Error)) {
@ -5291,6 +5363,7 @@ var Link = function (_Inline) {
var node = _get(Link.__proto__ || Object.getPrototypeOf(Link), 'create', this).call(this, value);
value = this.sanitize(value);
node.setAttribute('href', value);
node.setAttribute('rel', 'noopener noreferrer');
node.setAttribute('target', '_blank');
return node;
}
@ -9954,7 +10027,7 @@ var SnowTooltip = function (_BaseTooltip) {
return SnowTooltip;
}(_base.BaseTooltip);
SnowTooltip.TEMPLATE = ['<a class="ql-preview" target="_blank" href="about:blank"></a>', '<input type="text" data-formula="e=mc^2" data-link="https://quilljs.com" data-video="Embed URL">', '<a class="ql-action"></a>', '<a class="ql-remove"></a>'].join('');
SnowTooltip.TEMPLATE = ['<a class="ql-preview" rel="noopener noreferrer" target="_blank" href="about:blank"></a>', '<input type="text" data-formula="e=mc^2" data-link="https://quilljs.com" data-video="Embed URL">', '<a class="ql-action"></a>', '<a class="ql-remove"></a>'].join('');
exports.default = SnowTheme;

4
assets/plugins/quill/quill.min.js vendored
查看文件

文件差异因一行或多行过长而隐藏

2
assets/plugins/quill/quill.min.js.map
查看文件

文件差异因一行或多行过长而隐藏

2
assets/plugins/quill/quill.snow.css
查看文件

@ -1,5 +1,5 @@
/*!
* Quill Editor v1.3.6
* Quill Editor v1.3.7
* https://quilljs.com/
* Copyright (c) 2014, Jason Chen
* Copyright (c) 2013, salesforce.com