Skip to content

Dev V2.3 Commits #1854

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
magicbug merged 59 commits into from
Dec 22, 2022
Merged

Dev V2.3 Commits #1854

Changes from 1 commit
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
30f3df1
[DXCC] Added map
AndreasK79 Nov 11, 2022
1b563b7
[DXCC Map] Fixed popup and added datatable to QSO table
AndreasK79 Nov 12, 2022
9d1f30d
[OQRS] Added OQRS system
AndreasK79 Nov 15, 2022
0602899
[DXCC Mao] Fixed so that worked/confirmed/not worked works with map
AndreasK79 Nov 22, 2022
debe3b3
[DXCC Map] Fixed header in table when datatable was not applied
AndreasK79 Nov 22, 2022
a66c9a0
[DXCC Map] Added prefix as icon
AndreasK79 Nov 24, 2022
faeb9a4
Merge branch 'dev' into dxcc_award_map
AndreasK79 Dec 7, 2022
4ab4f06
[Satellites] Add CAS-5A
magicbug Dec 9, 2022
e1444c2
[IOTA Map] Added map to display IOTA's
AndreasK79 Dec 11, 2022
6e91f64
[Backup ADIF] Fixed invalid length of programversion. Fixes #1837
AndreasK79 Dec 11, 2022
611013b
Fix ADIF version tags
phl0 Dec 11, 2022
516141d
Merge pull request #1834 from AndreasK79/dxcc_award_map
AndreasK79 Dec 12, 2022
cd6dfd0
Remove redundant 'Version' info
phl0 Dec 12, 2022
84ba8d3
[IOTA Map] Added more info in tooltip
AndreasK79 Dec 12, 2022
4da2227
Merge branch 'dev' into iota_map
AndreasK79 Dec 12, 2022
e05cd9b
Merge pull request #1841 from AndreasK79/iota_map
AndreasK79 Dec 13, 2022
7043561
Merge pull request #1840 from phl0/fixMoreAdifVersions
AndreasK79 Dec 13, 2022
ca23cf8
[OQRS] Added it's own view for the QSO lookup
AndreasK79 Dec 14, 2022
9917b14
Merge branch 'dev' into online_qsl_request
AndreasK79 Dec 14, 2022
5db5f73
[OQRS] Updated migration script number
AndreasK79 Dec 14, 2022
b2b7596
Add Frequency to selectable colums and previous QSOs
phl0 Dec 14, 2022
8384d7d
[PHP8.1] Added some fixes for PHP 8.1
AndreasK79 Dec 14, 2022
1a786f8
Fix strlen stuff
phl0 Dec 14, 2022
72f2072
Merge pull request #15 from phl0/fixPhp8.1Fixes
AndreasK79 Dec 14, 2022
85ca34b
[PHP8.1] Replaced output.php with a newer one
AndreasK79 Dec 14, 2022
239149d
Merge branch 'php8.1_fixes' of https://github.com/AndreasK79/Cloudlog…
AndreasK79 Dec 14, 2022
5c565bf
Merge pull request #1843 from AndreasK79/php8.1_fixes
AndreasK79 Dec 14, 2022
ee14821
[Satellites] changed cas5a to FO-118 in the satellite_data.json file
magicbug Dec 16, 2022
c93a32d
Rename CAS-5A to FO-118
phl0 Dec 18, 2022
51e79f2
Merge pull request #1846 from phl0/FO118
magicbug Dec 18, 2022
96219b6
[Satellites] Adds CAS-10 XW-4 support to dropdowns
magicbug Dec 18, 2022
dbc8a54
[Logbookadvanced] First version of a logbook with filtering and batch…
AndreasK79 Dec 18, 2022
6cd742b
[Logbookadvanced] Added a few more columns
AndreasK79 Dec 18, 2022
067196e
[Logbookadvanced] Reset now resets form and does initial search.
AndreasK79 Dec 18, 2022
2cf7e87
Fixed frequency tag in logbook.
AndreasK79 Dec 18, 2022
044b0df
Convert Hz to MHz on public pages
phl0 Dec 18, 2022
0cad6c7
Merge pull request #1844 from phl0/addFreqColumn
AndreasK79 Dec 18, 2022
f5bd6df
[Advanced search] Fixed correct tag in table head
AndreasK79 Dec 19, 2022
04e9960
[Advanced search] Fixed frequency column
AndreasK79 Dec 19, 2022
26cc67a
[Logbookadvanced] Added dropdown to choose number of results returned
AndreasK79 Dec 19, 2022
6ca8bb1
[Logbookadvanced] Improved layout on different resolutions
AndreasK79 Dec 19, 2022
5240164
[Logbookadvanced] Saves callsign callbook info in database
AndreasK79 Dec 20, 2022
1b57e55
[Logbookadvanced] Fixed so that master checkbox is also unchecked aft…
AndreasK79 Dec 20, 2022
d10a105
[Logbookadvanced] Fixed callsign link when updating row
AndreasK79 Dec 21, 2022
be871d3
[Logbookadvanced] Search fix for SAT
AndreasK79 Dec 21, 2022
07617e6
Check eQSL/LotW dates for NULL before using them
phl0 Dec 21, 2022
f4c02f9
Merge pull request #1849 from phl0/fixEmptyQslDates
magicbug Dec 21, 2022
a8987d1
Have two separate items for logbook and advanced
phl0 Dec 21, 2022
fc8d631
Merge pull request #17 from phl0/2logbooks
AndreasK79 Dec 21, 2022
507adce
Merge pull request #1847 from AndreasK79/logbookadvanced
magicbug Dec 21, 2022
08f08d2
Reupload IO-117 and FO-118 QSOs to LotW
phl0 Dec 21, 2022
309732c
Fix typo
phl0 Dec 21, 2022
89956a9
Merge pull request #1851 from phl0/reUploadFo118iO117
magicbug Dec 21, 2022
1759e44
Merge branch 'dev' into online_qsl_request
AndreasK79 Dec 21, 2022
2ba3d14
[OQRS] Updated migration script number again
AndreasK79 Dec 21, 2022
880c872
[OQRS] Removed default on text column
AndreasK79 Dec 21, 2022
b4a14ae
Only show QSL dates if those are set
phl0 Dec 22, 2022
aec9e96
Merge pull request #1852 from phl0/hideUnknownQslDates
magicbug Dec 22, 2022
1c92c5f
Merge pull request #1842 from AndreasK79/online_qsl_request
magicbug Dec 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[DXCC Map] Fixed header in table when datatable was not applied
  • Loading branch information
