Fix confirmed activated grids function
这个提交包含在:
父节点
2839c6725f
当前提交
0f47f0e73a
共有 1 个文件被更改,包括 35 次插入 和 45 次删除
|
|
@ -88,19 +88,17 @@ class Activated_grids extends CI_Controller {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check if 2 Char is in array
|
// Check if 2 Char is in array
|
||||||
if(!in_array($grid_two, $array_grid_2char)){
|
if(!in_array($grid_two, $array_confirmed_grid_2char)){
|
||||||
array_push($array_grid_2char, $grid_two);
|
array_push($array_confirmed_grid_2char, $grid_two);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(!in_array($grid_four, $array_confirmed_grid_4char)){
|
||||||
if(!in_array($grid_four, $array_grid_4char)){
|
array_push($array_confirmed_grid_4char, $grid_four);
|
||||||
array_push($array_grid_4char, $grid_four);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if ($this->config->item('map_6digit_grids')) {
|
if ($this->config->item('map_6digit_grids')) {
|
||||||
if(!in_array($grid_six, $array_grid_6char)){
|
if(!in_array($grid_six, $array_confirmed_grid_6char)){
|
||||||
array_push($array_grid_6char, $grid_six);
|
array_push($array_confirmed_grid_6char, $grid_six);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -118,12 +116,10 @@ class Activated_grids extends CI_Controller {
|
||||||
array_push($array_confirmed_grid_2char, $grid_2char_confirmed);
|
array_push($array_confirmed_grid_2char, $grid_2char_confirmed);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if(!in_array($grid_4char_confirmed, $array_confirmed_grid_4char)){
|
if(!in_array($grid_4char_confirmed, $array_confirmed_grid_4char)){
|
||||||
array_push($array_confirmed_grid_4char, $grid_4char_confirmed);
|
array_push($array_confirmed_grid_4char, $grid_4char_confirmed);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if ($this->config->item('map_6digit_grids')) {
|
if ($this->config->item('map_6digit_grids')) {
|
||||||
if(!in_array($grid_6char_confirmed, $array_confirmed_grid_6char)){
|
if(!in_array($grid_6char_confirmed, $array_confirmed_grid_6char)){
|
||||||
array_push($array_confirmed_grid_6char, $grid_6char_confirmed);
|
array_push($array_confirmed_grid_6char, $grid_6char_confirmed);
|
||||||
|
|
@ -159,12 +155,10 @@ class Activated_grids extends CI_Controller {
|
||||||
array_push($array_grid_2char, $grid_two);
|
array_push($array_grid_2char, $grid_two);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if(!in_array($grid_four, $array_grid_4char)){
|
if(!in_array($grid_four, $array_grid_4char)){
|
||||||
array_push($array_grid_4char, $grid_four);
|
array_push($array_grid_4char, $grid_four);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if ($this->config->item('map_6digit_grids')) {
|
if ($this->config->item('map_6digit_grids')) {
|
||||||
if(!in_array($grid_six, $array_grid_6char)){
|
if(!in_array($grid_six, $array_grid_6char)){
|
||||||
array_push($array_grid_6char, $grid_six);
|
array_push($array_grid_6char, $grid_six);
|
||||||
|
|
@ -185,12 +179,10 @@ class Activated_grids extends CI_Controller {
|
||||||
array_push($array_grid_2char, $grid_two);
|
array_push($array_grid_2char, $grid_two);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if(!in_array($grid_four, $array_grid_4char)){
|
if(!in_array($grid_four, $array_grid_4char)){
|
||||||
array_push($array_grid_4char, $grid_four);
|
array_push($array_grid_4char, $grid_four);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if ($this->config->item('map_6digit_grids')) {
|
if ($this->config->item('map_6digit_grids')) {
|
||||||
if(!in_array($grid_six, $array_grid_6char)){
|
if(!in_array($grid_six, $array_grid_6char)){
|
||||||
array_push($array_grid_6char, $grid_six);
|
array_push($array_grid_6char, $grid_six);
|
||||||
|
|
@ -214,7 +206,6 @@ class Activated_grids extends CI_Controller {
|
||||||
return '[' . implode(',', $temp) . ']';
|
return '[' . implode(',', $temp) . ']';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
$data['grid_2char_confirmed'] = js_array($array_confirmed_grid_2char);
|
$data['grid_2char_confirmed'] = js_array($array_confirmed_grid_2char);
|
||||||
$data['grid_4char_confirmed'] = js_array($array_confirmed_grid_4char);
|
$data['grid_4char_confirmed'] = js_array($array_confirmed_grid_4char);
|
||||||
$data['grid_6char_confirmed'] = js_array($array_confirmed_grid_6char);
|
$data['grid_6char_confirmed'] = js_array($array_confirmed_grid_6char);
|
||||||
|
|
@ -229,7 +220,6 @@ class Activated_grids extends CI_Controller {
|
||||||
$this->load->view('interface_assets/footer');
|
$this->load->view('interface_assets/footer');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public function band($band)
|
public function band($band)
|
||||||
{
|
{
|
||||||
$this->load->model('activated_grids_model');
|
$this->load->model('activated_grids_model');
|
||||||
|
|
|
||||||
正在加载…
在新工单中引用