Merge branch 'master' of biuro.biall-net.pl:plabudda/se

SE/se-lib/Route/UrlAction/ProjektyProNetMediaBudget.php

@@ -82,9 +82,9 @@ dostęp dla zarządu i os. odp.	kwota końcowa
 		$data['projectInfo'] = $rows[0];
 		$data['budget'] = V::get('M_DIST_COST_PROJECT', 0, $data['projectInfo']);
 		$data['projectLabel'] = $data['projectInfo']['M_DIST_DESC'];
-		$data['POCZATEK_UMOWY'] = V::get('POCZATEK_UMOWY', 0, $data['projectInfo']);
-		$data['KONIEC_BUDOWY'] = V::get('KONIEC_BUDOWY', 0, $data['projectInfo']);
-		$data['days_to_finish'] = 0; // pozostało dni - // ilość dni wyliczana z różnicy dat [13513] KONIEC_BUDOWY - [13512] POCZATEK_UMOWY (raczej today)
+		$data['POCZATEK_UMOWY'] = V::get('POCZATEK_UMOWY', '', $data['projectInfo']);
+		$data['KONIEC_BUDOWY'] = V::get('KONIEC_BUDOWY', '', $data['projectInfo']);
+		$data['days_to_finish'] = null; // pozostało dni - // ilość dni wyliczana z różnicy dat [13513] KONIEC_BUDOWY - [13512] POCZATEK_UMOWY (raczej today)
 		$data['budget'] = V::get('DBG_M_DIST_COST_PROJECT', $data['budget'], $_GET);// TODO: TEST
 		$data['KONIEC_BUDOWY'] = V::get('DBG_KONIEC_BUDOWY', $data['KONIEC_BUDOWY'], $_GET);// TODO: TEST
 		if ($data['KONIEC_BUDOWY']) {
@@ -234,13 +234,13 @@ dostęp dla zarządu i os. odp.	kwota końcowa
 	<table class="table table-bordered">
 		<thead>
 			<tr>
-				<td rowspan="7" colspan="1" style="width:80px; text-align:center; vertical-align:middle">data</td>
+				<td rowspan="6" colspan="1" style="width:80px; text-align:center; vertical-align:middle">data</td>
 				<td rowspan="1" colspan="2" style="text-align:center; vertical-align:middle">data rozpoczęcia umowy</td>
 				<td rowspan="1" colspan="2" style="text-align:center; vertical-align:middle">data zakończenia umowy</td>
 				<td rowspan="1" colspan="2" style="text-align:center; vertical-align:middle">pozostało dni:</td>
 				<td rowspan="2" colspan="2" style="text-align:center; vertical-align:middle">Wartość kosztorysu</td>
 				<td rowspan="3" colspan="2" style="text-align:center; vertical-align:middle">ROBOCIZNA</td>
-				<td rowspan="6" colspan="1" style="text-align:center; vertical-align:middle; border-bottom:none">Koszty dodatkowe (reprezentacyjne)</td>
+				<td rowspan="5" colspan="1" style="text-align:center; vertical-align:middle; border-bottom:none">Koszty dodatkowe (reprezentacyjne)</td>
 				<td rowspan="4" colspan="2" style="text-align:center; vertical-align:middle">Zamówienia</td>
 				<td rowspan="4" colspan="2" style="text-align:center; vertical-align:middle">Zaliczki</td>
 				<td rowspan="4" colspan="2" style="text-align:center; vertical-align:middle">Zgody wejścia w teren</td>
@@ -260,37 +260,32 @@ dostęp dla zarządu i os. odp.	kwota końcowa
 				<td rowspan="1" colspan="1" style="text-align:center; vertical-align:middle">Materiały</td>
 			</tr>
 			<tr>
-				<th rowspan="4" colspan="1" style="text-align:center; vertical-align:middle; white-space:nowrap"><?php echo UI::price($data['budget']); ?></th>
+				<th rowspan="3" colspan="1" style="text-align:center; vertical-align:middle; white-space:nowrap"><?php echo UI::price($data['budget']); ?></th>
 				<td rowspan="1" colspan="1" style="text-align:center; vertical-align:middle">Zysk/Strata</td>
-				<th rowspan="3" colspan="1" style="text-align:center; vertical-align:middle; white-space:nowrap; border-bottom:none"><?php echo UI::price($data['TODO__aneks_netto']); ?></th>
-				<th rowspan="3" colspan="2" style="text-align:center; vertical-align:middle; white-space:nowrap; border-bottom:none"><?php echo UI::price($data['TODO__kary_netto']); ?></th>
-				<td rowspan="1" colspan="1" style="text-align:center; vertical-align:middle">???</td>
-				<th rowspan="3" colspan="1" style="text-align:center; vertical-align:middle; white-space:nowrap; border-bottom:none"><?php echo UI::price($data['COST_OSPRZET']); ?></th>
-				<th rowspan="3" colspan="1" style="text-align:center; vertical-align:middle; white-space:nowrap; border-bottom:none"><?php echo UI::price($data['COST_MATERIALY']); ?></th>
-				<td rowspan="3" colspan="1" style="text-align:center; vertical-align:middle; border-bottom:none">koszty pracowników</td>
-				<td rowspan="3" colspan="1" style="text-align:center; vertical-align:middle; border-bottom:none">koszt firmy podwykonawczej</td>
+				<th rowspan="2" colspan="1" style="text-align:center; vertical-align:middle; white-space:nowrap; border-bottom:none"><?php echo UI::price($data['TODO__aneks_netto']); ?></th>
+				<th rowspan="2" colspan="2" style="text-align:center; vertical-align:middle; white-space:nowrap; border-bottom:none"><?php echo UI::price($data['TODO__kary_netto']); ?></th>
+				<th rowspan="2" colspan="2" style="text-align:center; vertical-align:middle; white-space:nowrap; border-bottom:none"><?php echo UI::price($data['COST_OSPRZET']); ?></th>
+				<th rowspan="2" colspan="1" style="text-align:center; vertical-align:middle; white-space:nowrap; border-bottom:none"><?php echo UI::price($data['COST_MATERIALY']); ?></th>
+				<td rowspan="2" colspan="1" style="text-align:center; vertical-align:middle; border-bottom:none">koszty pracowników</td>
+				<td rowspan="2" colspan="1" style="text-align:center; vertical-align:middle; border-bottom:none">koszt firmy podwykonawczej</td>
 			</tr>
 			<tr>
-				<td rowspan="3" colspan="1" style="text-align:center; vertical-align:middle; white-space:nowrap; <?php echo $styleZyskStrata; ?>"><?php echo UI::price($data['TODO__sum_zysk_strata']); ?></td>
-				<td rowspan="1" colspan="1" style="text-align:center; vertical-align:middle">???</td>
-				<td rowspan="3" colspan="1" style="text-align:center; vertical-align:middle">numer zamówienia (kwota netto)</td>
-				<td rowspan="3" colspan="1" style="text-align:center; vertical-align:middle">numer faktury kwota po weryfikacji</td>
-				<td rowspan="3" colspan="1" style="text-align:center; vertical-align:middle">zaliczka kwota</td>
-				<td rowspan="3" colspan="1" style="text-align:center; vertical-align:middle">rozliczanie zaliczki koszty dzienne</td>
-				<td rowspan="2" colspan="1" style="text-align:center; vertical-align:middle; border-bottom:none">służebności</td>
-				<td rowspan="2" colspan="1" style="text-align:center; vertical-align:middle; border-bottom:none">odszkodowania</td>
-				<td rowspan="2" colspan="1" style="text-align:center; vertical-align:middle; border-bottom:none">Sprzęt własny</td>
-				<td rowspan="2" colspan="1" style="text-align:center; vertical-align:middle; border-bottom:none">sprzęt wynajęty</td>
-				<td rowspan="2" colspan="1" style="text-align:center; vertical-align:middle; border-bottom:none">organizacja ruchu</td>
-				<td rowspan="2" colspan="1" style="text-align:center; vertical-align:middle; border-bottom:none">zajętość pasa drogowego</td>
-			</tr>
-			<tr>
-				<td rowspan="2" colspan="1" style="text-align:center; vertical-align:middle">???</td>
+				<td rowspan="2" colspan="1" style="text-align:center; vertical-align:middle; white-space:nowrap; <?php echo $styleZyskStrata; ?>"><?php echo UI::price($data['TODO__sum_zysk_strata']); ?></td>
+				<td rowspan="2" colspan="1" style="text-align:center; vertical-align:middle">numer zamówienia (kwota netto)</td>
+				<td rowspan="2" colspan="1" style="text-align:center; vertical-align:middle">numer faktury kwota po weryfikacji</td>
+				<td rowspan="2" colspan="1" style="text-align:center; vertical-align:middle">zaliczka kwota</td>
+				<td rowspan="2" colspan="1" style="text-align:center; vertical-align:middle">rozliczanie zaliczki koszty dzienne</td>
+				<td rowspan="1" colspan="1" style="text-align:center; vertical-align:middle; border-bottom:none">służebności</td>
+				<td rowspan="1" colspan="1" style="text-align:center; vertical-align:middle; border-bottom:none">odszkodowania</td>
+				<td rowspan="1" colspan="1" style="text-align:center; vertical-align:middle; border-bottom:none">Sprzęt własny</td>
+				<td rowspan="1" colspan="1" style="text-align:center; vertical-align:middle; border-bottom:none">sprzęt wynajęty</td>
+				<td rowspan="1" colspan="1" style="text-align:center; vertical-align:middle; border-bottom:none">organizacja ruchu</td>
+				<td rowspan="1" colspan="1" style="text-align:center; vertical-align:middle; border-bottom:none">zajętość pasa drogowego</td>
 			</tr>
 			<tr>
 				<td rowspan="1" colspan="1" style="padding:0; text-align:center; vertical-align:middle; border-top:none"><button onClick="return budget_addCost(this, 'ANEKS')" class="btn btn-link" style="padding:0"><i class="glyphicon glyphicon-plus-sign"></i></button></td>
 				<td rowspan="1" colspan="2" style="padding:0; text-align:center; vertical-align:middle; border-top:none"><button onClick="return budget_addCost(this, 'KARY')" class="btn btn-link" style="padding:0"><i class="glyphicon glyphicon-plus-sign"></i></button></td>
-				<td rowspan="1" colspan="1" style="padding:0; text-align:center; vertical-align:middle; border-top:none"><button onClick="return budget_addCost(this, 'OSPRZET')" class="btn btn-link" style="padding:0"><i class="glyphicon glyphicon-plus-sign"></i></button></td>
+				<td rowspan="1" colspan="2" style="padding:0; text-align:center; vertical-align:middle; border-top:none"><button onClick="return budget_addCost(this, 'OSPRZET')" class="btn btn-link" style="padding:0"><i class="glyphicon glyphicon-plus-sign"></i></button></td>
 				<td rowspan="1" colspan="1" style="padding:0; text-align:center; vertical-align:middle; border-top:none"><button onClick="return budget_addCost(this, 'MATERIALY')" class="btn btn-link" style="padding:0"><i class="glyphicon glyphicon-plus-sign"></i></button></td>
 				<td rowspan="1" colspan="1" style="padding:0; text-align:center; vertical-align:middle; border-top:none"><button onClick="return budget_addCost(this, 'PRACOWNICY')" class="btn btn-link" style="padding:0"><i class="glyphicon glyphicon-plus-sign"></i></button></td>
 				<td rowspan="1" colspan="1" style="padding:0; text-align:center; vertical-align:middle; border-top:none"><button onClick="return budget_addCost(this, 'PODWYKONAWCY')" class="btn btn-link" style="padding:0"><i class="glyphicon glyphicon-plus-sign"></i></button></td>

SE/se-lib/SE_Layout.php

@@ -1,83 +1,16 @@
 <?php
 
+Lib::loadClass('UI');
 
 class SE_Layout {
 
-	public static function getTitle() {
-		$title = 'SE';
-
-		$host = $_SERVER['SERVER_NAME'];
-		if (substr($host, 0, 5) == 'biuro') {
-			$host = substr($host, 6);
-		}
-
-		$title = "{$host}-SE";
-
-		return $title;
-	}
-
-	public static function gora() {
-		Lib::loadClass('S');
-		SE_Layout::loadTemplate('_layout_gora');
-	}
-
-	public static function dol() {
-		$version = (file_exists(APP_PATH_ROOT . '/VERSION'))? file_get_contents(APP_PATH_ROOT . '/VERSION') : null;
-		if ($version) {
-			echo '<div style="border-top:1px solid #ddd;margin-top:10px;padding:0 30px;font-size:xx-small;color:#888;">version: '.$version.'</div>';
-		}
-		echo "\n</body></html>";
-	}
-
-	public static function menu() {
-		if (!User::logged()) return;
-
-		if (User::hasAccess('menu')) {
-			Lib::loadClass('ProcesMenu');
-
-			$procesMenu = ProcesMenu::getInstance();
-			$procesMenu->show();
-
-			if (!V::get('MENU_INIT', '', $_GET)) {
-				Lib::loadClass('UserActivity');
-				//echo UserActivity::showListInContainer();
-			}
-
-		}
-		else {
-			SE_Layout::loadTemplate('menuLevel6');
-		}
-	}
-
-	public static function loadTemplate($tmplName, $data = array()) {
-		if (is_array($data) && !empty($data)) {
-			extract($data);
-		}
-		include APP_PATH_LIB . "/tmpl/{$tmplName}.php";
-	}
-
-	public static function hotKeyDBG($str) {
-		if (User::hasAccess('dbg')) {
-			echo '<span class="hidden-dbg">' . htmlspecialchars($str) . '</span>';
-		}
-	}
-
-	public static function showMessagesForTable($tblName) {
-		if (empty($tblName)) return;
-
-		$msgsRoute = Router::getRoute('Msgs');
-		$msgs = $msgsRoute->getActiveMessagesForTable($tblName);
-		if (!empty($msgs)) {
-			self::loadTemplate('msgsForTable', array('msgs' => $msgs));
-		}
-	}
-
-	public static function alert($alertType, $msg) {
-		?>
-<div class="alert alert-<?php echo $alertType; ?>">
-	<?php echo $msg; ?>
-</div>
-		<?php
-	}
+	public static function getTitle() { return UI::getTitle(); }
+	public static function gora() { UI::startHtml(); }
+	public static function dol() { UI::endHtml(); }
+	public static function menu() { UI::menu(); }
+	public static function loadTemplate($tmplName, $data = array()) { UI::loadTemplate($tmplName, $data); }
+	public static function hotKeyDBG($str) { UI::hotKeyDBG($str); }
+	public static function showMessagesForTable($tblName) { UI::showMessagesForTable($tblName); }
+	public static function alert($alertType, $msg) { UI::alert($alertType, $msg); }
 
 }

SE/se-lib/UI.php

@@ -29,11 +29,22 @@ class UI {
 		UI::endHtml();
 	}
 
+	public static function fixFooterPosition($type) {
+		$fixFooterPosition = true;// from config?
+		if (!$fixFooterPosition) return;
+		switch ($type) {
+			case 'footer_style': return 'position:absolute; bottom:0; left:0; width:100%; ';
+			case 'body_style': return 'position:relative; padding-bottom:32px;';
+			case 'footer_js_tag': return "\n<script>document.body.style.minHeight = '' + (window.innerHeight - 2) + 'px';</script>";
+		}
+	}
+
 	public static function endHtml() {
 		$version = (file_exists(APP_PATH_ROOT . '/VERSION'))? file_get_contents(APP_PATH_ROOT . '/VERSION') : null;
 		if ($version) {
-			echo '<div style="border-top:1px solid #ddd;margin-top:10px;padding:0 30px;font-size:xx-small;color:#888;">version: '.$version.'</div>';
+			echo '<div style="' . UI::fixFooterPosition('footer_style') . 'border-top:1px solid #ddd; margin-top:10px; padding:0 30px; font-size:xx-small; color:#888">version: '.$version.'</div>';
 		}
+		echo UI::fixFooterPosition('footer_js_tag');
 		echo "\n</body></html>";
 	}
 
@@ -73,6 +84,7 @@ class UI {
 	public static function showMessagesForTable($tblName) {
 		if (empty($tblName)) return;
 
+		Lib::loadClass('Router');
 		$msgsRoute = Router::getRoute('Msgs');
 		$msgs = $msgsRoute->getActiveMessagesForTable($tblName);
 		if (!empty($msgs)) {

SE/se-lib/tmpl/_layout_gora.php

@@ -12,7 +12,51 @@
 	<link rel="stylesheet" href="stuff/jquery.selectize/css/selectize.bootstrap3.css" type="text/css" />
 	<link rel="stylesheet" href="stuff/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css" type="text/css" />
 	<link rel="stylesheet" href="stuff/jquery-ui-smoothness/jquery-ui-1.10.4.custom.min.css" type="text/css">
-	<link rel="stylesheet" href="stuff/main.css" type="text/css" />
+	<style type="text/css">
+body { margin:0; font-size:12px; line-height:18px; }
+body { <?php echo UI::fixFooterPosition('body_style'); ?> }
+
+#SE-menu { font-size:13px; }
+#SE-menu { min-height:36px; }
+#SE-menu > .container-fluid { padding:0; }
+#SE-menu .navbar { margin-bottom:0; }
+#SE-menu .navbar-form { margin-top:0; margin-bottom:0; }
+#SE-menu .nav > li > a { padding: 8px 10px 8px; }
+#SE-menu { -webkit-border-radius:0; -moz-border-radius:0; border-radius:0; }
+#SE-menu-sub { border-bottom:2px solid #C53000; background:#eee;}
+#SE-menu-sub .btn {margin:4px 2px;}
+
+#SE-menu .bookmark-item-rem {opacity:0.5;}
+#SE-menu .bookmark-item-add {opacity:0.5;}
+#SE-menu .bookmark-item-rem:hover {opacity:1;}
+#SE-menu .bookmark-item-add:hover {opacity:1;}
+
+.tbl-view td {border-color:#eee;}
+.tbl-view thead td {background:#f3f3f3;}
+.tbl-view tbody tr:hover td {background:#E6FFE6;}
+.tbl-view tbody tr.tbl-row-0,
+.tbl-view tbody tr.row-0 {background:#f3f3f3;}
+.tbl-view tbody tr.tbl-row-1,
+.tbl-view tbody tr.row-1 {background:#fff;}
+.tbl-view input[type=text] {margin:0;padding:0;}
+
+.se-main-menu {}
+.se-main-menu td:hover {background-color:#f3f3f3;}
+
+.red{color:#f00;}
+.green{color:#0f0;}
+.blue{color:#00f;}
+
+.dropdown-menu a em {font-size:0.9em; color:#bbb;}
+
+.label-A_STATUS-NORMAL   { background:#aeffae; color:#555;    text-align:center; text-shadow:none; }
+.label-A_STATUS-WAITING  { background:#ffd2ff; color:#555;    text-align:center; text-shadow:none; }
+.label-A_STATUS-MONITOR  { background:#cccaff; color:#555;    text-align:center; text-shadow:none; }
+.label-A_STATUS-WARNING  { background:#ffbaba; color:#555;    text-align:center; text-shadow:none; }
+.label-A_STATUS-DELETED  { background:#e0e0e0; color:#808080; text-align:center; text-shadow:none; }
+.label-A_STATUS-OFF_SOFT { background:#fce3b7; color:#808080; text-align:center; text-shadow:none; }
+.label-A_STATUS-OFF_HARD { background:#eee;    color:#808080; text-align:center; text-shadow:none; }
+	</style>
 
 	<script src="stuff/jquery-2.1.0.min.js"></script>
 	<script src="stuff/jquery-plugins.js"></script>