Moved Model_Map::searchTeachers to Model_Teachers

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

@@ -425,26 +425,16 @@ class Controller_Handler_Map extends Controller_Handler {
             $this->post->rule('DepartmentID', 'digit')
                 ->rule('DisciplineID', 'not_empty')
                 ->rule('DisciplineID', 'digit');
+
             if ($this->post->check()) {
-				$SeResult = $this->model->SearchTeachers(
+                $teachers = Model_Teachers::search(
                     $this->post['FacultyID'],
                     $this->post['DepartmentID'],
                     $this->post['Last'],
                     $this->post['DisciplineID']
                 );
-				$SearchResult = array();
-				$i = 0;
-				foreach($SeResult as $row){
-					$i++;
-					$SearchResult[$i]['TeacherID'] = $row['ID'];
-					$SearchResult[$i]['TeacherLast'] = $row['LastName'];
-					$SearchResult[$i]['TeacherFirst'] = $row['FirstName'];
-					$SearchResult[$i]['TeacherSecond'] = $row['SecondName'];
-					$SearchResult[$i]['JobPositionName'] = $row['JobPositionName'];
-					$SearchResult[$i]['DepID'] = $row['DepID'];
-				}
 
+                $this->response->body(json_encode($teachers));
             }
-			$this->response->body(json_encode($SearchResult));
 		}
 }

~dev_rating/application/classes/Model/Map.php

@@ -193,16 +193,4 @@ class Model_Map extends Model
                 ':student'    => $studentID,
             ])->execute();
     }
-
-    // deprecated (moved in helpers)
-    public static function searchTeachers($facultyID, $departmentID, $name, $disciplineID) {
-        $sql = "CALL `SearchTeachers`(:faculty, :department, :name, :discipline)";
-        return DB::query(Database::SELECT, $sql)
-            ->parameters([
-                ':name'       => $name,
-                ':faculty'    => $facultyID,
-                ':department' => $departmentID,
-                ':discipline' => $disciplineID,
-            ])->execute();
-    }
 }

~dev_rating/application/classes/Model/Teachers.php

@@ -21,16 +21,16 @@ class Model_Teachers extends Model
             ->execute();
     }
 
-    public static function searchTeachers($facultyID, $departmentID, $last, $first, $second) {
-        $sql = "CALL `SearchTeachers`(:faculty, :department, :last, :first, :second)";
+    // todo: does it make search among all teachers?
+    public static function search($facultyID, $departmentID, $name, $disciplineID) {
+        $sql = "CALL `SearchTeachers`(:faculty, :department, :name, :discipline)";
         return DB::query(Database::SELECT, $sql)
             ->parameters([
+                ':name'       => $name,
                 ':faculty'    => $facultyID,
                 ':department' => $departmentID,
-                ':last'       => $last,
-                ':first'      => $first,
-                ':second'     => $second,
-            ])->execute();
+                ':discipline' => $disciplineID,
+            ])->execute()->as_array();
     }
 
     public static function searchTeacherNew($facultyID, $departmentID, $last, $first, $second, $disciplineID) {

~dev_rating/media/js/discipline/EditTeachers.js

@@ -49,17 +49,19 @@ $(function() {
                 "DisciplineID": g_disciplineID
             },
             function(data) {
-                var SearchResult = $.parseJSON(data);
-                var SearchResultDIV = $(".SearchResult");
-                var i = 0;
-                if (SearchResult != null && SearchResult != undefined) {
-                    SearchResultDIV.html("");
-                    for(i in SearchResult) {
-                        var name = SearchResult[i].TeacherLast + " " + SearchResult[i].TeacherFirst + " " + SearchResult[i].TeacherSecond;
-                        SearchResultDIV.append(AddTeacher(SearchResult[i].TeacherID, name, "Bind"));
+                var jSearchResult = $('.SearchResult');
+                var teachers = $.parseJSON(data);
+
+                if (teachers.length) {
+                    jSearchResult.html('');
+                    for (var i in teachers) {
+                        var t = teachers[i];
+                        var name = t.LastName + ' ' + t.FirstName + ' ' + t.SecondName;
+                        jSearchResult.append(AddTeacher(t.ID, name, 'Bind'));
                     }
+                } else {
+                    jSearchResult.html('<p class="notification">Нет результатов... Возможно, преподаватели, соответствующие критериям поиска, уже прикреплены.</p>');
                 }
-                if (i<= 0) SearchResultDIV.html("<p class='notification'>Нет результатов... Возможно, преподаватели, соответствующие критериям поиска, уже прикреплены.</p>");
             }
         );
     }