diff --git a/application/models/Itindata_model.php b/application/models/Itindata_model.php index a0241d0b..18e2a57b 100644 --- a/application/models/Itindata_model.php +++ b/application/models/Itindata_model.php @@ -84,7 +84,7 @@ public function get_checkpoints() { // $this->db->order_by('compname_clients', 'ASC'); - $query = $this->db->query('SELECT c.id_section AS mainsectid, c.name_section AS mainsect, c.en_name_section AS en_mainsect, c.printtext_section AS mainsectprint, c.en_printtext_section AS en_mainsectprint, b.id_section, b.name_section, b.en_name_section, b.printtext_section, b.en_printtext_section, a.id_cp, a.name_cp, a.en_name_cp, a.points_cp, a.printtext_cp, a.en_printtext_cp, a.nokpoints_cp, a.helptext_cp, a.en_helptext_cp FROM db_itin.checkpoint_tbl AS a left join db_itin.sections_tbl AS b on b.id_section = a.sect_cp inner join db_itin.sections_tbl AS c on b.parent_section = c.id_section'); + $query = $this->db->query('SELECT c.id_section as mainsectid, c.name_section as mainsect, c.en_name_section as en_mainsect, c.printtext_section as mainsectprint, c.en_printtext_section as en_mainsectprint, b.id_section, b.name_section, b.en_name_section, b.printtext_section, b.en_printtext_section, a.id_cp, a.name_cp, a.en_name_cp, a.points_cp, a.printtext_cp, a.en_printtext_cp, a.nokpoints_cp, a.helptext_cp, a.en_helptext_cp FROM db_itin.checkpoint_tbl as a left join db_itin.sections_tbl as b on b.id_section = a.sect_cp inner join db_itin.sections_tbl as c on b.parent_section = c.id_section'); return $query->result_array(); } @@ -118,9 +118,9 @@ public function get_clientsplain($where=null) { public function get_clients($where = null) { - $q = "Select c.*, v.*, iv.* from clients_tbl AS c + $q = "Select c.*, v.*, k.* from clients_tbl c LEFT JOIN vehicles_tbl AS v ON c.id_client = v.client_vhcl - LEFT JOIN inspections_tbl AS is ON v.id_vhcl = iv.vehicle_inspection"; + LEFT JOIN inspections_tbl AS k ON v.id_vhcl = k.vehicle_inspection"; if (isset($where)) { @@ -159,8 +159,8 @@ public function get_unisnpvehicles(){ public function get_vehiclesfull($where=null) { - $q = "Select v.*, iv.*, c.* from vehicles_tbl AS v - LEFT JOIN inspections_tbl AS is ON v.id_vhcl = iv.vehicle_inspection + $q = "Select v.*, k.*, c.* from vehicles_tbl v + LEFT JOIN inspections_tbl AS k ON v.id_vhcl = k.vehicle_inspection LEFT JOIN clients_tbl AS c ON v.client_vhcl = c.id_client" ; @@ -207,10 +207,10 @@ public function set_inspection($data) { public function get_inspectionsfull($where=null) { - $q = "Select iv.*, v.*, c.*, u.first_name, u.last_name from inspections_tbl AS is - LEFT JOIN vehicles_tbl AS v ON iv.vehicle_inspection = v.id_vhcl - LEFT JOIN clients_tbl AS c ON iv.client_inspection = c.id_client - LEFT JOIN users AS u ON iv.inspector_inspection = u.id"; + $q = "Select k.*, v.*, c.*, u.first_name, u.last_name from inspections_tbl as k + LEFT JOIN vehicles_tbl AS v ON k.vehicle_inspection = v.id_vhcl + LEFT JOIN clients_tbl AS c ON k.client_inspection = c.id_client + LEFT JOIN users AS u ON k.inspector_inspection = u.id"; if (isset($where)) { @@ -426,5 +426,4 @@ public function get_signature($where = null) { } -} - +} \ No newline at end of file