Merge branch 'master' of https://git.informatics.buu.ac.th/62160336/exhibition_docker

html/exhi/application/models/general/M_general.php

@@ -15,26 +15,27 @@ class M_general extends Da_general
     public function get_num_project($year)
     {
         $sql = "SELECT 
-        (SELECT COUNT(project_id) FROM project WHERE status = 1) AS all_project,
-        (SELECT COUNT(project_id) FROM project WHERE status = 1 AND date = $year) AS by_year,
-        (SELECT COUNT(project_id) FROM project WHERE status = 1 AND cluster_id != 0 AND date = $year) AS cluster,
-        (SELECT COUNT(project_id) FROM project WHERE status = 1 AND team_id != 0 AND date = $year) AS team,
-        (SELECT COUNT(project_id) FROM project WHERE status = 1 AND team_id = 0 AND cluster_id = 0 AND date = $year) AS project;";
+        (SELECT COUNT(project_id) FROM {$this->db_name}.project WHERE status = 1) AS all_project,
+        (SELECT COUNT(project_id) FROM {$this->db_name}.project WHERE status = 1 AND date = $year) AS by_year,
+        (SELECT COUNT(project_id) FROM {$this->db_name}.project WHERE status = 1 AND cluster_id != 0 AND date = $year) AS cluster,
+        (SELECT COUNT(project_id) FROM {$this->db_name}.project WHERE status = 1 AND team_id != 0 AND date = $year) AS team,
+        (SELECT COUNT(project_id) FROM {$this->db_name}.project WHERE status = 1 AND team_id = 0 AND cluster_id = 0 AND date = $year) AS project;";
         $query = $this->db->query($sql);
         return $query;
     }
 
     public function get_trend()
     {
-        $sql = "SELECT * FROM project ORDER BY project_id DESC LIMIT 4";
+        $sql = "SELECT * FROM {$this->db_name}.project ORDER BY project_id DESC LIMIT 4";
         $query = $this->db->query($sql);
         return $query;
     }
 
     public function get_project_2($year)
     {
-        $sql = "SELECT *,project.name_th as pj_name,cluster.name AS ct_name FROM {$this->db_name}.project
+        $sql = "SELECT *, project.name_th as pj_name, cluster.name AS ct_name, company.name AS cp_name FROM {$this->db_name}.project
         JOIN cluster ON project.cluster_id = cluster.cluster_id
+        JOIN company ON project.company_id = company.company_id
 		WHERE status = 1 AND project.cluster_id != 0 AND date = $year";
         $query = $this->db->query($sql);
         return $query;
@@ -62,8 +63,9 @@ class M_general extends Da_general
 
     public function get_project_3($year)
     {
-        $sql = "SELECT *,project.name_th as pj_name,team.name AS t_name FROM {$this->db_name}.project
+        $sql = "SELECT *, project.name_th as pj_name, team.name AS t_name, company.name AS cp_name FROM {$this->db_name}.project
         JOIN team ON project.team_id = team.team_id
+        JOIN company ON project.company_id = company.company_id
 		WHERE status = 1 AND project.team_id !=0 AND date = $year";
         $query = $this->db->query($sql);
         return $query;
@@ -81,8 +83,9 @@ class M_general extends Da_general
 
     public function get_project_4($year)
     {
-        $sql = "SELECT project_id, name_th as pj_name, image_logo, image_cover, user.student_id, user.first_name, user.last_name FROM {$this->db_name}.project
-		join user on project.user_id = user.user_id
+        $sql = "SELECT project_id, name_th as pj_name, image_logo, image_cover, user.student_id, user.first_name, user.last_name, company.name AS cp_name FROM {$this->db_name}.project
+		JOIN user on project.user_id = user.user_id
+        JOIN company ON project.company_id = company.company_id
 		Where project.status = 1 AND cluster_id = 0 AND team_id = 0 AND date = $year";
         $query = $this->db->query($sql);
         return $query;
@@ -116,7 +119,7 @@ class M_general extends Da_general
         $tag = ($tag == '') ? $tag = 'AND (project_tag.tag_id = project_tag.tag_id OR project_tag.tag_id IS NULL)' : $tag = 'AND project_tag.tag_id IN (' . $tag . ')';
         $offset = ($page - 1) * $limit;
         $sql = "SELECT *, project.project_id as project_id
-        FROM project
+        FROM {$this->db_name}.project
         LEFT OUTER JOIN project_tag ON project_tag.project_id = project.project_id
         WHERE 
             (project_tag.project_id IS NULL OR project_tag.project_id = project_tag.project_id)
@@ -149,7 +152,7 @@ class M_general extends Da_general
         ($tag == '') ?: $tag = implode(',', $tag);
         $tag = ($tag == '') ? $tag = 'AND (project_tag.tag_id = project_tag.tag_id)' : $tag = 'AND project_tag.tag_id IN (' . $tag . ')';
         $sql = "SELECT count(project.project_id) AS num_project
-        FROM project
+        FROM {$this->db_name}.project
         LEFT JOIN project_tag ON project_tag.project_id = project.project_id
         WHERE 
             (project_tag.project_id IS NULL OR project_tag.project_id = project_tag.project_id)
@@ -172,7 +175,7 @@ class M_general extends Da_general
     public function get_search($year, $grade, $cluster, $team, $company, $pname, $tag)
     {
         $sql = "SELECT *
-        FROM project
+        FROM {$this->db_name}.project
         LEFT JOIN project_tag ON project_tag.project_id = project.project_id
         WHERE 
             (project_tag.project_id IS NULL OR project_tag.project_id = project_tag.project_id)

html/exhi/application/views/general/v_general_home.php

@@ -239,8 +239,8 @@
         </div>
         <div class="search-container">
             <form method="POST" action="<?php echo site_url() . '/General/get_search' ?>">
-                <input type="text" placeholder="ชื่อโปรเจกต์.." name="pname">
-                <!-- <button type="submit"><i class="fa fa-search"></i></button> -->
+                <input type="text" placeholder="ชื่อโปรเจกต์.." name="pname" id="pname">
+                <button disabled id=" pname_btn" type="submit"><i class="fa fa-search"></i></button>
             </form>
         </div>
         <div class="year">