diff --git a/db/stored/procedures.sql b/db/stored/procedures.sql index 0e645d37ad8ca4c980ffb3cae737b02a16ab150d..36da068bdd4b50ced09bc29be410a21093cd26d2 100644 --- a/db/stored/procedures.sql +++ b/db/stored/procedures.sql @@ -1139,6 +1139,22 @@ BEGIN WHERE modules.DisciplineID = pDisciplineID; END // +DROP PROCEDURE IF EXISTS GetSignInHistory// +CREATE PROCEDURE `GetSignInHistory` ( + IN `pLimit` INT +) NO SQL +BEGIN + SELECT logs_signin.ID, + logs_signin.Date, + logs_signin.AccountID, + teachers.LastName, + teachers.FirstName, + teachers.SecondName + FROM `logs_signin` + INNER JOIN `teachers` ON teachers.AccountID = logs_signin.AccountID + ORDER BY logs_signin.Date DESC LIMIT pLimit; +END // + DROP PROCEDURE IF EXISTS GetAttestationData// CREATE PROCEDURE GetAttestationData ( IN pDisciplineID INT, diff --git a/~dev_rating/application/classes/Controller/Office/Logs.php b/~dev_rating/application/classes/Controller/Office/Logs.php index 5d1594428e50b56d063e2879cfc5312bc8e040fd..2f7dac179c8a89667325a53e7c5f7b15c72fd802 100644 --- a/~dev_rating/application/classes/Controller/Office/Logs.php +++ b/~dev_rating/application/classes/Controller/Office/Logs.php @@ -5,7 +5,7 @@ class Controller_Office_Logs extends Controller_Environment_Office public function action_index() { $this->twig->set([ - 'Logs' => Model_Logs::loadAll(), + 'Logs' => Model_Logs::load(), ])->set_filename(static::OFFICE . 'logs'); } } diff --git a/~dev_rating/application/classes/Model/Logs.php b/~dev_rating/application/classes/Model/Logs.php index 9efdb42f014a7d6db061570c7ed94947a65f515b..d5effbf2309992f838ba236a1d384f1f754039a5 100644 --- a/~dev_rating/application/classes/Model/Logs.php +++ b/~dev_rating/application/classes/Model/Logs.php @@ -10,19 +10,10 @@ */ class Model_Logs extends Model { - - public static function loadAll() + public static function load() { - return DB::query(Database::SELECT, " - SELECT logs_signin.ID, - logs_signin.AccountID, - logs_signin.Date, - teachers.LastName, - teachers.FirstName, - teachers.SecondName - FROM `logs_signin` JOIN `teachers` ON logs_signin.AccountID = teachers.AccountID - ORDER BY logs_signin.Date DESC LIMIT 50" - )->execute()->as_array(); + $query = 'CALL `GetSignInHistory`(50)'; + return DB::query(Database::SELECT, $query)->execute()->as_array(); }