diff --git a/api/v0/get/application.php b/api/v0/get/application.php
index d1da30e..ada4860 100644
--- a/api/v0/get/application.php
+++ b/api/v0/get/application.php
@@ -198,7 +198,12 @@ case 'getQuestions':
         case 'final':
         $arrayQuestions = $arrayQuestions_finalize;
             break;
-            }
+
+        case 'cartest':
+            include './settings/systemcartest.php';
+            $arrayQuestions = $arrayQuestions_cartest;
+                break;
+        }
     //Return JSON
     echo json_encode($arrayQuestions);
 }
diff --git a/api/v0/post/application.php b/api/v0/post/application.php
index ab38242..0fb0adb 100644
--- a/api/v0/post/application.php
+++ b/api/v0/post/application.php
@@ -53,7 +53,7 @@ if (!empty($post_content['sn']) && !empty($post_content['testdetails'])) {
     $historyUpdate_type = 0; //update type of history
     $updateObject_visual = 0; //update visual inspection object
     $sendServiceReport = 0; //send service report via email
-    
+    $transfercartest = 0; //Update cartest table with incoming data
     // +++++++++++++++++++++++++++++++++++++++++++++++++++++++
     //SET DEFAULT PARAMETERS
     // +++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -154,6 +154,7 @@ if (!empty($post_content['sn']) && !empty($post_content['testdetails'])) {
         case 11: //car_test
             $historytype = 'CarTest';
             $equipmentCreate = 1;
+            $transfercartest = 1;
         break;
 
         case 'firmware': //update from Portal
@@ -341,7 +342,13 @@ if (!empty($post_content['sn']) && !empty($post_content['testdetails'])) {
             $servicereport = serviceReport($result, 'email');
             generatedPDF($servicereport,$last_id,$useremail);
         }
-    }   
+    }  
+    // +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    // transfer to cartest table	++++++++++++++++++++++++++
+    // +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    if ($transfercartest == 1){
+        convertCartest();
+    }
 }
 else
 {
diff --git a/api/v1/get/cartests.php b/api/v1/get/cartests.php
index 84c05ab..ff8ece3 100644
--- a/api/v1/get/cartests.php
+++ b/api/v1/get/cartests.php
@@ -10,17 +10,9 @@ $pdo = dbConnect($dbname);
 
 //NEW ARRAY
 $criterias = [];   
-$whereclause = 'WHERE type="cartest"';
+$whereclause = '';
 $clause = '';
 
- //FILTER FOR GROUPBY FILTERS on CAR
- $filter1 = '"CarBrand": "';
- $filter2 = '"CarType": "';
- $filter3 = '"CarVIN": "';
-
- $car_brand = 'SUBSTRING_INDEX(SUBSTRING_INDEX(description, "'.$filter1.'", -1),"'.$filter2.'",1)';
- $car_type = 'SUBSTRING_INDEX(SUBSTRING_INDEX(description, "'.$filter2.'", -1),"'.$filter3.'",1)';
-
 //Check for $_GET variables and build up clause
 if(isset($get_content) && $get_content!=''){    
     //GET VARIABLES FROM URL
@@ -31,12 +23,12 @@ if(isset($get_content) && $get_content!=''){
         //INCLUDE VARIABLES IN ARRAY
         $criterias[$v[0]] = $v[1]; 
     
-        if ($v[0] == 'page' || $v[0] =='p' || $v[0] =='totals' || $v[0] =='list'|| $v[0] =='success_msg'){
+        if ($v[0] == 'page' || $v[0] =='p' || $v[0] =='totals' || $v[0] =='download' || $v[0] =='list'|| $v[0] =='success_msg'){
         //do nothing
         } 
         elseif ($v[0] == 'search') {
         //build up search
-        $clause .= ' AND '.$car_brand.' like :'.$v[0]; 
+        $clause .= ' AND (carbrand like :'.$v[0].' OR createdby like :'.$v[0].')'; 
         }
         else {//create clause
         $clause .= ' AND '.$v[0].' = :'.$v[0];
@@ -51,15 +43,23 @@ if(isset($get_content) && $get_content!=''){
 //Define Query
 if(isset($criterias['totals']) && $criterias['totals'] ==''){
 //Request for total rows
-    $sql = 'SELECT count(*) as count FROM history '.$whereclause;
+    $sql = 'SELECT count(*) as count FROM cartest '.$whereclause;
 } 
-elseif(isset($criterias['list']) && $criterias['list'] ==''){
+elseif(isset($criterias['list']) && $criterias['list'] =='brand'){
     //Request for total rows
-        $sql = 'SELECT distinct('.$car_brand.') FROM history '.$whereclause;
-    } 
+        $sql = 'SELECT distinct(carbrand) FROM cartest '.$whereclause;
+} 
+elseif(isset($criterias['list']) && $criterias['list'] =='type'){
+    //Request for total rows
+        $sql = 'SELECT distinct(cartype) FROM cartest '.$whereclause;
+} 
+elseif(isset($criterias['download']) && $criterias['download'] ==''){
+    //Request for total rows
+        $sql = 'SELECT * FROM cartest '.$whereclause;
+} 
 else {
     //SQL for Paging 
-    $sql = "SELECT *, SUBSTRING_INDEX(SUBSTRING_INDEX(description, '$filter1', -1),'$filter2',1) as carbrand from history $whereclause group by SUBSTRING_INDEX(SUBSTRING_INDEX(description, '$filter1', -1),'$filter2',1), SUBSTRING_INDEX(SUBSTRING_INDEX(description, '$filter2', -1),'$filter3',1) ORDER BY carbrand DESC LIMIT :page,:num_products";
+    $sql = "SELECT * from cartest $whereclause ORDER BY carbrand, cartype DESC LIMIT :page,:num_products";
 }
 
 $stmt = $pdo->prepare($sql);
@@ -84,13 +84,21 @@ if (!empty($criterias)){
     }
 }
 
+//------------------------------------------
+// Debuglog
+//------------------------------------------
+if (debug){
+    $message = $date.';'.$sql.';'.$username;
+    debuglog($message);
+}
+
 //Add paging details
 if(isset($criterias['totals']) && $criterias['totals']==''){
     $stmt->execute();
     $messages = $stmt->fetch();
     $messages = $messages[0];
 }
-elseif(isset($criterias['list']) && $criterias['list']==''){
+elseif ((isset($criterias['list']) && $criterias['list']!='') || (isset($criterias['download']) && $criterias['download'] =='')){
    //Excute Query
    $stmt->execute();
    //Get results
diff --git a/api/v1/post/cartests.php b/api/v1/post/cartests.php
new file mode 100644
index 0000000..3b5e984
--- /dev/null
+++ b/api/v1/post/cartests.php
@@ -0,0 +1,76 @@
+<?php
+defined($security_key) or exit;
+
+//------------------------------------------
+// CarTESTS
+//------------------------------------------
+//Connect to DB
+$pdo = dbConnect($dbname);
+
+//CONTENT FROM API (POST)
+$post_content = json_decode(decode_payload($input),true);
+
+//default whereclause
+$whereclause = '';
+
+//SET PARAMETERS FOR QUERY
+$id = $post_content['rowID'] ?? ''; //check for rowID
+$command = ($id == '')? 'insert' : 'update';  //IF rowID = empty then INSERT
+if (isset($post_content['delete'])){$command = 'delete';} //change command to delete
+$date = date('Y-m-d H:i:s');
+
+//CREATE EMPTY STRINGS
+$clause = '';
+$clause_insert ='';
+$input_insert = '';
+
+//ADD STANDARD PARAMETERS TO ARRAY BASED ON INSERT OR UPDATE
+if ($command == 'insert'){
+    $post_content['created'] = $date;
+    $post_content['createdby'] = $username;
+}
+//CREAT NEW ARRAY AND MAP TO CLAUSE
+if(isset($post_content) && $post_content!=''){   
+    foreach ($post_content as $key => $var){
+        if ($key == 'submit' || $key == 'delete' || $key == 'rowID'){
+            //do nothing
+        }
+        else {
+            $criterias[$key] = $var;
+            $clause .= ' , '.$key.' = ?';
+            $clause_insert .= ' , '.$key.'';
+            $input_insert .= ', ?'; // ? for each insert item
+            $execute_input[]= $var; // Build array for input
+        }
+    }
+}
+
+//CLEAN UP INPUT
+$clause = substr($clause, 2); //Clean clause - remove first comma
+$clause_insert = substr($clause_insert, 2); //Clean clause - remove first comma
+$input_insert = substr($input_insert, 1); //Clean clause - remove first comma
+
+//QUERY AND VERIFY ALLOWED
+if ($command == 'update' && isAllowed('cartest_manage',$profile,$permission,'U') === 1){
+    $sql = 'UPDATE cartest SET '.$clause.' WHERE rowID = ? '.$whereclause.'';
+    $execute_input[] = $id;
+    $stmt = $pdo->prepare($sql);
+    $stmt->execute($execute_input);
+} 
+elseif ($command == 'insert' && isAllowed('cartest_manage',$profile,$permission,'C') === 1){
+    $sql = 'INSERT INTO cartest ('.$clause_insert.') VALUES ('.$input_insert.')';
+    $stmt = $pdo->prepare($sql);
+    $stmt->execute($execute_input);
+}
+elseif ($command == 'delete' && isAllowed('cartest_manage',$profile,$permission,'D') === 1){
+    $stmt = $pdo->prepare('DELETE FROM cartest WHERE rowID = ? '.$whereclause.'');
+    $stmt->execute([ $id ]); 
+
+    //Add deletion to changelog
+    changelog($dbname,'cartest',$id,'Delete','Delete',$username);
+} else
+{
+    //do nothing
+}
+
+?>
\ No newline at end of file
diff --git a/assets/functions.php b/assets/functions.php
index cd8a377..be48e54 100644
--- a/assets/functions.php
+++ b/assets/functions.php
@@ -2048,4 +2048,47 @@ function getQuestions($type){
     $view .= '</div>';
     }
   }
+}
+// +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+// convert cartest from history to cartest table
+// +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+function convertCartest(){
+
+include dirname(__FILE__,2).'/settings/settings.php';
+
+//GET CARTEST FROM HISTORY TABLE
+$pdo = dbConnect($dbname);
+$sql = 'SELECT * FROM history WHERE type="cartest"';
+$stmt = $pdo->prepare($sql);
+//Excute Query
+$stmt->execute();
+//Get results
+$messages = $stmt->fetchAll(PDO::FETCH_ASSOC);
+
+//FOR EACH CARTEST TRANSFER TO CARTEST TABLE
+  foreach ($messages as $message){
+      //GET VARIABLES
+      $cartest = json_decode($message['description'],true);
+      $carbrand = ucfirst($cartest["CarBrand"]);
+      $cartype = ucfirst($cartest["CarType"]);
+      $questions = json_encode($cartest["Questions"] ??'');
+      $datapoints = json_encode($cartest["plugDataPoints"] ?? '');
+
+      //get header data only
+      unset($cartest["Questions"]);
+      unset($cartest["plugDataPoints"]);
+      $header = json_encode($cartest);
+
+      //INSERT INTO CARTEST
+      $sql = 'INSERT INTO cartest (carbrand, cartype,header,questions,datapoints,createdby) VALUES (?,?,?,?,?,?)';
+      $stmt = $pdo->prepare($sql);
+      //Excute Query
+      $stmt->execute([$carbrand,$cartype,$header,$questions,$datapoints,$cartest["NameTester"]]);
+
+      //MARK HISTORY ITEM FOR DELETATION
+      $sql = 'UPDATE history SET type = "delete" WHERE rowID = '.$message['rowID'];
+      $stmt = $pdo->prepare($sql);
+      //Excute Query
+      $stmt->execute();
+  }
 }
\ No newline at end of file
diff --git a/assets/readdevice.js b/assets/readdevice.js
index 3346194..b648312 100644
--- a/assets/readdevice.js
+++ b/assets/readdevice.js
@@ -235,10 +235,18 @@ async function listenToPort() {
 }
 
 const serialResultsDiv = document.getElementById("serialResults");
+const plug_data = document.getElementById("plug_data");
 
 async function appendToTerminal(newStuff) {
     serialResultsDiv.innerHTML += newStuff;
-    serialOutput +=newStuff
+    //vcp_data.value +=newStuff
+    if (typeof plug_data !== "undefined"){
+        var plugdata = {"VCP":{VCP}, "VPP1":{VPP1},"VPP2":{VPP2},"VBAT":{VBAT}, "PWM":{PWM},"STATE":{STATE}, "xChart":{xChart}}
+        plug_data.value = JSON.stringify(plugdata);
+    }
+
+    serialOutput +=newStuff;
+  
 }
 
 
@@ -374,6 +382,37 @@ async function closePort(){
         window.location.reload();
 }
 
+async function closePortCarTest(){
+        
+    reader.cancel();
+    await readableStreamClosed.catch(() => { /* Ignore the error */ });
+    writer.close();
+    await writableStreamClosed 
+    console.log(maintenanceRun);
+    await port.close();
+
+    //Check for errors maintenanceRun = 999
+    if (maintenanceRun != 999){
+        serialResultsDiv.innerHTML = '';
+        
+        if (maintenanceRun !=0){
+            if (value != 33){//Include the correct ROWID of the Productrecord
+                progressBar("100", "Ready", "#04AA6D");
+                }
+            else{
+                progressBar("100", "Ready => Warning: Product requires TESLA adapter", "#ff6666");
+                }
+        
+        }
+        else {
+            progressBar("100", "Ready", "#04AA6D");
+        }
+    }
+
+    maintenanceRun = 0; // reset maintenanceRun
+
+}
+
 async function updateHistory(){
 
     var data = document.getElementById("servicetoken").innerHTML; //get ServiceID
diff --git a/cartest.php b/cartest.php
index 9d3161f..15397d0 100644
--- a/cartest.php
+++ b/cartest.php
@@ -9,6 +9,7 @@ if (debug && debug_id == $_SESSION['id']){
 
 include_once './assets/functions.php';
 include_once './settings/settings.php';
+include_once './settings/systemcartest.php';
 
 $page = 'cartest';
 //Check if allowed
@@ -28,8 +29,13 @@ $cartest = ioServer($api_url,'');
 //Decode Payload
 if (!empty($cartest)){$cartest = decode_payload($cartest);}else{$cartest = null;}
 $cartest = $cartest[0];
+
+//CHECK FOR CARTEST APP OR PORTAL
+$version = str_contains($cartest->questions,'GoToP')?0:1;
 //GET TEST DETAILS
-$cartest_details = json_decode($cartest->description,true);
+$cartest_header = json_decode($cartest->header,true) ?? '';
+$cartest_questions = json_decode($cartest->questions,true) ?? '';
+$cartest_datapoints = json_decode($cartest->datapoints,true) ?? '';
 
 // Handle success messages
 if (isset($_GET['success_msg'])) {
@@ -44,6 +50,10 @@ if (isset($_GET['success_msg'])) {
     }
 }
 
+if (isset($_GET['download'])){
+    downloadToExcel('cartests',$cartest);
+}
+
 template_header('Cartest', 'cartest', 'view');
 $view = '
     <div class="content-title responsive-flex-wrap responsive-pad-bot-3">
@@ -51,6 +61,10 @@ $view = '
         <a href="index.php?page=cartests" class="btn alt mar-right-2">'.$button_cancel.'</a>
 ';
 
+if ($update_allowed === 1 && $version != 0){
+    $view .= '<a href="index.php?page=cartest_manage&rowID='.$_GET['rowID'].'" class="btn">Edit</a>';
+}
+
 $view .= '</div>';
 
 if (isset($success_msg)){
@@ -71,15 +85,15 @@ $view .= '  <div class="content-block order-details">
                 </div>
                 <div class="order-detail">
                     <h3>'.$cartest_carbrand.'</h3>
-                    <p>'.$cartest_details['CarBrand'].'</p>
+                    <p>'.$cartest->carbrand.'</p>
                 </div>
                 <div class="order-detail">
                     <h3>'.$cartest_cartype.'</h3>
-                    <p>'.$cartest_details['CarType'].'</p>
+                    <p>'.$cartest->cartype.'</p>
                 </div>
                 <div class="order-detail">
                     <h3>'.$cartest_carvin.'</h3>
-                    <p>'.$cartest_details['CarVIN'].'</p>
+                    <p>'.$cartest_header['CarVIN'].'</p>
                 </div>
               </div>
 ';
@@ -94,44 +108,97 @@ $view .='<div class="content-block order-details">
             </div>
             <div class="order-detail">
                     <h3>'.$cartest_tester.'</h3>
-                    <p>'.$cartest_details['NameTester'].'</p>
+                    <p>'.$cartest_header['NameTester'].'</p>
             </div>
             <div class="order-detail">
                     <h3>'.$cartest_device.'</h3>
-                    <p>'.$cartest_details['SN'].'</p>
+                    <p>'.$cartest_header['SN'].'</p>
             </div>
             <div class="order-detail">
                     <h3>'.$cartest_device_hw.'</h3>
-                    <p>'.$cartest_details['HW'].'</p>
+                    <p>'.$cartest_header['HW'].'</p>
             </div>
             <div class="order-detail">
                     <h3>'.$cartest_device_sw.'</h3>
-                    <p>'.$cartest_details['FW'].'</p>
+                    <p>'.$cartest_header['FW'].'</p>
             </div>
         </div>';
 
 $view .= '</div>';
 $view .= '<div class="content-block">
             <div class="block-header">
-                <i class="fa-solid fa-bars fa-sm"></i>'.$cartest_questions.'
+                <i class="fa-solid fa-bars fa-sm"></i>'.$cartest_questions_text.'
             </div>
              <div class="table order-table">
             <table>';
             
-            //Retrieve questions and anwers
-            foreach ($cartest_details['Questions'] as $key => $value){
-                $view .= '<tr>
-                            <td style="width:25%;">'.$key.'</td>
-                            <td>'.((!empty($value)|| $value !='')?$value:$not_specified).'</td>
-                        </tr>';
-            }
+            //Retrieve questions and awnsers
+           
+                if ($version == 0){
+
+                    foreach ($cartest_questions as $key => $value){
+                        $view .= '<tr>
+                                    <td style="width:25%;">'.$key.'</td>
+                                    <td>'.((!empty($value)|| $value !='')?$value:$not_specified).'</td>
+                                </tr>';
+                    }
+                } else {
+                    //CREATE OUTPUT BASED ON ARRAY
+                    $view .= '<div class="tabs">';
+                    foreach($arrayQuestions_cartest as $group){
+                        if ($group['Group_sequence'] == 1){
+                            $view .= '<a href="#" class="active">'.$group['Group'].'</a>';
+                        } else {
+                            $view .= '<a href="#">'.$group['Group'].'</a>';
+                        }
+                    }
+                    $view .= '</div>';    
+                        
+                    foreach($arrayQuestions_cartest as $group){    
+                    
+                        if ($group['Group_sequence'] == 1){
+                            $view .= '<div class="content-block tab-content active">
+                                        <div class="form responsive-width-100">';
+                         } else {
+                            $view .= '<div class="content-block tab-content">
+                                        <div class="form responsive-width-100">';
+                        }
+                        
+                        foreach($group['Questions_in_group'] as $question){
+                        
+                        //SHOW QUESTION FROM ARRAY
+                        $view .= '<label for="" id="'.$question['QuestionID'].'">'.$question['Question'].'</label>';
+                        
+                        //GET RESPONSE FROM DATABASE
+                            foreach ($cartest_questions as $key => $value){
+                                
+                                if ($question['QuestionID'] == $key){
+
+                                    switch ($question['Type']) {
+                                        case 'dropdown':
+                                            $view .= '<p>'.((!empty($value) || $value !="")?${'cartest_allowed_label'.$value}:$not_specified).'</p>';
+                                            break;
+                                        
+                                        case 'textarea':
+                                            $view .= '<p>'.((!empty($value) || $value !="")?$value:$not_specified).'</p>';
+                                            break;
+                                    }
+                                   
+                                }
+                            }
+                        }
+                    $view .= '    </div>
+                                </div>';
+                    } 
+            
+                }
             $view .= '
             </table>    
             </div>
         </div>
     ';
 
-if (isset($cartest_details['plugDataPoints']) && $cartest_details['plugDataPoints'] !=''){
+if (isset($cartest_datapoints) && $cartest_datapoints !=''){
 $view .= '<div class="content-block">
     <div class="block-header">
         <i class="fa-solid fa-bars fa-sm"></i>'.$cartest_charts.'';
@@ -145,30 +212,41 @@ $view .= '<div class="content-block">
          $STATE= []; //for state values
          $xaxis= []; //values for xaxis
          $x = 0;
-        foreach ($cartest_details['plugDataPoints'] as $datapoint){        
-                $VCP[] = $datapoint['vcp'];
-                $VPP1[] = $datapoint['vpp1'];
-                $VPP2[] = $datapoint['vpp2'];
-                $VBAT[] = $datapoint['vbat'];
-                $PWM[] = $datapoint['pwm'];
 
-                switch ($datapoint['state']) {
-                    case 'FULL_CONNECT':
-                        $STATE[] = 5;
-                        break;
-                    case 'REACTIVATE':
-                        $STATE[] = 3;
-                        break;
-                    case 'DISCONNECTED':
-                        $STATE[] = 0;
-                        break;
+         if ($version == 0){
+            foreach ($cartest_datapoints as $datapoint){        
+                    $VCP[] = $datapoint['vcp'];
+                    $VPP1[] = $datapoint['vpp1'];
+                    $VPP2[] = $datapoint['vpp2'];
+                    $VBAT[] = $datapoint['vbat'];
+                    $PWM[] = $datapoint['pwm'];
+
+                    switch ($datapoint['state']) {
+                        case 'FULL_CONNECT':
+                            $STATE[] = 5;
+                            break;
+                        case 'REACTIVATE':
+                            $STATE[] = 3;
+                            break;
+                        case 'DISCONNECTED':
+                            $STATE[] = 0;
+                            break;
+                    }
+                    
+
+                    //Add to x-axis
+                    $xaxis[] = $x;
+                    $x++;
                 }
-                
-
-                //Add to x-axis
-                $xaxis[] = $x;
-                $x++;
-            }
+         } else {
+            $VCP = $cartest_datapoints['VCP']['VCP'];
+            $VPP1 = $cartest_datapoints['VPP1']['VPP1'];
+            $VPP2 = $cartest_datapoints['VPP2']['VPP2'];
+            $VBAT = $cartest_datapoints['VBAT']['VBAT'];
+            $PWM = $cartest_datapoints['PWM']['PWM'];
+            $STATE = $cartest_datapoints['STATE']['STATE'];
+            $xaxis = $cartest_datapoints['xChart']['xChart'];
+         }
         $view.= '
         <div>
             <canvas id="chart_VCP" style="width:400px;max-width:800px"></canvas></div>
diff --git a/cartest_manage.php b/cartest_manage.php
index 128b6ca..96e6dba 100644
--- a/cartest_manage.php
+++ b/cartest_manage.php
@@ -9,6 +9,7 @@ if (debug && debug_id == $_SESSION['id']){
 
 include_once './assets/functions.php';
 include_once './settings/settings.php';
+include_once './settings/systemcartest.php';
 
 $page = 'cartest_manage';
 //Check if allowed
@@ -23,34 +24,232 @@ $create_allowed = isAllowed($page ,$_SESSION['profile'],$_SESSION['permission'],
 
 $bearertoken = createCommunicationToken($_SESSION['userkey']);
 
-//GET PRODUCTS FROM DB
-$pdo = dbConnect($dbname);
-$sql = 'SELECT rowID, productcode, productname, product_category,sn from products where status = "1" and build = "1"';
-$stmt = $pdo->prepare($sql);
-//Excute Query
-$stmt->execute();
-//Get results
-$messages = $stmt->fetchAll(PDO::FETCH_ASSOC);
+$rowID = $_GET['rowID'] ?? '';
 
-template_header('Buildtool', 'buildtool','view');
+if ($rowID !=''){
+    $url = 'index.php?page=cartest&rowID='.$rowID.'';
+} else {
+    $url = 'index.php?page=cartests';
+}
 
-$view = '
-<div class="content-title">
-    <div class="title">
-        <i class="fa-solid fa-box-open"></i>
-        <div class="txt">
-            <h2>'.$buildtool_h2 .'</h2>
-            <p>'.$buildtool_p.'</p>
-        </div>
-    </div>
-</div>';
+// Default input product values
+$cartest = [
+    'rowID' => '',
+    'carbrand' => '',
+    'cartype' => '',
+    'header' => [
+        'CarVIN' => '',
+        'NameTester'=> $_SESSION['username'],
+        'SN' =>'',
+        'HW' =>'',
+        'FW' =>''
+    ],
+    'questions' => [],
+    'datapoints' => [],
+    'created' => ''
+];
 
-$view .= '
-    <div class="content-header responsive-flex-column pad-top-5">
-        <a href="index.php?page=dashboard" class="btn">'.$button_cancel.'</a>
-     </div>
+if (isset($_GET['rowID'])) {
+    // ID param exists, edit an existing product
+       //CALL TO API
+       $api_url = '/v1/cartests/rowID='.$_GET['rowID'];
+       $responses = ioServer($api_url,'');
+       //Decode Payload
+       if (!empty($responses)){$responses = decode_payload($responses);}else{$responses = null;}
+       
+       $cartest = json_decode(json_encode($responses[0]), true);
+
+       $cartest['header'] = (is_string($cartest['header']))? json_decode($cartest['header'],true) : ''; 
+       $cartest['questions'] = (is_string($cartest['questions']))? json_decode($cartest['questions'],true) : ''; 
+       $cartest['datapoints'] = (is_string($cartest['datapoints']))? json_decode($cartest['datapoints'],true) : ''; 
+
+    if ($update_allowed === 1){
+        if (isset($_POST['submit'])) {
+             //ARRAY convert to JSON
+            $_POST['header'] = json_encode($_POST['header'], JSON_UNESCAPED_UNICODE);
+            $_POST['questions'] = json_encode($_POST['questions'], JSON_UNESCAPED_UNICODE);
+       
+            //CHECK IF DATAPOINTS IS NOT EMPTY THEN UPDATE IF NOT REMOVE EMPTY ARRAY FROM POST         
+            if (!empty($_POST['datapoints']) || $_POST['datapoints'] !="") {
+                $_POST['datapoints'] = json_encode($_POST['datapoints'], JSON_UNESCAPED_UNICODE);
+            }
+            else {
+                unset($_POST['datapoints']);
+            }
+            
+             //GET ALL POST DATA
+            $data = json_encode($_POST, JSON_UNESCAPED_UNICODE);
+            //Secure data
+            $payload = generate_payload($data);
+            //API call
+            $responses = ioServer('/v1/cartests', $payload);
+            if ($responses === 'NOK'){
+
+            } else {
+            header('Location: index.php?page=cartest&rowID='.$_GET['rowID'].'&success_msg=2');
+            exit;
+            }
+        }
+    }
+    
+    if ($delete_allowed === 1){
+        if (isset($_POST['delete'])) {
+            //GET ALL POST DATA
+            $data = json_encode($_POST , JSON_UNESCAPED_UNICODE);
+            //Secure data
+            $payload = generate_payload($data);
+            //API call
+            $responses = ioServer('/v1/cartests', $payload);
+            // Redirect and delete equipment
+            if ($responses === 'NOK'){
+
+            } else {
+            header('Location: index.php?page=cartests&success_msg=3');
+            exit;
+            }
+        }
+    }
+   
+} else {
+    // Create a new equipment
+    if (isset($_POST['submit'])) {
+        //ARRAY convert to JSON
+        $_POST['header'] = json_encode($_POST['header'], JSON_UNESCAPED_UNICODE);
+        $_POST['questions'] = json_encode($_POST['questions'], JSON_UNESCAPED_UNICODE);
+        $_POST['datapoints'] = json_encode($_POST['datapoints'], JSON_UNESCAPED_UNICODE);
+        //GET ALL POST DATA
+        $data = json_encode($_POST, JSON_UNESCAPED_UNICODE);
+        //Secure data
+        $payload = generate_payload($data);
+        //API call
+        $responses = ioServer('/v1/cartests', $payload);
+        if ($responses === 'NOK'){
+
+        } else {
+        header('Location: index.php?page=cartests&success_msg=1');
+        exit;
+        }
+    }
+}
+
+template_header('Cartesttool', 'cartesttool','manage');
+
+$view ='
+<form action="" method="post">
+    <div class="content-title responsive-flex-wrap responsive-pad-bot-3">
+        <h2 class="responsive-width-100"><?=$page?>'.$cartest_h2.'</h2>
+        <a href="'.$url .'" class="btn alt mar-right-2">'.$button_cancel.'</a>
+    ';
+
+if ($delete_allowed === 1){
+    $view .= '<input type="submit" name="delete" value="Delete" class="btn red mar-right-2" onclick="return confirm(\'Are you sure you want to delete this cartest?\')">';
+}
+if ($update_allowed === 1){
+    $view .= '<input type="submit" name="submit" value="Save" class="btn">';
+}
+    
+$view .= '</div>';
+$view .= '<div class="content-block-wrapper">';
+$view .= '  <div class="content-block order-details">
+                <div class="block-header">
+                <i class="fa-solid fa-circle-info"></i></i>'.$cartest_information.'
+                </div>
+                <div class="order-detail">
+                    <h3>'.$cartest_carbrand.'</h3>
+                    <p><input type="text" name="carbrand" value="'.$cartest['carbrand'].'">
+                        <input type="hidden" name="rowID" value="'.$rowID.'">
+                    </p>
+                </div>
+                <div class="order-detail">
+                    <h3>'.$cartest_cartype.'</h3>
+                    <p><input type="text" name="cartype" value="'.$cartest['cartype'].'"></p>
+                </div>
+                <div class="order-detail">
+                    <h3>'.$cartest_carvin.'</h3>
+                    <p><input type="text" name="header[CarVIN]" value="'.$cartest['header']['CarVIN'].'"></p>
+                </div>
+              </div>
 ';
 
+$view .='<div class="content-block order-details">
+            <div class="block-header">
+                <i class="fa-solid fa-user fa-sm"></i>'.$cartest_details_text.'
+            </div>
+            <div class="order-detail">
+                    <h3>'.$cartest_created.'</h3>
+                    <p>'.$cartest['created'].'</p>
+            </div>
+            <div class="order-detail">
+                    <h3>'.$cartest_tester.'</h3>
+                    <p><input type="text" name="header[NameTester]" value="'.$cartest['header']['NameTester'].'"></p>
+            </div>
+            <div class="order-detail">
+                    <h3>'.$cartest_device.'</h3>
+                    <p><input type="text" name="header[SN]" value="'.$cartest['header']['SN'].'"></p>
+            </div>
+            <div class="order-detail">
+                    <h3>'.$cartest_device_hw.'</h3>
+                    <p><input type="text" name="header[HW]" value="'.$cartest['header']['HW'].'"></p>
+            </div>
+            <div class="order-detail">
+                    <h3>'.$cartest_device_sw.'</h3>
+                    <p><input type="text" name="header[FW]" value="'.$cartest['header']['FW'].'"></p>
+            </div>
+        </div>';
+$view .= '</div>';
+// -------------------------------
+//BUILD TO INPUT FORM BASED ON ARRAY
+// ------------------------------
+
+$view .= '<div class="tabs">';
+foreach($arrayQuestions_cartest as $group){
+
+    if ($group['Group_sequence'] == 1){
+         $view .= '<a href="#" class="active">'.$group['Group'].'</a>';
+    } else {
+        $view .= '<a href="#">'.$group['Group'].'</a>';
+    }
+}
+$view .= '</div>';    
+    
+foreach($arrayQuestions_cartest as $group){    
+  
+    if ($group['Group_sequence'] == 1){
+        $view .= '<div class="content-block tab-content active">
+                    <div class="form responsive-width-100">';
+   } else {
+        $view .= '<div class="content-block tab-content">
+                    <div class="form responsive-width-100">';
+   }
+    
+    foreach($group['Questions_in_group'] as $question){
+      
+      switch ($question['Type']) {
+        case 'dropdown':
+          $view .= '<label for="" id="'.$question['QuestionID'].'">'.$question['Question'].'</label>';
+          $view .= '<select id="" name="questions['.$question['QuestionID'].']" required>';
+          $view .= '<option value=>'.$cartest_allowed_label0.'</option>';  
+          foreach ($question['Response'] as $response){
+                    $view .= '<option value="'.$response['responseID'].'" '.((isset($cartest['questions'][$question['QuestionID']]) && $cartest['questions'][$question['QuestionID']] == $response['responseID'])? 'selected':'').'>'.$response['Response'].'</option>';  
+          }
+          $view .= '</select>';
+          break;
+
+        case 'textarea':
+          $view .= '<label for="" id="'.$question['QuestionID'].']">'.$question['Question'].'</label>';
+          $view .= '<textarea id="QuestionID" name="questions['.$question['QuestionID'].']" placeholder="">'.(isset($cartest['questions'][$question['QuestionID']])?$cartest['questions'][$question['QuestionID']]:'').'</textarea>';
+        break;
+      }
+    }
+  $view .= '    </div>
+            </div>';
+} 
+//CAPTURE DATA FROM PLUG
+
+$view .= '<input id="plug_data" type="hidden" name="datapoints" value="">';
+
+$view .= '</form>';
+
 $view .= '<div class="content-block">
     <div class="block-header">
         <i class="fa-solid fa-bars fa-sm"></i><span id="time">25:00</span>
@@ -60,7 +259,7 @@ $view .= '<div class="content-block">
     <div id="connectdevice" style="display:flex;">
       <div>
         <button class="btn" style="margin-right:10px;" onclick="connectSerial();startGraph()">Connect</button>
-        <button class="btn" id="clear" onclick="closePort()" style="">X</button>
+        <button class="btn" id="clear" onclick="closePortCarTest()" style="">X</button>
         <button class="btn" onClick="window.location.reload()">&#8634;</button>
       </div>
       <div id="readStatus" style="width: 75%;background-color: #f1f1f1;">
diff --git a/cartests.php b/cartests.php
index b5cab59..58f72c5 100644
--- a/cartests.php
+++ b/cartests.php
@@ -54,6 +54,10 @@ if (isset($_GET['success_msg'])) {
     }
 }
 
+if (isset($_GET['download'])){
+    downloadToExcel('cartests',$responses);
+}
+
 template_header('Cartests', 'cartests' ,'view');
 $view = '
 <div class="content-title">
@@ -91,8 +95,14 @@ $view .= '
                 </select>
                 <button type="submit">'.$button_apply.'</button>
             </div>
-        </div>
-        <div class="search">
+        </div>';
+//SHOW DOWNLOAD TO EXCELL OPTION ONLY TO ADMIN USERS
+if ($_SESSION['permission'] == 3 || $_SESSION['permission'] == 4){
+    $view .='<div class="filters">
+                <a href="index.php?page=cartests&download="><i class="fa-solid fa-download"></i></a>        
+            </div>';
+}        
+$view .= '<div class="search">
             <label for="search">
                 <input id="search" type="text" name="search" placeholder="'.$cartest_search.'" value="" class="responsive-width-100">
                 <i class="fas fa-search"></i>
@@ -111,6 +121,7 @@ $view .= '
                     <th class="responsive-hidden">'.$cartest_rowID.'</th>
                     <th>'.$cartest_carbrand.'</th>
                     <th>'.$cartest_cartype.'</th>
+                    <th>'.$general_createdby.'</th>
                     <th>'.$general_actions.'</th>
                 </tr>
             </thead>
@@ -126,13 +137,12 @@ $view .= '
             }
             else {
                 foreach ($responses as $response){
-                    //get cartest details
-                    $cartest = json_decode($response->description,true);
                 $view .= ' 
                     <tr>
                     <td class="responsive-hidden">'.$response->rowID.'</td>
-                    <td>'.$cartest['CarBrand'].'</td>
-                    <td>'.$cartest['CarType'].'</td>
+                    <td>'.$response->carbrand.'</td>
+                    <td>'.$response->cartype.'</td>
+                    <td>'.$response->createdby.'</td>
                     <td><a href="index.php?page=cartest&rowID='.$response->rowID.'" class="btn_link">'.$general_view.'</a></td>
                 </tr>
                 ';
diff --git a/dev.php b/dev.php
index 8b44355..6ea017c 100644
--- a/dev.php
+++ b/dev.php
@@ -7,51 +7,13 @@ include './assets/functions.php';
 include './settings/settings.php';
 include './settings/config.php';
 
-$pdo = dbConnect($dbname);
-$sql = 'SELECT rowID, productcode, productname, product_category,sn from products where status = "1" and build = "1"';
-$stmt = $pdo->prepare($sql);
-//Excute Query
-$stmt->execute();
-//Get results
-$messages = $stmt->fetchAll(PDO::FETCH_ASSOC);
 
-$bearertoken = createCommunicationToken($_SESSION['userkey']);
+$plugdata = '{"VCP":{"VCP":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11.95324,11.95324,-11.894518,-11.894518,-11.894518,-11.894518,-11.894518,-11.894518,-11.894518,11.95324,11.95324]},"VPP1":{"VPP1":[0.151528,0.151528,0.141752,0.180856,0.151528,0.151528,0.141752,0.180856,0.151528,0.151528,0.141752,0.180856,0.151528,0.151528,0.141752,0.180856,0.151528,0.151528,0.141752,0.180856,0.151528,0.180856,0.156416,0.156416,0.151528,0.141752,0.180856,0.151528,0.180856,0.156416,0.156416,0.156416,0.156416,0,0.034216,0.102648,0.092872,0.09776,0.141752,0.034216,0.092872,0,0,0,0,0]},"VPP2":{"VPP2":[0.151528,0.151528,0.156416,0.156416,0.156416,0.151528,0.156416,0.156416,0.156416,0.151528,0.156416,0.156416,0.156416,0.151528,0.156416,0.156416,0.156416,0.151528,0.156416,0.156416,0.156416,0.156416,0.156416,0.156416,0.151528,0.156416,0.156416,0.156416,0.156416,0.156416,0.156416,0.156416,0.156416,0,0.029328,0.087984,0.068432,0.078208,0.09776,0,0.136864,0,0,0,0,0]},"VBAT":{"VBAT":[0,0,4.824456,4.824456,4.824456,0,4.824456,4.824456,4.824456,0,4.824456,4.824456,4.824456,0,4.824456,4.824456,4.824456,0,4.824456,4.824456,4.824456,4.824456,4.824456,4.824456,0,4.824456,4.824456,4.824456,4.824456,4.824456,4.824456,4.824456,4.824456,4.824456,4.824456,4.824456,4.824456,4.824456,4.824456,4.824456,4.824456,4.824456,4.824456,4.824456,4.726696,4.66804]},"PWM":{"PWM":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,10,10,0,0,0,0,0,0,10,10,10]},"STATE":{"STATE":[null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,-5,-5,-5,-5,-5,-5,-5,-5]},"xChart":{"xChart":[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46]}}';
 
-$view ='
-<p id="servicetoken" value="'.$token.'" hidden>'.$token.'</p>
-<div style="width:70%">
- <select id="productlist" name="productlist" >
-    <option selected value="0">Assign Product</option>
-';
+//echo $plugdata;
+//$plugdata =json_encode($plugdata);
+$plugdata =json_decode($plugdata,true);
+var_dump($plugdata['PWM']['PWM']);
 
-foreach ($messages as $message){   
-    $view .='<option value="'.$message["rowID"].'|'.$message["product_category"].'|'.$message["sn"].'">'.$message["productcode"].' - '.$message["productname"].'</option>';
-}
-
-$view .='</select>
-    <input type="hidden" id="lineToSend" >
-</div>
-<div style="position: relative;left:30%;top: -20px;">
-    <button class="button" onclick="startMaintenance()">Assembly</button>
-    <button class="button"  id="connectButton" onClick="window.location.reload()">&#8634;</button>
-</div>
-<div>
-<div id="readStatus" style="width: 75%;background-color: #f1f1f1;">
-    <div id="readBar"></div>
-</div>
-</div>
-<div id="Device_output">
-    <div id="serialResults">
-</div>
-</div>
-<script src = "https://legacy.veliti.nl/assets/readdevice.js?'.script_version.'"></script>
-<script src = "https://legacy.veliti.nl/assets/charts.js?'.script_version.'"></script>
-<script src = "https://legacy.veliti.nl/assets/jquery-2.1.4.min.js"></script>
-<script src = "https://legacy.veliti.nl/assets/DYMO.Label.Framework.latest.js?'.script_version.'" type="text/javascript" charset="UTF-8"> </script>
-';
-//LABEL PRINTER niet vergeten
-//add window.location.relead() after script
-
-echo $view;
 
 ?>
\ No newline at end of file
diff --git a/profile.php b/profile.php
index d682ca5..53e26ee 100644
--- a/profile.php
+++ b/profile.php
@@ -118,6 +118,7 @@ $view .= '<div class="content-block tab-content active">
                     <option value="" '.(($user['language'] =='')?' selected':'').'></option>
                     <option value="US" '.(($user['language']=='US')?' selected':'').'>US</option>
                     <option value="NL" '.(($user['language']=='NL')?' selected':'').'>NL</option>
+                    <option value="DE" '.(($user['language']=='DE')?' selected':'').'>DE (beta)</option>
                 </select>
                 <input type="hidden" name="id" value="'.$user['id'].'">
         ';
diff --git a/servicereports.php b/servicereports.php
index 59b287f..22e2904 100644
--- a/servicereports.php
+++ b/servicereports.php
@@ -10,7 +10,7 @@ include_once './settings/settings.php';
 
 //SET PAGE ORIGIN FOR NAVIGATION AND SECURITY
 $_SESSION['prev_origin_servicereport'] = $_SERVER['REQUEST_URI'];
-$prev_page = (isset($_SESSION['prev_origin_equipment'])) ? $_SESSION['prev_origin_equipment'] : $_SESSION['prev_origin'];
+$prev_page = ((isset($_SESSION['prev_origin_equipment'])) ? $_SESSION['prev_origin_equipment'] : (isset($_SESSION['prev_origin'])? $_SESSION['prev_origin']:""));
 $page = $_SESSION['origin'] = 'servicereports';
 
 //create backbutton to prev_origin
diff --git a/settings/systemcartest.php b/settings/systemcartest.php
new file mode 100644
index 0000000..9202462
--- /dev/null
+++ b/settings/systemcartest.php
@@ -0,0 +1,97 @@
+<?php
+
+//=================================================================
+//CarTest tool allowed responses===================================
+//=================================================================
+
+$allowedResponse_1 = array(
+    array("responseID" => "1", "Response" => $cartest_allowed_label1),
+    array("responseID" => "2", "Response" => $cartest_allowed_label2)   
+);
+
+$allowedResponse_2 = array(
+    array("responseID" => "3", "Response" => $cartest_allowed_label3),
+    array("responseID" => "4", "Response" => $cartest_allowed_label4)   
+);
+
+$allowedResponse_3 = array(
+    array("responseID" => "5", "Response" => $cartest_allowed_label5),
+    array("responseID" => "6", "Response" => $cartest_allowed_label6),
+    array("responseID" => "7", "Response" => $cartest_allowed_label7),
+    array("responseID" => "8", "Response" => $cartest_allowed_label8)    
+);
+
+$allowedResponse_4 = array(
+    array("responseID" => "9", "Response" => $cartest_allowed_label9),
+    array("responseID" => "10", "Response" => $cartest_allowed_label10)   
+);
+//=================================================================
+//CarTest Tool questions        ===================================
+//=================================================================
+
+$arrayQuestions_cartest = array(
+    array("Group" => $cartest_header_1,
+            "Group_sequence" => '1',
+            "Questions_in_group" => array(
+            array("Question_sequence" => '1',"QuestionID" => "cartest_1","Question" => $cartest_1, "Type" => 'dropdown', "Response" => $allowedResponse_1),
+            array("Question_sequence" => '2',"QuestionID" => "cartest_2","Question" => $cartest_2, "Type" => 'dropdown', "Response" => $allowedResponse_1),
+            array("Question_sequence" => '3',"QuestionID" => "cartest_3","Question" => $cartest_3, "Type" => 'dropdown', "Response" => $allowedResponse_1),
+            array("Question_sequence" => '4',"QuestionID" => "cartest_4","Question" => $cartest_4, "Type" => 'dropdown', "Response" => $allowedResponse_1),
+            array("Question_sequence" => '5',"QuestionID" => "cartest_5","Question" => $cartest_5, "Type" => 'dropdown', "Response" => $allowedResponse_1),
+            array("Question_sequence" => '6',"QuestionID" => "cartest_6","Question" => $cartest_6, "Type" => 'dropdown', "Response" => $allowedResponse_1),
+            array("Question_sequence" => '7',"QuestionID" => "cartest_7","Question" => $cartest_7, "Type" => 'dropdown', "Response" => $allowedResponse_1)
+            )
+        ),
+    array("Group" => $cartest_header_2,
+            "Group_sequence" => '2',
+            "Questions_in_group" => array(
+            array("Question_sequence" => '1',"QuestionID" => "cartest_8","Question" => $cartest_8, "Type" => 'dropdown', "Response" => $allowedResponse_2),
+            array("Question_sequence" => '2',"QuestionID" => "cartest_9","Question" => $cartest_9, "Type" => 'dropdown', "Response" => $allowedResponse_1),
+            array("Question_sequence" => '3',"QuestionID" => "cartest_10","Question" => $cartest_10, "Type" => 'dropdown', "Response" => $allowedResponse_1)
+            )
+        ),
+    array("Group" => $cartest_header_3,
+            "Group_sequence" => '3',
+            "Questions_in_group" => array(
+            array("Question_sequence" => '1',"QuestionID" => "cartest_11","Question" => $cartest_11, "Type" => 'dropdown', "Response" => $allowedResponse_3),
+            array("Question_sequence" => '2',"QuestionID" => "cartest_12","Question" => $cartest_12, "Type" => 'dropdown', "Response" => $allowedResponse_3),
+            array("Question_sequence" => '3',"QuestionID" => "cartest_13","Question" => $cartest_13, "Type" => 'dropdown', "Response" => $allowedResponse_3)
+            )
+        ) ,
+    array("Group" => $cartest_header_4,
+            "Group_sequence" => '4',
+            "Questions_in_group" => array(
+            array("Question_sequence" => '1',"QuestionID" => "cartest_14","Question" => $cartest_14, "Type" => 'dropdown', "Response" => $allowedResponse_1),
+            array("Question_sequence" => '2',"QuestionID" => "cartest_15","Question" => $cartest_15, "Type" => 'dropdown', "Response" => $allowedResponse_1),
+            array("Question_sequence" => '3',"QuestionID" => "cartest_16","Question" => $cartest_16, "Type" => 'dropdown', "Response" => $allowedResponse_1),
+            array("Question_sequence" => '4',"QuestionID" => "cartest_17","Question" => $cartest_17, "Type" => 'textarea', "Response" => "")
+            )
+        ),
+    array("Group" => $cartest_header_5,
+        "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" => '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("Group" => $cartest_header_6,
+        "Group_sequence" => '6',
+        "Questions_in_group" => array(
+        array("Question_sequence" => '1',"QuestionID" => "cartest_23","Question" => $cartest_23, "Type" => 'dropdown', "Response" => $allowedResponse_1),
+        array("Question_sequence" => '2',"QuestionID" => "cartest_24","Question" => $cartest_24, "Type" => 'dropdown', "Response" => $allowedResponse_1),
+        array("Question_sequence" => '3',"QuestionID" => "cartest_25","Question" => $cartest_25, "Type" => 'dropdown', "Response" => $allowedResponse_1),
+        array("Question_sequence" => '4',"QuestionID" => "cartest_26","Question" => $cartest_26, "Type" => 'dropdown', "Response" => $allowedResponse_1),
+        array("Question_sequence" => '5',"QuestionID" => "cartest_27","Question" => $cartest_27, "Type" => 'dropdown', "Response" => $allowedResponse_1),
+        array("Question_sequence" => '6',"QuestionID" => "cartest_28","Question" => $cartest_28, "Type" => 'dropdown', "Response" => $allowedResponse_4)
+       )
+    ),
+    array("Group" => $group_header_7,
+    "Group_sequence" => '8',
+    "Questions_in_group" => array(
+        array("Question_sequence" => '1',"QuestionID" => "cartest_notes", "Question" => $cartest_notes, "Type" => 'textarea', "Response" => "")
+        )
+    )
+);
\ No newline at end of file
diff --git a/settings/translations/translations_DE.php b/settings/translations/translations_DE.php
new file mode 100644
index 0000000..facf2c6
--- /dev/null
+++ b/settings/translations/translations_DE.php
@@ -0,0 +1,763 @@
+<?php
+//MENÜEINTRÄGE:
+$menu_dashboard = 'Dashboard';
+$menu_assets = 'Assets';
+$menu_service_reports = 'Serviceberichte';
+$menu_history = 'Verlauf';
+$menu_firmwaretool = 'Firmwaretool';
+$menu_equipments_mass_update = 'Massenaktualisierungen';
+$menu_products = 'Produkte';
+$menu_sales = 'Verkäufe';
+$menu_sales_accounts = "Konten";
+$menu_sales_contracts = 'Verträge';
+$menu_admin = 'Administrator';
+$menu_admin_users = "Benutzer";
+$menu_admin_communications = 'Kommunikation';
+$menu_admin_partners = 'Partner';
+$menu_settings = 'Einstellungen';
+$menu_config = 'Konfiguration';
+$menu_language = 'Sprache';
+$menu_log = 'Protokoll';
+$menu_marketing = 'Marketing';
+$menu_build = 'Erstellen';
+$menu_cartest = 'Fahrzeugdatenbank';
+
+//TABS
+$tab1 = 'Allgemein';
+$tab2 = 'Partner';
+$tab3 = 'Protokoll';
+$tab4 = 'Einstellungen';
+
+//Global
+$general_salesid = 'Verkaufs-ID';
+$general_soldto = 'Verkauft an';
+$general_shipto = 'Lieferadresse';
+$general_location = 'Standort';
+$general_section = 'Abschnitt';
+
+$general_created = 'Erstellt';
+$general_createdby = 'Erstellt von';
+$general_updated = 'Aktualisiert';
+$general_updatedby = 'Aktualisiert von';
+
+$general_filters = 'Filter';
+$general_filters_clear = 'löschen';
+
+$general_sort = 'Sortieren';
+$general_page = 'Seite ';
+$general_page_of = ' von ';
+
+$general_sort_type_1 = 'Niedrig - Hoch';
+
+$general_sort_type_2 = 'Hoch - Niedrig';
+
+$general_prev = '«';
+$general_next = '»';
+$general_last = '↦'; // Letzte->
+$general_first = '↤'; // <-Erste;
+
+$general_view = 'Anzeigen';
+$general_actions = 'Aktionen';
+$general_actions_more = 'Mehr anzeigen';
+
+$general_profile = 'Profil';
+$general_logout = 'Abmelden';
+
+$button_apply = 'Übernehmen';
+$button_cancel = 'Abbrechen';
+$button_back = 'Zurück';
+$button_history = 'Verlauf';
+$button_firmware = 'Firmware aktualisieren';
+$button_create_asset = 'Asset erstellen';
+$button_create_product = 'Produkt erstellen';
+$button_create_user = 'Benutzer erstellen';
+$button_create_partner = 'Partner erstellen';
+$button_view = 'Anzeigen';
+$button_create_communication = 'Kommunikation erstellen';
+$button_create_account = 'Konto erstellen';
+$button_partner_assigned_equipment = 'Zugehörige Assets';
+$button_partner_assigned_contracts = 'Zugehörige Verträge';
+$button_partner_assigned_communication = 'Zugehörige Kommunikation';
+$button_partner_assigned_users = 'Zugehörige Benutzer';
+$button_create_contract = 'Vertrag erstellen';
+$button_create_communication_send = 'Firmware-Kommunikation';
+$button_create_cartest = 'Cartest erstellen';
+
+//Konto / Benutzer
+$account_h2 = 'Konto';
+$account_status = 'Status';
+$account_username = 'Benutzername';
+$account_permission = 'Berechtigung';
+$account_profile = 'Profil';
+$account_service = 'Dienst';
+$account_pw_reset = 'Passwort zurücksetzen';
+$account_lastlogin = 'letzte Anmeldung';
+$account_language = 'Sprache';
+
+//Dashboard
+$dashboard_h2 = 'Dashboard';
+$dashboard_p = 'Statistiken';
+$dashboard_news = 'Neuigkeiten';
+$data_assets_h3 = 'Vermögenswerte';
+$data_assets_text = 'Gesamtzahl der verfügbaren Vermögenswerte';
+$data_service_h3 = 'Service fällig';
+$data_service_text = 'Vermögenswerte mit Service';
+$data_warranty_h3 = 'Garantie';
+$data_warranty_text = 'Geräte mit Garantie';
+$data_software_h3 = 'Firmware';
+$data_software_text = 'Geräte, für die ein Firmware-Upgrade erforderlich ist';
+$data_service_text_forecast = 'Geräte, deren Wartung innerhalb des angegebenen Zeitraums fällig ist';
+$data_warranty_text_forecast = 'Geräte mit Garantieabdeckung bis zum angegebenen Zeitraum';
+//Zurücksetzen
+$button1 = 'Anmelden';
+$button2 = 'Zurücksetzen anfordern';
+
+//Geräte
+$equipment_label1 = 'Indikatoren';
+$equipment_label2 = 'Seriennummer';
+$equipment_label3 = 'Status';
+$equipment_label4 = 'Produkt';
+$equipment_label5 = 'Hardware';
+$equipment_label6 = 'Software';
+$equipment_label7 = 'Garantiebeginn';
+$equipment_label8 = 'Wartungsdatum';
+$equipment_label9 = 'Serviceerneuerung';
+$equipment_label10 = 'Asset-ID';
+$equipment_label11 = 'Bestellreferenz';
+$equipment_label12 = 'Geolokalisierung (Breiten- und Längengrad)';
+
+$equiment_search = 'Seriennummer suchen...';
+
+$assets_h2 = "Assets";
+$assets_p = 'Assets anzeigen, verwalten und suchen.';
+$view_asset_h2 = 'Asset';
+$view_asset_information = 'Asset - Informationen';
+$view_asset_partners = 'Asset - Partner';
+$view_asset_details = 'Details';
+$view_asset_servicereport = 'Serviceberichte';
+$view_asset_notes = 'Zusätzliche Hinweise';
+$view_asset_actions = 'Aktionen';
+
+$not_specified = 'Nicht angegeben';
+
+$warranty_status = 'Garantiestatus';
+$service_status = 'Servicestatus';
+$software_status = 'Softwarestatus';
+
+$service_report_item = 'Serviceartikel';
+$service_report_no_comments = 'Keine Kommentare';
+$service_report_maintenance_test = 'Wartungstest';
+$service_report_maintenance_test_status = 'Status';
+
+$service_report_outcome_good = 'Gut';
+$service_report_outcome_attention = 'Achtung';
+$service_report_no_text = 'Es sind keine Serviceberichte vorhanden';
+
+$service_maintenance_test_fail = 'fehlgeschlagen';
+$service_maintenance_test_pass = 'gut';
+
+$status0 = 0; $status0_text = 'Neu';
+$status1 = 1; $status1_text = 'Erstellt';
+$status2 = 2; $status2_text = 'Auf Lager';
+$status3 = 3; $status3_text = 'Senden';
+$status4 = 4; $status4_text = 'In Verwendung';
+$status5 = 5; $status5_text = 'Verschrottet';
+
+$product_location_raw = 'PCB';
+$product_location_SFG = 'Halbfertigware';
+$product_location_FG = 'Fertigware';
+
+$warranty_outdated_text = 'Garantie abgelaufen';
+$warranty_recent = 'Unter Garantie';
+
+$service_renewal_text = 'Service fällig';
+$service_recent = 'Service auf dem neuesten Stand';
+
+$firmware_update_text = 'Firmware-Upgrade verfügbar';
+$firmware_recent_text = 'Firmware auf dem neuesten Stand';
+$firmware_update_confirm = 'Ich bestätige, dass SN und HW vom Gerät gelesen wurden';
+
+$message_eq_1 = 'Gerät erfolgreich erstellt!';
+$message_eq_2 = 'Gerät erfolgreich aktualisiert!';
+$message_eq_3 = 'Gerät erfolgreich gelöscht!';
+$message_no_assets = 'Es sind keine Assets vorhanden';
+
+//Assets verwalten
+$manage_asset_h2 = 'Asset verwalten';
+
+//ServiceReports
+$servicereports_h2 = 'Serviceberichte';
+$servicereports_p = 'Serviceberichte anzeigen, verwalten und durchsuchen.';
+$servicereports_Search = 'Serviceberichte durchsuchen...';
+$servicereports_no_history = 'Es sind keine Berichte vorhanden.';
+$servicereports_details = 'Serviceberichte';
+
+$servicereport_h2 = 'Servicebericht';
+$servicereport_p = 'Serviceberichtdetails anzeigen.';
+$servicereport_no_history = 'Es ist kein Bericht vorhanden.';
+$servicereport_details = 'Servicebericht';
+
+//Verlauf
+$history_h2 = 'Verlauf';
+$history_p = 'Verlauf anzeigen, verwalten und durchsuchen.';
+$history_Search = 'Verlauf durchsuchen...';
+$history_no_history = 'Es ist kein Verlauf vorhanden.';
+
+$history_label1 = 'HistoryID';
+$history_label2 = 'Typ';
+$history_label3 = 'Erstellt';
+$history_label4 = 'Erstellt von';
+$history_label5 = 'Beschreibung';
+$history_label6 = 'Seriennummer';
+
+//Massenaktualisierung
+$mass_update_h2 = 'Massenaktualisierung von Assets';
+$mass_update_partners = 'Partner zuweisen';
+$mass_update_input = 'Zuweisen und eingeben';
+$mass_update_confirm_message = 'Aktualisierung verarbeiten?';
+
+$mass_update_correct = 'Aktualisierung abgeschlossen';
+$mass_update_not_found = 'nicht gefunden';
+
+$mass_update_order_ref = 'Bestellreferenz';
+$mass_update_order_total = 'Bestellsumme';
+$mass_update_customer = 'Kunde';
+
+$paste_excel_h3 = 'Seriennummern einfügen';
+$paste_excel_1 = 'Seriennummer hinzufügen oder aus Excel einfügen';
+$paste_excel_2 = '1 Nummer pro Zeile';
+
+//Produkte
+$products_h2 = 'Produkte';
+$product_h2 = 'Produkt';
+$products_p = 'Produkte anzeigen, verwalten und suchen.';
+$product_code = 'Produktcode';
+$product_status = 'Status';
+$product_category = 'Kategorie';
+$product_name = 'Name';
+$product_description = 'Beschreibung';
+$product_parttype = 'Typ';
+$product_search = 'Produktnamen suchen...';
+$product_software = 'Softwareversion';
+$product_price = 'Preis';
+$product_serialized = 'Serialisiert';
+$product_build = 'Build';
+$product_sales = 'Verkäufe';
+
+$part_type1 = 'Produkt';
+$part_type2 = 'Ersatzteil';
+$part_type3 = 'Loose_item';
+
+$product_category0 = 'Notstecker';
+$product_category1 = 'Werkstattstecker';
+$product_category2 = 'Service';
+$product_category3 = 'Sonstiges';
+
+$prod_status_text = "Status";
+$prod_status_0 = "Inaktiv"; //0
+$prod_status_1 = "Aktiv"; //1
+
+$message_pr_1 = 'Produkt erfolgreich erstellt!';
+$message_pr_2 = 'Produkt erfolgreich aktualisiert!';
+$message_pr_3 = 'Produkt erfolgreich gelöscht!';
+$message_no_products = 'Es sind keine Produkte vorhanden';
+
+//Benutzer
+$users_h2 = 'Benutzer';
+$user_h2 = 'Benutzer';
+$users_p = 'Benutzer anzeigen, verwalten und suchen.';
+$users_search = 'Benutzer suchen';
+$User_service = 'Dienst';
+$User_update = 'Aktiv';
+$User_username = 'Benutzername';
+$User_email = 'E-Mail';
+$User_partnerhierarchy = 'Hierarchie';
+$User_permission = 'Berechtigung';
+$User_profile = 'Profil';
+$User_lastlogin = 'Letzte Anmeldung';
+$User_language = 'Sprache';
+$User_pw_reset = 'Passwort zurücksetzen';
+$User_pw_login_count = 'Fehlgeschlagene Anmeldeversuche';
+$User_block = 'Gesperrt';
+
+$reset_message = 'Passwort zurücksetzen gestartet => Weitere Anweisungen finden Sie in Ihrem E-Mail-Posteingang. Sie werden zur Anmeldeseite weitergeleitet.';
+$reset_message2 = 'Resettoken ungültig, Sie werden weitergeleitet';
+$reset_message3 = 'Passwort muss mindestens 6 Zeichen lang sein';
+
+$enabled = 'Aktiv';
+
+$disabled = 'Inaktiv';
+
+$message_us_1 = 'Benutzer erfolgreich erstellt!';
+
+$message_us_2 = 'Benutzer erfolgreich aktualisiert!';
+
+$message_us_3 = 'Benutzer erfolgreich gelöscht!';
+
+$message_no_users = 'Es sind keine Benutzer vorhanden';
+
+$error_msg_0 = 'Benutzer existiert bereits.';
+
+//Partner
+$partners_h2 = 'Partner';
+
+$partners_p = 'Partner anzeigen, verwalten und suchen.';
+
+$partner_h2 = 'Partner';
+
+$partner_status = 'Status';
+
+$partner_partnerID = 'ID';
+
+$partner_partnertype = 'Typ';
+
+$partner_partnername = 'Name';
+
+$partner_salesID = 'Partnerhierarchie';
+
+$partner_note = 'Notizen';
+
+$partnertype1 = 'SalesID';
+$partnertype2 = 'Verkauft an';
+$partnertype3 = 'Lieferadresse';
+$partnertype4 = 'Standort';
+$partnertype5 = 'Abschnitt';
+
+$partner_search = 'Partner suchen...';
+$partner_view_assigned_assets = 'Zugewiesene Assets anzeigen';
+
+$message_pa_1 = 'Partner erfolgreich erstellt!';
+$message_pa_2 = 'Partner erfolgreich aktualisiert!';
+$message_pa_3 = 'Partner erfolgreich gelöscht!';
+$message_no_partners = 'Es sind keine Partner vorhanden';
+
+//Build
+$buildtool_h2 = 'Buildtool';
+$buildtool_p = 'Produkt zusammenbauen';
+
+//Firmware
+$firmwaretool_h2 = 'Firmwaretool';
+$firmwaretool_p = 'Firmware aktualisieren.';
+
+$firmwaretool_step = 'Anleitung';
+$firmwaretool_step_1 = 'Verbinde dasVerbinden Sie das Gerät per USB mit dem Computer (unter der Batterieabdeckung zu finden).';
+$firmwaretool_step_2 = 'Drücken Sie die Schaltfläche "<i>Verbinden</i>"';
+$firmwaretool_step_3 = 'Ein Popup wird angezeigt, in dem Sie aufgefordert werden, ein Gerät auszuwählen. Wählen Sie das Gerät aus, indem Sie darauf klicken, und drücken Sie die Schaltfläche "Verbinden".';
+$firmwaretool_step_4 = 'Nachdem das Popup verschwindet, wird das Gerät gelesen. In der Statusleiste wird der Fortschritt angezeigt.';
+$firmwaretool_step_5 = 'Wenn Firmware verfügbar ist: In der Statusleiste wird "<i>Firmware verfügbar</i>" angezeigt.';
+$firmwaretool_step_6 = 'Wenn Firmware verfügbar ist: Stellen Sie sicher, dass SN und HW vom Gerät gelesen werden, und bestätigen Sie dies, indem Sie das Kontrollkästchen "Ich bestätige, dass SN und HW vom Gerät gelesen werden" aktivieren.';
+$firmwaretool_step_7 = 'Drücken Sie die Schaltfläche <i>"Firmware aktualisieren</i>", um den Dialog zur Firmwareaktualisierung zu starten, und folgen Sie den Anweisungen auf dem Bildschirm.';
+$firmwaretool_step_8 = '<b>Beachten Sie: Dieser Vorgang kann nicht gestoppt werden und muss abgeschlossen werden.</b>';
+
+//EMAIL
+$newuser_subject = 'CustomerPortal-Benutzer erstellt';
+$newuser_header = 'Sehr geehrter CustomerPortal-Benutzer';
+$newuser_text = 'Ihr CustomerPortal-Administrator hat Ihnen Zugriff auf das CustomerPortal gewährt. Um Ihr Konto zu vervollständigen, müssen Sie Ihr Passwort über den untenstehenden Link aktualisieren.';
+$newuser_credential_label = 'Link zum Portal:';
+$newuser_closure = 'Aus Sicherheitsgründen ist dieser Link nur 10 Minuten lang aktiv.';
+
+$changeuser_subject = 'CustomerPortal - Passwortzurücksetzung angefordert';
+$changeuser_header = 'Sehr geehrter CustomerPortal-Benutzer';
+$changeuser_text = 'Für Ihr Konto wurde eine Passwortzurücksetzung angefordert. Um Ihr Konto zurückzusetzen, verwenden Sie den untenstehenden Link.';
+$changeuser_credential_label = 'Link zum Portal:';
+$changeuser_closure = 'Aus Sicherheitsgründen ist dieser Link nur 10 Minuten lang aktiv.';
+
+$register_user_subject = 'Kundenportal - Firmware - Benutzer erstellt';
+$register_user_header = 'Sehr geehrter Kunde';
+$register_user_text = 'Vielen Dank für Ihre Registrierung. Basierend auf Ihrer Produktregistrierung gewähren wir Ihnen hiermit Zugriff auf unsere Online-Firmware-Update-Funktion.';
+$register_user_credential_label = 'Link zum Portal:';
+$register_user_closure = 'Dies ist ein allgemeines Konto und kann nicht geändert werden.';
+
+//Registrieren
+$register_message_1 = 'Seriennummer nicht erkannt, bitte wenden Sie sich an Ihren Lieferanten';
+$register_message_2 = 'Produkt unter Garantie oder Garantie abgelaufen. Falls nicht korrekt, wenden Sie sich bitte an Ihren Lieferanten';
+$register_message_3 = 'Garantie wird um 1 weiteres Jahr verlängert';
+$register_message_4 = 'Vielen Dank für Ihre Registrierung. Sie erhalten den Link zu unserem Software-Update-Tool über die bei der Registrierung angegebene E-Mail-Adresse.';
+
+//Kommunikation
+$communication_h2 = 'Kommunikation';
+$communication_p = 'Kommunikation anzeigen, verwalten und suchen.';
+$communication_status = 'Status';
+$communication_search = 'E-Mail suchen';
+
+$comm_status_0 = $disabled; //0
+$comm_status_1 = $enabled; //1
+
+$message_comm_1 = 'Kommunikation erfolgreich erstellt!';
+$message_comm_2 = 'Kommunikation erfolgreich aktualisiert!';
+$message_comm_3 = 'Kommunikation erfolgreich gelöscht!';
+$message_comm_4 = 'Firmware-Kommunikation aktiviert!';
+$message_no_communication = 'Es gibt keine Kommunikationsdatensätze';
+
+$communication_partner = 'PartnerID';
+$communication_email = 'E-Mail';
+$communication_firmware = 'Firmware';
+$communication_service = 'Dienst';
+$communication_marketing = 'Marketing';
+$communication_type = 'Typ';
+$communication_send = 'Senden';
+
+$coms_types = 'Kommunikation';
+$coms_status_0 = "Inaktiv"; //0
+$coms_status_1 = "Aktiv"; // 1
+
+$coms_type_0 = 'Prognose';
+$coms_type_1 = 'Ereignisbasiert';
+
+$communication_send_firmware_h2 = 'Firmware-Nachricht erstellen';
+$communication_target = 'Ziel';
+$communication_target_both = 'Beides';
+$communication_hw_scope = 'Hardware-Umfang';
+
+//Konto
+$accountstatus_0 = 'Lead';
+$accountstatus_1 = 'Kunde';
+$accountstatus_2 = 'Abbrechen';
+
+$account_h2 = 'Konto';
+$account_p = 'Konto anzeigen, verwalten und suchen.';
+$account_status = 'Status';
+$account_search = 'Kontonamen suchen';
+
+$message_account_1 = 'Konto erfolgreich erstellt!';
+
+$message_account_2 = 'Konto erfolgreich aktualisiert!';
+
+$message_account_3 = 'Konto erfolgreich gelöscht!';
+
+$message_no_account = 'Es sind keine Konten vorhanden';
+
+$account_id = 'Konto-ID';
+
+$account_name = 'Name';
+
+$account_firstname = 'Vorname';
+
+$account_lastname = 'Nachname';
+
+$account_email = 'E-Mail';
+
+$account_phone = 'Telefon';
+
+$view_account_information = 'Kontoinformationen';
+
+$view_account_contact = 'Kontaktinformationen';
+
+$account_contactfirstname = 'Vorname der Kontaktperson';
+
+$account_contactlastname = 'Nachname der Kontaktperson';
+
+$account_contactemail = 'E-Mail';
+
+$account_contactphonenumber = 'Telefon';
+$account_billing = 'Rechnungsstellung';
+$account_billstreetadress ='Straßenadresse';
+$account_billpostalcode ='Postleitzahl';
+$account_billdistrict ='Bezirk';
+$account_billcity ='Stadt';
+$account_billstate ='Bundesland';
+$account_billcountry ='Land';
+$account_shipping ='Versand';
+$account_company ='Firmenname';
+$account_firstname ='Vorname';
+$account_lastname ='Nachname';
+$account_streetadress ='Straßenadresse';
+$account_postalcode ='Postleitzahl';
+$account_district ='Distreng';
+$account_city ='Stadt';
+$account_state ='Staat';
+$account_country ='Land';
+$account_vatnumber ='Umsatzsteuer-Identifikationsnummer';
+$account_loghandlername ='Logistik-Handler';
+$account_loghandleraccount ='Logistikkonto';
+
+//Verträge
+$message_contract_1 = 'Vertrag erfolgreich erstellt!';
+$message_contract_2 = 'Vertrag erfolgreich aktualisiert!';
+$message_contract_3 = 'Vertrag erfolgreich gelöscht!';
+$message_no_contract = 'Es sind keine Verträge vorhanden';
+
+$contract_h2 = 'Verträge';
+$contract_p = 'Verträge anzeigen, verwalten und suchen.';
+$contract_status = 'Status';
+$contract_search = 'Suchreferenz';
+
+$contract_status0 = 'Entwurf';
+$contract_status1 = 'Aktiv';
+$contract_status2 = 'Geschlossen';
+
+$contract_type0 = 'Fest';
+
+$contract_type1 = 'Abonnement';
+
+$contract_type2 = 'Zahlung pro Nutzung';
+
+$contract_id = 'Vertrags-ID';
+
+$contract_account = 'Konto';
+
+$contract_type = 'Typ';
+
+$contract_start_date = 'Startdatum';
+
+$contract_end_date = 'Enddatum';
+
+$contract_reference = 'Referenz';
+
+$contract_duration = 'Dauer (in Monaten)';
+
+$contract_servicetool = 'Servicetool';
+
+$contract_assigned_users = 'Zugewiesene Benutzer';
+
+$contract_assigned_users_add = 'Benutzer hinzufügen';
+
+//=================================================================
+//Service Tool-Fragevariablen ===========================================
+//= ... 
+$group_header_5 = 'Gehäuse';
+$group_header_6 = 'Aktionen';
+$group_header_7 = 'Notizen';
+$group_header_8 = 'Repariert/Ersetzt';
+$group_header_9 = 'Abschließen';
+
+//ServiceReport_labels
+$service_report_id = 'ServicereportID';
+$service_serialnumber = 'Seriennummer';
+$service_date = 'Servicedatum';
+$service_renewal = 'Verlängerungsdatum';
+$service_performed_by = 'Durchgeführt von';
+
+//Summarylabels für Bericht
+$summary_label1 = 'Durchgeführte Serviceaktionen';
+$summary_label2 = 'Beobachtungen';
+$summary_label3 = 'Korrosion';
+$summary_label4 = 'Status';
+
+$message1 = 'Keine Serviceaktionen durchgeführt/erforderlich';
+$message2 = 'Keine Reparaturmaßnahmen durchgeführt/erforderlich';
+
+//---------------------------------
+//Visuelle Fragen zum Servicetool
+//---------------------------------
+$service_visual_1 = 'Produktgehäuse enthalten?';
+$service_visual_2 = 'Ersatzbatterien enthalten?';
+$service_visual_3 = 'Spudger enthalten?';
+$service_visual_4 = 'Adapter (NA) enthalten?';
+
+$service_visual_5 = 'Kopf und Pins sauber?';
+$service_visual_6 = 'Alle Pins vorhanden (3x)?';
+$service_visual_7 = 'Korrosion an den Pins sichtbar?';
+$service_visual_8 = 'Zustand des Kunststoffgehäuses';
+
+$service_visual_9 = 'Kopf und Pins sauber?';
+$service_visual_10 = 'Alle Pins vorhanden (3x)?';
+$service_visual_11 = 'Korrosion an den Pins sichtbar?';
+$service_visual_12 = 'Zustand des Kunststoffgehäuses';
+
+$service_visual_13 = 'Batterieabdeckung vorhanden?';
+$service_visual_14 = 'Korrosion an Batteriekontakten?';
+$service_visual_15 = 'Batteriekontakte vorhanden?';
+$service_visual_15 = 'Seriennummer lesbar?';
+$service_visual_16 = 'USB-Anschluss sauber?';
+$service_visual_17 = 'Spiel am USB-Anschluss?';
+$service_visual_18 = 'Schrauben fest (5x)?';
+
+$service_visual_19 = 'Knopf lässt sich drücken?';
+$service_visual_20 = 'Zustand des Gehäuses?';
+$service_visual_21 = 'Zustand des Diffusors?';
+$service_visual_22 = 'Zustand der LED-Abdeckung?';
+
+//---------------------------------
+//Servicetool abschließen
+//---------------------------------
+$service_action_clean = "Gerät gereinigt";
+$service_action_battery = "Batterien ersetzt";
+
+$service_notes = 'Notizen';
+$service_action_serial = 'Seriennummer';
+$service_action_cover = 'Batterieabdeckung';
+$service_action_spudger = 'Betstange (Spudger)';
+$service_action_case = 'Koffer';
+$service_action_instructions = 'Anleitung im Koffer';
+//PFLICHTIGE Frage
+$service_mandatory_question = 'Ich erkläre, dass ich die Fragen wahrheitsgemäß beantwortet habe';
+
+//=================================================================
+//SERVICE Tool erlaubte Antworten============================================
+//= ... 
+$service_allowed_label5 = 'Gut';
+$service_allowed_label6 = 'Ja';
+$service_allowed_label7 = 'Nein';
+$service_allowed_label8 = 'Kommentar';
+$service_allowed_label9 = 'n/a';
+$service_allowed_label10 = 'Überprüfen';
+
+//=================================================================
+//SERVICE-Frage - Legacy ==========================================
+//= ... $group_header_legacy_5 = 'Status';
+$group_header_legacy_6 = 'Bewegung';
+$group_header_legacy_7 = 'Sonstiges';
+
+$question1 = 'Produkthülle enthalten?';
+$question2 = 'Spudger in der Hülle?';
+$question3 = 'Batterien enthalten?';
+$question4 = 'Batterieabdeckung inenthalten?';
+$question5 = 'Seriennummer auf Etikett lesbar?';
+$question6 = 'Typ 1 Kopf und Pins sauber?';
+$question7 = 'Typ 2 Kopf und Pins sauber?';
+$question8 = 'USB-Anschluss sauber?';
+$question9 = 'PCB sauber?';
+$question10 = 'Gehäuse';
+$question11 = 'Kopf-Typ1';
+$question12 = 'Kopf-Typ2';
+$question13 = 'Batterien';
+$question14 = 'Batteriekontakte';
+$question11a = 'Kopf-Typ1 nicht korrodiert';
+$question12a = 'Kopf-Typ2 nicht korrodiert';
+$question13a = 'Batterien nicht korrodiert';
+$question14a = 'Batteriekontakte nicht korrodiert';
+$question18a = 'PCB nicht korrodiert';
+$question15 = 'Batterieabdeckung';
+$question16 = 'Abdeckung';
+$question17 = 'Diffusor';
+$question18 = 'PCB';
+$question19 = 'Alle Schrauben vorhanden?';
+$question20 = 'Keine Bewegung an den Pins?';
+$question21 = 'Alle Pins vorhanden?';
+$question22 = 'Keine Bewegung am USB-Anschluss?';
+$question23 = 'Taste funktioniert?';
+$question24 = 'Funktionieren alle LEDs?';
+
+$servicereport5 = 'Nicht angegeben';
+
+$action_clean = "action_clean";
+$action_clean_description = "Gerät gereinigt";
+$action_firmware = "action_firmware";
+$action_firmware_description = "Firmware des Geräts aktualisiert";
+$action_firmware_update_description = "Ich bestätige, dass SN und HW vom Gerät gelesen wurden";
+$action_maintenance = "action_maintenance";
+$action_maintenance_description = "Gerätefunktionalität getestet";
+$action_serial = "action_serial";
+$action_serial_description = "Geräteseriennummernetikett regeneriert";
+$action_replacement_body = "action_replacement_body";
+$action_replacement_body_description = "Gerätegehäuse ersetzt";
+$action_replacement_pcb = "action_replacement_pcb";
+$action_replacement_pcb_description = "Geräte-PCB ersetzt";
+$action_replacement_battery = "action_replacement_body";
+$action_replacement_battery_description = "Batterien ersetzt";
+$action_repaired_body = "action_repaired_body";
+$action_repaired_body_description = "Gerätegehäuse repariert";
+$action_repaired_pcb = "action_repaired_pcb";
+$action_repaired_pcb_description = "Geräte-PCB repariert";
+$action_repaired_LED = "action_repaired_LED";
+$action_repaired_LED_description = "Geräte-LED repariert";
+$action_repaired_button = "action_repaired_button";
+$action_repaired_button_description = "Gerätetaste repariert";
+
+//Marketing
+$marketing_h2 = "Marketing";
+$marketing_p = "Marketingkatalog";
+
+//Abmelden
+$unscribe_msg1 = "E-Mail abgemeldet";
+$unscribe_msg_error = "Etwas ist schiefgelaufen. Bitte wenden Sie sich für Hilfe an Ihren Lieferanten";
+
+//Cartest
+$cartests_h2 = "Fahrzeugdatenbank";
+$cartests_p = "Fahrzeugdetails anzeigen, verwalten und suchen.";
+$cartest_h2 = 'Cartest';
+
+$cartest_charts = 'Testgraphen';
+
+$message_ct_1 = 'Cartest erfolgreich erstellt!';
+
+$message_ct_2 = 'Cartest erfolgreich aktualisiert!';
+
+$message_ct_3 = 'Cartest erfolgreich gelöscht!';
+
+$message_no_ct = 'Es sind keine Cartests vorhanden';
+
+$cartest_search = 'Automarke suchen...';
+
+$cartest_information = 'Cartest-Informationen';
+
+$cartest_rowID = 'Test-ID';
+
+$cartest_carbrand = 'Automarke';
+
+$cartest_cartype = 'Autotyp';
+
+$cartest_carvin = 'VIN';
+
+$cartest_details_text = 'Testdetails';
+
+$cartest_created = 'Zeitstempel';
+
+$cartest_tester = 'Tester';
+
+$cartest_device = 'Gebrauchtes Asset';
+$cartest_device_hw = 'Verwendete Hardware';
+$cartest_device_sw = 'Verwendete Software';
+$cartest_questions_text = 'Frage & Antwort';
+
+//---------------------------------
+//CarTest-Header
+//---------------------------------
+$cartest_header_0 = 'Fahrzeugdaten';
+$cartest_header_1 = 'Testergebnisse';
+$cartest_header_2 = 'PHEV oder EV';
+$cartest_header_3 = 'Farbe der LED';
+$cartest_header_4 = 'Armaturenbrett-Anzeigen';
+$cartest_header_5 = 'Allgemein';
+$cartest_header_6 = 'Ergebnisse nach dem Test';
+$cartest_header_7 = 'Hinweise';
+
+//---------------------------------
+//CarTest-Fragen
+//---------------------------------
+$cartest_1 = 'Gehe zu P';
+$cartest_2 = 'Aus D';
+$cartest_3 = 'Möglicher Gangwechsel';
+$cartest_4 = 'Beschleuniger abschalten';
+$cartest_5 = 'Auf N gehen';
+$cartest_6 = 'Handbremse angezogen';
+$cartest_7 = 'Antrieb durch Beschleuniger';
+$cartest_8 = 'EV oder PHEV';
+$cartest_9 = 'ICE-Abschaltung';
+$cartest_10 = 'ICE durch Beschleuniger einschalten';
+$cartest_11 = 'Vor dem Einfügen';
+$cartest_12 = 'Nach dem Einfügen 1 Sekunde';
+$cartest_13 = 'Nach dem Einfügen 2 Sekunden';
+$cartest_14 = 'Ladezeichen';
+$cartest_15 = 'Keine Zeichen';
+$cartest_16 = 'Ladefehler';
+$cartest_17 = 'Alle anderen';
+$cartest_18 = 'Bewegt sich im Leerlauf';
+$cartest_19 = 'Foto der Fahrgestellnummer aufgenommen';
+$cartest_20 = 'Foto der Fahrzeugübersicht';
+$cartest_21 = 'In 5 Minuten wieder anschließen';
+$cartest_22 = 'Foto des Typenschilds';
+$cartest_23 = 'Möglicher Gangwechsel nach Ausbau EP';
+$cartest_24 = 'Motor direkt an nach Ausbau EP';
+$cartest_25 = 'PHEV, ICE an nach Ausbau EP';
+$cartest_26 = 'Erster Kontakt zum Neustart';
+$cartest_27 = 'Verriegelung nach Ausbau geöffnet';
+$cartest_28 = 'Testergebnisse bestanden/nicht bestanden';
+
+$cartest_notes = 'Notizen';
+
+//---------------------------------
+//CarTest-Antwort
+//---------------------------------
+$cartest_allowed_label0 = 'Antwort einfügen';
+$cartest_allowed_label1 = 'Ja';
+$cartest_allowed_label2 = 'Nein';
+$cartest_allowed_label3 = 'EV';
+$cartest_allowed_label4 = 'PHEV';
+$cartest_allowed_label5 = 'Grün';
+$cartest_allowed_label6 = 'Gelb';
+$cartest_allowed_label7 = 'Blau';
+$cartest_allowed_label8 = 'Rot';
+$cartest_allowed_label9 = 'Bestanden';
+$cartest_allowed_label10 = 'Nicht bestanden';
\ No newline at end of file
diff --git a/settings/translations/translations_NL.php b/settings/translations/translations_NL.php
index 6d5fffa..2defd5d 100644
--- a/settings/translations/translations_NL.php
+++ b/settings/translations/translations_NL.php
@@ -671,4 +671,65 @@ $cartest_tester = 'Tester';
 $cartest_device = 'Gebruikte activa';
 $cartest_device_hw = 'Gebruikte hardware';
 $cartest_device_sw = 'Gebruikte software';
-$cartest_questions = 'Vraag & Antwoord';
+$cartest_questions_text = 'Vraag & Antwoord';
+
+//---------------------------------
+//CarTest headers
+//---------------------------------
+$cartest_header_0 = 'Auto data';
+$cartest_header_1 = 'Test resultaten';
+$cartest_header_2 = 'PHEV of EV';
+$cartest_header_3 = 'LED kleuren';
+$cartest_header_4 = 'Dashboard signalen';
+$cartest_header_5 = 'Algemeen';
+$cartest_header_6 = 'Resultaten na test';
+$cartest_header_7 = 'Noties';
+
+
+//---------------------------------
+//CarTest questions
+//---------------------------------
+$cartest_1 = 'Ga naar P';
+$cartest_2 = 'Uit D';
+$cartest_3 = 'Mogelijke versnellingsschakelaar';
+$cartest_4 = 'Snijversneller';
+$cartest_5 = 'Ga naar N';
+$cartest_6 = 'Handrem ingeschakeld';
+$cartest_7 = 'Voortstuwing door gaspedaal';
+$cartest_8 = 'EV of PHEV';
+$cartest_9 = 'ICE-afsluiting';
+$cartest_10 = 'ICE ingeschakeld door gaspedaal';
+$cartest_11 = 'Vóór invoegen';
+$cartest_12 = 'Na invoeging van 1 seconde';
+$cartest_13 = 'Na 2 seconden';
+$cartest_14 = 'Teken van opladen';
+$cartest_15 = 'Geen tekenen';
+$cartest_16 = 'Oplaadfout';
+$cartest_17 = 'Elke andere';
+$cartest_18 = 'Beweegt bij inactiviteit';
+$cartest_19 = 'Foto van chassisnummer genomen';
+$cartest_20 = 'Foto van autooverzicht';
+$cartest_21 = 'Opnieuw verbinding maken over 5 minuten';
+$cartest_22 = 'Foto van identificatieplaatje';
+$cartest_23 = 'Mogelijke versnellingsschakelaar na verwijdering EP';
+$cartest_24 = 'Motor direct aan na verwijderen EP';
+$cartest_25 = 'PHEV, ICE aan na verwijdering EP';
+$cartest_26 = 'Eerste contact om opnieuw op te starten';
+$cartest_27 = 'Vergrendeling open na verwijdering';
+$cartest_28 = 'Testresultaten geslaagd/mislukt';
+$cartest_notes = 'Notities';
+
+//---------------------------------
+//CarTest response
+//---------------------------------
+$cartest_allowed_label0 = 'voeg antwoord toe';
+$cartest_allowed_label1 = 'Ja';
+$cartest_allowed_label2 = 'Nee';
+$cartest_allowed_label3 = 'EV';
+$cartest_allowed_label4 = 'PHEV';
+$cartest_allowed_label5 = 'Groen';
+$cartest_allowed_label6 = 'Geel';
+$cartest_allowed_label7 = 'Blauw';
+$cartest_allowed_label8 = 'Rood';
+$cartest_allowed_label9 = 'Goed';
+$cartest_allowed_label10 = 'Fout';
\ No newline at end of file
diff --git a/settings/translations/translations_US.php b/settings/translations/translations_US.php
index 11f6b3d..9493a38 100644
--- a/settings/translations/translations_US.php
+++ b/settings/translations/translations_US.php
@@ -667,4 +667,65 @@ $cartest_tester = 'Tester';
 $cartest_device = 'Used asset';
 $cartest_device_hw = 'Used hardware';
 $cartest_device_sw = 'Used software';
-$cartest_questions = 'Question & answer';
\ No newline at end of file
+$cartest_questions_text = 'Question & answer';
+
+//---------------------------------
+//CarTest headers
+//---------------------------------
+$cartest_header_0 = 'Car data';
+$cartest_header_1 = 'Test Results';
+$cartest_header_2 = 'PHEV or EV';
+$cartest_header_3 = 'Color of led';
+$cartest_header_4 = 'Dashboard signs';
+$cartest_header_5 = 'General';
+$cartest_header_6 = 'Results after test';
+$cartest_header_7 = 'Notes';
+
+//---------------------------------
+//CarTest questions
+//---------------------------------
+$cartest_1 = 'Go to P';
+$cartest_2 = 'Out of D';
+$cartest_3 = 'Possible gear switch';
+$cartest_4 = 'Cuts accelerator';
+$cartest_5 = 'Go to N';
+$cartest_6 = 'Handbrake on';
+$cartest_7 = 'Propulsion by accelerator';
+$cartest_8 = 'EV or PHEV';
+$cartest_9 = 'ICE shutdown';
+$cartest_10 = 'ICE on by accelerator';
+$cartest_11 = 'Before insert';
+$cartest_12 = 'After insert 1 second';
+$cartest_13 = 'After inster 2 seconds';
+$cartest_14 = 'Sign of charging';
+$cartest_15 = 'No Signs';
+$cartest_16 = 'Charging failure';
+$cartest_17 = 'Any other';
+$cartest_18 = 'Moves on idle';
+$cartest_19 = 'Photo of VIN taken';
+$cartest_20 = 'Photo of car overview';
+$cartest_21 = 'Reconnect in 5 minutes';
+$cartest_22 = 'Photo of identification plate';
+$cartest_23 = 'Possible gear switch after removal EP';
+$cartest_24 = 'Engine directly on after removal EP';
+$cartest_25 = 'PHEV, ICE on after removal EP';
+$cartest_26 = 'First contact of to restart';
+$cartest_27 = 'Locking open after removal';
+$cartest_28 = 'Testresults Pass/Fail';
+
+$cartest_notes = 'Notes';
+
+//---------------------------------
+//CarTest response
+//---------------------------------
+$cartest_allowed_label0 = 'insert answer';
+$cartest_allowed_label1 = 'Yes';
+$cartest_allowed_label2 = 'No';
+$cartest_allowed_label3 = 'EV';
+$cartest_allowed_label4 = 'PHEV';
+$cartest_allowed_label5 = 'Green';
+$cartest_allowed_label6 = 'Yellow';
+$cartest_allowed_label7 = 'Blue';
+$cartest_allowed_label8 = 'Red';
+$cartest_allowed_label9 = 'Pass';
+$cartest_allowed_label10 = 'Fail';
\ No newline at end of file
diff --git a/style/admin.css b/style/admin.css
index 9c270d6..69b9133 100644
--- a/style/admin.css
+++ b/style/admin.css
@@ -2682,4 +2682,9 @@ h4.label {
   margin-top: 5px;
   cursor: pointer;
   border-radius: 4px;
+}
+
+.order-detail input {
+  border: 0;
+  border-bottom: 1px solid #dedfe1
 }
\ No newline at end of file
diff --git a/user.php b/user.php
index cda01ba..4499d09 100644
--- a/user.php
+++ b/user.php
@@ -225,6 +225,7 @@ $view .='       <label for="service">'.$User_service.'</label>
                     <option value="" '.(($user['language'] =='')?' selected':'').'></option>
                     <option value="US" '.(($user['language']=='US')?' selected':'').'>US</option>
                     <option value="NL" '.(($user['language']=='NL')?' selected':'').'>NL</option>
+                    <option value="DE" '.(($user['language']=='DE')?' selected':'').'>DE (beta)</option>
                 </select>
 
                 <input type="hidden" name="id" value="'.$user_ID.'">