diff --git a/groupTasks/groups/production1/index.json b/groupTasks/groups/production1/index.json index 98c3ff2..573f8bf 100644 --- a/groupTasks/groups/production1/index.json +++ b/groupTasks/groups/production1/index.json @@ -19,7 +19,7 @@ "onFinish": "pause", "undoPossible": false, "scriptPath": "test1.py", - "parameter": [ + "parameters": [ { "parameterName": "labelformat", "type": "text", @@ -40,7 +40,7 @@ "onFinish": "nextStep", "undoPossible": false, "scriptPath": "test2.py", - "parameter": [], + "parameters": [], "feedback": "" }, { @@ -48,7 +48,7 @@ "onFinish": "nextStep", "undoPossible": false, "scriptPath": "test2.py", - "parameter": [], + "parameters": [], "feedback": "" }, { @@ -56,7 +56,7 @@ "onFinish": "nextStep", "undoPossible": false, "scriptPath": "test2.py", - "parameter": [], + "parameters": [], "feedback": "" } ] diff --git a/groupTasks/groups/production1/test1.py b/groupTasks/groups/production1/test1.py index 8acf58b..8baafee 100644 --- a/groupTasks/groups/production1/test1.py +++ b/groupTasks/groups/production1/test1.py @@ -8,4 +8,4 @@ try: x = 5 / 0 # Hier wird ein Fehler ausgelöst except ZeroDivisionError: print("Ein Fehler ist aufgetreten: Division durch Null.") - raise SystemExit(0) \ No newline at end of file + raise SystemExit(140) \ No newline at end of file diff --git a/groupTasks/groups/roese/haha.py b/groupTasks/groups/roese/haha.py new file mode 100644 index 0000000..67bb810 --- /dev/null +++ b/groupTasks/groups/roese/haha.py @@ -0,0 +1 @@ +print("working") \ No newline at end of file diff --git a/groupTasks/groups/roese/index.json b/groupTasks/groups/roese/index.json index 45bfc7a..985a14c 100644 --- a/groupTasks/groups/roese/index.json +++ b/groupTasks/groups/roese/index.json @@ -1,4 +1,13 @@ { "category": "Roese", - "name": "Roese Home" + "name": "Roese Home", + "tasks": [ + { + "name": "Haha", + "onFinish": "pause", + "undoPossible": false, + "scriptPath": "haha.py", + "feedback": "" + } + ] } \ No newline at end of file diff --git a/groupTasks/groups/testa/index.json b/groupTasks/groups/testa/index.json index 8bbeedc..7d9970a 100644 --- a/groupTasks/groups/testa/index.json +++ b/groupTasks/groups/testa/index.json @@ -7,7 +7,7 @@ "onFinish": "pause", "undoPossible": false, "scriptPath": "", - "parameter": [], + "parameters": [], "feedback": "" }, { @@ -15,7 +15,7 @@ "onFinish": "nextStep", "undoPossible": false, "scriptPath": "", - "parameter": [], + "parameters": [], "feedback": "" }, { @@ -23,7 +23,7 @@ "onFinish": "nextStep", "undoPossible": false, "scriptPath": "", - "parameter": [], + "parameters": [], "feedback": "" }, { @@ -31,7 +31,7 @@ "onFinish": "nextStep", "undoPossible": false, "scriptPath": "", - "parameter": [], + "parameters": [], "feedback": "" }, { @@ -39,7 +39,7 @@ "onFinish": "nextStep", "undoPossible": false, "scriptPath": "", - "parameter": [], + "parameters": [], "feedback": "" } ] diff --git a/grouptasks/grouptasks.go b/grouptasks/grouptasks.go index 4b19bf4..3b2726c 100644 --- a/grouptasks/grouptasks.go +++ b/grouptasks/grouptasks.go @@ -149,25 +149,6 @@ func RunGroupTask(args RunGroupTaskArgs) { groupTaskStep.Log = cmdLog groupTaskStep.EndedAt = time.Now() - /* - if args.StartType == RunGroupTaskStartTypeNormal { - database.DB.Model(&structs.GroupTaskSteps{}).Where("id = ?", groupTaskStep.Id).Updates(groupTaskStep) - - socketclients.BroadcastMessage(structs.SendSocketMessage{ - Cmd: utils.SentCmdUpdateGroupTaskStep, - Body: groupTaskStep, - }) - } else if args.StartType == RunGroupTaskStartTypeTryAgain { - log.Debug().Msgf("update", groupTaskStep.Id, groupTaskStep.Status) - - database.DB.Model(&structs.GroupTaskSteps{}).Where("id = ?", groupTaskStep.Id).Updates(groupTaskStep) - - socketclients.BroadcastMessage(structs.SendSocketMessage{ - Cmd: utils.SentCmdUpdateGroupTaskStep, - Body: groupTaskStep, - }) - }*/ - database.DB.Model(&structs.GroupTaskSteps{}).Where("id = ?", groupTaskStep.Id).Updates(groupTaskStep) socketclients.BroadcastMessage(structs.SendSocketMessage{ @@ -230,7 +211,6 @@ func RunGroupTask(args RunGroupTaskArgs) { log.Info().Msg("SET TO FINISHED") } - } func GetAllGroupTasks() []structs.GroupTasks { diff --git a/modules/structs/grouptasks.go b/modules/structs/grouptasks.go index 2f4bbcb..b3d7f9a 100644 --- a/modules/structs/grouptasks.go +++ b/modules/structs/grouptasks.go @@ -64,7 +64,7 @@ type Task struct { OnFinish string `json:"onFinish"` UndoPossible bool `json:"undoPossible"` ScriptPath string `json:"scriptPath"` - Parameter []TaskParameter `json:"parameter"` + Parameters []TaskParameter `json:"parameters"` Feedback string `json:"feedback"` }