@AndreasK79
AndreasK79 committed Nov 22, 2022
commit debe3b3baa085234b9d0477a7c8ad98c5a018a30
74 changes: 37 additions & 37 deletions application/views/view_log/partial/log_ajax.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?php
function echo_table_header_col($ctx, $name) {
switch($name) {
case 'Mode': echo '<td>'.$ctx->lang->line('gen_hamradio_mode').'</td>'; break;
case 'RSTS': echo '<td>'.$ctx->lang->line('gen_hamradio_rsts').'</td>'; break;
case 'RSTR': echo '<td>'.$ctx->lang->line('gen_hamradio_rstr').'</td>'; break;
case 'Country': echo '<td>'.$ctx->lang->line('general_word_country').'</td>'; break;
case 'IOTA': echo '<td>'.$ctx->lang->line('gen_hamradio_iota').'</td>'; break;
case 'SOTA': echo '<td>'.$ctx->lang->line('gen_hamradio_sota').'</td>'; break;
case 'WWFF': echo '<td>'.$ctx->lang->line('gen_hamradio_wwff').'</td>'; break;
case 'State': echo '<td>'.$ctx->lang->line('gen_hamradio_state').'</td>'; break;
case 'Grid': echo '<td>'.$ctx->lang->line('gen_hamradio_gridsquare').'</td>'; break;
case 'Band': echo '<td>'.$ctx->lang->line('gen_hamradio_band').'</td>'; break;
case 'Operator': echo '<td>'.$ctx->lang->line('gen_hamradio_operator').'</td>'; break;
case 'Mode': echo '<th>'.$ctx->lang->line('gen_hamradio_mode').'</th>'; break;
case 'RSTS': echo '<th>'.$ctx->lang->line('gen_hamradio_rsts').'</th>'; break;
case 'RSTR': echo '<th>'.$ctx->lang->line('gen_hamradio_rstr').'</th>'; break;
case 'Country': echo '<th>'.$ctx->lang->line('general_word_country').'</th>'; break;
case 'IOTA': echo '<th>'.$ctx->lang->line('gen_hamradio_iota').'</th>'; break;
case 'SOTA': echo '<th>'.$ctx->lang->line('gen_hamradio_sota').'</th>'; break;
case 'WWFF': echo '<th>'.$ctx->lang->line('gen_hamradio_wwff').'</th>'; break;
case 'State': echo '<th>'.$ctx->lang->line('gen_hamradio_state').'</th>'; break;
case 'Grid': echo '<th>'.$ctx->lang->line('gen_hamradio_gridsquare').'</th>'; break;
case 'Band': echo '<th>'.$ctx->lang->line('gen_hamradio_band').'</td>'; break;
case 'Operator': echo '<th>'.$ctx->lang->line('gen_hamradio_operator').'</th>'; break;

}
}
Expand Down Expand Up @@ -46,35 +46,35 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
<div class="table-responsive">
<table style="width:100%" class="table contacttable table-striped table-hover">
<thead>
<tr class="titles">
<td><?php echo $this->lang->line('general_word_date'); ?></td>
<?php if(($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE || ($this->config->item('show_time'))) { ?>
<td><?php echo $this->lang->line('general_word_time'); ?></td>
<?php } ?>
<td><?php echo $this->lang->line('gen_hamradio_call'); ?></td>
<?php
echo_table_header_col($this, $this->session->userdata('user_column1')==""?'Mode':$this->session->userdata('user_column1'));
echo_table_header_col($this, $this->session->userdata('user_column2')==""?'RSTS':$this->session->userdata('user_column2'));
echo_table_header_col($this, $this->session->userdata('user_column3')==""?'RSTR':$this->session->userdata('user_column3'));
echo_table_header_col($this, $this->session->userdata('user_column4')==""?'Band':$this->session->userdata('user_column4'));
echo_table_header_col($this, $this->session->userdata('user_column5')==""?'Country':$this->session->userdata('user_column5'));
<tr class="titles">
<th><?php echo $this->lang->line('general_word_date'); ?></th>
<?php if(($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE || ($this->config->item('show_time'))) { ?>
<th><?php echo $this->lang->line('general_word_time'); ?></th>
<?php } ?>
<th><?php echo $this->lang->line('gen_hamradio_call'); ?></th>
<?php
echo_table_header_col($this, $this->session->userdata('user_column1')==""?'Mode':$this->session->userdata('user_column1'));
echo_table_header_col($this, $this->session->userdata('user_column2')==""?'RSTS':$this->session->userdata('user_column2'));
echo_table_header_col($this, $this->session->userdata('user_column3')==""?'RSTR':$this->session->userdata('user_column3'));
echo_table_header_col($this, $this->session->userdata('user_column4')==""?'Band':$this->session->userdata('user_column4'));
echo_table_header_col($this, $this->session->userdata('user_column5')==""?'Country':$this->session->userdata('user_column5'));

if(($this->config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?>
<td>QSL</td>
<?php if($this->session->userdata('user_eqsl_name') != "") { ?>
<td>eQSL</td>
if(($this->config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?>
<th>QSL</th>
<?php if($this->session->userdata('user_eqsl_name') != "") { ?>
<th>eQSL</th>
<?php } ?>
<?php if($this->session->userdata('user_lotw_name') != "") { ?>
<th>LoTW</th>
<?php } ?>
<?php } ?>
<?php if($this->session->userdata('user_lotw_name') != "") { ?>
<td>LoTW</td>
<th><?php echo $this->lang->line('gen_hamradio_station'); ?></th>
<?php if(($this->config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?>
<th></th>
<?php } ?>
<?php } ?>
<td><?php echo $this->lang->line('gen_hamradio_station'); ?></td>
<?php if(($this->config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?>
<td></td>
<?php } ?>
</tr>
<thead>
<tbody>
</tr>
</thead>
<tbody>

<?php $i = 0;
foreach ($results->result() as $row) {
Expand Down