Fix help

badgy

@@ -24,21 +24,52 @@ devalidate()
 
 s2h()
 {
-  local sc=${1}
+  local sc=0
+  local sign=""
+  if [ ${1} -lt 0 ]; then
+    sign="-"
+    sc=$(echo ${1} | cut -c2-)
+  else
+    sc=${1}
+  fi
   local h=$(( sc / 3600))
   local m=$(( (sc % 3600) / 60 ))
   local s=$(( sc % 60))
-  printf "%dh%02dm" "${h}" "${m}"
+  printf "%s%dh%02dm" "${sign}" "${h}" "${m}"
 }
 
 getNewBalance()
 {
-  local wk=25200
+  local workDay=25200
-  local blh=$(echo ${1} | cut -d ':' -f 1)
+  local blh=$(echo ${1} | cut -d ':' -f 1 | cut -c2-)
   local blm=$(echo ${1} | cut -d ':' -f 2)
-  local bls=""
+  local bls=$((blh*3600 + blm*60))
-  local nbls=""
+  local nbls=0
-  echo ${nbls}
+  if [ "${bls}" -le "${workDay}" ]; then
+    nbls=$((${2}-(workDay - bls)))
+  else
+    nbls=$((bls+${2}))
+  fi
+
+  echo $nbls
+}
+
+getClockOutTime()
+{
+  local workDay=25200
+  local dr=${1}
+  local now=$(date +'%s')
+  local remaining=$((workDay - dr))
+  local endingTime=$((now + remaining))
+  date -d @${endingTime} +'%H:%M'
+}
+
+captitalTime2seconds()
+{
+  cph=$(echo "${1}" | awk -F ':' '{gsub("+|-",""); print $1}' )
+  cpm=$(echo "${1}" | awk -F ':' '{gsub("+|-",""); print $2}' )
+  sign=${1::1}
+  echo ${sign}$(( (cphd*3600)+(cpm*60)))
 }
 
 getCapitalTime()
@@ -47,31 +78,40 @@ getCapitalTime()
   clocks=$(echo ${data} | jq -rc ".timers[]")
   sl=$(echo ${data} | jq -rc ".capitaltime")
   dr=0
-  
+
-  echo "Timers:"
+  echo "Timers :"
   for cl in ${clocks}
   do
     starts=$(echo ${cl} | jq -rc ".start")
-    st=$(date --date="${starts}" +'%s') 
+    st=$(date --date="${starts}" +'%s')
     ends=$(echo ${cl} | jq -rc ".end")
-    echo 
+    echo
-    echo "   Start: $(date --date=${starts} +'%A %d %B %Y : %H:%M')"
+    echo -n " $(date --date=${starts} +"%A %d %B %Y") "
+    echo -n "$(date --date=${starts} +'%H:%M') to "
     if [ "${ends}" != "null" ];then
-      ed=$(date --date="${ends}" +'%s') 
+      ed=$(date --date="${ends}" +'%s')
-      echo "   End: $(date --date=${ends} +'%A %d %B %Y : %H:%M')"
+      echo -n "$(date --date=${ends} +'%H:%M')"
     else
       ed=$(date +'%s')
-      echo "   End: running"
+      echo -n "....."
     fi
-    dr=$(( dr + (ed - st)))
+    timerCount="$((ed - st))"
+    echo -n " ($(s2h ${timerCount}))"
+    dr=$(( dr + timerCount))
   done
 
   nbl=$(getNewBalance "${sl}" "${dr}")
-
+  balance=$(captitalTime2seconds "${sl}")
+  clockOutTime=$(getClockOutTime "$((dr+balance))")
   echo
-  echo "Your time balance is : ${sl}"
+  echo
-  echo "Today you worked $(s2h ${dr})"
+  echo "Your time balance is: ${sl}"
-  #echo "If you validate now your balance will be : ${nbl}"
+  echo
+  echo "Today you worked: $(s2h ${dr})"
+  echo 
+  echo "Balance if you validate now  : $(s2h ${nbl})"
+  echo "Clockout time (use balance)  : ${clockOutTime}"
+  echo "Clockout time (keep balance) : $(getClockOutTime "${dr}")"
 }
 
 show()
@@ -84,11 +124,11 @@ if [ -e "${HOME}/.badgyrc" ]; then
 else
   echo "${HOME}/.badgyrc file is missing, I need it"
   echo "Create it with this command:"
-  echo "   echo 'BADGEURL="https://myninebage" KEY="XXXX-XX-XXX-XXX"' > ${HOME}/.badyrc"
+  echo "   echo 'BADGEURL="https://myninebage" KEY="XXXX-XX-XXX-XXX"' > ${HOME}/.badgyrc"
   exit 2
 fi
 
-case ${1} in 
+case ${1} in
   in|clockin|c)
      clockin | jq
   ;;