瀏覽代碼

added style for billed orders in Budget for pro-netmedia

Piotr Labudda 9 年之前
父節點
當前提交
b8eea27457
共有 1 個文件被更改,包括 35 次插入10 次删除
  1. 35 10
      SE/se-lib/Route/UrlAction/ProjektyProNetMediaBudget.php

+ 35 - 10
SE/se-lib/Route/UrlAction/ProjektyProNetMediaBudget.php

@@ -148,15 +148,20 @@ dostęp dla zarządu i os. odp.	kwota końcowa
 								, 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})
+					where k.A_STATUS != 'DELETED'
+					-- and k.ID in (2293) -- TEST
+					-- and k.ID in (2537, 2538, 2539, 2536) -- TEST
+						and k.ORDER_NR in({$sqlOrderLabels})
 				");
 				foreach ($data['fvToOrdersRaw'] as $fv) {
 					$labelOrder = $fv['ORDER_NR'];
-					foreach ($data['costs'] as $cost) {
-						if ($isOrder && $labelOrder == $cost['order_nr']) {
+					foreach ($data['costs'] as $idx => $cost) {
+						// if ('order' == $cost['_type'] && 'ZATWIERDZONE' == $cost['order_approve_status']) {// TEST
+						// OCZEKUJE_ZATWIERDZENIA, OCZEKUJE_OSTATECZNEGO_ZATWIERDZENIA
+						if ('order' == $cost['_type'] && $labelOrder == $cost['order_nr']) {
 							$idKoresp = $fv['ID'];
 							// $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']);
+							$data['costs'][$idx]['nr_fv_do_zamowienia'][] = array('id'=>$idKoresp, 'nr'=>$fv['obcy_nr_koresp'], 'cost'=>$fv['cost']);
 						}
 					}
 				}
@@ -242,6 +247,7 @@ dostęp dla zarządu i os. odp.	kwota końcowa
 		if ($data['TODO__sum_zysk_strata'] > 0) $styleZyskStrata = 'color:green';
 		if ($data['TODO__sum_zysk_strata'] < 0) $styleZyskStrata = 'color:red';
 		$costs = $data['costs'];
+		DBG::_('DBG', '>2', 'costs', $costs, __CLASS__, __FUNCTION__, __LINE__);
 		?>
 <div class="container">
 	<div class="row">
@@ -475,7 +481,21 @@ dostęp dla zarządu i os. odp.	kwota końcowa
 			tdNode.appendChild(document.createTextNode(p5Utils__pricePrintPL(cost['budget_koszt_reprezentacyjny'], '0,00')))
 			costNode.appendChild(tdNode)
 
+			var orderFvBilled = null
+			var fvSum = 0
+			if (cost['order_nr'] && cost['nr_fv_do_zamowienia']) {
+				// var budgetZyskStrata = costs.reduce(function (prevValue, currCost) {
+				// 	return currCost['budget_minus_sum'];// get last value - calculated in php
+				// }, _initBudgetValue);
+				fvSum = cost['nr_fv_do_zamowienia'].reduce(function(prevVal, fv) {
+					return prevVal + p5Utils__parseFloatOrZero(fv['cost'])
+				}, 0)
+				orderFvBilled = (fvSum > 0 && fvSum - p5Utils__parseFloatOrZero(cost['order_cost']) >= 0) ? true : false
+			}
+
 			tdNode = document.createElement('td')
+			tdNode.style.whiteSpace = 'nowrap'
+			tdNode.style.color = 'silver'
 			if (cost['order_nr']) {
 				var cellOrderColor = '#aaa';
 				var cellOrderTitle = '';
@@ -493,14 +513,15 @@ dostęp dla zarządu i os. odp.	kwota końcowa
 					case 'ODRZUCONE': cellOrderTitle = "Zamówienie odrzucone"; break;
 					case 'WERSJA_ROBOCZA': cellOrderTitle = "Wersja robocza"; break;
 				}
-				cellOrderNrNode.setAttribute('style', 'white-space:nowrap; color:silver')
+				cellOrderNrNode.style.whiteSpace = 'nowrap'
+				cellOrderNrNode.style.color = '#999'
 				cellOrderNrNode.appendChild(document.createTextNode('nr: ' + cost['order_nr']))
-				tdNode.setAttribute('style', 'white-space:nowrap; color:' + cellOrderColor)
+				tdNode.style.color = cellOrderColor
 				tdNode.setAttribute('title', cellOrderTitle)
 				tdNode.appendChild(document.createTextNode(p5Utils__pricePrintPL(cost['order_cost'], '0,00')))
 				tdNode.appendChild(cellOrderNrNode)
+				tdNode.style.backgroundColor = (orderFvBilled) ? '#d9edf7' : '#fff'
 			} else {
-				tdNode.setAttribute('style', 'white-space:nowrap; color:silver')
 				tdNode.appendChild(document.createTextNode('0,00'))
 			}
 			costNode.appendChild(tdNode)
@@ -511,11 +532,15 @@ dostęp dla zarządu i os. odp.	kwota końcowa
 				// $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'] + ')'))
+					var fvNode = document.createElement('div')
+					fvNode.style.whiteSpace = 'nowrap'
+					fvNode.appendChild(document.createTextNode(p5Utils__pricePrintPL(fv['cost'], '0,00')))
+					if (fv['nr']) fvNode.appendChild(document.createTextNode(' (' + fv['nr'] + ')'))
+					else fvNode.appendChild(document.createTextNode(' [' + fv['id'] + ']'))
+					tdNode.appendChild(fvNode)
 				})
 			}
-			tdNode.setAttribute('style', 'white-space:nowrap; color:' + ((cost['nr_fv_do_zamowienia']) ? 'black' : 'silver'))
+			tdNode.style.color = cost['nr_fv_do_zamowienia'] ? 'black' : 'silver'
 			costNode.appendChild(tdNode)
 
 			// <td style="color:<?php echo ($cost['budget_zaliczki']) ? 'black' : 'silver'; ?>"><?php echo UI::price($cost['budget_zaliczki']); ?></td>