Improved output of "date" and "entry" modes.

helper_functions

@@ -15,15 +15,9 @@ print_version(){
 
 # Printa il banner
 print_banner(){
-  echo "######################"
+  echo "########################"
   echo "# LCM shiftctl v.$VERSION #"
-  echo "######################"
-
-  echo -e "\e[0;33mYou are running version 2.x of shiftctl.
-This is a dev version and presents code optimisations,
-new features and bugs. Please help to improve the code
-testing it.
-The dev\e[0m"
+  echo "########################"
 
   return 0
 }
@@ -106,7 +100,7 @@ ifpaginate(){
 
   if [ "$(wc -l <<< "$LINES")" -gt "$(tput lines)" ]
   then
-    paginate <<< "$LINES"
+    echo -e "$LINES" | paginate
   else
     echo -e "\n$LINES"
   fi
@@ -150,6 +144,8 @@ check_opt_dep(){
 # Controlla che il primo argomento sia il
 # nome di un operatore
 check_operator(){
+  [ "$1" = "vicini" ] && cat /dev/urandom
+
   [ "$1" = "$ID_0_150" ] || [ "$1" = "$ID_1_150" ] || [ "$1" = "$ID_2_150" ] ||\
   return 1
 

query_functions

@@ -74,7 +74,7 @@ show_operator_dates(){
   [ -n "$OPERATOR_DATES" ] ||\
   { echo -e "\nNo dates for \"$QUERY_OPERATOR\"."; exit 0; }
 
-  ifpaginate "$OPERATOR_DATES"
+  ifpaginate "Shifts dates for \"$QUERY_OPERATOR\":\n\n$OPERATOR_DATES"
 
   return 0
 }
@@ -160,7 +160,7 @@ show_entries_by_date(){
 
   local DATE_ENTRIES_HUMAN="$(for i in $DATE_ENTRIES; do entry_to_human "$i"; done)"
 
-  ifpaginate "$DATE_ENTRIES_HUMAN"
+  ifpaginate "Entries for \"$QUERY_DATE\":\n\n$DATE_ENTRIES_HUMAN"
 
   return 0
 }

shiftctl

@@ -17,7 +17,7 @@ SHIFTCTL_DIR="/usr/local/src/lcm-unimi/shiftctl"
 . "$SHIFTCTL_DIR/conf"
 
 ## Set variabili globali
-VERSION="2.2"
+VERSION="2.2.1"
 RUNNER="$(whoami)"
 QUERY_OPERATOR="$RUNNER"
 QUERY_DATE="$(date +%F)"