diff --git a/html/exhi/application/controllers/Tag.php b/html/exhi/application/controllers/Tag.php index 4e5cbf9e1f5eb04325877e0058a9539c5a989c93..4d268e8a79d3b275f71e7cdefcef742d50314f07 100644 --- a/html/exhi/application/controllers/Tag.php +++ b/html/exhi/application/controllers/Tag.php @@ -28,7 +28,7 @@ class Tag extends Exhibition_Controller { public function insert_tag(){ $data['message'] = true ; - $name = $this->input->post('name'); + $name = trim($this->input->post('name')); $this->load->model('tag/M_tag','tag'); $tags = $this->tag->get_all()->result(); foreach($tags as $tag){ @@ -45,7 +45,7 @@ class Tag extends Exhibition_Controller { public function update_tag(){ $data['message'] = true ; $id = $this->input->post('id'); - $name = $this->input->post('name'); + $name = trim($this->input->post('name')); $this->load->model('tag/M_tag','tag'); $tags = $this->tag->get_all()->result(); foreach($tags as $tag){ diff --git a/html/exhi/application/controllers/User.php b/html/exhi/application/controllers/User.php index fff81a4996848dc2f8170c865bb4894cce6a9543..d9ee93ae27f165c06f043c98a457bb9ab85a34d7 100644 --- a/html/exhi/application/controllers/User.php +++ b/html/exhi/application/controllers/User.php @@ -51,7 +51,7 @@ class User extends Exhibition_Controller { $first_name = $this->input->post('first_name'); $last_name = $this->input->post('last_name'); $student_id = $this->input->post('student_id'); - $email = $this->input->post('email'); + $email = trim($this->input->post('email')); $password = $this->input->post('password'); $role = $this->input->post('role'); $this->load->model('user/M_user','user'); diff --git a/html/exhi/application/views/general/v_general_select.php b/html/exhi/application/views/general/v_general_select.php index e515d4ae85829ff037042e64bcc3e10b99bf43aa..1df619a3bf8dff1e1e8672162c5e626cf85764d9 100644 --- a/html/exhi/application/views/general/v_general_select.php +++ b/html/exhi/application/views/general/v_general_select.php @@ -138,7 +138,7 @@ span{ .image-detail { object-fit: cover; width: auto; - height: 300px; + height: auto; padding: 20px; display: block; margin-left: auto; @@ -177,9 +177,20 @@ span{ <div class="row"> <p style="white-space: pre-line; font-size: 20px; margin-left: 5px;"><?php echo $project->name_th ?></p> </div> - <div class="row"> - <p style="white-space: pre-line; font-size: 20px; margin-left: 5px;"><?php echo $project->select ?></p> - </div> + <?php if($project->cluster_id != 0){ ?> + <div class="row"> + <p style="white-space: pre-line; font-size: 20px; margin-left: 5px;">มกุล : <?php echo $project->select ?></p> + </div> + <?php }else if($project->team_id != 0){ ?> + <div class="row"> + <p style="white-space: pre-line; font-size: 20px; margin-left: 5px;">ทีม : <?php echo $project->select ?></p> + </div> + <?php }else { ?> + <div class="row"> + <p style="white-space: pre-line; font-size: 20px; margin-left: 5px;">อาจารย์ที่ปรึกษา : <?php echo $project->select ?></p> + </div> + + <?php } ?> <div class="row"> <p style="white-space: pre-line; font-size: 20px; margin-left: 5px;">ปี : <?php echo $project->date ?></p> </div> diff --git a/html/exhi/application/views/project/v_project_manage_user.php b/html/exhi/application/views/project/v_project_manage_user.php index 5f2dcf93ab1e5ef59d1a6aec9f64706f3455578a..c58fc49c4c5e4af6e78c55f5add35258616c7e6e 100644 --- a/html/exhi/application/views/project/v_project_manage_user.php +++ b/html/exhi/application/views/project/v_project_manage_user.php @@ -271,7 +271,7 @@ function update_status(id, status) { if (data['message'] == true) { Toast.fire({ icon: 'success', - title: 'เปลี่ยนสถานะสำเร็จ', + title: 'อัพเดตสถานะสำเร็จ', }); await get_project() } diff --git a/html/exhi/application/views/tag/v_tag_manage.php b/html/exhi/application/views/tag/v_tag_manage.php index 770c52c934779dd18547ca378f00256437abfea3..d9729e50379f46fe75a7125f7af14d11e82de836 100644 --- a/html/exhi/application/views/tag/v_tag_manage.php +++ b/html/exhi/application/views/tag/v_tag_manage.php @@ -249,7 +249,7 @@ function insert_tag(name) { type: 'post', url: "<?php echo site_url().'/Tag/insert_tag'; ?>", data: { - 'name': name + 'name': name.trim() }, dataType: 'json', success: async function(data) {