From da3dc228d9b4ddf70ed2840002bc8d099603f0f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CVeLiTi=E2=80=9D?= <“info@veliti.nl”>
Date: Fri, 5 Apr 2024 14:10:07 +0200
Subject: [PATCH] CIM63 - asset search on email

---
 accounts.php           |  3 +++
 api/v1/get/history.php |  2 +-
 communication.php      | 17 +++++++++++++++--
 communications.php     |  3 +++
 histories.php          |  9 ++++++++-
 5 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/accounts.php b/accounts.php
index ea2d63c..a79c640 100644
--- a/accounts.php
+++ b/accounts.php
@@ -8,6 +8,9 @@ defined(page_security_key) or exit;
 include_once './assets/functions.php';
 include_once './settings/settings.php';
 
+//SET ORIGIN FOR NAVIGATION
+$_SESSION['prev_origin'] = '';
+
 //Check if allowed
 if (isAllowed('accounts',$_SESSION['profile'],$_SESSION['permission'],'R') === 0){
     header('location: index.php');
diff --git a/api/v1/get/history.php b/api/v1/get/history.php
index 869562f..22fbb8f 100644
--- a/api/v1/get/history.php
+++ b/api/v1/get/history.php
@@ -61,7 +61,7 @@ if(isset($get_content) && $get_content!=''){
         }
         elseif ($v[0] == 'search') {
         //build up search
-        $clause .= ' AND h.rowID like :'.$v[0]; 
+        $clause .= ' AND (h.rowID like :'.$v[0].' OR h.createdby like :'.$v[0].')'; 
         }
         else {//create clause
         $clause .= ' AND '.$v[0].' = :'.$v[0];
diff --git a/communication.php b/communication.php
index 8294ed6..4169a78 100644
--- a/communication.php
+++ b/communication.php
@@ -1,7 +1,10 @@
 <?php
 defined(page_security_key) or exit;
 
-$page = 'communication';
+//SET ORIGIN FOR NAVIGATION
+$_SESSION['prev_origin'] = $_SERVER['REQUEST_URI'];
+$page = $_SESSION['origin'] = 'communication';
+
 //Check if allowed
 if (isAllowed($page,$_SESSION['profile'],$_SESSION['permission'],'R') === 0){
     header('location: index.php');
@@ -117,6 +120,15 @@ $view .= '<div class="tabs">
          </div>
     ';
 
+//GET PARTNERID
+$view_partners = '';
+if(isset($communication['partnerID']) && $communication['partnerID'] !=''){
+    $partner_ID = strtok($communication['partnerID'],'-');
+    $view_partners = '
+        <label for="">'.$partner_view_assigned_assets.'</label>
+        <a href="index.php?page=equipments&partnerid='.$partner_ID.'" class="btn" style="width: 15%;">'.$button_view.'</a>'; 
+}
+
 $view .= '<div class="content-block tab-content active">
             <div class="form responsive-width-100">
                 <label for="status">'.$communication_status.'</label>
@@ -148,7 +160,8 @@ $view .= '<div class="content-block tab-content active">
                     <option value="1" '.($communication['type_3']==1?' selected':'').'>'.$coms_status_1 .'</option>
                     <option value="0" '.($communication['type_3']==0?' selected':'').'>'.$coms_status_0 .'</option>
                 </select>
-                <input type="hidden" name="rowID" value="'.$communication['rowID'].'">   
+                <input type="hidden" name="rowID" value="'.$communication['rowID'].'"> 
+                '.$view_partners.'
             </div>
         </div>';
 
diff --git a/communications.php b/communications.php
index c96885e..fece8d9 100644
--- a/communications.php
+++ b/communications.php
@@ -8,6 +8,9 @@ defined(page_security_key) or exit;
 include_once './assets/functions.php';
 include_once './settings/settings.php';
 
+//SET ORIGIN FOR NAVIGATION
+$_SESSION['prev_origin'] = '';
+
 //Check if allowed
 if (isAllowed('communications',$_SESSION['profile'],$_SESSION['permission'],'R') === 0){
     header('location: index.php');
diff --git a/histories.php b/histories.php
index 4567456..e34c79e 100644
--- a/histories.php
+++ b/histories.php
@@ -8,8 +8,12 @@ defined(page_security_key) or exit;
 include_once './assets/functions.php';
 include_once './settings/settings.php';
 
+//SET ORIGIN FOR NAVIGATION
+$_SESSION['prev_origin'] = $_SERVER['REQUEST_URI'];
+$page = $_SESSION['origin'] = 'histories';
+
 //Check if allowed
-if (isAllowed('histories',$_SESSION['profile'],$_SESSION['permission'],'R') === 0){
+if (isAllowed($page,$_SESSION['profile'],$_SESSION['permission'],'R') === 0){
     header('location: index.php');
     exit;
 }
@@ -74,6 +78,7 @@ $view .= '
     </form>
 </div>
 ';
+
 $view .= '
 <div class="content-block">
     <div class="table">
@@ -85,6 +90,7 @@ $view .= '
                     <th class="responsive-hidden">'.$history_label3.'</th>
                     <th class="responsive-hidden">'.$history_label4.'</th>
                     <th>'.$history_label5.'</th>
+                    <th>'.$view_asset_actions.'</th>
                 </tr>
             </thead>
             <tbody>
@@ -109,6 +115,7 @@ $view .= '
                         <td class="responsive-hidden">'.$response->created.'</td>
                         <td class="responsive-hidden">'.$response->createdby.'</td>
                         <td><pre>' . $description . '</pre></td>
+                        <td><a href="index.php?page=equipment&equipmentID='.$response->equipmentID.'" class="btn_link">'.$general_view .'</a></td>
                     </tr>
                     ';
                 }