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

Enhancing advanced search with some more operators and enabling QSO-View to link to edit page if logged in.

浏览代码
这个提交包含在：
Kim Huebel 2019-10-09 18:57:55 +02:00
父节点 928ad137a8
当前提交 bfd5526e13
共有 3 个文件被更改，包括 121 次插入 和 4 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

118
application/controllers/Search.php
查看文件

@ -95,6 +95,63 @@ class Search extends CI_Controller {
$this->db->or_where($group_value['field'].' !=', $group_value['value']);
}
}
if($group_value['operator'] == "begins_with") {
if($values['condition'] == "AND") {
$this->db->where($group_value['field'].' like ', $group_value['value']."%");
} else {
$this->db->or_where($group_value['field'].' like ', $group_value['value']."%");
}
}
if($group_value['operator'] == "contains") {
if($values['condition'] == "AND") {
$this->db->where($group_value['field'].' like ', "%".$group_value['value']."%");
} else {
$this->db->or_where($group_value['field'].' like ', "%".$group_value['value']."%");
}
}
if($group_value['operator'] == "ends_with") {
if($values['condition'] == "AND") {
$this->db->where($group_value['field'].' like ', "%".$group_value['value']);
} else {
$this->db->or_where($group_value['field'].' like ', "%".$group_value['value']);
}
}
if($group_value['operator'] == "is_empty") {
if($values['condition'] == "AND") {
$this->db->where($group_value['field'], "''");
} else {
$this->db->or_where($group_value['field'], "''");
}
}
if($group_value['operator'] == "is_not_empty") {
if($values['condition'] == "AND") {
$this->db->where($group_value['field'].' !=', "''");
} else {
$this->db->or_where($group_value['field'].' !=', "''");
}
}
if($group_value['operator'] == "is_null") {
if($values['condition'] == "AND") {
$this->db->where($group_value['field'].' is ', NULL);
} else {
$this->db->or_where($group_value['field'].' is ', NULL);
}
}
if($group_value['operator'] == "is_not_null") {
if($values['condition'] == "AND") {
$this->db->where($group_value['field'].' is not ', NULL);
} else {
$this->db->or_where($group_value['field'].' is not ', NULL);
}
}
if($group_value['operator'] == "less") {
if($values['condition'] == "AND") {
@ -150,6 +207,62 @@ class Search extends CI_Controller {
$this->db->or_where($values['field'].' !=', $values['value']);
}
}
if($values['operator'] == "begins_with") {
if($search_type == "AND") {
$this->db->where($values['field'].' like ', $values['value']."%");
} else {
$this->db->or_where($values['field'].' like ', $values['value']."%");
}
}
if($values['operator'] == "contains") {
if($search_type == "AND") {
$this->db->where($values['field'].' like ', "%".$values['value']."%");
} else {
$this->db->or_where($values['field'].' like ', "%".$values['value']."%");
}
}
if($values['operator'] == "ends_with") {
if($search_type == "AND") {
$this->db->where($values['field'].' like ', "%".$values['value']);
} else {
$this->db->or_where($values['field'].' like ', "%".$values['value']);
}
}
if($values['operator'] == "is_empty") {
if($search_type == "AND") {
$this->db->where($values['field'], "");
} else {
$this->db->or_where($values['field'], "");
}
}
if($values['operator'] == "is_not_empty") {
if($search_type == "AND") {
$this->db->where($values['field'].' !=', "");
} else {
$this->db->or_where($values['field'].' !=', "");
}
}
if($values['operator'] == "is_null") {
if($search_type == "AND") {
$this->db->where($values['field'].' is ', NULL);
} else {
$this->db->or_where($values['field'].' is ', NULL);
}
}
if($values['operator'] == "is_not_null") {
if($search_type == "AND") {
$this->db->where($values['field'].' is not ', NULL);
} else {
$this->db->or_where($values['field'].' is not ', NULL);
}
}
if($values['operator'] == "less") {
if($search_type == "AND") {
@ -189,10 +302,9 @@ class Search extends CI_Controller {
}
$this->db->order_by('COL_TIME_ON', 'DESC');
$query = $this->db->get($this->config->item('table_name'));
//echo $this->db->last_query();
echo json_encode($query->result_array());
} else {
echo "Noooooooob";
} else {
echo "Noooooooob";
}
}

2
application/views/interface_assets/footer.php
查看文件

@ -63,7 +63,7 @@ $(".search-results-box").hide();
operators: ['equal', 'not_equal', 'less', 'less_or_equal', 'greater', 'greater_or_equal']
<?php } else { ?>
type: 'string',
operators: ['equal', 'not_equal']
operators: ['equal', 'not_equal', 'begins_with', 'contains', 'ends_with', 'is_empty', 'is_not_empty', 'is_null', 'is_not_null']
<?php } ?>
},
<?php } ?>

5
application/views/view_log/qso.php
查看文件

@ -183,6 +183,11 @@
<td><?php echo $row->COL_OPERATOR; ?></td>
</tr>
<?php } ?>
<?php if(($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) { ?>
<tr>
<td><a href="<?php echo site_url('qso/edit'); ?>/<?php echo $row->COL_PRIMARY_KEY; ?>" href="javascript:;"><i class="fas fa-edit"></i> Edit QSO</a></td>
</tr>
<?php } ?>
</table>
</div>
<div class="col">