From 1407a24ffb5afc13ce5e24a8dd7ef710f4febbc4 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sat, 11 May 2024 22:23:04 -0500
Subject: [PATCH] Update temp.inc.sh

---
 inc/temp.inc.sh | 53 ++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 50 insertions(+), 3 deletions(-)

diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh
index c86ca32e..2dc21b8d 100644
--- a/inc/temp.inc.sh
+++ b/inc/temp.inc.sh
@@ -258,7 +258,7 @@ CHECKTEMP(){
 						if [ "${OLD_temp_f}" != "" ]; then
 							
 							c=0; spc=''; spc1=`expr ${spc_cnt} - ${#OLD_temp_f}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
-							echo -en "${lclr}~${M}m ago - ${lclr}${lico}${spc}"
+							echo -en "~${M}m ago - ${lclr}${lico}${spc}"
 							[ "${PW_SENSOR_TYPE[${SENSOR}]}" == "system" ] && [[ "${SENSOR}" = *"FAN"* ]] && echo -e "$(IDS_NUMBER_FORMAT ${OLD_temp_f})${GAUGESH}" || echo -e "${OLD_temp_f}${GAUGESH}"
 						else
 							echo -e "${lclr}~${M}m ago - ${lclr}${lico}"
@@ -471,8 +471,55 @@ CHECKTEMP(){
 										echo -e "${idsCL[Default]}"
 									fi
 									
-									if [ ${DETAILS} -eq 1 ]; then
-										echo here
+									if [ ${DETAILS} -eq 1 ] && [ ! -f ${PW_TMPFOLDER}/${SENSOR}.down ] && [ "${temp_f}" != "timeout" ] && [ "${temp_f}" != "offline" ]; then
+										DIVIDER . white ${PRI_WIDTH}
+										for M in 15 30 60 120; do
+											lico=" "
+											entityid=($(${mysql_conn} -e "SELECT id FROM servermonitor.entities WHERE BINARY name='${sensorname// /_}' AND sensorid='${PW_SENSOR_ID[${SENSOR}]}'"))
+											if [ "${PW_SENSOR_TYPE[${SENSOR}]}" == "system" ] && [[ "${SENSOR}" = *"FAN"* ]]; then
+												spc_cnt=6
+												OLD_temp_f=($(${mysql_conn} -e "SELECT speed FROM servermonitor.sensor_data WHERE sensorid='${PW_SENSOR_ID[${SENSOR}]}' AND entity=${entityid[1]} AND date >= DATE_SUB(NOW(), INTERVAL ${R} MINUTE) AND date <= DATE_SUB(NOW(), INTERVAL $(expr ${R} - 7) MINUTE) ORDER BY date ASC LIMIT 1"))
+											else
+												spc_cnt=7
+												OLD_temp_f=($(${mysql_conn} -e "SELECT temp FROM servermonitor.sensor_data WHERE sensorid='${PW_SENSOR_ID[${SENSOR}]}' AND entity=${entityid[1]} AND date >= DATE_SUB(NOW(), INTERVAL ${R} MINUTE) AND date <= DATE_SUB(NOW(), INTERVAL $(expr ${R} - 7) MINUTE) ORDER BY date ASC LIMIT 1"))
+											fi
+											OLD_temp_f=${OLD_temp_f[1]}
+											if [ "${OLD_temp_f}" != "" ]; then
+												if [ $(bc -l <<< "${temp_f} <  $(echo "scale=2; ${OLD_temp_f}+${PW_TEMPIND_DIFF}" | bc)") -eq 1 ] && [ $(bc -l <<< "$(echo "scale=2; ${OLD_temp_f}-${PW_TEMPIND_DIFF}" | bc) < ${temp_f}") -eq 1 ]; then
+													lclr="${idsCL[White]}"
+													lico="\u23F9"
+												elif [ $(bc -l <<< "$(bc <<< "scale=2; ${OLD_temp_f}+(${PW_TEMPIND_DIFF}*2)") < ${temp_f}") -eq 1 ]; then
+													lclr="${idsCL[LightRed]}"
+													lico="\u25B2"
+												elif [ $(bc -l <<< "${OLD_temp_f} < ${temp_f}") -eq 1 ]; then
+													lclr="${idsCL[Magenta]}"
+													lico="\u25B2"
+												elif [ $(bc -l <<< "${temp_f} < $(bc <<< "scale=2; ${OLD_temp_f}-(${PW_TEMPIND_DIFF}*2)")") -eq 1 ]; then
+													lclr="${idsCL[LightGreen]}"
+													lico="\u25BC"
+												elif [ $(bc -l <<< "${temp_f} < ${OLD_temp_f}") -eq 1 ]; then
+													lclr="${idsCL[LightCyan]}"
+													lico="\u25BC"
+												else
+													lclr="${idsCL[Default]}"
+												fi
+											else
+												lclr="${idsCL[Default]}"
+												lico="\u22C5"
+											fi
+											([ "${temp_h}" != "" ] && [ "${temp_h}" != "0" ]) && echo -en "${idsCL[White]}|  " || echo -n "   "
+											echo -en "${idsCL[Default]}                   "
+											[ ${#M} -eq 2 ] && echo -n " "
+											if [ "${OLD_temp_f}" != "" ]; then
+							
+												c=0; spc=''; spc1=`expr ${spc_cnt} - ${#OLD_temp_f}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
+												echo -en "~${M}m ago - ${lclr}${lico}${spc}"
+												[ "${PW_SENSOR_TYPE[${SENSOR}]}" == "system" ] && [[ "${SENSOR}" = *"FAN"* ]] && echo -e "$(IDS_NUMBER_FORMAT ${OLD_temp_f})${GAUGESH}" || echo -e "${OLD_temp_f}${GAUGESH}"
+											else
+												echo -e "${lclr}~${M}m ago - ${lclr}${lico}"
+											fi
+										done
+					
 									fi
 									
 									if [ "${TTYPE}" == "fans" ]; then