updated ajax table rows in Budget for pro-netmedia

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

@@ -123,6 +123,7 @@ dostęp dla zarządu i os. odp.	kwota końcowa
 				$toFindKoresp[$idOrder] = $labelOrder;
 				if (count($data['costs']) < $idxOrders + 1) {
 					$data['costs'][] = array(
+						'_type'=>'order',
 						'data'=>$order['ORDER_DATE'],
 						'order_approve_status'=>$order['APPROVE_STATUS'],
 						'order_cost'=>$order['SUM_NETTO'],
@@ -130,14 +131,7 @@ dostęp dla zarządu i os. odp.	kwota końcowa
 						'order_nr'=>$labelOrder,
 						'nr_zamowienia'=>$labelOrder,// TODO: RMME -> mved to `order_nr`
 						'nr_fv_do_zamowienia'=>array(),
-						'cost_zaliczki'=>0,
-						'cost_pracownicy'=>0,
-						'cost_wynajem'=>0,
-						'cost_serwis'=>0,
-						'cost_materialy'=>0,
-						'cost_osprzet'=>0,
-						'cost_dodatkowe'=>0,
-						'sum'=>0,
+						'sum'=>$order['SUM_NETTO'],
 						'orderRaw'=>$order
 					);
 				}
@@ -154,6 +148,7 @@ dostęp dla zarządu i os. odp.	kwota końcowa
 					select k.ID
 								, k.ORDER_NR
 								, k.K_NR_OTRZYM_KORESP as obcy_nr_koresp
+								, k.COST_VALUE as cost
 					from IN7_DZIENNIK_KORESP k
 					where k.ORDER_NR in({$sqlOrderLabels})
 				");
@@ -162,28 +157,85 @@ dostęp dla zarządu i os. odp.	kwota końcowa
 					foreach ($data['costs'] as $cost) {
 						if ($isOrder && $labelOrder == $cost['nr_zamowienia']) {
 							$idKoresp = $fv['ID'];
-							$cost['nr_fv_do_zamowienia'][$idKoresp] = $fv['obcy_nr_koresp'];
+							// $cost['nr_fv_do_zamowienia'][$idKoresp] = $fv['obcy_nr_koresp'];
+							$cost['nr_fv_do_zamowienia'][] = array('id'=>$idKoresp, 'nr'=>$fv['obcy_nr_koresp'], 'cost'=>$fv['cost']);
 						}
 					}
 				}
 			}
 
+			{// PROJECT_COSTS
+				$data['projectCostsRaw'] = DB::getPDO()->fetchAll("
+					select c.ID
+							, c.ID_PROJECT
+							, c.COST_DATE
+							, c.COST_VALUE
+							, c.COST_TYPE
+					from PROJECT_COSTS c
+					where (c.A_STATUS is null or c.A_STATUS not in('DELETED'))
+						and c.ID_PROJECT = {$idProj}
+					order by c.COST_DATE ASC, c.ID ASC
+				");
+				foreach ($data['projectCostsRaw'] as $projCost) {
+					$item = array(
+						'_type'=>'project_cost',
+						'data'=>$projCost['COST_DATE'],
+						'sum'=>$projCost['COST_VALUE'],
+						'costRaw'=>$projCost
+					);
+					switch ($projCost['COST_TYPE']) {
+						case 'ANEKS': $item['TODO__budget_aneks'] = $projCost['COST_VALUE']; break;
+						case 'KARY': $item['TODO__budget_kary'] = $projCost['COST_VALUE']; break;
+						case 'OSPRZET': $item['TODO__budget_osprzet'] = $projCost['COST_VALUE']; break;
+						case 'MATERIALY': $item['TODO__budget_materialy'] = $projCost['COST_VALUE']; break;
+						case 'PRACOWNICY': $item['TODO__budget_koszt_pracownikow'] = $projCost['COST_VALUE']; break;
+						case 'PODWYKONAWCY': $item['TODO__budget_koszt_podwykonawcow'] = $projCost['COST_VALUE']; break;
+						case 'REPREZENTACYJNE': $item['TODO__budget_koszt_reprezentacyjny'] = $projCost['COST_VALUE']; break;
+						case 'ZGODY_SLUZEBNOSCI': $item['TODO__budget_zgoda_sluzebnosci'] = $projCost['COST_VALUE']; break;
+						case 'ZGODY_ODSZKODOWANIA': $item['TODO__budget_zgoda_odszkodowania'] = $projCost['COST_VALUE']; break;
+						case 'SPRZET_WLASNY': $item['TODO__budget_sprzet_wlasny'] = $projCost['COST_VALUE']; break;
+						case 'SPRZET_WYNAJETY': $item['TODO__budget_sprzet_wynajety'] = $projCost['COST_VALUE']; break;
+						case 'ORGANIZACJA_RUCHU': $item['TODO__budget_organizacja_ruchu'] = $projCost['COST_VALUE']; break;
+						case 'ZAJETOSC_PASA': $item['TODO__budget_zajetosc_pasa'] = $projCost['COST_VALUE']; break;
+					}
+					$data['costs'][] = $item;
+				}
+			}
+
+			{// TODO: Koresp.: TODO__budget_zaliczki, TODO__budget_rozliczone_zaliczki
+
+			}
+
+			// order $data['costs'] by `data`, then by `ID` for the same `_type` else: order, project_cost, koresp
+			usort($data['costs'], function($a, $b) {
+				if ($a['data'] == $b['data']) {
+					if ($a['_type'] == $b['_type']) {
+						if ('project_cost' == $a['_type']) {
+							return ($a['costRaw']['ID'] < $b['costRaw']['ID']) ? -1 : 1;
+						}
+						if ('order' == $a['_type']) {
+							return ($a['orderRaw']['ID'] < $b['orderRaw']['ID']) ? -1 : 1;
+						}
+						return 0;
+					}
+					$oa = 999; $ob = 999;
+					if ('order' == $a['_type']) $oa = 1;
+					else if ('project_cost' == $a['_type']) $oa = 2;
+					if ('order' == $b['_type']) $ob = 1;
+					else if ('project_cost' == $b['_type']) $ob = 2;
+					return ($oa < $ob) ? -1 : 1;
+				}
+				return ($a['data'] < $b['data']) ? -1 : 1;
+			});
+
 			$budget = $data['budget'];
 			foreach ($data['costs'] as $idx => $cost) {
 				// TODO: fix - `cost_wynajem` pewnie będzie częścią z zamówienia - minus od project COST_OSPRZET
 				// TODO: fix - `cost_materialy` pewnie będzie częścią z zamówienia - minus od project COST_MATERIALY
-				$sum = $cost['cost_zamowienia']
-				 	+ $cost['cost_zaliczki']
-				 	+ $cost['cost_pracownicy']
-				 	+ $cost['cost_wynajem']
-				 	+ $cost['cost_serwis']
-				 	+ $cost['cost_materialy']
-				 	+ $cost['cost_osprzet']
-				 	+ $cost['cost_dodatkowe']
-				;
+				// TODO: cost_wynajem i cost_materialy - edit in this table - cost may be verified by fv, etc.
+				$sum = $cost['sum'];
 				$budget -= $sum;
 				$data['costs'][$idx]['budget_minus_sum'] = $budget;
-				$data['costs'][$idx]['sum'] = $sum;
 			}
 		}
 		return $data;
