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

PR #636 Fixes issue with QSO Streak Date

浏览代码 
Datefix + added table-sm to tables.
这个提交包含在：
Peter Goodhall 2020-10-01 15:34:22 +01:00 提交者 GitHub
当前提交 44eee371d6
找不到此签名对应的密钥
GPG 密钥 ID: 4AEE18F83AFDEB23
共有 2 个文件被更改，包括 5 次插入 和 7 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

6
application/models/Dayswithqso_model.php
查看文件

@ -47,7 +47,7 @@ class Dayswithqso_model extends CI_Model
} }
else if ($diff == 1 and !$firstrun) { // If diff = 1, means that we are on a streak else if ($diff == 1 and !$firstrun) { // If diff = 1, means that we are on a streak
$streaks['highstreak'] = ++$streak; $streaks['highstreak'] = ++$streak;
$streaks['beginstreak'] = $datecurr->sub(new DateInterval('P'.($streak-1).'D'))->format('Y-m-d'); $streaks['beginstreak'] = date_create($streaks['endstreak'])->sub(new DateInterval('P'.($streak-1).'D'))->format('Y-m-d');
} else { } else {
break; break;
} }
@ -84,10 +84,8 @@ class Dayswithqso_model extends CI_Model
} }
else if ($diff == 1 && $firstrun == false) { else if ($diff == 1 && $firstrun == false) {
$streaks['highstreak'] = $streak++; $streaks['highstreak'] = $streak++;
$streaks['beginstreak'] = $datecurr->format('Y-m-d'); $streaks['beginstreak'] = date_create($streaks['endstreak'])->sub(new DateInterval('P'.($streak-2).'D'))->format('Y-m-d');
} else { } else {
//$streaks['highstreak'] = $streak;
//$streaks['beginstreak'] = $datecurr->format('Y-m-d');
break; break;
} }
$dateprev = date_create($date->date); $dateprev = date_create($date->date);

6
application/views/dayswithqso/index.php
查看文件

@ -6,7 +6,7 @@
<?php <?php
if (is_array($result)) { if (is_array($result)) {
echo '<div id="diffDays" class="table-responsive"><table class="qsotable table table-bordered table-hover table-striped table-condensed">'; echo '<div id="diffDays" class="table-responsive"><table class="qsotable table table-sm table-bordered table-hover table-striped table-condensed">';
echo '<tr>'; echo '<tr>';
echo '<th style=\'text-align: center\'>Year</th>'; echo '<th style=\'text-align: center\'>Year</th>';
@ -46,7 +46,7 @@
<?php <?php
if (is_array($streaks)) { if (is_array($streaks)) {
echo '<div id="streaks" class="table-responsive"><table class="qsotable table table-bordered table-hover table-striped table-condensed">'; echo '<div id="streaks" class="table-responsive"><table class="qsotable table table-sm table-bordered table-hover table-striped table-condensed">';
echo '<tr>'; echo '<tr>';
echo '<th style=\'text-align: center\'>Streak (Continues days with QSOs)</th>'; echo '<th style=\'text-align: center\'>Streak (Continues days with QSOs)</th>';
@ -74,7 +74,7 @@
<h2>Current streak with QSOs in the log</h2> <h2>Current streak with QSOs in the log</h2>
<?php <?php
if (is_array($currentstreak)) { if (is_array($currentstreak)) {
echo '<div id="streaks" class="table-responsive"><table class="qsotable table table-bordered table-hover table-striped table-condensed">'; echo '<div id="streaks" class="table-responsive"><table class="qsotable table table-sm table-bordered table-hover table-striped table-condensed">';
echo '<tr>'; echo '<tr>';
echo '<th style=\'text-align: center\'>Current Streak (Continues days with QSOs)</th>'; echo '<th style=\'text-align: center\'>Current Streak (Continues days with QSOs)</th>';