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

sort logbook and station list by name

Browse Source
This commit is contained in:
Thomas Werzmirzowsky
2021-10-20 21:26:35 +02:00
parent 58a2346de6
commit 5f39e99d47
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
application/models/Logbooks_model.php
View File

@@ -11,6 +11,7 @@ class Logbooks_model extends CI_Model {
function show_all() {
$this->db->where('user_id', $this->session->userdata('user_id'));
$this->db->order_by('logbook_name');
return $this->db->get('station_logbooks');
}

3
application/models/Stations.php
View File

@@ -15,7 +15,8 @@ class Stations extends CI_Model {
$this->db->join($this->config->item('table_name'),'station_profile.station_id = '.$this->config->item('table_name').'.station_id','left');
$this->db->group_by('station_profile.station_id');
$this->db->where('station_profile.user_id', $this->session->userdata('user_id'));
$this->db->or_where('station_profile.user_id =', NULL);
$this->db->or_where('station_profile.user_id =', NULL);
$this->db->order_by('station_profile.station_profile_name');
return $this->db->get();
}