Jannex
/
admin-dashboard-backend
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed parameter to parameters

main
alex 2023-05-07 17:30:20 +02:00
parent 2b8be9ebf3
commit 557134276a
7 changed files with 22 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
groupTasks/groups/production1/index.json
View File

@ -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": ""
}
]

2
groupTasks/groups/production1/test1.py
View File

@ -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)
raise SystemExit(140)

1
groupTasks/groups/roese/haha.py Normal file
View File

@ -0,0 +1 @@
print("working")

11
groupTasks/groups/roese/index.json
View File

@ -1,4 +1,13 @@
{
"category": "Roese",
"name": "Roese Home"
"name": "Roese Home",
"tasks": [
{
"name": "Haha",
"onFinish": "pause",
"undoPossible": false,
"scriptPath": "haha.py",
"feedback": ""
}
]
}

10
groupTasks/groups/testa/index.json
View File

@ -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": ""
}
]

20
grouptasks/grouptasks.go
View File

@ -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 {

2
modules/structs/grouptasks.go
View File

@ -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"`
}