@@ -193,29 +245,7 @@ dostęp dla zarządu i os. odp.	kwota końcowa
 		$styleZyskStrata = 'color: black';
 		if ($data['TODO__sum_zysk_strata'] > 0) $styleZyskStrata = 'color:green';
 		if ($data['TODO__sum_zysk_strata'] < 0) $styleZyskStrata = 'color:red';
-
 		$costs = $data['costs'];
-		foreach ($costs as $idx => $cost) {
-			$cost['is_order'] = ($cost['order_cost'] && $cost['order_nr']);
-			if ($cost['is_order']) {
-				$cost['cell_order_color'] = '#aaa';
-				$cost['cell_order_title'] = '';
-				switch ($cost['order_approve_status']) {
-					case 'ZATWIERDZONE': $cost['cell_order_color'] = 'black'; break;
-					case 'OCZEKUJE_OSTATECZNEGO_ZATWIERDZENIA': $cost['cell_order_color'] = '#777'; break;
-					case 'OCZEKUJE_ZATWIERDZENIA': $cost['cell_order_color'] = '#777'; break;
-					case 'WERSJA_ROBOCZA': $cost['cell_order_color'] = '#aaa'; break;
-				}
-				switch ($cost['order_approve_status']) {
-					case 'ZATWIERDZONE': $cost['cell_order_title'] = "Zamówienie zatwierdzone"; break;
-					case 'OCZEKUJE_OSTATECZNEGO_ZATWIERDZENIA': $cost['cell_order_title'] = "Zamówienie oczekuje ostatecznego zatwierdzenia"; break;
-					case 'OCZEKUJE_ZATWIERDZENIA': $cost['cell_order_title'] = "Zamówienie oczekuje zatwierdzenia"; break;
-					case 'ODRZUCONE': $cost['cell_order_title'] = "Zamówienie odrzucone"; break;
-					case 'WERSJA_ROBOCZA': $cost['cell_order_title'] = "Wersja robocza"; break;
-				}
-			}
-			$costs[$idx] = $cost;
-		}
 		?>
 <div class="container">
 	<div class="row">
@@ -234,37 +264,43 @@ dostęp dla zarządu i os. odp.	kwota końcowa
 	<table class="table table-bordered">
 		<thead>
 			<tr>
-				<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="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>
-				<td rowspan="4" colspan="2" style="text-align:center; vertical-align:middle">Wynajem sprzętu</td>
-				<td rowspan="4" colspan="2" style="text-align:center; vertical-align:middle">Koszty projektu</td>
-			</tr>
-			<tr>
-				<td rowspan="1" colspan="2" style="text-align:center; vertical-align:middle"><?php echo $data['POCZATEK_UMOWY']; ?></td>
-				<td rowspan="1" colspan="2" style="text-align:center; vertical-align:middle"><?php echo $data['KONIEC_BUDOWY']; ?></td>
-				<td rowspan="1" colspan="2" style="text-align:center; vertical-align:middle"><?php echo $data['days_to_finish']; ?></td>
+				<td rowspan="5" colspan="1" style="width:80px; text-align:center; vertical-align:middle">data</td>
+				<td rowspan="1" colspan="6" style="padding:0">
+					<table class="table table-bordered" style="width:100%; margin:0; border:0">
+						<tr>
+							<td rowspan="1" colspan="1" style="text-align:center; vertical-align:middle; border-top:0; border-left:0">data rozpoczęcia umowy</td>
+							<td rowspan="1" colspan="1" style="text-align:center; vertical-align:middle; border-top:0">data zakończenia umowy</td>
+							<td rowspan="1" colspan="1" style="text-align:center; vertical-align:middle; border-top:0">pozostało dni:</td>
+							<td rowspan="2" colspan="1" style="text-align:center; vertical-align:middle; border-top:0; border-right:0; border-bottom:0">Wartość kosztorysu</td>
+						</tr>
+						<tr>
+							<td rowspan="1" colspan="1" style="text-align:center; vertical-align:middle; border-bottom:0; border-left:0"><?php echo $data['POCZATEK_UMOWY']; ?></td>
+							<td rowspan="1" colspan="1" style="text-align:center; vertical-align:middle; border-bottom:0"><?php echo $data['KONIEC_BUDOWY']; ?></td>
+							<td rowspan="1" colspan="1" style="text-align:center; vertical-align:middle; border-bottom:0"><?php echo $data['days_to_finish']; ?></td>
+						</tr>
+					</table>
+				</td>
+				<td rowspan="2" colspan="2" style="text-align:center; vertical-align:middle">ROBOCIZNA</td>
+				<td rowspan="4" colspan="1" style="text-align:center; vertical-align:middle; border-bottom:none">Koszty dodatkowe (reprezentacyjne)</td>
+				<td rowspan="3" colspan="2" style="text-align:center; vertical-align:middle">Zamówienia</td>
+				<td rowspan="3" colspan="2" style="text-align:center; vertical-align:middle">Zaliczki</td>
+				<td rowspan="3" colspan="2" style="text-align:center; vertical-align:middle">Zgody wejścia w teren</td>
+				<td rowspan="3" colspan="2" style="text-align:center; vertical-align:middle">Wynajem sprzętu</td>
+				<td rowspan="3" colspan="2" style="text-align:center; vertical-align:middle">Koszty projektu</td>
 			</tr>
 			<tr>
 				<td rowspan="1" colspan="2" style="text-align:center; vertical-align:middle">Kwota Umowy (netto)</td>
 				<td rowspan="1" colspan="1" style="text-align:center; vertical-align:middle">Aneks (netto)</td>
