diff options
| -rw-r--r-- | interact.go | 29 | ||||
| -rw-r--r-- | main.go | 2 | ||||
| -rw-r--r-- | sqlite.go | 5 |
3 files changed, 30 insertions, 6 deletions
diff --git a/interact.go b/interact.go index e336535..a37c665 100644 --- a/interact.go +++ b/interact.go @@ -19,11 +19,12 @@ func interact() { //cyan := color.New(color.FgCyan).SprintFunc() //yellow := color.New(color.FgYellow).SprintFunc() green := color.New(color.FgGreen).SprintFunc() -// boldGreen := color.New(color.FgGreen, color.Bold).SprintFunc() + boldBlue := color.New(color.FgBlue, color.Bold).SprintFunc() boldRed := color.New(color.FgRed, color.Bold).SprintFunc() // display info. shell.Println("Starting interactive Shell") + shell.SetPrompt(boldBlue(">>>")) shell.AddCmd(&ishell.Cmd{ Name: "new", @@ -33,6 +34,7 @@ func interact() { //c.Println(boldGreen("Start New Project")) newProject() showLastProject() + c.Println(boldBlue("______________________")) }, }) @@ -43,16 +45,18 @@ func interact() { //c.Print("\033[H\033[2J") //c.Println(boldGreen("Start New Project")) editConf() + c.Println(boldBlue("______________________")) }, }) shell.AddCmd(&ishell.Cmd{ - Name: "show", - Help: "Show Current State", + Name: "status", + Help: "Show Current Project and Tasks", Func: func(c *ishell.Context) { //c.Print("\033[H\033[2J") //c.Println(boldGreen("Start New Project")) stdOut() + c.Println(boldBlue("______________________")) }, }) @@ -63,6 +67,7 @@ func interact() { //c.Print("\033[H\033[2J") //c.Println(boldGreen("Start New Project")) addCustomer() + c.Println(boldBlue("______________________")) }, }) @@ -73,6 +78,7 @@ func interact() { //c.Println(boldGreen("New Task")) newTask(projectid) stdOut() + c.Println(boldBlue("______________________")) }, }) @@ -84,6 +90,7 @@ func interact() { //c.Println(boldGreen("Stoping Task",opentask.id)) closeTask() stdOut() + c.Println(boldBlue("______________________")) }, }) @@ -107,6 +114,7 @@ func interact() { c.Println(boldRed("deletetask <id> - Please enter an id")) allProjects() } + c.Println(boldBlue("______________________")) }, }) @@ -130,6 +138,7 @@ func interact() { c.Println(boldRed("project <id> - Please enter an id")) allProjects() } + c.Println(boldBlue("______________________")) }, }) @@ -152,6 +161,7 @@ func interact() { }else{ c.Println(boldRed("edittask <id> - Please enter an id")) } + c.Println(boldBlue("______________________")) }, }) @@ -175,6 +185,7 @@ func interact() { c.Println(boldRed("editproject <id> - Please enter an id")) allProjects() } + c.Println(boldBlue("______________________")) }, }) @@ -199,6 +210,7 @@ func interact() { c.Println(boldRed("editcustomer <id> - Please enter an id")) allCustomers() } + c.Println(boldBlue("______________________")) }, }) @@ -216,6 +228,7 @@ func interact() { }else{ c.Println(boldRed("start <DateTime> - Please enter a Datetime")) } + c.Println(boldBlue("______________________")) }, }) @@ -233,6 +246,7 @@ func interact() { }else{ c.Println(boldRed("stop <DateTime> - Please enter a Datetime")) } + c.Println(boldBlue("______________________")) }, }) @@ -242,8 +256,11 @@ func interact() { Func: func(c *ishell.Context) { //c.Print("\033[H\033[2J") //c.Println(boldGreen("Start New Project")) + //c.ClearScreen() + //c.Println(boldBlue(">> All Projects\n")) allProjects() stdOut() + c.Println(boldBlue("______________________")) }, }) @@ -253,7 +270,9 @@ func interact() { Func: func(c *ishell.Context) { //c.Print("\033[H\033[2J") //c.Println(boldGreen("Start New Project")) + //c.Println(boldBlue(">> All Bills\n")) showLastBills(0) + c.Println(boldBlue("______________________")) }, }) @@ -261,6 +280,7 @@ func interact() { Name: "showbills", Help: "<n> - Show the last n bills", Func: func(c *ishell.Context) { + //c.ClearScreen() arg := "none" if len(c.Args) > 0 { arg = strings.Join(c.Args, " ") @@ -276,6 +296,7 @@ func interact() { //c.Print("\033[H\033[2J") //c.Println(boldGreen("Start New Project")) stdOut() + c.Println(boldBlue("______________________")) }, }) /* @@ -457,11 +478,11 @@ func interact() { c.ReadLine() stdOut() } + c.Println(boldBlue("______________________")) c.ShowPrompt(true) }, }) - shell.Run() // teardown shell.Close() @@ -65,7 +65,7 @@ func init() { false, "View and Edit Configuration") flag.BoolVar(&addcustomer, - "addcustomer", + "add", false, "Adds a new Customer") flag.BoolVar(&allproj, @@ -128,11 +128,14 @@ func newTaskTime(proj int, tim string) { fmt.Println(boldGreen("Start Project at ",tim)) if (opentask.id == 0) { timstr := "1791-09-30 19:07" + //zone, _ := time.Now().Zone() if isDate(tim) { timstr = getDate(tim) + //timst = timstr+" "+zone }else if isTime(tim) { - currdate := time.Now().UTC().Format("2006-01-02") + currdate := time.Now().Local().Format("2006-01-02") timstr = currdate+" "+getTime(tim) + //timst = timstr+" "+zone }else { fmt.Println(tim,boldRed("is Not a Valid Timestring!"), "use: 'YYYY-MM-DD HH:MM' or 'HH:MM'") return |
