From 18a0acd77b434d6f168f0be3f41bcfedbde748a3 Mon Sep 17 00:00:00 2001
From: Krivchikov Dmitry <krivchikovda@gmail.com>
Date: Mon, 14 Apr 2014 07:09:30 +0400
Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=20?=
 =?UTF-8?q?=D0=BF=D0=BE=D1=80=D1=8F=D0=B4=D0=BE=D0=BA=20=D0=B2=D1=8B=D0=B2?=
 =?UTF-8?q?=D0=BE=D0=B4=D0=B0=20=D0=BA=D0=B0=D1=82=D0=B5=D0=B3=D0=BE=D1=80?=
 =?UTF-8?q?=D0=B8=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ground/classes/Model.php               |  16 +++++++++++-----
 ground/controllers/IndexController.php |   2 +-
 public/ico/cup.png                     | Bin 0 -> 1205 bytes
 3 files changed, 12 insertions(+), 6 deletions(-)
 create mode 100644 public/ico/cup.png

diff --git a/ground/classes/Model.php b/ground/classes/Model.php
index 5a6f3ed..fcc1004 100644
--- a/ground/classes/Model.php
+++ b/ground/classes/Model.php
@@ -46,13 +46,19 @@ class Model
 	}
 
     /**
-     * Возвращает массив с ассоциативными массивами, соответствующими записями в БД.
-     * @return array
-     */
-	function getAll()
+	 * Возвращает массив с ассоциативными массивами, соответствующими записями в БД.
+	 * @param string $where просто строка с условиями: (`id` > 1) AND (`name` == 'TEST')
+	 * @param string $order строка с именем толбца и напрабления: `summ` DESC
+	 * @return type
+	 */
+	function getAll($where = '', $order = '')
 	{
         /* TODO: Переделать этот метод. Сделать статическим, возвращать массив объектов. */
-		$res = App::$DB->query('SELECT * FROM ' . $this->_tableName_);
+		$sql = 'SELECT * FROM ' . $this->_tableName_;
+		$sql .= $where ? ' WHERE '.$where : '';
+		$sql .= $order ? ' ORDER BY '.$order : '';
+
+		$res = App::$DB->query($sql);
 
         $this->_id_ = NULL; // Это больше не конкретная запись
 		$ready = array();
diff --git a/ground/controllers/IndexController.php b/ground/controllers/IndexController.php
index ed30b40..43d945f 100644
--- a/ground/controllers/IndexController.php
+++ b/ground/controllers/IndexController.php
@@ -19,7 +19,7 @@ class IndexController extends Controller
 		$category = new Category();
 
 		self::render('indexTemplate.php', array(
-			'categories' => $category->getAll(),
+			'categories' => $category->getAll('', 'ord'),
 		));
 	}
 
diff --git a/public/ico/cup.png b/public/ico/cup.png
new file mode 100644
index 0000000000000000000000000000000000000000..6171df1fc0a3e70b7dca9dec2440ca593ccc1523
GIT binary patch
literal 1205
zcmV;m1WNmfP)<h;3K|Lk000e1NJLTq001BW001Qj1^@s6Be&~E000DhNkl<ZScSEh
z(Q6Y)9Du*9O`2{t)wE4*X^7UMf*?hNR`1|?4;y`u^F$80iVrIIqJjlq3;qwHf~bWn
z^`MV;LWL&Ka!>;iE%$U*+v7}wEmxJMZ9=+<yZ4Ztx~)xixAuN8%(6So_wCGYm-%@N
z!vG)_i`4)U;4}Lgwl_+E4rqWLkH<>@9>XvM+z0s0<}(GPZG!8jfCd!Irp4p&l1Eil
z0hfV#v-k7=tUv+C150MFiMRBd@a9A;k=$nRx=`clar06KO4g;96R|`xyf;j(T#L`|
z+g7kv&{)l{l87aeYFs^xxeeCD^8=g0HBDoFe%=+ZrKJU*@AEtx<`j7*)llAR(bfiL
zvstp)ERrOl>pDjokC6H?<p|#OTNjh_lXyHH48tH83=#^3tP*QXk!W9Jdp4Wp*3nz^
zclPr-`<h2nkI3XQv=6seh0p#xOJ_qTL*EZ^VCMnuPTi$%qK{B0v~j2;Oe#iyXFsWh
z6n)7)?tF8HNFYM-a?y4LZXUkL^=H?)a_|b*4ql^gqOamu+wc7C@>`z2f6nRnX<M*}
z^JC{3n;T<#Y1($It-wy-P5=s@3XTPqic5Gr9^@MN>jX-Ai9?}70A#hSV}V6&5yLR(
zZtng%fsxq}B7ulwum~Z0toazJh3a2UMS;4yIv!3v1fZv-$F)R9umgbmukNq=A2=3J
z6osdmrvMCmHvoWc=#B+$AHNO2;G01dMR6}sS62tX<LSpll_-0ZJ&eqb*n)-RiO31Y
z=f(lHCIBGIG8g~22*C8YX@;hUYz0yaDF%B60XP#sLv3ws)$vsYnwpvbxRJa8z{$u-
zTLH-<(c96>gI5p8m2!l`;jIe*ghC<i{dJF*?_YB1z$IIOu5cHbT!yR9uA(Rkl2jdG
zD-a9@@p`><|K82V)sMCU+9!?n;dXZH*g-=>gY9@nN3Pb^RwPMc_v76R|2<rB+-PQ$
zz%Ky++S=NjOzr&47l}lWWtj`(7dV?Z`^EF#v0hG%p2F|<6OBflPV4U6*VNQRKA-1F
z`U&0vFH=8FQSYm#_19Ja8XFr41OjfRbbs)aWtnI+%7=F!*jK*~fc^FRS>3hjb}C?t
z$L_hgIdY{OCA|c|o255oGMTRuaQu%=r_&URMUp=xsgcSHICE|WUDrvc({9*0l((Q{
zX=nwl>WMfSjWVOotiPv3DPAtpk?5#O)C!uoTw~Voxm+p$tmeymSxF+DPU9W$Ru!xS
z7jv5|4bVNRs`>y0*hQ7XB)m6Fupw9xY>nlQ%Pjn}u<0|iF!>i)1Xjcf6eyQVm_>uN
zG?M@lvBU&mD<R-&T>aL(CGu-yX;uJqC&lU789ot9yr{Mk7Wh%t=T_z7)TTTay|sLs
z+)Tm(KVrV6*k`N2=H+>{Fva|o^F%Qv{<KP1;GHIX#cTxusuZ>Y6(kg~5`gv1S8xG$
zEU<}0y(#em5PQBtIk_CeT?uTEkj*B378>QH&%1%U7O+T&q!gd3_{20faDe{+tNYz{
TpHxT&00000NkvXXu0mjfhg(6E

literal 0
HcmV?d00001