From 2e2faff2ed9fe6273c145a4c3d035615627d5062 Mon Sep 17 00:00:00 2001
From: RomanSteinberg <romanofficial@yandex.ru>
Date: Mon, 22 Dec 2014 19:15:45 +0300
Subject: [PATCH] fix: sort and seek
---
db/StoredProcedures.sql | 8 +++++---
.../application/classes/Controller/Teacher/Rating.php | 4 ++--
~dev_rating/media/css/rating.css | 2 +-
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/db/StoredProcedures.sql b/db/StoredProcedures.sql
index e8dc38864..7456b87d7 100644
--- a/db/StoredProcedures.sql
+++ b/db/StoredProcedures.sql
@@ -2080,7 +2080,7 @@ BEGIN
modules.Name AS 'ModuleName',
modules.Type AS 'ModuleType',
submodules.ID AS 'SubmoduleID',
- submodules.Name AS 'SubModuleName',
+ submodules.Name AS 'SubModuleName',
submodules.Description AS 'SubmoduleDescription',
submodules.MaxRate,
submodules.Type AS 'SubmoduleControl'
@@ -2090,8 +2090,10 @@ BEGIN
INNER JOIN `subjects` ON disciplines.SubjectID = subjects.ID
WHERE modules.DisciplineID = DisciplineID AND
(modules.Type != 2 OR submodules.OrderNum = 1)
- ORDER BY modules.OrderNum ASC,
- submodules.OrderNum ASC;
+ ORDER BY modules.Type ^ 1 ASC,
+ -- 1, 3, 2, 4 ASC
+ modules.OrderNum ASC,
+ submodules.OrderNum ASC;
END IF;
END //
diff --git a/~dev_rating/application/classes/Controller/Teacher/Rating.php b/~dev_rating/application/classes/Controller/Teacher/Rating.php
index 1c3ea54af..9c844b5f8 100644
--- a/~dev_rating/application/classes/Controller/Teacher/Rating.php
+++ b/~dev_rating/application/classes/Controller/Teacher/Rating.php
@@ -121,9 +121,9 @@ class Controller_Teacher_Rating extends Controller_UserEnvi {
$rateHandled[$i_g]['Students'][$i_s]['Rates'][$i_r]['Rate'] = $r['Rate'];
$rateHandled[$i_g]['Students'][$i_s]['RateResult'] += $r['Rate'];
- if ($r['ModuleType'] == 'exam' || $r['ModuleType'] == 'extra')
+ /* if ($r['ModuleType'] == 'exam' || $r['ModuleType'] == 'extra')
$rateHandled[$i_g]['Students'][$i_s]['Rates'][$i_r]['SubmoduleID'] = -1;
- else
+ else */
$rateHandled[$i_g]['Students'][$i_s]['Rates'][$i_r]['SubmoduleID'] = $r['SubmoduleID'];
}
}
diff --git a/~dev_rating/media/css/rating.css b/~dev_rating/media/css/rating.css
index 3e95179c2..fa62b92ee 100644
--- a/~dev_rating/media/css/rating.css
+++ b/~dev_rating/media/css/rating.css
@@ -172,7 +172,7 @@ div#tdInfo_wrap {
/* todo */
.downloadExcelStatement {
- color: #0183ce;
+ color: #CE0101;
font-weight: bold;
}
--
GitLab