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

[User selectable columns] Add Location to possible columns 

508d63dc Make user_column5 optional
0cf0b590 Add Location (station_profile_name) to possible columns
pull/2125/head
Christoph Kottke 2023-04-09 22:50:37 +02:00 zatwierdzone przez Christoph Kottke
rodzic 101140373b
commit d7f7e3e83c
3 zmienionych plików z 9 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
application/views/user/add.php
Wyświetl plik

@ -417,6 +417,7 @@
<label
for="column5"><?php echo $this->lang->line('account_column5_text'); ?></label>
<select class="custom-select" id="column5" name="user_column5">
<option value=""></option>
<option value="Band"> <?php echo $this->lang->line('gen_hamradio_band'); ?>
</option>
<option value="Frequency">
@ -439,6 +440,8 @@
<?php echo $this->lang->line('gen_hamradio_gridsquare'); ?></option>
<option value="Operator">
<?php echo $this->lang->line('gen_hamradio_operator'); ?></option>
<option value="Location">
<?php echo $this->lang->line('cloudlog_station_profile'); ?></option>
</select>
</div>
</div>

2
application/views/user/edit.php
Wyświetl plik

@ -423,6 +423,7 @@
<div class="form-group col-md-12">
<label for="column5"><?php echo $this->lang->line('account_column5_text'); ?></label>
<select class="custom-select" id="column5" name="user_column5">
<option value="" <?php if ($user_column5 == "") { echo " selected =\"selected\""; } ?>></option>
<option value="Band" <?php if ($user_column5 == "Band") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_band'); ?></option>
<option value="Frequency" <?php if ($user_column5 == "Frequency") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_frequency'); ?></option>
<option value="Mode" <?php if ($user_column5 == "Mode") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_mode'); ?></option>
@ -436,6 +437,7 @@
<option value="State" <?php if ($user_column5 == "State") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_state'); ?></option>
<option value="Grid" <?php if ($user_column5 == "Grid") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_gridsquare'); ?></option>
<option value="Operator" <?php if ($user_column5 == "Operator") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_operator'); ?></option>
<option value="Location" <?php if ($user_column5 == "Location") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('cloudlog_station_profile'); ?></option>
</select>
</div>
</div>

6
application/views/view_log/partial/log_ajax.php
Wyświetl plik

@ -14,6 +14,7 @@ function echo_table_header_col($ctx, $name) {
case 'Band': echo '<th>'.$ctx->lang->line('gen_hamradio_band').'</td>'; break;
case 'Frequency': echo '<th>'.$ctx->lang->line('gen_hamradio_frequency').'</th>'; break;
case 'Operator': echo '<th>'.$ctx->lang->line('gen_hamradio_operator').'</th>'; break;
case 'Location': echo '<th>'.$ctx->lang->line('cloudlog_station_profile').'</th>'; break;
}
}
@ -33,6 +34,7 @@ function echo_table_col($row, $name) {
case 'Frequency': echo '<td>'; if($row->COL_SAT_NAME != null) { echo '<a href="https://db.satnogs.org/search/?q='.$row->COL_SAT_NAME.'" target="_blank">'; if ($row->COL_FREQ != null) { echo '<span data-toggle="tooltip" data-original-title="'.$ci->frequency->hz_to_mhz($row->COL_FREQ).'">'.$row->COL_SAT_NAME.'</span>'; } else { echo $row->COL_SAT_NAME; } echo '</a></td>'; } else { if ($row->COL_FREQ != null) { echo '<span data-toggle="tooltip" data-original-title="'.$row->COL_BAND.'">'.$ci->frequency->hz_to_mhz($row->COL_FREQ).'</span>'; } else { echo strtolower($row->COL_BAND); } } echo '</td>'; break;
case 'State': echo '<td>' . ($row->COL_STATE) . '</td>'; break;
case 'Operator':echo '<td>' . ($row->COL_OPERATOR) . '</td>'; break;
case 'Location':echo '<td>' . ($row->station_profile_name) . '</td>'; break;
}
}
@ -61,7 +63,7 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
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'));
echo_table_header_col($this, $this->session->userdata('user_column5'));
if(($this->config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?>
<th>QSL</th>
@ -104,7 +106,7 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
echo_table_col($row, $this->session->userdata('user_column2')==""?'RSTS':$this->session->userdata('user_column2'));
echo_table_col($row, $this->session->userdata('user_column3')==""?'RSTR':$this->session->userdata('user_column3'));
echo_table_col($row, $this->session->userdata('user_column4')==""?'Band':$this->session->userdata('user_column4'));
echo_table_col($row, $this->session->userdata('user_column5')==""?'Country':$this->session->userdata('user_column5'));
echo_table_col($row, $this->session->userdata('user_column5'));
if(($this->config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?>
<td class="qsl">