From e7780432d717ab7dadaf54c1f13436021a45a45f Mon Sep 17 00:00:00 2001 From: "Martin (Schretzi) Fuchsluger" Date: Mon, 17 Feb 2025 19:26:03 +0100 Subject: [PATCH] Add switch and switchback Cmd Add switch and switchback Cmd --- z/rootCmd.go | 1 + z/switchBackCmd.go | 26 ++++++++++++++++++++++++++ z/switchCmd.go | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 65 insertions(+) create mode 100644 z/switchBackCmd.go create mode 100644 z/switchCmd.go diff --git a/z/rootCmd.go b/z/rootCmd.go index ed30570..2ad2398 100644 --- a/z/rootCmd.go +++ b/z/rootCmd.go @@ -12,6 +12,7 @@ var database *Database var begin string var finish string +var switchString string var project string var task string var notes string diff --git a/z/switchBackCmd.go b/z/switchBackCmd.go new file mode 100644 index 0000000..b6d31ba --- /dev/null +++ b/z/switchBackCmd.go @@ -0,0 +1,26 @@ +package z + +import ( + "github.com/spf13/cobra" +) + +var switchBackCmd = &cobra.Command{ + Use: "switchback", + Short: "switchback to the task before the last one", + Long: "End running activity and resume the task which was before, which can either be kept running until 'finish' is being called or parameterized to be a finished activity.", + Run: func(cmd *cobra.Command, args []string) { + + finish = switchString + finishTask(FinishOnlyTime) + + finish = "" + begin = switchString + resumeTask(2) + }, +} + +func init() { + rootCmd.AddCommand(switchBackCmd) + + switchBackCmd.Flags().StringVarP(&switchString, "begin", "b", "", "Time the new activity should begin at and the old one ends\n\nEither in the formats 16:00 / 4:00PM \nor relative to the current time, \ne.g. -0:15 (now minus 15 minutes), +1.50 (now plus 1:30h).") +} diff --git a/z/switchCmd.go b/z/switchCmd.go new file mode 100644 index 0000000..044b6ee --- /dev/null +++ b/z/switchCmd.go @@ -0,0 +1,38 @@ +package z + +import ( + "github.com/spf13/cobra" +) + +var switchCmd = &cobra.Command{ + Use: "switch", + Short: "switch to another task", + Long: "End running activity and track new activity, which can either be kept running until 'finish' is being called or parameterized to be a finished activity.", + Run: func(cmd *cobra.Command, args []string) { + + finish = switchString + finishTask(FinishOnlyTime) + + finish = "" + begin = switchString + trackTask() + }, +} + +func init() { + rootCmd.AddCommand(switchCmd) + + switchCmd.Flags().StringVarP(&switchString, "begin", "b", "", "Time the new activity should begin at and the old one ends\n\nEither in the formats 16:00 / 4:00PM \nor relative to the current time, \ne.g. -0:15 (now minus 15 minutes), +1.50 (now plus 1:30h).") + switchCmd.Flags().StringVarP(&project, "project", "p", "", "Project to be assigned") + switchCmd.Flags().StringVarP(&task, "task", "t", "", "Task to be assigned") + switchCmd.Flags().StringVarP(¬es, "notes", "n", "", "Activity notes") + + flagName := "task" + switchCmd.RegisterFlagCompletionFunc(flagName, func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) { + user := GetCurrentUser() + entries, _ := database.ListEntries(user) + _, tasks := listProjectsAndTasks(entries) + return tasks, cobra.ShellCompDirectiveDefault + }) +} +