-				<td rowspan="1" colspan="2" style="text-align:center; vertical-align:middle">kary, potrącenia (netto)</td>
-				<td rowspan="1" colspan="2" style="text-align:center; vertical-align:middle">Osprzęt</td>
+				<td rowspan="1" colspan="1" style="text-align:center; vertical-align:middle">kary, potrącenia (netto)</td>
+				<td rowspan="1" colspan="1" style="text-align:center; vertical-align:middle">Osprzęt</td>
 				<td rowspan="1" colspan="1" style="text-align:center; vertical-align:middle">Materiały</td>
 			</tr>
 			<tr>
 				<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="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['TODO__kary_netto']); ?></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_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>
@@ -283,150 +319,280 @@ dostęp dla zarządu i os. odp.	kwota końcowa
 				<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="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>
-				<td rowspan="1" colspan="1" style="padding:0; text-align:center; vertical-align:middle; border-top:none"><button onClick="return budget_addCost(this, 'REPREZENTACYJNE')" 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, 'ZGODY_SLUZEBNOSCI')" 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, 'ZGODY_ODSZKODOWANIA')" 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, 'SPRZET_WLASNY')" 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, 'SPRZET_WYNAJETY')" 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, 'ORGANIZACJA_RUCHU')" 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, 'ZAJETOSC_PASA')" 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 p5UI__Clickable(this, 'p5:Budget:addCost', {type: 'ANEKS'})" 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 p5UI__Clickable(this, 'p5:Budget:addCost', {type: '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 p5UI__Clickable(this, 'p5:Budget:addCost', {type: '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 p5UI__Clickable(this, 'p5:Budget:addCost', {type: '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 p5UI__Clickable(this, 'p5:Budget:addCost', {type: '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 p5UI__Clickable(this, 'p5:Budget:addCost', {type: 'PODWYKONAWCY'})" 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 p5UI__Clickable(this, 'p5:Budget:addCost', {type: 'REPREZENTACYJNE'})" 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 p5UI__Clickable(this, 'p5:Budget:addCost', {type: 'ZGODY_SLUZEBNOSCI'})" 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 p5UI__Clickable(this, 'p5:Budget:addCost', {type: 'ZGODY_ODSZKODOWANIA'})" 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 p5UI__Clickable(this, 'p5:Budget:addCost', {type: 'SPRZET_WLASNY'})" 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 p5UI__Clickable(this, 'p5:Budget:addCost', {type: 'SPRZET_WYNAJETY'})" 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 p5UI__Clickable(this, 'p5:Budget:addCost', {type: 'ORGANIZACJA_RUCHU'})" 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 p5UI__Clickable(this, 'p5:Budget:addCost', {type: 'ZAJETOSC_PASA'})" class="btn btn-link" style="padding:0"><i class="glyphicon glyphicon-plus-sign"></i></button></td>
 			</tr>
 		</thead>
