changed parameter to parameters
parent
2b8be9ebf3
commit
557134276a
|
@ -19,7 +19,7 @@
|
||||||
"onFinish": "pause",
|
"onFinish": "pause",
|
||||||
"undoPossible": false,
|
"undoPossible": false,
|
||||||
"scriptPath": "test1.py",
|
"scriptPath": "test1.py",
|
||||||
"parameter": [
|
"parameters": [
|
||||||
{
|
{
|
||||||
"parameterName": "labelformat",
|
"parameterName": "labelformat",
|
||||||
"type": "text",
|
"type": "text",
|
||||||
|
@ -40,7 +40,7 @@
|
||||||
"onFinish": "nextStep",
|
"onFinish": "nextStep",
|
||||||
"undoPossible": false,
|
"undoPossible": false,
|
||||||
"scriptPath": "test2.py",
|
"scriptPath": "test2.py",
|
||||||
"parameter": [],
|
"parameters": [],
|
||||||
"feedback": ""
|
"feedback": ""
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -48,7 +48,7 @@
|
||||||
"onFinish": "nextStep",
|
"onFinish": "nextStep",
|
||||||
"undoPossible": false,
|
"undoPossible": false,
|
||||||
"scriptPath": "test2.py",
|
"scriptPath": "test2.py",
|
||||||
"parameter": [],
|
"parameters": [],
|
||||||
"feedback": ""
|
"feedback": ""
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -56,7 +56,7 @@
|
||||||
"onFinish": "nextStep",
|
"onFinish": "nextStep",
|
||||||
"undoPossible": false,
|
"undoPossible": false,
|
||||||
"scriptPath": "test2.py",
|
"scriptPath": "test2.py",
|
||||||
"parameter": [],
|
"parameters": [],
|
||||||
"feedback": ""
|
"feedback": ""
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
|
@ -8,4 +8,4 @@ try:
|
||||||
x = 5 / 0 # Hier wird ein Fehler ausgelöst
|
x = 5 / 0 # Hier wird ein Fehler ausgelöst
|
||||||
except ZeroDivisionError:
|
except ZeroDivisionError:
|
||||||
print("Ein Fehler ist aufgetreten: Division durch Null.")
|
print("Ein Fehler ist aufgetreten: Division durch Null.")
|
||||||
raise SystemExit(0)
|
raise SystemExit(140)
|
|
@ -0,0 +1 @@
|
||||||
|
print("working")
|
|
@ -1,4 +1,13 @@
|
||||||
{
|
{
|
||||||
"category": "Roese",
|
"category": "Roese",
|
||||||
"name": "Roese Home"
|
"name": "Roese Home",
|
||||||
|
"tasks": [
|
||||||
|
{
|
||||||
|
"name": "Haha",
|
||||||
|
"onFinish": "pause",
|
||||||
|
"undoPossible": false,
|
||||||
|
"scriptPath": "haha.py",
|
||||||
|
"feedback": ""
|
||||||
|
}
|
||||||
|
]
|
||||||
}
|
}
|
|
@ -7,7 +7,7 @@
|
||||||
"onFinish": "pause",
|
"onFinish": "pause",
|
||||||
"undoPossible": false,
|
"undoPossible": false,
|
||||||
"scriptPath": "",
|
"scriptPath": "",
|
||||||
"parameter": [],
|
"parameters": [],
|
||||||
"feedback": ""
|
"feedback": ""
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -15,7 +15,7 @@
|
||||||
"onFinish": "nextStep",
|
"onFinish": "nextStep",
|
||||||
"undoPossible": false,
|
"undoPossible": false,
|
||||||
"scriptPath": "",
|
"scriptPath": "",
|
||||||
"parameter": [],
|
"parameters": [],
|
||||||
"feedback": ""
|
"feedback": ""
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -23,7 +23,7 @@
|
||||||
"onFinish": "nextStep",
|
"onFinish": "nextStep",
|
||||||
"undoPossible": false,
|
"undoPossible": false,
|
||||||
"scriptPath": "",
|
"scriptPath": "",
|
||||||
"parameter": [],
|
"parameters": [],
|
||||||
"feedback": ""
|
"feedback": ""
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -31,7 +31,7 @@
|
||||||
"onFinish": "nextStep",
|
"onFinish": "nextStep",
|
||||||
"undoPossible": false,
|
"undoPossible": false,
|
||||||
"scriptPath": "",
|
"scriptPath": "",
|
||||||
"parameter": [],
|
"parameters": [],
|
||||||
"feedback": ""
|
"feedback": ""
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -39,7 +39,7 @@
|
||||||
"onFinish": "nextStep",
|
"onFinish": "nextStep",
|
||||||
"undoPossible": false,
|
"undoPossible": false,
|
||||||
"scriptPath": "",
|
"scriptPath": "",
|
||||||
"parameter": [],
|
"parameters": [],
|
||||||
"feedback": ""
|
"feedback": ""
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
|
@ -149,25 +149,6 @@ func RunGroupTask(args RunGroupTaskArgs) {
|
||||||
groupTaskStep.Log = cmdLog
|
groupTaskStep.Log = cmdLog
|
||||||
groupTaskStep.EndedAt = time.Now()
|
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)
|
database.DB.Model(&structs.GroupTaskSteps{}).Where("id = ?", groupTaskStep.Id).Updates(groupTaskStep)
|
||||||
|
|
||||||
socketclients.BroadcastMessage(structs.SendSocketMessage{
|
socketclients.BroadcastMessage(structs.SendSocketMessage{
|
||||||
|
@ -230,7 +211,6 @@ func RunGroupTask(args RunGroupTaskArgs) {
|
||||||
|
|
||||||
log.Info().Msg("SET TO FINISHED")
|
log.Info().Msg("SET TO FINISHED")
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetAllGroupTasks() []structs.GroupTasks {
|
func GetAllGroupTasks() []structs.GroupTasks {
|
||||||
|
|
|
@ -64,7 +64,7 @@ type Task struct {
|
||||||
OnFinish string `json:"onFinish"`
|
OnFinish string `json:"onFinish"`
|
||||||
UndoPossible bool `json:"undoPossible"`
|
UndoPossible bool `json:"undoPossible"`
|
||||||
ScriptPath string `json:"scriptPath"`
|
ScriptPath string `json:"scriptPath"`
|
||||||
Parameter []TaskParameter `json:"parameter"`
|
Parameters []TaskParameter `json:"parameters"`
|
||||||
Feedback string `json:"feedback"`
|
Feedback string `json:"feedback"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue