diff --git a/~dev_rating/application/classes/Controller/Handler/Credits.php b/~dev_rating/application/classes/Controller/Handler/Credits.php index 14de7a372de96bd6f3f93d14b2da4303b4546fe9..db97bf1b54eaed56d0ab5a891aeaf1cfc1254556 100644 --- a/~dev_rating/application/classes/Controller/Handler/Credits.php +++ b/~dev_rating/application/classes/Controller/Handler/Credits.php @@ -24,9 +24,7 @@ class Controller_Handler_Credits extends Controller_Handler } public function action_setCreditMilestone() { - $id = (int) $this->request->param("param1"); - $stage = (int) $this->request->param("param2"); - + list($id, $stage) = explode(":", $this->request->param("id")); Model_Discipline::load($id)->setMilestone($stage); $this->response->body(''); } diff --git a/~dev_rating/application/classes/Model/Discipline.php b/~dev_rating/application/classes/Model/Discipline.php index 38220f8e9785af88852303c77a890dd472fd1308..c7cf585b109caa5246a12dcdac6d22e7d867a886 100644 --- a/~dev_rating/application/classes/Model/Discipline.php +++ b/~dev_rating/application/classes/Model/Discipline.php @@ -148,7 +148,7 @@ class Model_Discipline extends Model_Container * @param $stage int number from 0 to 3 */ public function setMilestone($stage) { - if ($stage >= 0 && $stage <= 3) + if ($stage < 0 || $stage > 3) throw new LogicException('Milestone argument is incorrect!'); $this->Milestone = $stage; diff --git a/~dev_rating/application/views/dean_office/credits.twig b/~dev_rating/application/views/dean_office/credits.twig index 6f63f47e55a404bc6c623d08db107c43feeccdbc..1f5c1053e26c9b7d8643936d45224a768a995624 100644 --- a/~dev_rating/application/views/dean_office/credits.twig +++ b/~dev_rating/application/views/dean_office/credits.twig @@ -5,7 +5,7 @@ {{ parent() }} {{ HTML.script('static/js/libs/jquery.fileDownload.js')|raw }} {{ HTML.style('static/css/discipline.css')|raw }} - {{ HTML.script('static/js/dean_office/credits.js')|raw }} + {{ HTML.script('static/js/dean/credits.js')|raw }} {{ HTML.script('static/js/libs/select2.js')|raw }} {{ HTML.style('static/css/select2.css')|raw }} diff --git a/~dev_rating/application/views/dean_office/sheets.twig b/~dev_rating/application/views/dean_office/sheets.twig index 6712a393df7321d4d2d821150195a538ae67e935..8ebf48388ea8d88760e3816565efc43d280b9ca9 100644 --- a/~dev_rating/application/views/dean_office/sheets.twig +++ b/~dev_rating/application/views/dean_office/sheets.twig @@ -5,7 +5,7 @@ {{ parent() }} {{ HTML.script('static/js/libs/jquery.fileDownload.js')|raw }} {{ HTML.style('static/css/discipline.css')|raw }} - {{ HTML.script('static/js/dean_office/dean.js')|raw }} + {{ HTML.script('static/js/dean/dean.js')|raw }} {% endblock %} {% block main_top_title %}Деканат > Ведомости{% endblock %} @@ -90,4 +90,4 @@ </div> </div> -{% endblock %} +{% endblock %}