|
|
@ -21,7 +21,7 @@ function datetimedescription() { |
|
|
do |
|
|
do |
|
|
extracttime $T |
|
|
extracttime $T |
|
|
printf "%s;%s;%s;%s;%s\n" \ |
|
|
printf "%s;%s;%s;%s;%s\n" \ |
|
|
$TIMEKEY $TIME $PROJECT $DESCRIPTION $COMPLETED |
|
|
|
|
|
|
|
|
"$TIMEKEY" "$TIME" "$PROJECT" "$DESCRIPTION" "$COMPLETED" |
|
|
done |
|
|
done |
|
|
done |
|
|
done |
|
|
} |
|
|
} |
|
|
@ -32,7 +32,7 @@ function report() { |
|
|
DATE=$1 |
|
|
DATE=$1 |
|
|
for LINE in "${(f)$(datetimedescription $@|sort -t\; -f -k1,1 -k3,3)}" |
|
|
for LINE in "${(f)$(datetimedescription $@|sort -t\; -f -k1,1 -k3,3)}" |
|
|
do |
|
|
do |
|
|
set -- ${(s(;))LINE} |
|
|
|
|
|
|
|
|
set -- "${(@s(;))LINE}" |
|
|
if [[ -n $1 && $(date -d $1 +%s) -ge $(date -d $DATE +%s) ]] |
|
|
if [[ -n $1 && $(date -d $1 +%s) -ge $(date -d $DATE +%s) ]] |
|
|
then |
|
|
then |
|
|
if [[ $D != $1 ]] |
|
|
if [[ $D != $1 ]] |
|
|
@ -42,7 +42,7 @@ function report() { |
|
|
fi |
|
|
fi |
|
|
T=$2 |
|
|
T=$2 |
|
|
if [[ -n $5 ]] && T=$(bold "" $T) |
|
|
if [[ -n $5 ]] && T=$(bold "" $T) |
|
|
if [[ -n $D ]] && printf "%s [%s] - %s\n" $T $3 $4 |
|
|
|
|
|
|
|
|
if [[ -n $D ]] && printf "%s [%s] - %s\n" "$T" "$3" "$4" |
|
|
fi |
|
|
fi |
|
|
done |
|
|
done |
|
|
} |
|
|
} |
|
|
@ -104,6 +104,5 @@ done |
|
|
|
|
|
|
|
|
DATEFROM=${DATEFROM:-$(date +%Y-%m-01)} |
|
|
DATEFROM=${DATEFROM:-$(date +%Y-%m-01)} |
|
|
report $DATEFROM $@ |
|
|
report $DATEFROM $@ |
|
|
#datetimedescription $DATEFROM $@|sort -t\; -f -k1,1 -k3,3 |
|
|
|
|
|
|
|
|
|
|
|
# vim: set et ts=4 sw=4: |
|
|
# vim: set et ts=4 sw=4: |
