diff --git a/src/main/java/ru/ulstu/fc/project/controller/ProjectRunController.java b/src/main/java/ru/ulstu/fc/project/controller/ProjectRunController.java index c2ca79a..03c740a 100644 --- a/src/main/java/ru/ulstu/fc/project/controller/ProjectRunController.java +++ b/src/main/java/ru/ulstu/fc/project/controller/ProjectRunController.java @@ -7,6 +7,7 @@ import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; +import ru.ulstu.fc.project.model.RunProjectForm; import ru.ulstu.fc.project.service.ProjectRulesService; import ru.ulstu.fc.project.service.ProjectService; import ru.ulstu.fc.project.service.ProjectVariableService; @@ -32,6 +33,8 @@ public class ProjectRunController { @GetMapping("init/{projectId}") public String getProjects(@PathVariable(value = "projectId") Integer projectId, Model model) { model.addAttribute("project", projectService.getById(projectId)); + model.addAttribute("runProjectForm", new RunProjectForm()); + model.addAttribute("variables", projectVariableService.getInputByProjectId(projectId)); return "project/init"; } } diff --git a/src/main/java/ru/ulstu/fc/project/model/RunProjectForm.java b/src/main/java/ru/ulstu/fc/project/model/RunProjectForm.java new file mode 100644 index 0000000..1910fe8 --- /dev/null +++ b/src/main/java/ru/ulstu/fc/project/model/RunProjectForm.java @@ -0,0 +1,13 @@ +package ru.ulstu.fc.project.model; + +public class RunProjectForm { + private Integer projectId; + + public Integer getProjectId() { + return projectId; + } + + public void setProjectId(Integer projectId) { + this.projectId = projectId; + } +} diff --git a/src/main/resources/templates/project/edit.html b/src/main/resources/templates/project/edit.html index 7f8955e..cbd5bc1 100644 --- a/src/main/resources/templates/project/edit.html +++ b/src/main/resources/templates/project/edit.html @@ -21,6 +21,8 @@ + Выполнить diff --git a/src/main/resources/templates/project/init.html b/src/main/resources/templates/project/init.html new file mode 100644 index 0000000..4de51bf --- /dev/null +++ b/src/main/resources/templates/project/init.html @@ -0,0 +1,29 @@ + + + + Ввод переменных + + + +
+

Ввод переменных:

+
+ +
+ + +
+
+ + Назад +
+
+
+