listOutput.twig is moved to /twig/handler/listOutput.twig

~dev_rating/application/classes/Controller/Handler/AdmStudents.php

@@ -10,6 +10,8 @@ abstract class SortingOptions { //extends SplEnum {  // todo: think about usage
 
 class Controller_Handler_AdmStudents extends Controller_Handler
 {
+    const STUDENTS_LIST = '/handler/listOutput';
+    
         public function before() {
             $this->setAccessLevel(self::ACCESS_USER);
             parent::before();
@@ -102,33 +104,18 @@ class Controller_Handler_AdmStudents extends Controller_Handler
             }
         }
 
-        public function action_getStudentsList($option = SortingOptions::Name)
-        {
-            $from = isset($this->get['dean']) ? 'dean_office' : 'admin';
-            $twig = Twig::factory($from . '/students/handler/listOutput');
-
-            $success = false;
-            $facultyID = $this->post['facultyID'];
-            $gradeID = $this->post['gradeID'];
-            $groupID = $this->post['groupID'];
+        public function action_getStudentsList($option = SortingOptions::Name) {
+            $twig = Twig::factory(self::STUDENTS_LIST);
 
-            $this->post-> rule('facultyID', 'not_empty')
-                -> rule('facultyID', 'digit')
-                -> rule('gradeID', 'not_empty')
-                -> rule('gradeID', 'digit')
-                -> rule('groupID', 'not_empty')
-                -> rule('groupID', 'digit');
+            $facultyID = (int) $this->post['facultyID'];
+            $gradeID = (int) $this->post['gradeID'];
+            $groupID = (int) $this->post['groupID'];
 
-            if($this->post->check()) {
+            if ($this->post->check()) {
                 $result = Model_Students::byFaculty($facultyID , $gradeID, $groupID);
-                if (!empty($result)) {
                     $twig->List = $result;
-                    $success = true;
-                }
-
             }
-            //$this->response->body(json_encode($data));
-            $twig->Success = $success;
+
             $this->response->body($twig);
         }
 
@@ -137,7 +124,7 @@ class Controller_Handler_AdmStudents extends Controller_Handler
             $groupID = $this->post['studyGroupID'];
             if($groupID != 0)
             {
-                $twig = Twig::factory('admin/students/handler/listOutput');
+                $twig = Twig::factory(self::STUDENTS_LIST);
                 $twig->List = Model_Students::byStudyGroup($groupID);
                 $this->response->body($twig);           
             }
@@ -149,7 +136,7 @@ class Controller_Handler_AdmStudents extends Controller_Handler
             $facultyID = $this->post['facultyID'];
             if($facultyID != 0)
             {
-                $twig = Twig::factory('admin/students/handler/listOutput');
+                $twig = Twig::factory(self::STUDENTS_LIST);
                 // (Grade, Group) = (0,0), to ignore (search all students)
                 $twig->List = Model_Students::byFaculty($facultyID, 0, 0);
                 $this->response->body($twig);           
@@ -157,8 +144,7 @@ class Controller_Handler_AdmStudents extends Controller_Handler
         }
 
     public function action_getStudentsByName() {
-        $from = isset($this->get['dean']) ? 'dean_office' : 'admin';
-        $twig = Twig::factory($from . '/students/handler/listOutput');
+        $twig = Twig::factory(self::STUDENTS_LIST);
 
         $facultyID = (int) $this->post['facultyID'];
         $gradeID = (int) $this->post['gradeID'];

~dev_rating/application/views/admin/students/handler/listOutput.twig

-
-{# Вывод списков студентов #}
-{% set pageNum = 1 %}
-<div id="listPage{{ pageNum }}" class='paginatorPage'>
-{% for row in List %}
-    {% if loop.index % 16 == 0 %}
-        {% set pageNum = pageNum + 1 %}
-        </div>
-        <div id="listPage{{ pageNum }}" class='paginatorPage hiddenPage'>
-    {% endif %}
-    <div class="search_item">
-        <div class="search_item_info">
-            <div class="search_item_firstLine">{{ HTML.anchor('admin/profile/student/' ~ row.AccountID, 
-                row.LastName ~  ' ' ~ row.FirstName ~ ' ' ~ row.SecondName)|raw }} ({{ row.Degree }}, {{ row.GradeNum }} курс, {{ row.GroupNum }} группа)</div>
-        </div>
-        <div class="search_item_actions">
-            <a href="#">Редактировать</a>
-        </div>
-    </div>
-{% else %}
-    Нет результатов!
-{% endfor %}
-</div>
-
-{% if pageNum > 1 %}
-    <div class="paginator">
-        <div class="paginator_title">Страницы:</div>
-    {% for i in range(1, pageNum)  %}
-        {% if loop.first %}
-            <a href="#" class="paginatorLink" id='listPage{{ loop.index }}'><div class="paginator_item selectedPageNum">{{ loop.index }}</div></a>
-        {% else %}
-            <a href="#" class="paginatorLink" id='listPage{{ loop.index }}'><div class="paginator_item">{{ loop.index }}</div></a>
-        {% endif %}
-    {% endfor %}
-    </div>
-{% endif %}

~dev_rating/media/js/admin/students/index.js

@@ -97,9 +97,9 @@ $(function()
         if (!arr.facultyID || !arr.gradeID)
             return;
         if (arr.name.length >= 3)
-            updateStudentsList('admStudents/getStudentsByName?dean', arr);
+            updateStudentsList('admStudents/getStudentsByName', arr);
         else if (arr.groupID)
-            updateStudentsList('admStudents/getStudentsList?dean', arr);
+            updateStudentsList('admStudents/getStudentsList', arr);
     }
 
     function updateStudentsList(method, params) {