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

Merge pull request #1261 from iddq/master

浏览代码 
Added Operator (COL_OPERATOR) to possible columns
这个提交包含在：
Andreas Kristiansen 2021-11-06 16:00:50 +01:00 提交者 GitHub
当前提交 7fe1c8fed9
找不到此签名对应的密钥
GPG 密钥 ID: 4AEE18F83AFDEB23
共有 7 个文件被更改，包括 36 次插入 和 0 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

1
application/language/english/general_words_lang.php
查看文件

@ -96,6 +96,7 @@ $lang['gen_hamradio_state'] = 'State';
$lang['gen_hamradio_iota'] = 'IOTA'; $lang['gen_hamradio_iota'] = 'IOTA';
$lang['gen_hamradio_sota'] = 'SOTA'; $lang['gen_hamradio_sota'] = 'SOTA';
$lang['gen_hamradio_gridsquare'] = 'Gridsquare'; $lang['gen_hamradio_gridsquare'] = 'Gridsquare';
$lang['gen_hamradio_operator'] = 'Operator';
$lang['gen_hamradio_sig'] = 'Sig'; $lang['gen_hamradio_sig'] = 'Sig';
$lang['gen_hamradio_sig_info'] = 'Sig Info'; $lang['gen_hamradio_sig_info'] = 'Sig Info';

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

@ -10,6 +10,7 @@ function echo_table_header_col($ctx, $name) {
case 'State': echo '<th>'.$ctx->lang->line('gen_hamradio_state').'</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 'Grid': echo '<th>'.$ctx->lang->line('gen_hamradio_gridsquare').'</th>'; break;
case 'Band': echo '<th>'.$ctx->lang->line('gen_hamradio_band').'</th>'; break; case 'Band': echo '<th>'.$ctx->lang->line('gen_hamradio_band').'</th>'; break;
case 'Operator': echo '<th>'.$ctx->lang->line('gen_hamradio_operator').'</th>'; break;
} }
} }
@ -24,6 +25,7 @@ function echo_table_col($row, $name) {
case 'Grid': echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE . '</td>'; break; case 'Grid': echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE . '</td>'; break;
case 'Band': echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); } echo '</td>'; break; case 'Band': echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); } echo '</td>'; break;
case 'State': echo '<td>' . ($row->COL_STATE) . '</td>'; break; case 'State': echo '<td>' . ($row->COL_STATE) . '</td>'; break;
case 'Operator': echo '<td>' . ($row->COL_OPERATOR) . '</td>'; break;
} }
} }
?> ?>

10
application/views/qslcard/searchresult.php
查看文件

@ -18,6 +18,7 @@
case 'State': echo $this->lang->line('gen_hamradio_state'); break; case 'State': echo $this->lang->line('gen_hamradio_state'); break;
case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break; case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break;
case 'Band': echo $this->lang->line('gen_hamradio_band'); break; case 'Band': echo $this->lang->line('gen_hamradio_band'); break;
case 'Operator': echo $this->lang->line('gen_hamradio_operator'); break;
} }
echo '</td>'; echo '</td>';
echo '<td>'; echo '<td>';
@ -31,6 +32,7 @@
case 'State': echo $this->lang->line('gen_hamradio_state'); break; case 'State': echo $this->lang->line('gen_hamradio_state'); break;
case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break; case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break;
case 'Band': echo $this->lang->line('gen_hamradio_band'); break; case 'Band': echo $this->lang->line('gen_hamradio_band'); break;
case 'Operator': echo $this->lang->line('gen_hamradio_band'); break;
} }
echo '</td>'; echo '</td>';
echo '<td>'; echo '<td>';
@ -44,6 +46,7 @@
case 'State': echo $this->lang->line('gen_hamradio_state'); break; case 'State': echo $this->lang->line('gen_hamradio_state'); break;
case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break; case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break;
case 'Band': echo $this->lang->line('gen_hamradio_band'); break; case 'Band': echo $this->lang->line('gen_hamradio_band'); break;
case 'Operator': echo $this->lang->line('gen_hamradio_operator'); break;
} }
echo '</td>'; echo '</td>';
echo '<td>'; echo '<td>';
@ -57,6 +60,7 @@
case 'State': echo $this->lang->line('gen_hamradio_state'); break; case 'State': echo $this->lang->line('gen_hamradio_state'); break;
case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break; case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break;
case 'Band': echo $this->lang->line('gen_hamradio_band'); break; case 'Band': echo $this->lang->line('gen_hamradio_band'); break;
case 'Operator': echo $this->lang->line('gen_hamradio_operator'); break;
} }
echo '</td>'; echo '</td>';
echo '<td>'; echo '<td>';
@ -70,6 +74,7 @@
case 'State': echo $this->lang->line('gen_hamradio_state'); break; case 'State': echo $this->lang->line('gen_hamradio_state'); break;
case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break; case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break;
case 'Band': echo $this->lang->line('gen_hamradio_band'); break; case 'Band': echo $this->lang->line('gen_hamradio_band'); break;
case 'Operator': echo $this->lang->line('gen_hamradio_operator'); break;
} }
echo '</td><td></td></tr>'; echo '</td><td></td></tr>';
@ -104,6 +109,7 @@
case 'Grid': echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break; case 'Grid': echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break;
case 'Band': echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break; case 'Band': echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break;
case 'State': echo '<td>' . ($row->COL_STATE); break; case 'State': echo '<td>' . ($row->COL_STATE); break;
case 'Operator': echo '<td>' . ($row->COL_OPERATOR); break;
} }
echo '</td>'; echo '</td>';
switch($this->session->userdata('user_column2')==""?'RSTS':$this->session->userdata('user_column2')) { switch($this->session->userdata('user_column2')==""?'RSTS':$this->session->userdata('user_column2')) {
@ -116,6 +122,7 @@
case 'Grid': echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break; case 'Grid': echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break;
case 'Band': echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break; case 'Band': echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break;
case 'State': echo '<td>' . ($row->COL_STATE); break; case 'State': echo '<td>' . ($row->COL_STATE); break;
case 'Operator': echo '<td>' . ($row->COL_OPERATOR); break;
} }
echo '</td>'; echo '</td>';
@ -129,6 +136,7 @@
case 'Grid': echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break; case 'Grid': echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break;
case 'Band': echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break; case 'Band': echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break;
case 'State': echo '<td>' . ($row->COL_STATE); break; case 'State': echo '<td>' . ($row->COL_STATE); break;
case 'Operator': echo '<td>' . ($row->COL_OPERATOR); break;
} }
echo '</td>'; echo '</td>';
switch($this->session->userdata('user_column4')==""?'Band':$this->session->userdata('user_column4')) { switch($this->session->userdata('user_column4')==""?'Band':$this->session->userdata('user_column4')) {
@ -141,6 +149,7 @@
case 'Grid': echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break; case 'Grid': echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break;
case 'Band': echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break; case 'Band': echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break;
case 'State': echo '<td>' . ($row->COL_STATE); break; case 'State': echo '<td>' . ($row->COL_STATE); break;
case 'Operator': echo '<td>' . ($row->COL_OPERATOR); break;
} }
echo '</td>'; echo '</td>';
switch($this->session->userdata('user_column5')==""?'Country':$this->session->userdata('user_column5')) { switch($this->session->userdata('user_column5')==""?'Country':$this->session->userdata('user_column5')) {
@ -153,6 +162,7 @@
case 'Grid': echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break; case 'Grid': echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break;
case 'Band': echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break; case 'Band': echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break;
case 'State': echo '<td>' . ($row->COL_STATE); break; case 'State': echo '<td>' . ($row->COL_STATE); break;
case 'Operator': echo '<td>' . ($row->COL_OPERATOR); break;
} }
echo '</td> echo '</td>
<td><button onclick="addQsoToQsl(' . $row->COL_PRIMARY_KEY . ', \'' . $filename . '\')" class="btn-sm btn-success" type="button"> Add to QSL</button></td>'; <td><button onclick="addQsoToQsl(' . $row->COL_PRIMARY_KEY . ', \'' . $filename . '\')" class="btn-sm btn-success" type="button"> Add to QSL</button></td>';

10
application/views/search/search_result_ajax.php
查看文件

