Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 1b904c597b |
@@ -24,6 +24,18 @@ eine Eingabe ohne Vorzeichen wird aus Kompatibilitaet als Minuszeit behandelt.
|
||||
|
||||
Kurze Zeiten wie `6:01` oder `01:52` sind ebenfalls erlaubt.
|
||||
|
||||
## Werte abfragen
|
||||
|
||||
```sh
|
||||
goTimecalc -a
|
||||
```
|
||||
|
||||
Oder ausgeschrieben:
|
||||
|
||||
```sh
|
||||
goTimecalc --ask
|
||||
```
|
||||
|
||||
## Netto-Zeit und Tages-Saldo
|
||||
|
||||
Der Tages-Saldo wird mit Vorzeichen angegeben: Minuszeit mit `-`, Pluszeit mit
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
"errors"
|
||||
"flag"
|
||||
"fmt"
|
||||
@@ -55,6 +56,8 @@ func run(args []string, out io.Writer) error {
|
||||
flags.SetOutput(out)
|
||||
|
||||
var days dayList
|
||||
askInput := flags.Bool("a", false, "Werte interaktiv abfragen")
|
||||
flags.BoolVar(askInput, "ask", false, "Werte interaktiv abfragen")
|
||||
webInput := flags.Bool("web", false, "Optionales Webinterface lokal starten")
|
||||
addrInput := flags.String("addr", "127.0.0.1:8080", "Adresse fuer das Webinterface")
|
||||
nettoInput := flags.String("netto", "", "Netto-Zeit, z.B. 06:01 oder 06:01:14")
|
||||
@@ -71,6 +74,7 @@ func run(args []string, out io.Writer) error {
|
||||
flags.Usage = func() {
|
||||
fmt.Fprintln(out, "Nutzung:")
|
||||
fmt.Fprintln(out, " goTimecalc 06:01:14 01:51:46")
|
||||
fmt.Fprintln(out, " goTimecalc -a")
|
||||
fmt.Fprintln(out, " goTimecalc --netto 08:56:12 --saldo +01:03:12")
|
||||
fmt.Fprintln(out, " goTimecalc --brutto 09:26:12 --pause 00:30 --soll 07:53")
|
||||
fmt.Fprintln(out, " goTimecalc --start 08:00 --ende 16:30 --pause 00:30 --soll 07:53")
|
||||
@@ -97,6 +101,10 @@ func run(args []string, out io.Writer) error {
|
||||
return errors.New("unbekannte Argumente. Hilfe mit: goTimecalc --help")
|
||||
}
|
||||
|
||||
if *askInput {
|
||||
return runAsk(os.Stdin, out)
|
||||
}
|
||||
|
||||
if *webInput {
|
||||
return startWebServer(*addrInput, out)
|
||||
}
|
||||
@@ -133,6 +141,23 @@ func run(args []string, out io.Writer) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func runAsk(input io.Reader, out io.Writer) error {
|
||||
reader := bufio.NewReader(input)
|
||||
|
||||
netto, err := promptDuration(reader, out, "Netto-Zeit: ")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
saldo, err := promptSaldo(reader, out, "Tagesaldo (+/-): ")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
printSollzeitFromSaldo(out, netto, saldo)
|
||||
return nil
|
||||
}
|
||||
|
||||
func runNettoSaldo(out io.Writer, nettoInput string, saldoInput string, minusInput string) error {
|
||||
if nettoInput == "" {
|
||||
return errors.New("--netto muss angegeben werden")
|
||||
@@ -231,6 +256,38 @@ func printSollzeitFromSaldo(out io.Writer, netto int, saldo int) {
|
||||
fmt.Fprintf(out, "= Sollzeit %8s\n", formatDuration(netto-saldo))
|
||||
}
|
||||
|
||||
func promptDuration(reader *bufio.Reader, out io.Writer, label string) (int, error) {
|
||||
fmt.Fprint(out, label)
|
||||
|
||||
input, err := reader.ReadString('\n')
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
|
||||
value, err := parseDuration(strings.TrimSpace(input))
|
||||
if err != nil {
|
||||
return 0, fmt.Errorf("%s%w", strings.TrimSuffix(label, ": "), err)
|
||||
}
|
||||
|
||||
return value, nil
|
||||
}
|
||||
|
||||
func promptSaldo(reader *bufio.Reader, out io.Writer, label string) (int, error) {
|
||||
fmt.Fprint(out, label)
|
||||
|
||||
input, err := reader.ReadString('\n')
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
|
||||
value, err := parseSaldoInput(strings.TrimSpace(input))
|
||||
if err != nil {
|
||||
return 0, fmt.Errorf("%s%w", strings.TrimSuffix(label, ": "), err)
|
||||
}
|
||||
|
||||
return value, nil
|
||||
}
|
||||
|
||||
func printBruttoNetto(out io.Writer, brutto int, pause int, sollInput string) error {
|
||||
netto := brutto - pause
|
||||
if netto < 0 {
|
||||
|
||||
@@ -33,9 +33,21 @@ func TestNoArgumentsShowsHelp(t *testing.T) {
|
||||
output := runCommand(t)
|
||||
|
||||
assertContains(t, output, "Nutzung:")
|
||||
assertContains(t, output, "goTimecalc -a")
|
||||
assertContains(t, output, "goTimecalc --netto 08:56:12 --saldo +01:03:12")
|
||||
}
|
||||
|
||||
func TestAskMode(t *testing.T) {
|
||||
var out bytes.Buffer
|
||||
if err := runAsk(strings.NewReader("08:05:25\n+00:12:25\n"), &out); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
assertContains(t, out.String(), "Netto-Zeit: Tagesaldo (+/-):")
|
||||
assertContains(t, out.String(), "Tagesaldo +00:12:25")
|
||||
assertContains(t, out.String(), "= Sollzeit 07:53:00")
|
||||
}
|
||||
|
||||
func TestStartEndWithPauseAndSoll(t *testing.T) {
|
||||
output := runCommand(t, "--start", "08:00", "--ende", "16:30", "--pause", "00:30", "--soll", "07:53")
|
||||
|
||||
|
||||
Reference in New Issue
Block a user