pcwvanbeers/assetmgt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CM69 - Bugfix graph cartest, CMXX - Healthindex update

Browse Source
This commit is contained in:
“VeLiTi”
2024-10-02 16:57:01 +02:00
parent 17df4c7bc1
commit bf567ec426
14 changed files with 776 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
equipment.php
View File

@@ -59,8 +59,8 @@ $warrantydate = warrantyStatus($responses->warranty_date);
$service_date_due = serviceStatus($responses->service_date);
$firmware_status = availableFirmware($responses->sw_version, $responses->hw_version);
//Calculate Asset-Health
$total_score = assetHealthIndex($_SESSION['profile'],$_SESSION['permission'],$equipment_data);
//Calculate Healthindex based on last test
$total_score = assetHealthIndex($_SESSION['profile'],$_SESSION['permission'],$equipment_data,0);
//GetPartnerDetails
$partner_data = json_decode($responses->accounthierarchy);
@@ -300,27 +300,12 @@ $view .= '<div class="content-block">
</thead>
<tbody>';
foreach ($equipment_data as $data){
$asset_score = 100;
foreach (json_decode($data->measurement,true) as $data_measure){
switch ($data_measure['deviation']) {
case 1:
$asset_score = $asset_score - $data_measure['deviation'];
break;
case 2:
$asset_score = $asset_score - ($data_measure['deviation']*2);
break;
case 3:
$asset_score = $asset_score - ($data_measure['deviation']*3);
break;
}
}
$view .= '<tr>
<td>'.$data->rowID.'</td>
<td>'.(($view_history == 1)? '<a href="index.php?page=history&equipmentID='.$responses->equipmentID.'&historyid='.$data->historyid.'" class="btn2">'.$data->historyid.'</a>':$data->historyid).'</td>
<td><span class="status '.(($asset_score >= 85) ?'enabled' : (($asset_score <= 50)? 'disabled' : 'id2')).'">'.$asset_score.'</span></td>
<td><a href="index.php?page=" class="btn_link">'.$general_view.'</a></td>
<td><span class="status '.(($data->healthindex >= 85) ?'enabled' : (($data->healthindex <= 50)? 'disabled' : 'id2')).'">'.$data->healthindex.'</span></td>
<td><a href="index.php?page=equipment_data&equipmentID='.$responses->equipmentID.'&rowID='.$data->rowID.'" class="btn_link">'.$general_view.'</a></td>
</tr>';
}
$view .= '