From 4cb104ab930f5d1e81c51a3f6443825d7306d35b Mon Sep 17 00:00:00 2001
From: RomanSteinberg <romanofficial@yandex.ru>
Date: Thu, 8 Jan 2015 18:50:03 +0300
Subject: [PATCH] FIX: exam form view

---
 .../Controller/Handler/FileCreator.php        |  38 +++++++++---------
 ~dev_rating/docs/template exam.xls            | Bin 30720 -> 30720 bytes
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/~dev_rating/application/classes/Controller/Handler/FileCreator.php b/~dev_rating/application/classes/Controller/Handler/FileCreator.php
index c325671cb..97ba532fc 100644
--- a/~dev_rating/application/classes/Controller/Handler/FileCreator.php
+++ b/~dev_rating/application/classes/Controller/Handler/FileCreator.php
@@ -208,7 +208,7 @@ class Controller_Handler_FileCreator extends Controller_Handler
         $this->prepareSheetHeader($objPHPExcel, $type, $headerData);
                 
         // fill students rows
-        $startRow = 13;  
+        $startRow = 12;
         $rowNumber = $startRow;
         $index = 1;
 
@@ -248,7 +248,7 @@ class Controller_Handler_FileCreator extends Controller_Handler
         $range = $objPHPExcel->getNamedRange("Year")->getRange();
         $sheet->setCellValue($range, $data['Year']);
         $range = $objPHPExcel->getNamedRange("CreationDate")->getRange();
-        $sheet->setCellValue($range, date("dd.mm.yy"));
+        $sheet->setCellValue($range, date("d.m.y"));
         
         $range = $objPHPExcel->getNamedRange("Date")->getRange();
         if ($disciplineType == 'credit') {
@@ -316,50 +316,52 @@ class Controller_Handler_FileCreator extends Controller_Handler
     {
         $indPosition = 'A'; // РќРѕРјРµСЂ
         $namePosition = 'B';  // Р¤РРћ
-        $totalRatePosition = 'G';  // РС‚РѕРіРѕРІС‹Р№ СЂРµР№С‚РёРЅРі
-        $semesterRatePosition  = 'H';   // РЎСѓРјРјР° Р±Р°Р»Р»РѕРІ
-        $bonusRatePosition = 'I'; // Р‘РѕРЅСѓСЃРЅС‹Рµ Р±Р°Р»Р»С‹
-        $examRatePosition = 'J'; // Р‘Р°Р»Р»С‹ Р·Р° СЌРєР·Р°РјРµРЅ
-        $rateOfFivePosition = 'K'; // РћС†РµРЅРєР° Р·Р° СЌРєР·Р°РјРµРЅ РїРѕ РїСЏС‚РёР±Р°Р»СЊРЅРѕР№ СЃРёСЃС‚РµРјРµ
+        $totalRatePosition = 'H';  // РС‚РѕРіРѕРІС‹Р№ СЂРµР№С‚РёРЅРі
+        $semesterRatePosition  = 'I';   // РЎСѓРјРјР° Р±Р°Р»Р»РѕРІ
+        $bonusRatePosition = 'J'; // Р‘РѕРЅСѓСЃРЅС‹Рµ Р±Р°Р»Р»С‹
+        $examRatePosition = 'K'; // Р‘Р°Р»Р»С‹ Р·Р° СЌРєР·Р°РјРµРЅ
+        $rateOfFivePosition = 'L'; // РћС†РµРЅРєР° Р·Р° СЌРєР·Р°РјРµРЅ РїРѕ РїСЏС‚РёР±Р°Р»СЊРЅРѕР№ СЃРёСЃС‚РµРјРµ
 
-        $sheet  ->getStyle("A".$row.":S".$row)
+        $sheet  ->getStyle("A".$row.":V".$row)
             ->getBorders()->getAllBorders()
             ->setBorderStyle(PHPExcel_Style_Border::BORDER_THIN);
-        $sheet  ->getStyle("G".$row.":J".$row)
+        $sheet  ->getStyle("H".$row.":K".$row)
             ->getAlignment()
             ->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_RIGHT);
-        $sheet  ->getStyle("K".$row.":L".$row)
+        $sheet  ->getStyle("L".$row.":M".$row)
             ->getAlignment()
             ->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_CENTER);
-        $sheet  ->getStyle("M".$row.":N".$row)
+        $sheet  ->getStyle("N".$row.":O".$row)
             ->getAlignment()
             ->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_RIGHT);
-        $sheet  ->getStyle("O".$row.":U".$row)
+        $sheet  ->getStyle("P".$row.":V".$row)
             ->getAlignment()
             ->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_CENTER);
-        $sheet  ->getStyle("R".$row.":R".$row)
+        $sheet  ->getStyle("S".$row.":S".$row)
             ->getAlignment()
             ->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_RIGHT);
-        $sheet->mergeCells("B".$row.":F".$row);
+        $sheet->mergeCells("B".$row.":G".$row);
 
         $lastName = $data['Last'];
         $firstName = $data['First'];
         $secondName = $data['Second'];
         $rate = (int)$data['intermediate'];
         $bonus = (int)$data['bonus'];