@ -19,6 +19,7 @@
case 'State': echo $this->lang->line('gen_hamradio_state'); break; case 'State': echo $this->lang->line('gen_hamradio_state'); break;
case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break; case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break;
case 'Band': echo $this->lang->line('gen_hamradio_band'); break; case 'Band': echo $this->lang->line('gen_hamradio_band'); break;
case 'Operator': echo $this->lang->line('gen_hamradio_operator'); break;
} }
echo '</td>'; echo '</td>';
echo '<td>'; echo '<td>';
@ -32,6 +33,7 @@
case 'SOTA': echo $this->lang->line('gen_hamradio_sota'); break; case 'SOTA': echo $this->lang->line('gen_hamradio_sota'); break;
case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break; case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break;
case 'Band': echo $this->lang->line('gen_hamradio_band'); break; case 'Band': echo $this->lang->line('gen_hamradio_band'); break;
case 'Operator': echo $this->lang->line('gen_hamradio_operator'); break;
} }
echo '</td>'; echo '</td>';
echo '<td>'; echo '<td>';
@ -45,6 +47,7 @@
case 'State': echo $this->lang->line('gen_hamradio_state'); break; case 'State': echo $this->lang->line('gen_hamradio_state'); break;
case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break; case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break;
case 'Band': echo $this->lang->line('gen_hamradio_band'); break; case 'Band': echo $this->lang->line('gen_hamradio_band'); break;
case 'Operator': echo $this->lang->line('gen_hamradio_operator'); break;
} }
echo '</td>'; echo '</td>';
echo '<td>'; echo '<td>';
@ -58,6 +61,7 @@
case 'State': echo $this->lang->line('gen_hamradio_state'); break; case 'State': echo $this->lang->line('gen_hamradio_state'); break;
case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break; case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break;
case 'Band': echo $this->lang->line('gen_hamradio_band'); break; case 'Band': echo $this->lang->line('gen_hamradio_band'); break;
case 'Operator': echo $this->lang->line('gen_hamradio_operator'); break;
} }
echo '</td>'; echo '</td>';
echo '<td>'; echo '<td>';
@ -71,6 +75,7 @@
case 'State': echo $this->lang->line('gen_hamradio_state'); break; case 'State': echo $this->lang->line('gen_hamradio_state'); break;
case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break; case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break;
case 'Band': echo $this->lang->line('gen_hamradio_band'); break; case 'Band': echo $this->lang->line('gen_hamradio_band'); break;
case 'Operator': echo $this->lang->line('gen_hamradio_operator'); break;
} }
echo '</td>'; echo '</td>';
@ -122,6 +127,7 @@
case 'Grid': echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break; case 'Grid': echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break;
case 'Band': echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break; case 'Band': echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break;
case 'State': echo '<td>' . ($row->COL_STATE); break; case 'State': echo '<td>' . ($row->COL_STATE); break;
case 'Operator': echo '<td>' . ($row->COL_OPERATOR); break;
} }
echo '</td>'; echo '</td>';
switch($this->session->userdata('user_column2')==""?'RSTS':$this->session->userdata('user_column2')) { switch($this->session->userdata('user_column2')==""?'RSTS':$this->session->userdata('user_column2')) {
@ -134,6 +140,7 @@
case 'Grid': echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break; case 'Grid': echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break;
case 'Band': echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break; case 'Band': echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break;
case 'State': echo '<td>' . ($row->COL_STATE); break; case 'State': echo '<td>' . ($row->COL_STATE); break;
case 'Operator': echo '<td>' . ($row->COL_OPERATOR); break;
} }
echo '</td>'; echo '</td>';
@ -147,6 +154,7 @@
case 'Grid': echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break; case 'Grid': echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break;
case 'Band': echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break; case 'Band': echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break;
case 'State': echo '<td>' . ($row->COL_STATE); break; case 'State': echo '<td>' . ($row->COL_STATE); break;
case 'Operator': echo '<td>' . ($row->COL_OPERATOR); break;
} }
echo '</td>'; echo '</td>';
switch($this->session->userdata('user_column4')==""?'Band':$this->session->userdata('user_column4')) { switch($this->session->userdata('user_column4')==""?'Band':$this->session->userdata('user_column4')) {
@ -159,6 +167,7 @@
case 'Grid': echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break; case 'Grid': echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break;
case 'Band': echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break; case 'Band': echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break;
case 'State': echo '<td>' . ($row->COL_STATE); break; case 'State': echo '<td>' . ($row->COL_STATE); break;
case 'Operator': echo '<td>' . ($row->COL_OPERATOR); break;
} }
echo '</td>'; echo '</td>';
switch($this->session->userdata('user_column5')==""?'Country':$this->session->userdata('user_column5')) { switch($this->session->userdata('user_column5')==""?'Country':$this->session->userdata('user_column5')) {
@ -171,6 +180,7 @@
case 'Grid': echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break; case 'Grid': echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break;
case 'Band': echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break; case 'Band': echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break;
case 'State': echo '<td>' . ($row->COL_STATE); break; case 'State': echo '<td>' . ($row->COL_STATE); break;
case 'Operator': echo '<td>' . ($row->COL_OPERATOR); break;
} }
echo '</td>'; echo '</td>';
if(($this->config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?> if(($this->config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?>

5
application/views/user/add.php
查看文件

@ -149,6 +149,7 @@
<option value="SOTA"><?php echo $this->lang->line('gen_hamradio_sota'); ?></option> <option value="SOTA"><?php echo $this->lang->line('gen_hamradio_sota'); ?></option>
<option value="State"><?php echo $this->lang->line('gen_hamradio_state'); ?></option> <option value="State"><?php echo $this->lang->line('gen_hamradio_state'); ?></option>
<option value="Grid"><?php echo $this->lang->line('gen_hamradio_gridsquare'); ?></option> <option value="Grid"><?php echo $this->lang->line('gen_hamradio_gridsquare'); ?></option>
<option value="Operator"><?php echo $this->lang->line('gen_hamradio_operator'); ?></option>
</select> </select>
</div> </div>
@ -164,6 +165,7 @@
<option value="SOTA"><?php echo $this->lang->line('gen_hamradio_sota'); ?></option> <option value="SOTA"><?php echo $this->lang->line('gen_hamradio_sota'); ?></option>
<option value="State"><?php echo $this->lang->line('gen_hamradio_state'); ?></option> <option value="State"><?php echo $this->lang->line('gen_hamradio_state'); ?></option>
<option value="Grid"><?php echo $this->lang->line('gen_hamradio_gridsquare'); ?></option> <option value="Grid"><?php echo $this->lang->line('gen_hamradio_gridsquare'); ?></option>
<option value="Operator"><?php echo $this->lang->line('gen_hamradio_operator'); ?></option>
</select> </select>
</div> </div>
@ -179,6 +181,7 @@
<option value="SOTA"><?php echo $this->lang->line('gen_hamradio_sota'); ?></option> <option value="SOTA"><?php echo $this->lang->line('gen_hamradio_sota'); ?></option>
<option value="State"><?php echo $this->lang->line('gen_hamradio_state'); ?></option> <option value="State"><?php echo $this->lang->line('gen_hamradio_state'); ?></option>
<option value="Grid"><?php echo $this->lang->line('gen_hamradio_gridsquare'); ?></option> <option value="Grid"><?php echo $this->lang->line('gen_hamradio_gridsquare'); ?></option>
<option value="Operator"><?php echo $this->lang->line('gen_hamradio_operator'); ?></option>
</select> </select>
</div> </div>
@ -194,6 +197,7 @@
<option value="SOTA"><?php echo $this->lang->line('gen_hamradio_sota'); ?></option> <option value="SOTA"><?php echo $this->lang->line('gen_hamradio_sota'); ?></option>
<option value="State"><?php echo $this->lang->line('gen_hamradio_state'); ?></option> <option value="State"><?php echo $this->lang->line('gen_hamradio_state'); ?></option>
<option value="Grid"><?php echo $this->lang->line('gen_hamradio_gridsquare'); ?></option> <option value="Grid"><?php echo $this->lang->line('gen_hamradio_gridsquare'); ?></option>
<option value="Operator"><?php echo $this->lang->line('gen_hamradio_operator'); ?></option>
</select> </select>
</div> </div>
@ -209,6 +213,7 @@
<option value="SOTA"><?php echo $this->lang->line('gen_hamradio_sota'); ?></option> <option value="SOTA"><?php echo $this->lang->line('gen_hamradio_sota'); ?></option>
<option value="State"><?php echo $this->lang->line('gen_hamradio_state'); ?></option> <option value="State"><?php echo $this->lang->line('gen_hamradio_state'); ?></option>
<option value="Grid"><?php echo $this->lang->line('gen_hamradio_gridsquare'); ?></option> <option value="Grid"><?php echo $this->lang->line('gen_hamradio_gridsquare'); ?></option>
<option value="Operator"><?php echo $this->lang->line('gen_hamradio_operator'); ?></option>
</select> </select>
</div> </div>
</div> </div>

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

@ -335,6 +335,7 @@
<option value="SOTA" <?php if ($user_column1 == "SOTA") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_sota'); ?></option> <option value="SOTA" <?php if ($user_column1 == "SOTA") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_sota'); ?></option>
<option value="State" <?php if ($user_column1 == "State") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_state'); ?></option> <option value="State" <?php if ($user_column1 == "State") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_state'); ?></option>
<option value="Grid" <?php if ($user_column1 == "Grid") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_gridsquare'); ?></option> <option value="Grid" <?php if ($user_column1 == "Grid") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_gridsquare'); ?></option>
<option value="Operator" <?php if ($user_column1 == "Operator") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_operator'); ?></option>
</select> </select>
</div> </div>
@ -350,6 +351,7 @@
<option value="SOTA" <?php if ($user_column2 == "SOTA") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_sota'); ?></option> <option value="SOTA" <?php if ($user_column2 == "SOTA") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_sota'); ?></option>
<option value="State" <?php if ($user_column2 == "State") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_state'); ?></option> <option value="State" <?php if ($user_column2 == "State") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_state'); ?></option>
<option value="Grid" <?php if ($user_column2 == "Grid") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_gridsquare'); ?></option> <option value="Grid" <?php if ($user_column2 == "Grid") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_gridsquare'); ?></option>
<option value="Operator" <?php if ($user_column2 == "Operator") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_operator'); ?></option>
</select> </select>
</div> </div>
@ -365,6 +367,7 @@
<option value="SOTA" <?php if ($user_column3 == "SOTA") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_sota'); ?></option> <option value="SOTA" <?php if ($user_column3 == "SOTA") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_sota'); ?></option>
<option value="State" <?php if ($user_column3 == "State") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_state'); ?></option> <option value="State" <?php if ($user_column3 == "State") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_state'); ?></option>
<option value="Grid" <?php if ($user_column3 == "Grid") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_gridsquare'); ?></option> <option value="Grid" <?php if ($user_column3 == "Grid") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_gridsquare'); ?></option>
<option value="Operator" <?php if ($user_column3 == "Operator") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_operator'); ?></option>
</select> </select>
</div> </div>
@ -380,6 +383,7 @@
<option value="SOTA" <?php if ($user_column4 == "SOTA") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_sota'); ?></option> <option value="SOTA" <?php if ($user_column4 == "SOTA") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_sota'); ?></option>
<option value="State" <?php if ($user_column4 == "State") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_state'); ?></option> <option value="State" <?php if ($user_column4 == "State") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_state'); ?></option>
<option value="Grid" <?php if ($user_column4 == "Grid") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_gridsquare'); ?></option> <option value="Grid" <?php if ($user_column4 == "Grid") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_gridsquare'); ?></option>
<option value="Operator" <?php if ($user_column4 == "Operator") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_operator'); ?></option>
</select> </select>
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
@ -394,6 +398,7 @@
<option value="SOTA" <?php if ($user_column5 == "SOTA") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_sota'); ?></option> <option value="SOTA" <?php if ($user_column5 == "SOTA") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_sota'); ?></option>
<option value="State" <?php if ($user_column5 == "State") { echo " selected =\"selected\""; } ?>><?php echo $this->lang->line('gen_hamradio_state'); ?></option> <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="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>
</select> </select>
</div> </div>
</div> </div>

3
application/views/view_log/partial/log_ajax.php
查看文件

@ -10,6 +10,8 @@ function echo_table_header_col($ctx, $name) {
case 'State': echo '<td>'.$ctx->lang->line('gen_hamradio_state').'</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 'Grid': echo '<td>'.$ctx->lang->line('gen_hamradio_gridsquare').'</td>'; break;
case 'Band': echo '<td>'.$ctx->lang->line('gen_hamradio_band').'</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;
} }
} }
@ -24,6 +26,7 @@ function echo_table_col($row, $name) {
case 'Grid': echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE . '</td>'; break; case 'Grid': echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE . '</td>'; break;
case 'Band': echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); } echo '</td>'; break; case 'Band': echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); } echo '</td>'; break;
case 'State': echo '<td>' . ($row->COL_STATE) . '</td>'; break; case 'State': echo '<td>' . ($row->COL_STATE) . '</td>'; break;
case 'Operator':echo '<td>' . ($row->COL_OPERATOR) . '</td>'; break;
} }
} }
?> ?>