Fix week and previous-week aliases

On Mondays, they gave the week before the wanted week

Author: Bohdan Potměkleč

stup

@@ -1195,11 +1195,11 @@ extract_from_to_dates()
 {
   case "$FROM_TO_ALIAS" in
     week)
-      FROM_AT=$(date -d "$(date -d yesterday +%u) days ago" +"%Y-%m-%d")
+      FROM_AT=$(date -d "$(($(date +%u) - 1)) days ago" +"%Y-%m-%d")
       TO_AT=$(date -d "$FROM_AT + 6 days" +"%Y-%m-%d")
       ;;
     previous-week)
-      local first_date_of_current_week=$(date -d "$(date -d yesterday +%u) days ago" +"%Y-%m-%d")
+      local first_date_of_current_week=$(date -d "$(($(date +%u) - 1)) days ago" +"%Y-%m-%d")
       FROM_AT=$(date -d "$first_date_of_current_week -7 days" +"%Y-%m-%d")
       TO_AT=$(date -d "$first_date_of_current_week -1 days" +"%Y-%m-%d")
       ;;
@@ -1212,8 +1212,8 @@ extract_from_to_dates()
       TO_AT=$(date -d "$(date +'%Y-%m-01') - 1 second" +"%Y-%m-%d")
       ;;
     year)
-      FROM_AT=$(date -d "today" +"%Y-01-01")
-      TO_AT=$(date -d "today" +"%Y-12-31")
+      FROM_AT=$(date +"%Y-01-01")
+      TO_AT=$(date +"%Y-12-31")
       ;;
     previous-year)
       FROM_AT=$(date -d "today - 1 year" +"%Y-01-01")