|
|
@@ -230,9 +230,9 @@ dostęp dla zarządu i os. odp. kwota końcowa
|
|
|
$data['costs'][] = $item;
|
|
|
}
|
|
|
if (V::get('DBG_PROFIT_FV', '', $_GET)>0) {// DBG
|
|
|
- $data['costs'][] = array('_type'=>'profit_fv', 'data'=>date("Y-m-d"), 'profit_fv_value'=>100, 'sum'=>-100, 'label'=>"TEST/FV/1", 'costRaw'=>array());// TODO: DBG
|
|
|
- $data['costs'][] = array('_type'=>'profit_fv', 'data'=>date("Y-m-d"), 'profit_fv_value'=>150, 'sum'=>-150, 'label'=>"TEST/FV/2", 'costRaw'=>array());// TODO: DBG
|
|
|
- $data['costs'][] = array('_type'=>'profit_fv', 'data'=>'2016-09-01', 'profit_fv_value'=>200, 'sum'=>-200, 'label'=>"TEST/FV/3", 'costRaw'=>array());// TODO: DBG
|
|
|
+ $data['costs'][] = array('_type'=>'profit_fv', 'data'=>date("Y-m-d"), 'profit_fv_value'=>100000, 'sum'=>-100000, 'label'=>"TEST/FV/1", 'costRaw'=>array());// TODO: DBG
|
|
|
+ $data['costs'][] = array('_type'=>'profit_fv', 'data'=>date("Y-m-d"), 'profit_fv_value'=>150000, 'sum'=>-150000, 'label'=>"TEST/FV/2", 'costRaw'=>array());// TODO: DBG
|
|
|
+ $data['costs'][] = array('_type'=>'profit_fv', 'data'=>'2016-09-01', 'profit_fv_value'=>10000, 'sum'=>-10000, 'label'=>"TEST/FV/3", 'costRaw'=>array());// TODO: DBG
|
|
|
}
|
|
|
|
|
|
// order $data['costs'] by `data`, then by `ID` for the same `_type` else: order, project_cost, koresp
|
|
|
@@ -400,7 +400,10 @@ 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="2" colspan="1" style="text-align:center; vertical-align:middle; white-space:nowrap; border-bottom:none"><span id="p5Budget__profit_fv" style="font-size:11px; font-weight:normal; white-space:nowrap"></span></th>
|
|
|
+ <th rowspan="2" colspan="1" style="text-align:center; vertical-align:middle; white-space:nowrap; border-bottom:none">
|
|
|
+ <span id="p5Budget__profit_fv" style="font-size:11px; font-weight:normal; white-space:nowrap"></span>
|
|
|
+ <span id="p5Budget__profit_fv_percent" style="display:block; white-space:nowrap; font-size:11px; font-weight:normal; color:#666"></span>
|
|
|
+ </th>
|
|
|
<th rowspan="2" colspan="1" style="text-align:center; vertical-align:middle; white-space:nowrap; border-bottom:none"><?php echo UI::price($data['budget']); ?><br><span id="p5Budget__zysk_strata" style="font-size:11px; font-weight:normal; white-space:nowrap"></span></th>
|
|
|
<th rowspan="2" colspan="1" style="text-align:center; vertical-align:middle; white-space:nowrap; border-bottom:none" id="p5Budget__aneks"></th>
|
|
|
<th rowspan="2" colspan="1" style="text-align:center; vertical-align:middle; white-space:nowrap; border-bottom:none" id="p5Budget__kary"></th>
|
|
|
@@ -466,10 +469,16 @@ dostęp dla zarządu i os. odp. kwota końcowa
|
|
|
if(_dbg)console.log('render costs: ', costs);
|
|
|
|
|
|
function budget__renderNodePrice(idNode, value) {
|
|
|
+ budget__renderNodeText(idNode, p5Utils__pricePrintPL(value), '0,00')
|
|
|
+ }
|
|
|
+ function budget__renderNodeText(idNode, value, defaultValue) {
|
|
|
+ if (!idNode) return;
|
|
|
var node = document.getElementById(idNode);
|
|
|
+ if (!node) return;
|
|
|
+ var defaultValue = defaultValue || ''
|
|
|
p5Utils__clearNode(node);
|
|
|
- if (value != 0) node.appendChild(document.createTextNode(p5Utils__pricePrintPL(value)));
|
|
|
- else node.appendChild(document.createTextNode('0,00'));
|
|
|
+ if (value != 0) node.appendChild(document.createTextNode(value));
|
|
|
+ else node.appendChild(document.createTextNode(defaultValue));
|
|
|
}
|
|
|
function budget__renderZyskStrataPrice(idNode, value) {
|
|
|
var node = document.getElementById(idNode);
|
|
|
@@ -531,7 +540,13 @@ dostęp dla zarządu i os. odp. kwota końcowa
|
|
|
return prevValue + currCost['profit_fv_value'];
|
|
|
}, 0);
|
|
|
if(_dbg)console.log('profitFvValue', profitFvValue);
|
|
|
- budget__renderNodePrice('p5Budget__profit_fv', profitFvValue);
|
|
|
+ budget__renderNodePrice('p5Budget__profit_fv', profitFvValue)
|
|
|
+
|
|
|
+ var budgetPercent = p5Utils__parseFloatOrZero(_initBudgetValue)
|
|
|
+ if (profitFvValue > 0 && budgetPercent > 0) {
|
|
|
+ var profitFvPercent = Math.round((profitFvValue * 100) / budgetPercent)
|
|
|
+ budget__renderNodeText('p5Budget__profit_fv_percent', '' + profitFvPercent + '%')
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
p5Utils__clearNode(_tbody);
|