-		<tbody>
-			<?php foreach ($costs as $cost) : ?>
-				<tr>
-					<td style="white-space:nowrap"><?php echo $cost['data']; ?></td>
-					<td><?php echo UI::price($cost['budget_minus_sum']); ?></td>
-					<td style="color:<?php echo ($cost['TODO__budget_zysk_strata']) ? 'black' : 'silver'; ?>"><?php echo UI::price($cost['TODO__budget_zysk_strata']); ?></td>
-					<td style="color:<?php echo ($cost['TODO__budget_aneks']) ? 'black' : 'silver'; ?>"><?php echo UI::price($cost['TODO__budget_aneks']); ?></td>
-					<td style="color:<?php echo ($cost['TODO__budget_kary']) ? 'black' : 'silver'; ?>" colspan="2"><?php echo UI::price($cost['TODO__budget_kary']); ?></td>
-					<td style="color:<?php echo ($cost['TODO__budget_']) ? 'black' : 'silver'; ?>"><?php echo UI::price($cost['TODO__budget_???']); ?></td>
-					<td style="color:<?php echo ($cost['TODO__budget_osprzet']) ? 'black' : 'silver'; ?>"><?php echo UI::price($cost['TODO__budget_osprzet']); ?></td>
-					<td style="color:<?php echo ($cost['TODO__budget_materialy']) ? 'black' : 'silver'; ?>"><?php echo UI::price($cost['TODO__budget_materialy']); ?></td>
-					<td style="color:<?php echo ($cost['TODO__budget_koszt_pracownikow']) ? 'black' : 'silver'; ?>"><?php echo UI::price($cost['TODO__budget_koszt_pracownikow']); ?></td>
-					<td style="color:<?php echo ($cost['TODO__budget_koszt_podwykonawcow']) ? 'black' : 'silver'; ?>"><?php echo UI::price($cost['TODO__budget_koszt_podwykonawcow']); ?></td>
-					<td style="color:<?php echo ($cost['TODO__budget_koszt_reprezentacyjny']) ? 'black' : 'silver'; ?>"><?php echo UI::price($cost['TODO__budget_koszt_reprezentacyjny']); ?></td>
-					<td style="color:<?php echo $cost['cell_order_color']; ?>" title="<?php echo $cost['cell_order_title']; ?>">
-						<!-- nr zam/kwota -->
-						<?php echo UI::price($cost['cost_zamowienia']); ?>
-						<div style="white-space:nowrap; color:silver">nr: <?php echo $cost['nr_zamowienia']; ?></div>
-					</td>
-					<td>
-						<!-- TODO: nr fv/kwota -->
-						<?php if (!empty($cost['nr_fv_do_zamowienia'])) : ?>
-							<?php foreach ($cost['nr_fv_do_zamowienia'] as $idKoresp => $obcyNrFV) : ?>
-								<?php // TODO: link do edycji koresp by $idKoresp ?>
-								<div style="white-space:nowrap; color:silver">fv: <?php echo ($obcyNrFV) ? $obcyNrFV : " nr {$idKoresp}"; ?></div>
-							<?php endforeach; ?>
-						<?php endif; ?>
-					</td>
-					<td style="color:<?php echo ($cost['TODO__budget_zaliczki']) ? 'black' : 'silver'; ?>"><?php echo UI::price($cost['TODO__budget_zaliczki']); ?></td>
-					<td style="color:<?php echo ($cost['TODO__budget_rozliczone_zaliczki']) ? 'black' : 'silver'; ?>"><?php echo UI::price($cost['TODO__budget_rozliczone_zaliczki']); ?></td>
-					<td style="color:<?php echo ($cost['TODO__budget_zgoda_sluzebnosci']) ? 'black' : 'silver'; ?>"><?php echo UI::price($cost['TODO__budget_zgoda_sluzebnosci']); ?></td>
-					<td style="color:<?php echo ($cost['TODO__budget_zgoda_odszkodowania']) ? 'black' : 'silver'; ?>"><?php echo UI::price($cost['TODO__budget_zgoda_odszkodowania']); ?></td>
-					<td style="color:<?php echo ($cost['TODO__budget_sprzet_wlasny']) ? 'black' : 'silver'; ?>"><?php echo UI::price($cost['TODO__budget_sprzet_wlasny']); ?></td>
-					<td style="color:<?php echo ($cost['TODO__budget_sprzet_wynajety']) ? 'black' : 'silver'; ?>"><?php echo UI::price($cost['TODO__budget_sprzet_wynajety']); ?></td>
-					<td style="color:<?php echo ($cost['TODO__budget_organizacja_ruchu']) ? 'black' : 'silver'; ?>"><?php echo UI::price($cost['TODO__budget_organizacja_ruchu']); ?></td>
-					<td style="color:<?php echo ($cost['TODO__budget_zajetosc_pasa']) ? 'black' : 'silver'; ?>"><?php echo UI::price($cost['TODO__budget_zajetosc_pasa']); ?></td>
-<!--
-					<td style="color:<?php echo ($cost['cost_zaliczki']) ? 'black' : 'silver'; ?>"><?php echo UI::price($cost['cost_zaliczki']); ?></td>
-					<td style="color:<?php echo ($cost['cost_pracownicy']) ? 'black' : 'silver'; ?>"><?php echo UI::price($cost['cost_pracownicy']); ?></td>
-					<td style="color:<?php echo ($cost['cost_wynajem']) ? 'black' : 'silver'; ?>"><?php echo UI::price($cost['cost_wynajem']); ?></td>
-					<td style="color:<?php echo ($cost['cost_serwis']) ? 'black' : 'silver'; ?>"><?php echo UI::price($cost['cost_serwis']); ?></td>
-					<td style="color:<?php echo ($cost['cost_materialy']) ? 'black' : 'silver'; ?>"><?php echo UI::price($cost['cost_materialy']); ?></td>
-					<td style="color:<?php echo ($cost['cost_osprzet']) ? 'black' : 'silver'; ?>"><?php echo UI::price($cost['cost_osprzet']); ?></td>
-					<td style="color:<?php echo ($cost['cost_dodatkowe']) ? 'black' : 'silver'; ?>"><?php echo UI::price($cost['cost_dodatkowe']); ?></td>
--->
-				</tr>
-			<?php endforeach; ?>
-		</tbody>
+		<tbody id="p5Budget__costs"></tbody>
 	</table>
 </div>
 <link rel="stylesheet" href="static/sweetalert2.min.css" type="text/css">
 <script src="static/sweetalert2.min.js"></script>
 <script>
