diff --git a/smardigo/backup/datasource/awx-job-plain.json b/smardigo/backup/datasource/awx-job-plain.json new file mode 100644 index 0000000..00db778 --- /dev/null +++ b/smardigo/backup/datasource/awx-job-plain.json @@ -0,0 +1,19 @@ +{ + "name" : "awx-job-plain", + "restApi" : true, + "configKey" : "awx-job-plain", + "payloadType" : "REST", + "config" : [ { + "name" : "connection", + "type" : "CONNECTION", + "value" : "awx" + }, { + "name" : "resource", + "type" : "STRING", + "value" : "api/v2/jobs/${id}/" + }, { + "name" : "sqlStatement", + "type" : "STRING", + "value" : "SELECT status,failed,started,finished,name,description FROM default_table" + } ] +} \ No newline at end of file diff --git a/smardigo/backup/form/current-job-left.json b/smardigo/backup/form/current-job-left.json new file mode 100644 index 0000000..efb5654 --- /dev/null +++ b/smardigo/backup/form/current-job-left.json @@ -0,0 +1,168 @@ +{ + "name" : "Current Job Left", + "configKey" : "current-job-left", + "page" : 0, + "components" : [ { + "label" : "Current Job", + "hideLabel" : true, + "persistent" : false, + "mask" : false, + "disabled" : true, + "tableView" : true, + "alwaysEnabled" : false, + "type" : "datasourcecontainer", + "input" : true, + "key" : "job", + "defaultValue" : { + "tenant" : { + "id" : "" + } + }, + "validate" : { + "customMessage" : "", + "json" : "" + }, + "conditional" : { + "show" : "", + "when" : "", + "json" : "" + }, + "data" : { + "url" : "api/v1/scopes/{{context.scopeId}}/tags/{{context.scopeTag}}/datasources/awx-job-plain/query?id={{data.current_job_id}}", + "method" : "GET", + "values" : [ { } ] + }, + "components" : [ { + "label" : "Current Job", + "hideLabel" : true, + "mask" : false, + "tableView" : true, + "alwaysEnabled" : false, + "type" : "container", + "input" : true, + "key" : "job", + "validate" : { + "customMessage" : "", + "json" : "" + }, + "conditional" : { + "show" : "", + "when" : "", + "json" : "" + }, + "components" : [ { + "label" : "Name", + "labelPosition" : "left-left", + "allowMultipleMasks" : false, + "showWordCount" : false, + "showCharCount" : false, + "tableView" : true, + "alwaysEnabled" : false, + "type" : "textfield", + "input" : true, + "key" : "name", + "defaultValue" : "", + "validate" : { + "customMessage" : "", + "json" : "" + }, + "conditional" : { + "show" : "", + "when" : "", + "json" : "" + }, + "tabs" : null, + "properties" : { }, + "inputFormat" : "plain", + "encrypted" : false, + "tags" : [ ], + "customConditional" : "", + "logic" : [ ], + "widget" : { + "type" : "" + }, + "reorder" : false + }, { + "label" : "Beschreibung", + "labelPosition" : "left-left", + "allowMultipleMasks" : false, + "showWordCount" : false, + "showCharCount" : false, + "tableView" : true, + "alwaysEnabled" : false, + "type" : "textfield", + "input" : true, + "key" : "description", + "defaultValue" : "", + "validate" : { + "customMessage" : "", + "json" : "" + }, + "conditional" : { + "show" : "", + "when" : "", + "json" : "" + }, + "tabs" : null, + "properties" : { }, + "inputFormat" : "plain", + "encrypted" : false, + "tags" : [ ], + "customConditional" : "", + "logic" : [ ], + "widget" : { + "type" : "" + }, + "reorder" : false + }, { + "label" : "Status", + "labelPosition" : "left-left", + "allowMultipleMasks" : false, + "showWordCount" : false, + "showCharCount" : false, + "tableView" : true, + "alwaysEnabled" : false, + "type" : "textfield", + "input" : true, + "key" : "status", + "defaultValue" : "", + "validate" : { + "customMessage" : "", + "json" : "" + }, + "conditional" : { + "show" : "", + "when" : "", + "json" : "" + }, + "tabs" : null, + "properties" : { }, + "inputFormat" : "plain", + "encrypted" : false, + "tags" : [ ], + "customConditional" : "", + "logic" : [ ], + "widget" : { + "type" : "" + }, + "reorder" : false + } ], + "tabs" : null, + "properties" : { }, + "tags" : [ ], + "encrypted" : false, + "customConditional" : "", + "logic" : [ ], + "reorder" : false + } ], + "tabs" : null, + "properties" : { }, + "datapath" : "0", + "encrypted" : false, + "tags" : [ ], + "customConditional" : "", + "logic" : [ ], + "reorder" : false + } ], + "display" : "form" +} \ No newline at end of file diff --git a/smardigo/backup/form/current-job-right.json b/smardigo/backup/form/current-job-right.json new file mode 100644 index 0000000..1e58e92 --- /dev/null +++ b/smardigo/backup/form/current-job-right.json @@ -0,0 +1,138 @@ +{ + "name" : "Current Job Right", + "configKey" : "current-job-right", + "page" : 0, + "components" : [ { + "label" : "Current Job", + "hideLabel" : true, + "persistent" : false, + "mask" : false, + "disabled" : true, + "tableView" : true, + "alwaysEnabled" : false, + "type" : "datasourcecontainer", + "input" : true, + "key" : "job", + "defaultValue" : { + "tenant" : { + "id" : "" + } + }, + "validate" : { + "customMessage" : "", + "json" : "" + }, + "conditional" : { + "show" : "", + "when" : "", + "json" : "" + }, + "data" : { + "url" : "api/v1/scopes/{{context.scopeId}}/tags/{{context.scopeTag}}/datasources/awx-job-plain/query?id={{data.current_job_id}}", + "method" : "GET", + "values" : [ { } ] + }, + "components" : [ { + "label" : "Current Job", + "hideLabel" : true, + "mask" : false, + "tableView" : true, + "alwaysEnabled" : false, + "type" : "container", + "input" : true, + "key" : "job", + "validate" : { + "customMessage" : "", + "json" : "" + }, + "conditional" : { + "show" : "", + "when" : "", + "json" : "" + }, + "components" : [ { + "label" : "HTML", + "labelPosition" : "left-left", + "className" : "", + "attrs" : [ { + "attr" : "", + "value" : "" + } ], + "content" : "
\n \n {{ data.status }}\n {{ data.status }}\n {{ data.status }}\n {{ data.status }}\n {{ data.status }}\n {{ data.status }}\n
", + "refreshOnChange" : true, + "mask" : false, + "tableView" : true, + "alwaysEnabled" : false, + "type" : "htmlelement", + "input" : false, + "key" : "html", + "validate" : { + "customMessage" : "", + "json" : "" + }, + "conditional" : { + "show" : "", + "when" : "", + "json" : "" + }, + "tabs" : null, + "encrypted" : false, + "properties" : { }, + "tags" : [ ], + "customConditional" : "", + "logic" : [ ], + "refreshOn" : "data", + "reorder" : false + }, { + "label" : "Status", + "labelPosition" : "left-left", + "allowMultipleMasks" : false, + "showWordCount" : false, + "showCharCount" : false, + "hidden" : true, + "tableView" : true, + "alwaysEnabled" : false, + "type" : "textfield", + "input" : true, + "key" : "status", + "defaultValue" : "", + "validate" : { + "customMessage" : "", + "json" : "" + }, + "conditional" : { + "show" : "", + "when" : "", + "json" : "" + }, + "tabs" : null, + "properties" : { }, + "inputFormat" : "plain", + "encrypted" : false, + "tags" : [ ], + "customConditional" : "", + "logic" : [ ], + "widget" : { + "type" : "" + }, + "reorder" : false + } ], + "tabs" : null, + "properties" : { }, + "tags" : [ ], + "encrypted" : false, + "customConditional" : "", + "logic" : [ ], + "reorder" : false + } ], + "tabs" : null, + "properties" : { }, + "datapath" : "0", + "encrypted" : false, + "tags" : [ ], + "customConditional" : "", + "logic" : [ ], + "reorder" : false + } ], + "display" : "form" +} \ No newline at end of file diff --git a/smardigo/backup/form/current-jobs.json b/smardigo/backup/form/current-jobs.json new file mode 100644 index 0000000..fe718e9 --- /dev/null +++ b/smardigo/backup/form/current-jobs.json @@ -0,0 +1,280 @@ +{ + "name" : "Current Jobs", + "configKey" : "current-jobs", + "page" : 0, + "components" : [ { + "label" : "Jobs", + "persistent" : false, + "mask" : false, + "tableView" : true, + "alwaysEnabled" : false, + "type" : "list", + "input" : true, + "key" : "jobs", + "conditional" : { + "show" : "", + "when" : "", + "json" : "" + }, + "components" : [ { + "label" : "job", + "mask" : false, + "hideLabel" : true, + "tableView" : true, + "alwaysEnabled" : false, + "customClass" : "pb-0", + "type" : "datasourcecontainer", + "input" : true, + "key" : "job", + "validate" : { + "customMessage" : "", + "json" : "" + }, + "conditional" : { + "show" : "", + "when" : "", + "json" : "" + }, + "data" : { + "url" : "api/v1/scopes/{{context.scopeId}}/tags/{{context.scopeTag}}/datasources/awx-job-plain/query?id={{ row }}", + "method" : "GET", + "values" : [ { } ] + }, + "components" : [ { + "label" : "job", + "hideLabel" : true, + "customClass" : "pb-0", + "mask" : false, + "tableView" : true, + "alwaysEnabled" : false, + "type" : "container", + "input" : true, + "key" : "job", + "validate" : { + "customMessage" : "", + "json" : "" + }, + "conditional" : { + "show" : "", + "when" : "", + "json" : "" + }, + "components" : [ { + "label" : "Columns", + "hideLabel" : true, + "columns" : [ { + "components" : [ { + "label" : "Name", + "hideLabel" : true, + "labelPosition" : "left-left", + "allowMultipleMasks" : false, + "showWordCount" : false, + "showCharCount" : false, + "tableView" : true, + "alwaysEnabled" : false, + "type" : "textfield", + "input" : true, + "key" : "name", + "defaultValue" : "", + "validate" : { + "customMessage" : "", + "json" : "" + }, + "conditional" : { + "show" : "", + "when" : "", + "json" : "" + }, + "tabs" : null, + "properties" : { }, + "tags" : [ ], + "inputFormat" : "plain", + "encrypted" : false, + "customConditional" : "", + "logic" : [ ], + "widget" : { + "type" : "" + }, + "reorder" : false + } ], + "width" : 4, + "offset" : 0, + "push" : 0, + "pull" : 0, + "type" : "column", + "input" : false, + "hideOnChildrenHidden" : false, + "key" : "column", + "tableView" : true, + "label" : "Column" + }, { + "components" : [ { + "label" : "Name", + "hideLabel" : true, + "labelPosition" : "left-left", + "allowMultipleMasks" : false, + "showWordCount" : false, + "showCharCount" : false, + "tableView" : true, + "alwaysEnabled" : false, + "type" : "textfield", + "input" : true, + "key" : "description", + "defaultValue" : "", + "validate" : { + "customMessage" : "", + "json" : "" + }, + "conditional" : { + "show" : "", + "when" : "", + "json" : "" + }, + "tabs" : null, + "properties" : { }, + "tags" : [ ], + "inputFormat" : "plain", + "encrypted" : false, + "customConditional" : "", + "logic" : [ ], + "widget" : { + "type" : "" + }, + "reorder" : false + } ], + "width" : 4, + "offset" : 0, + "push" : 0, + "pull" : 0, + "type" : "column", + "input" : false, + "hideOnChildrenHidden" : false, + "key" : "column", + "tableView" : true, + "label" : "Column" + }, { + "width" : 4, + "offset" : 0, + "push" : 0, + "pull" : 0, + "type" : "column", + "input" : false, + "hideOnChildrenHidden" : false, + "key" : "column", + "tableView" : true, + "label" : "Column", + "components" : [ { + "label" : "Name", + "hideLabel" : true, + "labelPosition" : "left-left", + "allowMultipleMasks" : false, + "showWordCount" : false, + "showCharCount" : false, + "clearOnHide" : false, + "hidden" : true, + "tableView" : true, + "alwaysEnabled" : false, + "type" : "textfield", + "input" : true, + "key" : "status", + "defaultValue" : "", + "validate" : { + "customMessage" : "", + "json" : "" + }, + "conditional" : { + "show" : "", + "when" : "", + "json" : "" + }, + "tabs" : null, + "properties" : { }, + "tags" : [ ], + "inputFormat" : "plain", + "encrypted" : false, + "customConditional" : "", + "logic" : [ ], + "widget" : { + "type" : "" + }, + "reorder" : false + }, { + "label" : "HTML", + "labelPosition" : "left-left", + "className" : "pb-0", + "attrs" : [ { + "attr" : "", + "value" : "" + } ], + "content" : "
\n \n {{ data.status }}\n {{ data.status }}\n {{ data.status }}\n {{ data.status }}\n {{ data.status }}\n {{ data.status }}\n
", + "refreshOnChange" : true, + "mask" : false, + "tableView" : true, + "alwaysEnabled" : false, + "type" : "htmlelement", + "input" : false, + "key" : "html", + "validate" : { + "customMessage" : "", + "json" : "" + }, + "conditional" : { + "show" : "", + "when" : "", + "json" : "" + }, + "tabs" : null, + "encrypted" : false, + "properties" : { }, + "tags" : [ ], + "customConditional" : "", + "logic" : [ ], + "refreshOn" : "data", + "reorder" : false + } ] + } ], + "customClass" : "pb-0", + "mask" : false, + "tableView" : false, + "alwaysEnabled" : false, + "type" : "columns", + "input" : false, + "key" : "columns", + "conditional" : { + "show" : "", + "when" : "", + "json" : "" + }, + "tabs" : null, + "properties" : { }, + "tags" : [ ], + "customConditional" : "", + "logic" : [ ], + "reorder" : false + } ], + "tabs" : null, + "properties" : { }, + "tags" : [ ], + "encrypted" : false, + "customConditional" : "", + "logic" : [ ], + "reorder" : false + } ], + "tabs" : null, + "properties" : { }, + "tags" : [ ], + "datapath" : "0", + "encrypted" : false, + "customConditional" : "", + "logic" : [ ], + "reorder" : false + } ], + "tabs" : null, + "customConditional" : "", + "properties" : { }, + "tags" : [ ], + "logic" : [ ], + "reorder" : false + } ], + "display" : "form" +} \ No newline at end of file diff --git a/smardigo/backup/form/progress-bar.json b/smardigo/backup/form/progress-bar.json new file mode 100644 index 0000000..6c4c6b2 --- /dev/null +++ b/smardigo/backup/form/progress-bar.json @@ -0,0 +1,98 @@ +{ + "name" : "Progress Bar", + "configKey" : "progress-bar", + "page" : 0, + "components" : [ { + "label" : "HTML", + "labelPosition" : "left-left", + "className" : "", + "attrs" : [ { + "attr" : "", + "value" : "" + } ], + "content" : "
\n \n
\n", + "refreshOnChange" : true, + "mask" : false, + "tableView" : true, + "alwaysEnabled" : false, + "type" : "htmlelement", + "input" : false, + "key" : "html", + "validate" : { + "customMessage" : "", + "json" : "" + }, + "conditional" : { + "show" : "", + "when" : "", + "json" : "" + }, + "tabs" : null, + "encrypted" : false, + "properties" : { }, + "tags" : null, + "customConditional" : "", + "logic" : [ ], + "refreshOn" : "data", + "reorder" : false + }, { + "label" : "progress_current", + "labelPosition" : "left-left", + "hidden" : true, + "mask" : false, + "tableView" : true, + "alwaysEnabled" : false, + "type" : "number", + "input" : true, + "key" : "progress_current", + "validate" : { + "customMessage" : "", + "json" : "" + }, + "conditional" : { + "show" : "", + "when" : "", + "json" : "" + }, + "tabs" : null, + "delimiter" : false, + "requireDecimal" : false, + "encrypted" : false, + "properties" : { }, + "tags" : [ ], + "decimalLimit" : null, + "customConditional" : "", + "logic" : [ ], + "reorder" : false + }, { + "label" : "progress_max", + "labelPosition" : "left-left", + "hidden" : true, + "mask" : false, + "tableView" : true, + "alwaysEnabled" : false, + "type" : "number", + "input" : true, + "key" : "progress_max", + "validate" : { + "customMessage" : "", + "json" : "" + }, + "conditional" : { + "show" : "", + "when" : "", + "json" : "" + }, + "tabs" : null, + "delimiter" : false, + "requireDecimal" : false, + "encrypted" : false, + "decimalLimit" : null, + "properties" : { }, + "tags" : [ ], + "customConditional" : "", + "logic" : [ ], + "reorder" : false + } ], + "display" : "form" +} \ No newline at end of file diff --git a/smardigo/backup/layout/primary-process.json b/smardigo/backup/layout/primary-process.json index 222a211..594efae 100644 --- a/smardigo/backup/layout/primary-process.json +++ b/smardigo/backup/layout/primary-process.json @@ -4,71 +4,95 @@ "tabExpression" : "Vorgang {{ data.process_instance_id }}", "readonlyExpression" : "data.vorgang_status > 10", "components" : [ { - "type" : "columns", - "key" : "dossier", - "columns" : [ { - "components" : [ { - "type" : "form", - "key" : "header", - "readonlyExpression" : "true" - }, { - "type" : "html", - "content" : "
" - }, { - "type" : "columns", - "key" : "first-column", - "columns" : [ { + "type" : "columns", + "key" : "dossier", + "columns" : [ { "components" : [ { - "type" : "page", - "key" : "dossier-page", - "toc" : "left", - "sections" : [ { - "type" : "section", - "key" : "body", - "title" : "Inhalt", - "components" : [ { - "type" : "form", - "key" : "body" - } ] - }, { - "type" : "section", - "key" : "dossier-attachments", - "title" : "Anhänge", - "components" : [ { - "type" : "form", - "key" : "attachments" - } ] - }, { - "type" : "section", - "key" : "dossier-comments", - "title" : "Kommentare", - "components" : [ { - "type" : "comments", - "key" : "comments" - } ] - }, { - "type" : "section", - "key" : "dossier-history", - "title" : "Protokoll", - "components" : [ { - "type" : "history", - "key" : "history" - } ] - } ] - } ], - "width" : "9" - }, { - "components" : [ { - "type" : "help-text", - "key" : "help-text" - }, { - "type" : "action-list", - "key" : "action-list" - } ], - "width" : "350px" + "type" : "form", + "key" : "header", + "readonlyExpression" : "true" + }, + { + "type" : "html", + "content" : "
" + }, + { + "type" : "columns", + "key" : "first-column", + "columns" : [ { + "components" : [ { + "type" : "page", + "key" : "dossier-page", + "toc" : "left", + "sections" : [ { + "type" : "section", + "key" : "aktionen", + "title" : "Aktionen", + "components" : [ { + "type" : "form", + "key" : "progress-bar", + "readonlyExpression" : "true" + }, + { + "type" : "columns", + "key" : "a_key", + "columns" : [ { + "width" : "75%", + "components" : [ { + "type" : "form", + "key" : "current-job-left", + "readonlyExpression" : "true" + } ] + }, + { + "width" : "25%", + "components" : [ { + "type" : "form", + "key" : "current-job-right", + "readonlyExpression" : "true" + } ] + } ] + }, + { + "type" : "form", + "key" : "current-jobs", + "readonlyExpression" : "true" + } ] + }, + { + "type" : "section", + "key" : "dossier-comments", + "title" : "Kommentare", + "components" : [ { + "type" : "comments", + "key" : "comments" + } ] + }, + { + "type" : "section", + "key" : "dossier-history", + "title" : "Protokoll", + "components" : [ { + "type" : "history", + "key" : "history" + } ] + } ] + } ], + "width" : "9" + }, + { + "components" : [ { + "type" : "help-text", + "key" : "help-text" + }, + { + "type" : "action-list", + "key" : "action-list" + } ], + "width" : "350px" + } ] + } ], + "width" : "12" } ] - } ], - "width" : "12" } ] - } ] -} \ No newline at end of file +} diff --git a/smardigo/backup/process/primary-process.bpmn b/smardigo/backup/process/primary-process.bpmn index 67b6a5a..e78c780 100644 --- a/smardigo/backup/process/primary-process.bpmn +++ b/smardigo/backup/process/primary-process.bpmn @@ -1,5 +1,5 @@ - + @@ -35,6 +35,9 @@ ${envStage} + + + Flow_0zzip76 @@ -73,31 +76,31 @@ Flow_1hsnadn Flow_0ufs5lg - - - - Flow_1a8vxf0 0 0 0 * * ? - Flow_1a8vxf0 Flow_0zzip76 Flow_1jgyavz - Flow_1jgyavz - Flow_0ufs5lg + + + + + + + @@ -140,15 +143,6 @@ Flow_1cnt5hf Flow_1nqz9ya - - Flow_1kxc9t0 - Flow_0gcsmj7 - - - - Flow_0gcsmj7 - Flow_1ju13h8 - @@ -162,19 +156,42 @@ Flow_1nqz9ya Flow_1kxc9t0 + + Flow_1kxc9t0 + Flow_1nuku1o + def jobs = processes.byId(contextScopeId, contextProcessId).getVariable('jobs') +jobs.add(0, awxResponse.job) +processes.byId(contextScopeId, contextProcessId).setVariable('jobs', jobs) + +processes.byId(contextScopeId, contextProcessId).setVariable('current_job_id', awxResponse.job) + +processes.byId(contextScopeId, contextProcessId).createComment('current_job_id := ' + awxResponse.job) + + + Flow_1nuku1o + Flow_0gcsmj7 + + + + Flow_0gcsmj7 + Flow_1ju13h8 + + + Flow_1ju13h8 + - + + - - Flow_1ju13h8 - + + Flow_1nplu24 @@ -189,15 +206,11 @@ Flow_1nplu24 Flow_1tye2db - - Flow_1tye2db - - @@ -218,208 +231,218 @@ Flow_1sb0o0i Flow_1868uod - Flow_1868uod Flow_04zgivk + + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - + + + + + + + + + + + + + + + + + + + - + - - + + - - + + - + - + - + - - + + + + + + + + + + + + + + - + + + + - - - - - + + - - + + - - + + - + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - + + + + + + + + + - - + + - - + + - - + + - - + + - - + + + + + + - + - - - - - + + - - + + - + - - + + - - + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/smardigo/provisioning/form/current-jobs.json b/smardigo/provisioning/form/current-jobs.json index cc2ac88..fe718e9 100644 --- a/smardigo/provisioning/form/current-jobs.json +++ b/smardigo/provisioning/form/current-jobs.json @@ -170,6 +170,8 @@ "allowMultipleMasks" : false, "showWordCount" : false, "showCharCount" : false, + "clearOnHide" : false, + "hidden" : true, "tableView" : true, "alwaysEnabled" : false, "type" : "textfield", @@ -196,6 +198,39 @@ "type" : "" }, "reorder" : false + }, { + "label" : "HTML", + "labelPosition" : "left-left", + "className" : "pb-0", + "attrs" : [ { + "attr" : "", + "value" : "" + } ], + "content" : "
\n \n {{ data.status }}\n {{ data.status }}\n {{ data.status }}\n {{ data.status }}\n {{ data.status }}\n {{ data.status }}\n
", + "refreshOnChange" : true, + "mask" : false, + "tableView" : true, + "alwaysEnabled" : false, + "type" : "htmlelement", + "input" : false, + "key" : "html", + "validate" : { + "customMessage" : "", + "json" : "" + }, + "conditional" : { + "show" : "", + "when" : "", + "json" : "" + }, + "tabs" : null, + "encrypted" : false, + "properties" : { }, + "tags" : [ ], + "customConditional" : "", + "logic" : [ ], + "refreshOn" : "data", + "reorder" : false } ] } ], "customClass" : "pb-0", diff --git a/smardigo/provisioning/layout/simple-connect.json b/smardigo/provisioning/layout/simple-connect.json index 27f54de..15b9a18 100644 --- a/smardigo/provisioning/layout/simple-connect.json +++ b/smardigo/provisioning/layout/simple-connect.json @@ -24,17 +24,17 @@ "type" : "page", "key" : "dossier-page", "toc" : "left", - "sections" : [ - { + "sections" : [ { "type" : "section", "key" : "aktionen", "title" : "Aktionen", - "visibleExpression": "(data.vorgang_status >= 40 && data.vorgang_status < 50)||(data.vorgang_status >= 60)", + "visibleExpression" : "(data.vorgang_status >= 40 && data.vorgang_status < 50)||(data.vorgang_status >= 60)", "components" : [ { "type" : "form", "key" : "progress-bar", "readonlyExpression" : "true" - }, { + }, + { "type" : "columns", "key" : "a_key", "columns" : [ { @@ -53,12 +53,14 @@ "readonlyExpression" : "true" } ] } ] - }, { - "type" : "form", - "key" : "current-jobs", - "readonlyExpression" : "true" - } ] - }, { + }, + { + "type" : "form", + "key" : "current-jobs", + "readonlyExpression" : "true" + } ] + }, + { "type" : "section", "key" : "smardigo", "title" : "Smardigo", @@ -66,7 +68,8 @@ "type" : "form", "key" : "simple-connect" } ] - }, { + }, + { "type" : "section", "key" : "stammdaten", "title" : "Stammdaten", @@ -75,7 +78,8 @@ "key" : "tenant", "readonlyExpression" : "true" } ] - }, { + }, + { "type" : "section", "key" : "dossier-comments", "title" : "Kommentare", diff --git a/smardigo/provisioning/process/simple-connect.bpmn b/smardigo/provisioning/process/simple-connect.bpmn index 5bbb45d..8ea1538 100644 --- a/smardigo/provisioning/process/simple-connect.bpmn +++ b/smardigo/provisioning/process/simple-connect.bpmn @@ -1120,6 +1120,28 @@ Variables.userId(authenticatedUserId) Flow_1ow8whd + + + + + + + + + + + + + + + ${extra_vars} + + + + + Flow_1nqz9ya + Flow_1kxc9t0 + Flow_1ow8whd Flow_0qfq760 @@ -1157,39 +1179,17 @@ Variables.userId(authenticatedUserId) Flow_1cnt5hf Flow_1nqz9ya - - - - - - ${extra_vars} - - - - - Flow_1nqz9ya - Flow_1kxc9t0 - Flow_1kxc9t0 Flow_1nuku1o def jobs = processes.byId(contextScopeId, contextProcessId).getVariable('jobs') -jobs << awxResponse.job +jobs.add(0, awxResponse.job) processes.byId(contextScopeId, contextProcessId).setVariable('jobs', jobs) processes.byId(contextScopeId, contextProcessId).setVariable('current_job_id', awxResponse.job) processes.byId(contextScopeId, contextProcessId).createComment('current_job_id := ' + awxResponse.job) - - - - - - - - - Flow_1nuku1o Flow_0gcsmj7 @@ -1208,6 +1208,8 @@ processes.byId(contextScopeId, contextProcessId).createComment('current_job_id : Flow_1nu8qqa + + @@ -1219,8 +1221,6 @@ processes.byId(contextScopeId, contextProcessId).createComment('current_job_id : Flow_1nu8qqa Flow_127qqnb - - Flow_127qqnb @@ -1231,6 +1231,25 @@ processes.byId(contextScopeId, contextProcessId).createComment('current_job_id : + + + + + + + + + + + + + + + + + + + @@ -1460,25 +1479,6 @@ processes.byId(contextScopeId, contextProcessId).createComment('current_job_id : - - - - - - - - - - - - - - - - - - - @@ -1542,97 +1542,6 @@ processes.byId(contextScopeId, contextProcessId).createComment('current_job_id : - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2125,6 +2034,97 @@ processes.byId(contextScopeId, contextProcessId).createComment('current_job_id : + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2168,97 +2168,97 @@ processes.byId(contextScopeId, contextProcessId).createComment('current_job_id : - + - - + + - - + + - - + + - + + - - - + + - - + + - - + + - - + + + + + - + - + - + - - - - + - + - + - + - + - + - - + + - + - + - +