From b5b6c9b2ae50257ab23e27e8a18413e5c5ea4162 Mon Sep 17 00:00:00 2001
From: Dmitry Yu Okunev <dyokunev@ut.mephi.ru>
Date: Wed, 9 Dec 2015 21:46:23 +0300
Subject: [PATCH] tiny fix

---
 genpdf/genpdf.php                       | 13 +++++++------
 mephimemo/template/request/vacation.tex |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/genpdf/genpdf.php b/genpdf/genpdf.php
index afb9c85..62a81cb 100644
--- a/genpdf/genpdf.php
+++ b/genpdf/genpdf.php
@@ -156,8 +156,8 @@ if (isset($_GET['signer-serialized'])) {
 	$signer_subdivs_full = $appointment->subdivision->name;
 
 	$_GET['signer-fullname']             = $user->employee->fullname;
-	$_GET['signer-appointment']          = my_mb_ucfirst($appointments_full);
-	$_GET['signer-appointment-wosubdiv'] = my_mb_ucfirst($appointments_wosubdiv);
+	$_GET['signer-appointment']          = $appointments_full;
+	$_GET['signer-appointment-wosubdiv'] = $appointments_wosubdiv;
 	$_GET['signer-subdivs']              = $signer_subdivs;
 	$_GET['signer-subdivs-full']         = $signer_subdivs_full;
 
@@ -494,7 +494,8 @@ foreach (array('signer', 'contact', 'user') as $key) {
 
 		}
 
-		$_GET[$key_prefix.$key.'-appointment-w-fullsubdiv'] = $appointment_w_fullsubdiv;//join(', ', $appointment_w_fullsubdiv);
+		$_GET[$key_prefix.$key.'-appointment-w-fullsubdiv']     = $appointment_w_fullsubdiv;
+		$_GET[$key_prefix.$key.'-appointment-w-fullsubdiv-cap'] = array(my_mb_ucfirst($appointment_w_fullsubdiv[0]));
 
 	}
 }
@@ -882,9 +883,9 @@ foreach ($files as $file) {
 			case 'request/temporary-acting':
 				$header = '\mmheadermemo{\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_}{\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_}';
 				$footer = '
-\mmfooter{'.$_GET['signer-appointment-w-fullsubdiv'].'}{'.$_GET{'signer-name'}.'}{}{}
+\mmfooter{'.my_mb_ucfirst($_GET['signer-appointment-w-fullsubdiv']).'}{'.$_GET{'signer-name'}.'}{}{}
 \\
-\mmfooter{'.(empty($_GET['user-appointment-w-fullsubdiv'])||$_GET['user-appointment-w-fullsubdiv']==" "?'\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_':$_GET['user-appointment-w-fullsubdiv']).'}{'.$_GET{'user-name'}.'}{}{}
+\mmfooter{'.(empty($_GET['user-appointment-w-fullsubdiv'])||$_GET['user-appointment-w-fullsubdiv']==" "?'\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_\_':my_mb_ucfirst($_GET['user-appointment-w-fullsubdiv'])).'}{'.$_GET{'user-name'}.'}{}{}
 ';
 				break;
 			case 'request/voip-transfer-equipment':
@@ -912,7 +913,7 @@ foreach ($files as $file) {
 
 			default:
 				$header = '\mmheader{Начальнику управления информатизации}{Н. Н. Романову}';
-				$footer = '\mmfooter{'.$_GET['signer-appointment'].'}{'.$_GET{'signer-name'}.'}{}{}';
+				$footer = '\mmfooter{'.my_mb_ucfirst($_GET['signer-appointment']).'}{'.$_GET{'signer-name'}.'}{}{}';
 		}
 		file_put_contents('header.tex',		$header);
 		file_put_contents('body.tex',		$body);
diff --git a/mephimemo/template/request/vacation.tex b/mephimemo/template/request/vacation.tex
index 16d2f31..cfc507d 100644
--- a/mephimemo/template/request/vacation.tex
+++ b/mephimemo/template/request/vacation.tex
@@ -1,7 +1,7 @@
 Прошу предоставить мне [{vacation-type}] на [{days-count}] [{days-descr}] с [{days-from}] по [{days-to}].
 
 \begin{flushright}
-[{signer-appointment-w-fullsubdiv}]\\
+[{signer-appointment-w-fullsubdiv-cap}]\\
 \vspace{0.7cm}
 \_\_\_\_\_\_\_\_\_\_\_\_\_ [{signer-name}]
 \end{flushright}
--
libgit2 0.24.0