From 2f89261f0049f98f8eb0e25204a109922f2e3366 Mon Sep 17 00:00:00 2001
From: Woraprat <73052317+aeworaprat@users.noreply.github.com>
Date: Wed, 5 Apr 2023 00:26:17 +0700
Subject: [PATCH] update project
---
html/exhi/application/controllers/Project.php | 10 ++++++++--
.../application/views/project/v_project_create.php | 8 ++++++--
html/exhi/application/views/project/v_project_edit.php | 7 ++++++-
3 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/html/exhi/application/controllers/Project.php b/html/exhi/application/controllers/Project.php
index b6f16c9..7a39bf6 100644
--- a/html/exhi/application/controllers/Project.php
+++ b/html/exhi/application/controllers/Project.php
@@ -277,7 +277,10 @@ class Project extends Exhibition_Controller {
$this->load->model('detail/M_detail','detail');
$this->load->model('member/M_member','member');
$this->load->model('user/M_user','user');
- $user = $this->user->get_user_by_id($select_create)->row();
+ $user = '';
+ if($graduation == 4){
+ $user = $this->user->get_user_by_id($select_create)->row();
+ }
$path_save_image = '';
if($graduation != 4){
@@ -576,7 +579,10 @@ class Project extends Exhibition_Controller {
$path_old = '';
$project = $this->project->get_project_by_id($id)->row();
$user_old = $this->user->get_user_by_id($project->user_id)->row();
- $user = $this->user->get_user_by_id($select_create)->row();
+ $user = '';
+ if($graduation == 4){
+ $user = $this->user->get_user_by_id($select_create)->row();
+ }
if($project->cluster_id != 0){
$select_old = $this->cluster->get_cluster_by_id($project->cluster_id)->row();
$path_old = '/project/year_'.$project->date.'/y2/'.$select_old->name.'/';
diff --git a/html/exhi/application/views/project/v_project_create.php b/html/exhi/application/views/project/v_project_create.php
index 0a8a7fa..091f061 100644
--- a/html/exhi/application/views/project/v_project_create.php
+++ b/html/exhi/application/views/project/v_project_create.php
@@ -779,7 +779,7 @@ function insert_projecct(){
}else{
select =$('#instructor_select').val()
}
- if(year == '' || graduation == '' || company == '' || name == '' || select == '' || select_create == '' || select_create == null){
+ if(year == '' || graduation == '' || company == '' || name == '' || select == ''){
Toast.fire({
icon: 'error',
title: 'กรุณากรอกข้อมูล',
@@ -789,7 +789,11 @@ function insert_projecct(){
icon: 'error',
title: 'กรุณาเพิ่มรูปภาพ',
})
-
+ }else if(graduation == 4 && select_create == null){
+ Toast.fire({
+ icon: 'error',
+ title: 'กรุณากรอกข้อมูล',
+ })
}else if(tags.length < 1){
Toast.fire({
icon: 'error',
diff --git a/html/exhi/application/views/project/v_project_edit.php b/html/exhi/application/views/project/v_project_edit.php
index ddb6863..8ae80ed 100644
--- a/html/exhi/application/views/project/v_project_edit.php
+++ b/html/exhi/application/views/project/v_project_edit.php
@@ -948,7 +948,12 @@ function update_projecct(){
}else{
select =$('#instructor_select').val()
}
- if(year == '' || graduation == '' || company == '' || name == '' || select == '' || select_create == '' || select_create == null){
+ if(year == '' || graduation == '' || company == '' || name == '' || select == ''){
+ Toast.fire({
+ icon: 'error',
+ title: 'กรุณากรอกข้อมูล',
+ })
+ }else if(graduation == 4 && select_create == null){
Toast.fire({
icon: 'error',
title: 'กรุณากรอกข้อมูล',
--
GitLab