-        $examRate = 0; // TODO: get it from DB
+        $examRateValue = 0; // TODO: get it from DB
         $fullName = $lastName." ".$firstName." ".$secondName;
-        $totalRateValue = $rate + $examRate + $bonus;
+        $totalRateValue = $rate + $examRateValue + $bonus;
 
         if ($totalRateValue > 100)
             $totalRateValue = 100;
 
         $totalRate = '';
         $rateOfFive = '';
+        $examRate = '';
         if ($rate < 38) {
             $totalRate = ' ';
-            $rateOfFive = 'РЅРµ СѓРґРѕРІР»';
-        } elseif (($rate >= 38) and ($examRate >= 22)) {
+            $rateOfFive = 'РЅРµСѓРґ';
+            $examRate ='0';
+        } elseif (($rate >= 38) and ($examRateValue >= 22)) {
             $totalRate = $totalRateValue;
             $rateOfFive = 'СѓРґРѕРІР»';
             if (($totalRateValue >= 75) and ($totalRateValue < 85))
diff --git a/~dev_rating/docs/template exam.xls b/~dev_rating/docs/template exam.xls
index 14c107a280f69e4579afc08f9a364838cd5053d8..48e86ac60652f29364a15ee1d1f6cf8211d9f205 100644
GIT binary patch
delta 2862
zcmai0O^j1j6h8O$zV`KR`rp@fs_ifYjS`#@jq=xNXHb4dLGW(|(4jKOj4&euZb*>M
z&V`z&SHr@9hOjakkP4Bg12HDf!i6LzZZ*+0xNsqf!SCGnI&Enu-jnz4JLfy+JNKUZ
z)6U-#^S8vsBhnnGmM@N}Ir)|`IbFXkhduQ@)@(2vCZfOZ6p6mV2RHdi@i$6RSpA-`
zMOY1H_#I2yT|7T_Ju6+&&s}t`EBdyJc4uzH-bmVs9t^5|glE;^<d(vD&CrQ{>DW~@
zWoJ9l1s8q4D|*#M2fLyT=D&bO8l(C!7CRk09VB@{$3|6O+7>ajE<F*AH++7fXYg52
z@1<>ZE$z=Hn?Mnt;JU7Zld2lGv#BOpB`OsfXj;W=TiEO)GOA)fq{?>O_l1tku~mI)
z4~SlM173OPS!HC_h<oaTnSxML+5IA<c4ci9&1IrNq!1J(%HRV{P32bYEfQOt=8VS+
zMNl8n;~FV8M&i@<{tkO+8GBGwa<-b!XA1wrs3vkZ)!BTH`nESv-_iT9SZ&cDhOmMt
z4{qJA7f)JAI%zd@?vK-Z*8I-;5BYl0SXojhHk}gzl`r)Rsmi5&c%Lct2~%Awt;F{q
zrD8#1<~fd(JQuf(AFLi*Ph^r$^$)EPk^1hT6NV>&@(g+tDmc6tGD*bbfZPBXRsRfE
zYcLdPy&REcSpgN4wfG#7Ly!R(V#A2sA|I85a+4gD>m)mr<Rj8zr~+Uko{Ahs)E!LI
zqBHA=xQ-Vvl6wVFcq7qCgJ^6M(T^UY16CRj9Jr}>N9Me5V3#~FRhOG5`)e~YLU5)x
z!66}6JWbui%(j_L-Ai7&Vl{Oi1?Wmke2{{)&D+F7;QS!e)Wg)%<{zO*tt}wRyQU>U
zjACsBaf-JQBq-4qpTs@X8lNH@jj%HSGWcv0hR7|A$1<W+bCf&WQCUQ^5k-W<ICo1n
zu2GsCKXUz0+zy-UVl%tgcweXKqgq=M-dcAj=9Np+A<n-v7{9jt#2ibufVMRU_%9ZR
z+q8ZQ!#POP<k%&>$hD%{0<A)4LS0^V(GzfX0#h`JqLbEm?9*5xq6J!wLnojegDlU)
z$S%b5a0C`-vWCzQ8Bm_p;?cwgHsTm;Ong636Wa3PM5Z*8=Po9XX5!*8lc$5J)=t|>
zCGVo*(=nz`8dJ#*s_sl&HD3Rnd}-^+;Rc}R^gRl!2GF1vT0jqtQx>jVA`@xG-5`^m
zZ}IZd)6}~}=%YRQzI9?OXii!`y!g^uz-4G+=WnN{@U%*8JC(5x?9LlxFAf;H4?q*p
z_R?<J*CA!Zv<nx11@ZQMlC~_#R%opf)_HhCzlNpI)u`bD6LbXg<g`&}2F<uKi$U<f
zED%o+|L<@#i(bNsXlQ<5Twn(a&>>th%*Am*nu3H}EDTRh?s)c4mHd4Ec>`J~?JJN2
z*v$?c2h3N6gC<;*=b1wo(P4U>j=C~O`{`voejV#a>TP`SxEk(6U0de$Bi9aHCtfN)
zg=+|NfS$IXNLx@88lPszGe*Oj!qMVwakvj#k|n9q5|_fC3L7k(n%OqfDdWBXJ_Q|w
zdTWRmAb<sEtoW;-`VIpO;P-84rXWVu#LR|5ihe~6PNC+DnDth7JDta%R?&6(UR|9T
zSj)cz{7-=UVDL}6gavalc~NT%OBBN!^M|k=ppeSX7HW+8F*zSH^L{jRFZBxfwI|~&
z92M79=6fWCTms%6omB!cAl!Q(-1F(>o`2KW!o3e1H+7!J5O>J3)n~I`Upl&I^pR=4
hGxp%mq73`|!sXjXFMp%IX>{=d+dZmJ+UJg&{{ai~hZFz+

delta 2774
zcmaJ?TWpj?6#iy+_SWrfcmJ|o3hY8jA21RK7_RO10&NP)MXi8Euvnm6wqW$d1l{^%
zqA%j07%wQqClo;!Fop;`AqkrJKw@HIG$cL}YoakBLHy3l?sm7Z{F8rX&UeoF&iT(=
z{)tI7F{#cS)Pc!~zFkA+Mg4~F+F0R^?)966p{ThXN)%Ry$D`(!7gwK{U%jL{WBb##
z|I+p!+WxHVzhFP094_-@zL5DH9-09Bb1ws&=R_WTq6YqP4g9Sd_-8fnuN<Cdtm?q$
zYdBo4fxlS;|F#BRozS+aFD_<uUqTlwQF94D7K<H^9*;twwRo%ozmmR^hJMfDanm+q
zXFgHV-oz$O)4)}$^{Vk`32&LgGn{f+oP8Ppo2Y#pK7(^xzMB{Uy2|`XhqnU9_Uv(K
zePaU?5eL(gY&T1jb5b))1m%T4W9{0^f#g7HR!Msk&vQy+7k0L}ksMHS3W?UV3Nd*o
zWX#E#N%MAVz;vdDmNhsGSPm&%rsNp3_`Di;#%xX{&AC*3S-rKRtK@4R7uezP`|uEL
z6y`C9KP894nYKrjU=}>umh52al8Ak-W{!kC90`|X84qD?=<M=BaCRZ%`=!%d>O7?)
zW=B`M`Lru(-tX#HFu!%pRobZRe9k+v8Ra+KU7i`vMpV%3&Ms7;!m;ctJ}(5-qaV|&
z`S$2u-L1I?%;I1o6@}{41B4grPQ6~Q&>1YzU3#fD?Y-AKf>29n+^4f_i*x`g#$grP
zdaa>WQq!$_%)h-O?e{PbVGOSTq#U`Gz#IkKSOpyM0k>8&p83A-_22?-iI4UcHmn(K
z&ku&1KqX$Kk7gSTOvwQRaIr!kL<AT0l)esi7z|FyQAF`h{ghmfhAR6;G*;O+p^2Nn
zB0w|OqLLtnSQSAW@hXA@Si=f`51u(XmK>B*5%#%tZNWWCK(}hL7%PGnY?GmkNdZcB
zDBAf2Gk=XGI;U#_53rW~+k$tiSY@BJn4W!!d<*tUh;qD$wf;ez%2=JnT&|MCT^3iK
zQQIq@J0YV*+>as18NZAU_L|Z|S{`dzC`agFoQc9plI^IJkTeT;A{3>kA4X(#aY!<X
zKZkM4B43uHEG!G*<19C=<);HB*|P*v=^Py$f&T#nCHv{4^Vim2w!9?3GchfEE<YV8
z%Z@-6bd&wnNsV~Iuo)?0PV!ah{CE;_i8`IG(gm==UM5Z##53H!ylH$JgCq@6bc!(6
zb015#vxwJW9iHG@-MU#`v6fZe!nyl4Df<>|F(>yYW_M$H^T?QC9H8IaJ&?-RTL!t!
zc0+0`d|@)|WsQWdk&+K%w(VmkP9MZDk8R01gl%%W7j?W`XjhUV*hLOu65cwzz!oi9
z)?+wNuw>eR=XiIBX+6<K>|oo;TDg!hYUO9)wDF==KBv`s?ZJK=u<anW<5|98>lvYT
z(EbU8C&G8o7R*WcC^p(^$aak|@b;opLzNS+qzb1dN^<TTMKgLWgOg%ae!Ph){1WJ?
z@bmB#+Ln?=LJQp*yylbJQrX|-WLAn_$Kr3bZG=Vrjv6kv`7xJPkDJ@MRcQ}Dv-Im&
z@9V5ce{s1#;5eU^xoQT+7cFVE3#(WI&isGi6t{|t6JU+PT*zkj^6^r4nMKX%@$`sj
zBTPTY9OU5122<pUGm`+(kkx@YvGH?t#6H9(qcBN}(a&!)@VKR9Q#l^FhF2cCW+wVi
re0})3Z|=nBFK-=s<R{fli;2q@?i{{w$;}i0jR@{Hb9M66OM(9Zp8m4T

-- 
GitLab