From 5ab161c62d0777d8b016db1f4951f9fde813cd73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CVeLiTi=E2=80=9D?= <“info@veliti.nl”> Date: Mon, 1 Jul 2024 16:52:44 +0200 Subject: [PATCH] CIM69 - Pictures --- assets/functions.php | 35 ++++++++++------------------------- cartest.php | 4 ++++ cartest_manage.php | 37 ++++++++++++++++++++++++++++++++++--- settings/systemcartest.php | 6 +++--- 4 files changed, 51 insertions(+), 31 deletions(-) diff --git a/assets/functions.php b/assets/functions.php index 46b68c1..90b51f3 100644 --- a/assets/functions.php +++ b/assets/functions.php @@ -1716,38 +1716,23 @@ if(($imageFileType == "jpg" || $imageFileType == "png" || $imageFileType == "jpe //------------------------------------------ // UPLOAD PICTURE for PRODUCTS //------------------------------------------ -function uploadrequest($requestid, $request_line_id, $name){ - - $identifier = date('YmdHis'); - $target_dir = dirname(__FILE__)."/images/requests/"; - $input_file = $target_dir . basename($_FILES["fileToUpload"]["name"]); +function uploadrequest($key){ + $target_dir = dirname(__FILE__)."/images/cartests/"; + $input_file = $target_dir . basename($_FILES["fileToUpload"]["name"][$key]); $imageFileType = strtolower(pathinfo($input_file,PATHINFO_EXTENSION)); - $target_file = $target_dir . $name.'-'.$identifier .'.jpg'; - $file_input_check = getimagesize($_FILES["fileToUpload"]["tmp_name"]); - $image_name = $name.'-'.$identifier .'.jpg'; + $file_input_check = getimagesize($_FILES["fileToUpload"]["tmp_name"][$key]); + $location = "./assets/images/cartests/".basename($_FILES["fileToUpload"]["name"][$key]); //Do when JPG or PNG or JPEG or GIF and smaller than 5MB - if(($imageFileType == "jpg" || $imageFileType == "png" || $imageFileType == "jpeg" || $imageFileType == "gif" || $imageFileType == "png") && $_FILES["fileToUpload"]["size"] < 5000000 && $file_input_check !== false) { + if(($imageFileType == "jpg" || $imageFileType == "png" || $imageFileType == "jpeg" || $imageFileType == "gif" || $imageFileType == "png") && $_FILES["fileToUpload"]["size"][$key] < 5000000 && $file_input_check !== false) { //Upload picture - if (move_uploaded_file($_FILES["fileToUpload"]["tmp_name"], $target_file)) { - storeImage($requestid,$request_line_id,$image_name); + if (move_uploaded_file($_FILES["fileToUpload"]["tmp_name"][$key], $input_file)) { + //ADD FILELOCATION TO POST VARIABLE + $_POST['questions'][$key] = $location; } else { - } - //} - } - } - - function storeImage($requestid, $request_line_id,$image_name){ - - include dirname(__FILE__,2).'/settings/settings.php'; - - $pdo = dbConnect($dbname); - - $sql = 'INSERT INTO images (requestid, request_line_id, image_name) VALUES (?,?,?)'; - $stmt = $pdo->prepare($sql); - $stmt->execute([$requestid, $request_line_id,$image_name]); } +} //------------------------------------------ // displayImages //------------------------------------------ diff --git a/cartest.php b/cartest.php index 05aefef..4a0d060 100644 --- a/cartest.php +++ b/cartest.php @@ -182,6 +182,10 @@ $view .= '
case 'textarea': $view .= '

'.((!empty($value) || $value !="")?$value:$not_specified).'

'; break; + + case 'file': + $view .= '

'; + break; } } diff --git a/cartest_manage.php b/cartest_manage.php index 31b2890..bb18715 100644 --- a/cartest_manage.php +++ b/cartest_manage.php @@ -65,7 +65,14 @@ if (isset($_GET['rowID'])) { if ($update_allowed === 1){ if (isset($_POST['submit'])) { - //ARRAY convert to JSON + //UPLOAD ALL PICTURES + foreach ($_FILES["fileToUpload"]["name"] as $key => $value){ + //ONLY UPDATE PICTURES IF SOMETHING IS RETURNED + if($value !='' || !empty($value)){ + uploadrequest($key); + } + } + //ARRAY convert to JSON $_POST['header'] = json_encode($_POST['header'], JSON_UNESCAPED_UNICODE); $_POST['questions'] = json_encode($_POST['questions'], JSON_UNESCAPED_UNICODE); @@ -113,6 +120,13 @@ if (isset($_GET['rowID'])) { } else { // Create a new equipment if (isset($_POST['submit'])) { + //UPLOAD ALL PICTURES + foreach ($_FILES["fileToUpload"]["name"] as $key => $value){ + //ONLY UPDATE PICTURES IF SOMETHING IS RETURNED + if($value !='' || !empty($value)){ + uploadrequest($key); + } + } //ARRAY convert to JSON $_POST['header'] = json_encode($_POST['header'], JSON_UNESCAPED_UNICODE); $_POST['questions'] = json_encode($_POST['questions'], JSON_UNESCAPED_UNICODE); @@ -152,7 +166,7 @@ $carbrands_input .= ''; template_header('Cartesttool', 'cartesttool','manage'); $view =' -
+

'.$cartest_h2.'

'.$button_cancel.' @@ -253,9 +267,21 @@ foreach($arrayQuestions_cartest as $group){ break; case 'textarea': - $view .= ''; + $view .= ''; $view .= ''; break; + + case 'file'; + $view .= ''; + + if ($question['QuestionID'] !=''){ + $view .= ' + '; + } else { + $view .= ''; + } + + break; } } $view .= '
@@ -334,6 +360,11 @@ echo ' display = document.querySelector(\'#time\'); startTimer(startMinute, display); }; + +function preview(id) { + id.src=URL.createObjectURL(event.target.files[0]); +} + '; diff --git a/settings/systemcartest.php b/settings/systemcartest.php index 6d1f15b..9ddc9db 100644 --- a/settings/systemcartest.php +++ b/settings/systemcartest.php @@ -71,10 +71,10 @@ $arrayQuestions_cartest = array( "Group_sequence" => '5', "Questions_in_group" => array( array("Question_sequence" => '1',"QuestionID" => "cartest_18","Question" => $cartest_18, "Type" => 'dropdown', "Response" => $allowedResponse_1), - array("Question_sequence" => '2',"QuestionID" => "cartest_19","Question" => $cartest_19, "Type" => 'dropdown', "Response" => $allowedResponse_1), - array("Question_sequence" => '3',"QuestionID" => "cartest_20","Question" => $cartest_20, "Type" => 'dropdown', "Response" => $allowedResponse_1), + array("Question_sequence" => '2',"QuestionID" => "cartest_19","Question" => $cartest_19, "Type" => 'file', "Response" => $allowedResponse_1), + array("Question_sequence" => '3',"QuestionID" => "cartest_20","Question" => $cartest_20, "Type" => 'file', "Response" => $allowedResponse_1), array("Question_sequence" => '4',"QuestionID" => "cartest_21","Question" => $cartest_21, "Type" => 'dropdown', "Response" => $allowedResponse_1), - array("Question_sequence" => '5',"QuestionID" => "cartest_22","Question" => $cartest_22, "Type" => 'dropdown', "Response" => $allowedResponse_1) + array("Question_sequence" => '5',"QuestionID" => "cartest_22","Question" => $cartest_22, "Type" => 'file', "Response" => $allowedResponse_1) ) ), array("Group" => $cartest_header_6,