From bcce465e78c96cc3b76013b531ae6149c6b39ba7 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sun, 12 May 2024 17:33:57 -0500
Subject: [PATCH] Update temp.inc.sh

---
 inc/temp.inc.sh | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh
index 67a95b2a..93a3d92b 100644
--- a/inc/temp.inc.sh
+++ b/inc/temp.inc.sh
@@ -220,7 +220,7 @@ CHECKTEMP(){
 				### DETAILS VIEW
 				if [ ${DETAILS} -eq 1 ] && [ ! -f ${PW_TMPFOLDER}/${SENSOR}.down ] && [ "${temp_f}" != "timeout" ] && [ "${temp_f}" != "offline" ]; then
 					DIVIDER . white ${PRI_WIDTH}
-					for M in 1 5 15 30 60 120; do
+					for M in 5 15 30 60 120; do
 						lico=" "
 						if [ "${PW_SENSOR_TYPE[${SENSOR}]}" == "system" ] && [[ "${SENSOR}" = *"FAN"* ]]; then
 							spc_cnt=6
@@ -257,7 +257,6 @@ CHECKTEMP(){
 						fi
 						([ "${temp_h}" != "" ] && [ "${temp_h}" != "0" ]) && echo -en "${idsCL[White]}|  " || echo -n "   "
 						echo -en "${idsCL[Default]}                   "
-						# [ ${#M} -eq 2 ] && echo -n " "
 						if [ ${#M} -eq 1 ]; then
 							echo -n "  "
 						elif [ ${#M} -lt 3 ]; then
@@ -293,7 +292,7 @@ CHECKTEMP(){
 					
 					if [ ${DETAILS} -eq 1 ] && [ ! -f ${PW_TMPFOLDER}/${SENSOR}.down ]; then
 						DIVIDER . lightCyan 50
-						for M in 15 30 60 120; do
+						for M in 5 15 30 60 120; do
 							lico=" "
 							OLD_temp_h=($(${mysql_conn} -e "SELECT hum,date FROM servermonitor.sensor_data WHERE sensorid='${PW_SENSOR_ID[${SENSOR}]}' AND date >= DATE_SUB(NOW(), INTERVAL $(expr ${M} + 1) MINUTE) AND date <= DATE_SUB(NOW(), INTERVAL $(expr ${M} - 6) MINUTE) ORDER BY date ASC LIMIT 1"))
 							OLD_temp_h=${OLD_temp_h[2]}
@@ -323,7 +322,15 @@ CHECKTEMP(){
 								lico="\u22C5"
 							fi
 							echo -en "${idsCL[Default]}                      "
-							[ ${#M} -eq 2 ] && echo -n " "
+							if [ ${#M} -eq 1 ]; then
+								echo -n "  "
+							elif [ ${#M} -lt 3 ]; then
+								c=0; spc1=`expr ${#M} - 1`
+								until [ ${c} = ${spc1} ]; do
+									echo -n " "
+									((c++))
+								done
+							fi
 							if [ "${OLD_temp_h}" != "" ]; then
 								c=0; spc=''; spc1=`expr 7 - ${#OLD_temp_h}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
 								echo -en "~${M}m ago - ${lclr}${lico}${spc}${OLD_temp_h}%"
@@ -489,7 +496,7 @@ CHECKTEMP(){
 									
 									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
+										for M in 5 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
@@ -527,7 +534,15 @@ CHECKTEMP(){
 											fi
 											([ "${temp_h}" != "" ] && [ "${temp_h}" != "0" ]) && echo -en "${idsCL[White]}|  " || echo -n "   "
 											echo -en "${idsCL[Default]}                   "
-											[ ${#M} -eq 2 ] && echo -n " "
+											if [ ${#M} -eq 1 ]; then
+												echo -n "  "
+											elif [ ${#M} -lt 3 ]; then
+												c=0; spc1=`expr ${#M} - 1`
+												until [ ${c} = ${spc1} ]; do
+													echo -n " "
+													((c++))
+												done
+											fi
 											if [ "${OLD_temp_f}" != "" ]; then
 							
 												c=0; spc=''; spc1=`expr ${spc_cnt} - ${#OLD_temp_f}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done