diff --git a/html/exhi/application/models/general/M_general.php b/html/exhi/application/models/general/M_general.php
index 6d1320aa8f849618c43d66f31c1cf1025b615cf5..c242c74f13854c7cde1a48726e140a5534ce69aa 100644
--- a/html/exhi/application/models/general/M_general.php
+++ b/html/exhi/application/models/general/M_general.php
@@ -201,8 +201,16 @@ class M_general extends Da_general
$tag
GROUP BY project.project_id
$having_count
- LIMIT $limit OFFSET $offset";
+ LIMIT $limit OFFSET $offset
+ ";
$query = $this->db->query($sql);
+ // echo '<pre>';
+ // print_r($sql);
+ // echo '</pre>';
+ // echo '<br>==========================<br>';
+ // echo '<pre>';
+ // print_r($query);
+ // echo '</pre>';
return $query;
}
@@ -218,25 +226,37 @@ class M_general extends Da_general
{
$having_count = ($tag == '') ? $having_count = '' : $having_count = 'HAVING COUNT(DISTINCT project_tag.tag_id) = ' . count($tag);
($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
+ $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 . ')';
+ $sql = "SELECT COUNT(*) as num_project FROM (SELECT project.project_id
FROM {$this->db_name}.project
- LEFT JOIN project_tag ON project_tag.project_id = project.project_id
+ LEFT OUTER JOIN project_tag ON project_tag.project_id = project.project_id
+ JOIN user on project.user_id = user.user_id
+ JOIN team ON project.team_id = team.team_id
+ JOIN cluster ON project.cluster_id = cluster.cluster_id
+ JOIN company ON project.company_id = company.company_id
+ JOIN instructor ON project.instructor_id = instructor.instructor_id
WHERE
(project_tag.project_id IS NULL OR project_tag.project_id = project_tag.project_id)
$pname
AND date = $year
- AND company_id = $company
- AND cluster_id = $cluster
- AND team_id = $team
+ AND project.company_id = $company
+ AND project.cluster_id = $cluster
+ AND project.team_id = $team
$grade
AND status = 1
- $tag
+ $tag
GROUP BY project.project_id
$having_count
- ";
+ ) as subquery";
$query = $this->db->query($sql);
+ // echo '<pre>';
// print_r($sql);
+ // echo '</pre>';
+ // echo '<br>==========================<br>';
+ // echo '<pre>';
+ // print_r($query);
+ // echo '</pre>';
+
return $query;
}
diff --git a/html/exhi/application/views/general/v_project_4.php b/html/exhi/application/views/general/v_project_4.php
index 382867406e6a0ce5c8fbdd165b44f73ca1f225f3..6cbfd3d8fe99c7da35a126d1926f2f81104562b9 100644
--- a/html/exhi/application/views/general/v_project_4.php
+++ b/html/exhi/application/views/general/v_project_4.php
@@ -164,13 +164,13 @@
<div class="col-2 position-relative">
<div class="form-group">
<label for="year" class="form-label">ปี</label>
- <select name="year" class="form-control form-sm" id="year" onchange="load_data()">
+ <select name="year" class="form-control form-sm" id="year" onchange="load_data(), load_num_project()">
</select>
</div>
</div>
<div class="col-2 position-relative">
<label for="limit" class="form-label">จำนวนต่อหน้า</label>
- <select name="limit" id="limit" class="form-control form-sm" onchange="load_num_project(), reset_page(), load_data()">
+ <select name="limit" id="limit" class="form-control form-sm" onchange="reset_page(), load_data(), load_num_project()">
<option value="10">10</option>
<option value="20">20</option>
<option value="50">50</option>
diff --git a/html/exhi/application/views/general/v_search.php b/html/exhi/application/views/general/v_search.php
index 9ef001347441e7d2580d050b373da172b7c13fc7..38db9696c3a2fa6d20775cc859143ea29e06e1c5 100644
--- a/html/exhi/application/views/general/v_search.php
+++ b/html/exhi/application/views/general/v_search.php
@@ -335,14 +335,22 @@ $s_value = (!isset($s_value)) ? '' : $s_value;
function set_page(page) {
current_page = page;
console.log('page' + page);
- load_data();
+ if ('<?php echo $search; ?>' == 'all') {
+ load_data()
+ } else {
+ load_data_search()
+ }
}
function previous_page() {
if (current_page > 1) {
current_page--;
console.log('page' + current_page);
- load_data();
+ if ('<?php echo $search; ?>' == 'all') {
+ load_data()
+ } else {
+ load_data_search()
+ }
mark_btn('page' + current_page);
}
}
@@ -351,7 +359,11 @@ $s_value = (!isset($s_value)) ? '' : $s_value;
if (current_page < maxPage) {
current_page++;
console.log('page' + current_page);
- load_data();
+ if ('<?php echo $search; ?>' == 'all') {
+ load_data()
+ } else {
+ load_data_search()
+ }
mark_btn('page' + current_page);
}
}
diff --git a/html/exhi/application/views/template/adminlte/topbar_general.php b/html/exhi/application/views/template/adminlte/topbar_general.php
index 12c5cb3a8ed269712acbc208f5b3ddbf6d26a3f5..489d23942987d61a901c0c5b28c349965acd8782 100644
--- a/html/exhi/application/views/template/adminlte/topbar_general.php
+++ b/html/exhi/application/views/template/adminlte/topbar_general.php
@@ -6,7 +6,7 @@
<div class="collapse navbar-collapse order-3" id="navbarCollapse">
<ul class="navbar-nav ml-auto">
<li class="nav-item">
- <a class="nav-link " href="<?php echo site_url() . '/Login/show_login' ?>" aria-expanded="true"><?php echo 'เข้าสู่ระบบ' ?></a>
+ <a class="nav-link " href="<?php echo site_url() . '/Login/show_login' ?>" aria-expanded="true"><b><?php echo 'เข้าสู่ระบบ' ?></b></a>
</li>
</ul>
</div>