Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #370 from dg9vh/improve_search

Browse Source 
Enhancing advanced search with some more operators and enabling QSO-V…
This commit is contained in:
Peter Goodhall
2019-10-09 21:21:14 +01:00
committed by GitHub
parent 8cca1bf998 bfd5526e13
commit 4df3a6ce8b
3 changed files with 121 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
application/controllers/Search.php
View File

@@ -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
View File

@@ -51,7 +51,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
View File

@@ -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">