-var _saveLink = '<?php echo Request::getPathUri(); ?>index.php?_route=UrlAction_ProjektyProNetMediaBudget&_task=addCostAjax&ID_PROJECT=<?php echo $data['id_project']; ?>';
-var _dbg = <?php echo V::get('DBG', 0, $_REQUEST, 'int'); ?>;
-
-function p5Utils_parseFloatOrZero(strToParse) {
-	if (!strToParse) return 0
-	if ("string" === typeof strToParse) {
-		strToParse = strToParse.replace(/,/g, '.')
-		strToParse = strToParse.replace(/ /g, '')
+(function(){
+	var _saveLink = '<?php echo Request::getPathUri(); ?>index.php?_route=UrlAction_ProjektyProNetMediaBudget&_task=addCostAjax&ID_PROJECT=<?php echo $data['id_project']; ?>';
+	var _dbg = <?php echo V::get('DBG', 0, $_REQUEST, 'int'); ?>;
+	var _initCosts = <?php echo json_encode($costs); ?>;
+
+	if (_initCosts) {
+		budget__renderCosts(_initCosts);
 	}
-	var floatVal = parseFloat(strToParse)
-	return (!isNaN(floatVal))? floatVal : 0
-}
 
-function budget_addCost(n, type) {
-	var labels = {}
-	labels['ANEKS'] = "Aneks"
-	labels['KARY'] = "kary, potrącenia"
-	// TODO: add labels ...
-	var labelType = (type in labels) ? labels[type] : type
-
-	swal({
-	  title: 'Kwota netto dla kosztu "' + labelType + '"',
-		animation: false,
-	  input: 'text',
-		inputPlaceholder: '0,00',
-		// inputAttributes: {'step': '0.01'},
-	  showCancelButton: true,
-	  confirmButtonText: 'Dodaj koszt',
-	  showLoaderOnConfirm: true,
-	  preConfirm: function(price) {
-	    return new Promise(function(resolve, reject) {
-				price = p5Utils_parseFloatOrZero(price)
-        if (price <= 0) {
-          reject('Kwota musi być większa od zera.')
-        } else {
-					superagent
-						.post(_saveLink)
-						.type('json') // header ĺapplication/x-www-form-urlencoded' requires type('form');
-						.send({
-							type: type,
-							price: price
-						})
-						.set('Accept', 'application/json')
-						.end(function(err, res) {
-							if(_dbg)console.log('#widget-budget/addCost: res:', res, 'res.body:', res.body)
-							if (err || !res.ok) {
-								// jQuery(document).trigger('DBG:notify', {type: 'warning', msg: 'Req error', err: err});
-								reject("Request error")
-							} else {
-								if ('application/json' !== res.type) {
-									reject("Wrong response type - required json")
-									return
-								}
-								if (!res.body.id || res.body.id <= 0) reject(res.body.msg || "Wystąpiły błędy podczas dodawaniu kosztu")
-								resolve({
-									id: res.body.id,
-									price: res.body.price,
-									type: res.body.type
-								})
-							}
-						})
-	      }
-	    })
-	  },
-	  allowOutsideClick: false
-	}).then(function(responseBody) {
-	  swal({
-	    type: 'success',
+	function budget__renderCosts(costs) {
+		var _tbody = document.getElementById('p5Budget__costs');
+		if (!_tbody) throw "Missing node #p5Budget__costs";
+		if(_dbg)console.log('TODO: render costs: ', costs);
+		var lastNode;
+    while (lastNode = _tbody.lastChild) _tbody.removeChild(lastNode);
+
+		var costNodes = costs.map(function(cost) {
+			var costNode = document.createElement('tr')
+			var tdNode = null
+
+			// 					<td style="white-space:nowrap"><?php echo $cost['data']; ?></td>
+			tdNode = document.createElement('td')
+			tdNode.setAttribute('style', 'white-space:nowrap')
+			tdNode.appendChild(document.createTextNode(cost['data']))
+			costNode.appendChild(tdNode)
+
+			// <td><?php echo UI::price($cost['budget_minus_sum']); ?></td>
+			tdNode = document.createElement('td')
+			tdNode.setAttribute('style', 'white-space:nowrap')
+			tdNode.appendChild(document.createTextNode(p5Utils__pricePrintPL(cost['budget_minus_sum'], '0,00')))
+			costNode.appendChild(tdNode)
+
+			// <td style="color:<?php echo ($cost['TODO__budget_zysk_strata']) ? 'black' : 'silver'; ?>"><?php echo UI::price($cost['TODO__budget_zysk_strata']); ?></td>
+			tdNode = document.createElement('td')
+			tdNode.setAttribute('style', 'white-space:nowrap; color:' + ((cost['TODO__budget_zysk_strata']) ? 'black' : 'silver'))
+			tdNode.appendChild(document.createTextNode(p5Utils__pricePrintPL(cost['TODO__budget_zysk_strata'], '0,00')))
+			costNode.appendChild(tdNode)
+
+			// <td style="color:<?php echo ($cost['TODO__budget_aneks']) ? 'black' : 'silver'; ?>"><?php echo UI::price($cost['TODO__budget_aneks']); ?></td>
+			tdNode = document.createElement('td')
+			tdNode.setAttribute('style', 'white-space:nowrap; color:' + ((cost['TODO__budget_aneks']) ? 'black' : 'silver'))
+			tdNode.appendChild(document.createTextNode(p5Utils__pricePrintPL(cost['TODO__budget_aneks'], '0,00')))
+			costNode.appendChild(tdNode)
+
+			// <td style="color:<?php echo ($cost['TODO__budget_kary']) ? 'black' : 'silver'; ?>"><?php echo UI::price($cost['TODO__budget_kary']); ?></td>
+			tdNode = document.createElement('td')
+			tdNode.setAttribute('style', 'white-space:nowrap; color:' + ((cost['TODO__budget_kary']) ? 'black' : 'silver'))
+			tdNode.appendChild(document.createTextNode(p5Utils__pricePrintPL(cost['TODO__budget_kary'], '0,00')))
+			costNode.appendChild(tdNode)
+
+			// <td style="color:<?php echo ($cost['TODO__budget_osprzet']) ? 'black' : 'silver'; ?>"><?php echo UI::price($cost['TODO__budget_osprzet']); ?></td>
+			tdNode = document.createElement('td')
+			tdNode.setAttribute('style', 'white-space:nowrap; color:' + ((cost['TODO__budget_osprzet']) ? 'black' : 'silver'))
+			tdNode.appendChild(document.createTextNode(p5Utils__pricePrintPL(cost['TODO__budget_osprzet'], '0,00')))
+			costNode.appendChild(tdNode)
+
+			// <td style="color:<?php echo ($cost['TODO__budget_materialy']) ? 'black' : 'silver'; ?>"><?php echo UI::price($cost['TODO__budget_materialy']); ?></td>
+			tdNode = document.createElement('td')
+			tdNode.setAttribute('style', 'white-space:nowrap; color:' + ((cost['TODO__budget_materialy']) ? 'black' : 'silver'))
+			tdNode.appendChild(document.createTextNode(p5Utils__pricePrintPL(cost['TODO__budget_materialy'], '0,00')))
+			costNode.appendChild(tdNode)
+
+			// <td style="color:<?php echo ($cost['TODO__budget_koszt_pracownikow']) ? 'black' : 'silver'; ?>"><?php echo UI::price($cost['TODO__budget_koszt_pracownikow']); ?></td>
+			tdNode = document.createElement('td')
+			tdNode.setAttribute('style', 'white-space:nowrap; color:' + ((cost['TODO__budget_koszt_pracownikow']) ? 'black' : 'silver'))
+			tdNode.appendChild(document.createTextNode(p5Utils__pricePrintPL(cost['TODO__budget_koszt_pracownikow'], '0,00')))
+			costNode.appendChild(tdNode)
+
+			// <td style="color:<?php echo ($cost['TODO__budget_koszt_podwykonawcow']) ? 'black' : 'silver'; ?>"><?php echo UI::price($cost['TODO__budget_koszt_podwykonawcow']); ?></td>
+			tdNode = document.createElement('td')
+			tdNode.setAttribute('style', 'white-space:nowrap; color:' + ((cost['TODO__budget_koszt_podwykonawcow']) ? 'black' : 'silver'))
+			tdNode.appendChild(document.createTextNode(p5Utils__pricePrintPL(cost['TODO__budget_koszt_podwykonawcow'], '0,00')))
+			costNode.appendChild(tdNode)
+
+			// <td style="color:<?php echo ($cost['TODO__budget_koszt_reprezentacyjny']) ? 'black' : 'silver'; ?>"><?php echo UI::price($cost['TODO__budget_koszt_reprezentacyjny']); ?></td>
+			tdNode = document.createElement('td')
+			tdNode.setAttribute('style', 'white-space:nowrap; color:' + ((cost['TODO__budget_koszt_reprezentacyjny']) ? 'black' : 'silver'))
+			tdNode.appendChild(document.createTextNode(p5Utils__pricePrintPL(cost['TODO__budget_koszt_reprezentacyjny'], '0,00')))
+			costNode.appendChild(tdNode)
+
+			// <td style="color:<?php echo $cost['cell_order_color']; ?>" title="<?php echo $cost['cell_order_title']; ?>">
+			// 	<!-- nr zam/kwota -->
+			// 	<?php echo UI::price($cost['cost_zamowienia']); ?>
+			// 	<div style="white-space:nowrap; color:silver">nr: <?php echo $cost['nr_zamowienia']; ?></div>
+			// </td>
+			tdNode = document.createElement('td')
+			if (cost['order_nr']) {
+				var cellOrderColor = '#aaa';
+				var cellOrderTitle = '';
+				var cellOrderNrNode = document.createElement('div')
+				switch (cost['order_approve_status']) {
+					case 'ZATWIERDZONE': cellOrderColor = 'black'; break;
+					case 'OCZEKUJE_OSTATECZNEGO_ZATWIERDZENIA': cellOrderColor = '#777'; break;
+					case 'OCZEKUJE_ZATWIERDZENIA': cellOrderColor = '#777'; break;
+					case 'WERSJA_ROBOCZA': cellOrderColor = '#aaa'; break;
+				}
+				switch (cost['order_approve_status']) {
+					case 'ZATWIERDZONE': cellOrderTitle = "Zamówienie zatwierdzone"; break;
+					case 'OCZEKUJE_OSTATECZNEGO_ZATWIERDZENIA': cellOrderTitle = "Zamówienie oczekuje ostatecznego zatwierdzenia"; break;
+					case 'OCZEKUJE_ZATWIERDZENIA': cellOrderTitle = "Zamówienie oczekuje zatwierdzenia"; break;
+					case 'ODRZUCONE': cellOrderTitle = "Zamówienie odrzucone"; break;
+					case 'WERSJA_ROBOCZA': cellOrderTitle = "Wersja robocza"; break;
+				}
+				cellOrderNrNode.setAttribute('style', 'white-space:nowrap; color:silver')
+				cellOrderNrNode.appendChild(document.createTextNode('nr: ' + cost['order_nr']))
+				tdNode.setAttribute('style', 'white-space:nowrap; color:' + cellOrderColor)
+				tdNode.setAttribute('title', cellOrderTitle)
+				tdNode.appendChild(document.createTextNode(p5Utils__pricePrintPL(cost['order_cost'], '0,00')))
+				tdNode.appendChild(cellOrderNrNode)
+			} else {
+				tdNode.setAttribute('style', 'white-space:nowrap; color:silver')
+				tdNode.appendChild(document.createTextNode('0,00'))
+			}
+			costNode.appendChild(tdNode)
+
+			// FV for Order
+			tdNode = document.createElement('td')
+			if (cost['nr_fv_do_zamowienia']) {
+				// $cost['nr_fv_do_zamowienia'][] = array('id'=>$idKoresp, 'nr'=>$fv['obcy_nr_koresp'], 'cost'=>$fv['cost']);
+				cost['nr_fv_do_zamowienia'].map(function(fv) {
+					// TODO: link do edycji koresp by $idKoresp
+					tdNode.appendChild(document.createTextNode(p5Utils__pricePrintPL(fv['cost'], '0,00')))
+					if (fv['nr']) tdNode.appendChild(document.createTextNode(' (' + fv['nr'] + ')'))
+				})
+			}
+			tdNode.setAttribute('style', 'white-space:nowrap; color:' + ((cost['nr_fv_do_zamowienia']) ? 'black' : 'silver'))
+			costNode.appendChild(tdNode)
+
+			// <td style="color:<?php echo ($cost['TODO__budget_zaliczki']) ? 'black' : 'silver'; ?>"><?php echo UI::price($cost['TODO__budget_zaliczki']); ?></td>
+			tdNode = document.createElement('td')
+			tdNode.setAttribute('style', 'white-space:nowrap; color:' + ((cost['TODO__budget_zaliczki']) ? 'black' : 'silver'))
+			tdNode.appendChild(document.createTextNode(p5Utils__pricePrintPL(cost['TODO__budget_zaliczki'], '0,00')))
+			costNode.appendChild(tdNode)
+
+			// <td style="color:<?php echo ($cost['TODO__budget_rozliczone_zaliczki']) ? 'black' : 'silver'; ?>"><?php echo UI::price($cost['TODO__budget_rozliczone_zaliczki']); ?></td>
+			tdNode = document.createElement('td')
+			tdNode.setAttribute('style', 'white-space:nowrap; color:' + ((cost['TODO__budget_rozliczone_zaliczki']) ? 'black' : 'silver'))
+			tdNode.appendChild(document.createTextNode(p5Utils__pricePrintPL(cost['TODO__budget_rozliczone_zaliczki'], '0,00')))
+			costNode.appendChild(tdNode)
+
+			// <td style="color:<?php echo ($cost['TODO__budget_zgoda_sluzebnosci']) ? 'black' : 'silver'; ?>"><?php echo UI::price($cost['TODO__budget_zgoda_sluzebnosci']); ?></td>
+			tdNode = document.createElement('td')
+			tdNode.setAttribute('style', 'white-space:nowrap; color:' + ((cost['TODO__budget_zgoda_sluzebnosci']) ? 'black' : 'silver'))
+			tdNode.appendChild(document.createTextNode(p5Utils__pricePrintPL(cost['TODO__budget_zgoda_sluzebnosci'], '0,00')))
+			costNode.appendChild(tdNode)
+
+			// <td style="color:<?php echo ($cost['TODO__budget_zgoda_odszkodowania']) ? 'black' : 'silver'; ?>"><?php echo UI::price($cost['TODO__budget_zgoda_odszkodowania']); ?></td>
+			tdNode = document.createElement('td')
+			tdNode.setAttribute('style', 'white-space:nowrap; color:' + ((cost['TODO__budget_zgoda_odszkodowania']) ? 'black' : 'silver'))
+			tdNode.appendChild(document.createTextNode(p5Utils__pricePrintPL(cost['TODO__budget_zgoda_odszkodowania'], '0,00')))
+			costNode.appendChild(tdNode)
+
+			// <td style="color:<?php echo ($cost['TODO__budget_sprzet_wlasny']) ? 'black' : 'silver'; ?>"><?php echo UI::price($cost['TODO__budget_sprzet_wlasny']); ?></td>
+			tdNode = document.createElement('td')
+			tdNode.setAttribute('style', 'white-space:nowrap; color:' + ((cost['TODO__budget_sprzet_wlasny']) ? 'black' : 'silver'))
+			tdNode.appendChild(document.createTextNode(p5Utils__pricePrintPL(cost['TODO__budget_sprzet_wlasny'], '0,00')))
+			costNode.appendChild(tdNode)
+
+			// <td style="color:<?php echo ($cost['TODO__budget_sprzet_wynajety']) ? 'black' : 'silver'; ?>"><?php echo UI::price($cost['TODO__budget_sprzet_wynajety']); ?></td>
+			tdNode = document.createElement('td')
+			tdNode.setAttribute('style', 'white-space:nowrap; color:' + ((cost['TODO__budget_sprzet_wynajety']) ? 'black' : 'silver'))
+			tdNode.appendChild(document.createTextNode(p5Utils__pricePrintPL(cost['TODO__budget_sprzet_wynajety'], '0,00')))
+			costNode.appendChild(tdNode)
+
+			// <td style="color:<?php echo ($cost['TODO__budget_organizacja_ruchu']) ? 'black' : 'silver'; ?>"><?php echo UI::price($cost['TODO__budget_organizacja_ruchu']); ?></td>
+			tdNode = document.createElement('td')
+			tdNode.setAttribute('style', 'white-space:nowrap; color:' + ((cost['TODO__budget_organizacja_ruchu']) ? 'black' : 'silver'))
+			tdNode.appendChild(document.createTextNode(p5Utils__pricePrintPL(cost['TODO__budget_organizacja_ruchu'], '0,00')))
+			costNode.appendChild(tdNode)
+
+			// <td style="color:<?php echo ($cost['TODO__budget_zajetosc_pasa']) ? 'black' : 'silver'; ?>"><?php echo UI::price($cost['TODO__budget_zajetosc_pasa']); ?></td>
+			tdNode = document.createElement('td')
+			tdNode.setAttribute('style', 'white-space:nowrap; color:' + ((cost['TODO__budget_zajetosc_pasa']) ? 'black' : 'silver'))
+			tdNode.appendChild(document.createTextNode(p5Utils__pricePrintPL(cost['TODO__budget_zajetosc_pasa'], '0,00')))
+			costNode.appendChild(tdNode)
+
+			return costNode;
+		})
+
+		costNodes.map(function(costNode) {
+			_tbody.appendChild(costNode);
+		});
+	}
+
+	jQuery(document).on('p5:Budget:addCost:click', function(e, n, payload) {
+		if (!payload || !payload.props || !payload.props.type) return false;
+		budget_addCost(n, payload.props.type);
+	});
+
+	function budget_addCost(n, type) {
+		var labels = {}
+		labels['ANEKS'] = "Aneks"
+		labels['KARY'] = "kary, potrącenia"
+		// TODO: add labels ...
+		var labelType = (type in labels) ? labels[type] : type
+
+		swal({
+		  title: 'Kwota netto dla kosztu "' + labelType + '"',
 			animation: false,
-	    title: responseBody.msg || 'Koszt dodano',
-	    html: 'Rodzaj kosztu: ' + (labelType || responseBody.type) + ', kwota: ' + responseBody.price + '.'
-	  })
-	}).catch(function(e) {
-		// eg. hit Cancel
-	})
-}
+		  input: 'text',
+			inputPlaceholder: '0,00',
+			// inputAttributes: {'step': '0.01'},
+		  showCancelButton: true,
+		  confirmButtonText: 'Dodaj koszt',
+		  showLoaderOnConfirm: true,
+		  preConfirm: function(price) {
+		    return new Promise(function(resolve, reject) {
+					price = p5Utils__parseFloatOrZero(price)
+	        if (price <= 0) {
+	          reject('Kwota musi być większa od zera.')
+	        } else {
+						superagent
+							.post(_saveLink)
+							.type('json') // header ĺapplication/x-www-form-urlencoded' requires type('form');
+							.send({
+								type: type,
+								price: price
+							})
+							.set('Accept', 'application/json')
+							.end(function(err, res) {
+								if(_dbg)console.log('#widget-budget/addCost: res:', res, 'res.body:', res.body)
+								if (err || !res.ok) {
+									// jQuery(document).trigger('DBG:notify', {type: 'warning', msg: 'Req error', err: err});
+									reject("Request error")
+								} else {
+									if ('application/json' !== res.type) {
+										reject("Wrong response type - required json")
+										return
+									}
+									if (!res.body.id || res.body.id <= 0) reject(res.body.msg || "Wystąpiły błędy podczas dodawaniu kosztu")
+									resolve(res.body)
+								}
+							})
+		      }
+		    })
+		  },
+		  allowOutsideClick: false
+		}).then(function(responseBody) {
+		  swal({
+		    type: 'success',
+				animation: false,
+		    title: responseBody.msg || 'Koszt dodano',
+		    html: 'Rodzaj kosztu: ' + (labelType || responseBody.type) + '<br>Kwota: ' + p5Utils__pricePrintPL(responseBody.price, '0') + '.'
+		  })
+			if (responseBody.update_data) {
+				// TODO: budget__renderData(responseBody.update_data)
+				budget__renderCosts(responseBody.update_data['costs']);
+			}
+		}).catch(function(e) {
+			// eg. hit Cancel
+		})
+	}
+})();
 </script>
 <?php if ($viewParams['print_mode']) : ?>
 <script>window.print();</script>
@@ -454,15 +620,22 @@ function budget_addCost(n, type) {
 			$response['type'] = $type;
 
 			$cost = array();
+			$cost['ID_PROJECT'] = $idProject;
 			$cost['COST_VALUE'] = $price;
 			$cost['COST_TYPE'] = $type;
-			$cost['ID_PROJECT'] = $idProject;
+			$cost['COST_DATE'] = date("Y-m-d");
 			// $cost['NOTES'] = $notes;// TODO: add notes to form?
 			$idItem = DB::getDB()->ADD_NEW_OBJ('PROJECT_COSTS', (object)$cost);
 			if ($idItem <= 0) throw new Exception("Wystąpiły błędy podczas tworzenia nowego rekordu w bazie danych");
 			$response['type'] = 'success';
 			$response['id'] = $idItem;
 			$response['msg'] = "Koszt został dodany";
+			{// update costs
+				$data = array();
+				$data['id_project'] = $idProject;
+				$data = $this->setProps($data);
+				$response['update_data'] = $data;
+			}
 		} catch (Exception $e) {
 			$response['type'] = 'danger';
 			$response['msg'] = $e->getMessage();
@@ -488,6 +661,7 @@ CREATE TABLE IF NOT EXISTS `PROJECT_COSTS` (
 	`A_CLASSIFIED` varchar(100) NOT NULL DEFAULT '',
 	`COST_VALUE` decimal(16,2) NOT NULL DEFAULT '',
 	`COST_TYPE` varchar(32) NOT NULL DEFAULT '',
+	`COST_DATE` date DEFAULT NULL,
 	`NOTES` varchar(255) NOT NULL DEFAULT '',
 	PRIMARY KEY (`ID`)
 	KEY `ID_PROJECT` (`ID_PROJECT`)
@@ -508,6 +682,7 @@ CREATE TABLE IF NOT EXISTS `PROJECT_COSTS_HIST` (
 	`A_CLASSIFIED` varchar(255) NOT NULL DEFAULT 'N/S;',
 	`COST_VALUE` varchar(16) NOT NULL DEFAULT 'N/S;',
 	`COST_TYPE` varchar(32) NOT NULL DEFAULT 'N/S;',
+	`COST_DATE` varchar(10) NOT NULL DEFAULT 'N/S;',
 	`NOTES` varchar(255) NOT NULL DEFAULT 'N/S;',
 	PRIMARY KEY (`ID`),
   KEY `ID_USERS2` (`ID_USERS2`)

SE/se-lib/tmpl/_layout_gora.php

@@ -173,6 +173,67 @@ function p5UI__ButtonAjax(n, eventNamespace, props) {
 	// }, 1000);
 	return false;
 }
+
+function p5Utils__parseFloatOrZero(strToParse) {
+	if (!strToParse) return 0
+	if ("string" === typeof strToParse) {
+		strToParse = strToParse.replace(/,/g, '.')
+		strToParse = strToParse.replace(/ /g, '')
+	}
+	var floatVal = parseFloat(strToParse)
+	return (!isNaN(floatVal))? floatVal : 0
+}
+
+function p5Utils__pricePrint(value, defaultValue) {
+	return p5Utils__pricePrintFormat(value, defaultValue, '.', ',');
+}
+
+function p5Utils__pricePrintPL(value, defaultValue) {
+	return p5Utils__pricePrintFormat(value, defaultValue, ',', ' ');
+}
+
+function p5Utils__pricePrintFormat(value, defaultValue, decPoint, thousands_sep) {
+	if (undefined === defaultValue) defaultValue = '';
+	if (!value) return defaultValue;
+	if ("number" === typeof value) {
+	} else if ("string" === typeof value) {
+		value = p5Utils__parseFloatOrZero(value);
+		if (isNaN(value)) {
+			return defaultValue;
+		}
+	} else {
+		return defaultValue;
+	}
+	var valueParts = value.toFixed(2).split('.'),
+			firstPart = valueParts[0],
+			secondPart = valueParts[1],
+			parts = [],
+			minus = ''
+	;
+	if ('-' === firstPart.substr(0, 1)) {
+		minus = '-';
+		firstPart = firstPart.substr(1);
+	}
+	var len = firstPart.length,
+			str = firstPart,
+			i = 0
+	;
+	//console.log('pricePrint(value:'+value+'). valueParts', valueParts, 'len', len);
+	//console.log('pricePrint(value:'+value+'). START parts', parts, 'len', len, 'str', str);
+	while (len > 3) {
+		parts.unshift(str.substr(-3));
+		len -= 3;
+		str = str.substr(0, len);
+		//console.log('pricePrint(value:'+value+'). LOOP-'+i+' parts', parts, 'len', len, 'str', str);
+		i++;
+	}
+	if (len > 0) {
+		//console.log('pricePrint(value:'+value+'). PRE END parts', parts, 'len', len, 'str', str);
+		parts.unshift(str);
+	}
+	//console.log('pricePrint(value:'+value+'). END parts', parts, 'len', len, 'str', str);
+	return '' + minus + parts.join(thousands_sep) + decPoint + secondPart;
+}
 	</script>
 	<script>
 function initDateTimePicker(node) {