Skip to content
Snippets Groups Projects
Commit f80322bc authored by xamgore's avatar xamgore
Browse files

Refactoring of Model_Grade::toStructuredArray()

parent 3a3c3355
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 30 additions and 38 deletions
~dev_rating/application/classes/Controller/Admin/Accounts.php
+ 1
− 1
View file @ f80322bc
...@@ -10,7 +10,7 @@ class Controller_Admin_Accounts extends Controller_Environment_Admin ...@@ -10,7 +10,7 @@ class Controller_Admin_Accounts extends Controller_Environment_Admin
Cookie::set('fD', 'true'); Cookie::set('fD', 'true');
$this->twig->set([ $this->twig->set([
'Faculties' => Model_Faculties::load(), 'Faculties' => Model_Faculties::load(),
'Grades' => Model_Grades::toStructuredArray(), 'Grades' => Model_Grades::groupByDegree(),
])->set_filename('admin/accounts/codes'); ])->set_filename('admin/accounts/codes');
} }
} }
~dev_rating/application/classes/Controller/Admin/Students.php
+ 2
− 2
View file @ f80322bc
...@@ -5,14 +5,14 @@ class Controller_Admin_Students extends Controller_Environment_Admin ...@@ -5,14 +5,14 @@ class Controller_Admin_Students extends Controller_Environment_Admin
public function action_index() { public function action_index() {
$this->twig->set([ $this->twig->set([
'Faculties' => Model_Faculties::load(), 'Faculties' => Model_Faculties::load(),
'Grades' => Model_Grades::toStructuredArray(), 'Grades' => Model_Grades::groupByDegree(),
])->set_filename('admin/students/index'); ])->set_filename('admin/students/index');
} }
public function action_add() { public function action_add() {
$this->twig->set([ $this->twig->set([
'Faculties' => Model_Faculties::load(), 'Faculties' => Model_Faculties::load(),
'Grades' => Model_Grades::toStructuredArray(), 'Grades' => Model_Grades::groupByDegree(),
])->set_filename('admin/students/add'); ])->set_filename('admin/students/add');
} }
......
~dev_rating/application/classes/Controller/DeanOffice/Students.php
+ 1
− 1
View file @ f80322bc
...@@ -6,7 +6,7 @@ class Controller_DeanOffice_Students extends Controller_Environment_DeanOffice ...@@ -6,7 +6,7 @@ class Controller_DeanOffice_Students extends Controller_Environment_DeanOffice
public function action_index() { public function action_index() {
$this->twig->set([ $this->twig->set([
'Faculties' => Model_Faculties::load(), 'Faculties' => Model_Faculties::load(),
'Grades' => Model_Grades::toStructuredArray(), 'Grades' => Model_Grades::groupByDegree(),
])->set_filename(static::DEAN . '/students/index'); ])->set_filename(static::DEAN . '/students/index');
} }
......
~dev_rating/application/classes/Model/Grades.php
+ 5
− 13
View file @ f80322bc
...@@ -35,21 +35,13 @@ class Model_Grades extends Model ...@@ -35,21 +35,13 @@ class Model_Grades extends Model
} }
} }
/** @return array an array with elements, grouped by grades. */ /** @return array */
public static function toStructuredArray() { public static function groupByDegree() {
$grades = self::toArray();
$list = []; $list = [];
$degree = 'null';
$i = 0;
foreach ($grades as $row) { foreach (self::getGrades() as $row) {
if ($degree != $row['Degree']) { $degree = $row['Degree'];
$degree = $row['Degree']; $list[$degree][] = $row;
$i++;
}
$list[$i]['Title'] = RusLang::tr($row['Degree']);
$list[$i]['Grades'][] = $row;
} }
return $list; return $list;
......
~dev_rating/application/views/admin/accounts/codes.twig
+ 6
− 6
View file @ f80322bc
...@@ -48,12 +48,12 @@ ...@@ -48,12 +48,12 @@
<div class="step_body"> <div class="step_body">
<select id="gradeSelect"> <select id="gradeSelect">
<option value="0">— Курс —</option> <option value="0">— Курс —</option>
{% for Degree in Grades %} {% for Title, Degree in Grades %}
<optgroup label="{{ Degree.Title }}"> <optgroup label="{{ Rus[Title] }}">
{% for Grade in Degree.Grades %} {% for Grade in Degree %}
<option value="{{ Grade.ID }}">{{ Grade.Num }} курс</option> <option value="{{ Grade.ID }}">{{ Grade.Num }} курс</option>
{% endfor %} {% endfor %}
</optgroup> </optgroup>
{% endfor %} {% endfor %}
</select> </select>
</div> </div>
......
~dev_rating/application/views/admin/students/add.twig
+ 6
− 6
View file @ f80322bc
...@@ -44,12 +44,12 @@ ...@@ -44,12 +44,12 @@
</select> </select>
<select id="gradeSelect"> <select id="gradeSelect">
<option value="0">— Курс —</option> <option value="0">— Курс —</option>
{% for Degree in Grades %} {% for Title, Degree in Grades %}
<optgroup label="{{ Degree.Title }}"> <optgroup label="{{ Rus[Title] }}">
{% for Grade in Degree.Grades %} {% for Grade in Degree %}
<option value="{{ Grade.ID }}">{{ Grade.Num }} курс</option> <option value="{{ Grade.ID }}">{{ Grade.Num }} курс</option>
{% endfor %} {% endfor %}
</optgroup> </optgroup>
{% endfor %} {% endfor %}
</select> </select>
<select id="groupSelect"> <select id="groupSelect">
......
~dev_rating/application/views/admin/students/index.twig
+ 6
− 6
View file @ f80322bc
...@@ -35,12 +35,12 @@ ...@@ -35,12 +35,12 @@
<div class='filter'> <div class='filter'>
<select id="gradeSelect"> <select id="gradeSelect">
<option value="0">— Курс —</option> <option value="0">— Курс —</option>
{% for Degree in Grades %} {% for Title, Degree in Grades %}
<optgroup label="{{ Degree.Title }}"> <optgroup label="{{ Rus[Title] }}">
{% for Grade in Degree.Grades %} {% for Grade in Degree %}
<option value="{{ Grade.ID }}">{{ Grade.Num }} курс</option> <option value="{{ Grade.ID }}">{{ Grade.Num }} курс</option>
{% endfor %} {% endfor %}
</optgroup> </optgroup>
{% endfor %} {% endfor %}
</select> </select>
</div> </div>
......
~dev_rating/application/views/dean_office/students/index.twig
+ 3
− 3
View file @ f80322bc
...@@ -25,9 +25,9 @@ ...@@ -25,9 +25,9 @@
<div class='filter'> <div class='filter'>
<select id="gradeSelect"> <select id="gradeSelect">
<option value="0">— Курс —</option> <option value="0">— Курс —</option>
{% for Degree in Grades %} {% for Title, Degree in Grades %}
<optgroup label="{{ Degree.Title }}"> <optgroup label="{{ Rus[Title] }}">
{% for Grade in Degree.Grades %} {% for Grade in Degree %}
<option value="{{ Grade.ID }}">{{ Grade.Num }} курс</option> <option value="{{ Grade.ID }}">{{ Grade.Num }} курс</option>
{% endfor %} {% endfor %}
</optgroup> </optgroup>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment