|
|
@@ -1089,7 +1089,7 @@ SQL_FUN;
|
|
|
// $defCennik = [ $id_zasob => [ 'price' => $price, 'ID', 'id_zasob', 'id_company', 'id_project', 'unit', 'quantity' ] ]
|
|
|
$cennik = ProjectKosztorysCennik::getCennik($idProject, $idCompany);
|
|
|
$workCennik = ProjectKosztorysCennik::getWorkCennik($idProject, $idCompany);
|
|
|
- $data = $this->getData($idProject, $admin = false);
|
|
|
+ $data = $this->getData($idProject, $idOrder = 0, $admin = false);
|
|
|
foreach ($data['summary'] as $idLayer => $layData) {
|
|
|
foreach ($layData['data'] as $typeData) {
|
|
|
if (!$typeData['idType']) continue;
|
|
|
@@ -1193,7 +1193,7 @@ SQL_FUN;
|
|
|
$summaryTypeCost = V::get('sub_costs', array(), $projCosts);
|
|
|
$subProjCost = V::get('sub_proj', array(), $projCosts);
|
|
|
|
|
|
- $data = $this->getData($idProject, $admin);
|
|
|
+ $data = $this->getData($idProject, $idOrder = 0, $admin);
|
|
|
$dataSummary = $data['summary'];
|
|
|
$dataSubProj = $data['by_project'];
|
|
|
// $dataSubProj = array();
|
|
|
@@ -1404,7 +1404,7 @@ SQL_FUN;
|
|
|
$summaryTypeCost = V::get('sub_costs', array(), $projCosts);
|
|
|
$subProjCost = V::get('sub_proj', array(), $projCosts);
|
|
|
|
|
|
- $data = $this->getData($idProject, $admin);
|
|
|
+ $data = $this->getData($idProject, $idOrder = 0, $admin);
|
|
|
$dataSummary = $data['summary'];
|
|
|
$dataSubProj = $data['by_project'];
|
|
|
// $dataSubProj = array();
|
|
|
@@ -1446,27 +1446,28 @@ SQL_FUN;
|
|
|
}
|
|
|
</style>
|
|
|
<?php $tblCols = 6 + ($admin ? 1 : 0) + ((!empty($summaryTypeCost))? 1 : 0); ?>
|
|
|
-<table class="tabel table-bordered" style="width:100%; margin-bottom:6px; page-break-inside:avoid">
|
|
|
+<table class="tabel table-bordered table-hover" style="width:100%; margin-bottom:6px; page-break-inside:avoid">
|
|
|
<tbody>
|
|
|
<?php foreach ($dataSummary as $idLayer => $layData) : ?>
|
|
|
<tr>
|
|
|
- <td colspan="<?php echo $tblCols; ?>" style="padding:0 6px; font-size:1.2em; line-height:2em; font-style:italic"><?php echo $layData['label']; ?></td>
|
|
|
+ <td colspan="<?php echo $tblCols + 1; ?>" style="padding:0 6px; font-size:1.2em; line-height:2em"> — <?php echo $layData['label']; ?></td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
- <td style="padding:0 6px">typ</td>
|
|
|
- <td style="width:60px; padding:0 6px; text-align:right">ilość</td>
|
|
|
- <td style="width:80px; padding:0 6px; text-align:right">jednostka</td>
|
|
|
+ <td style="width:24px"></td>
|
|
|
+ <td style="color:#888; padding:0 6px">typ</td>
|
|
|
+ <td style="color:#888; width:60px; padding:0 6px; text-align:right">ilość</td>
|
|
|
+ <td style="color:#888; width:80px; padding:0 6px; text-align:right">jednostka</td>
|
|
|
<?php if ($showPrices) : ?>
|
|
|
- <td style="padding:0 6px; text-align:right">cena jednostkowa</td>
|
|
|
- <td style="padding:0 6px; text-align:right">cena jedn. (robocizna)</td>
|
|
|
+ <td style="color:#888; padding:0 6px; text-align:right">cena jednostkowa</td>
|
|
|
+ <td style="color:#888; padding:0 6px; text-align:right">cena jedn. (robocizna)</td>
|
|
|
<?php endif; ?>
|
|
|
<?php if ($admin) : ?>
|
|
|
- <td style="padding:0 6px; text-align:right">cena jedn. (domyślna)</td>
|
|
|
+ <td style="color:#888; padding:0 6px; text-align:right">cena jedn. (domyślna)</td>
|
|
|
<?php endif; ?>
|
|
|
<?php if (!empty($summaryTypeCost)) : ?>
|
|
|
- <td style="padding:0 6px; text-align:right">szacowany koszt [zł]</td>
|
|
|
+ <td style="color:#888; padding:0 6px; text-align:right">szacowany koszt [zł]</td>
|
|
|
<?php endif; ?>
|
|
|
- <td style="padding:0 6px; text-align:right">uwagi</td>
|
|
|
+ <td style="color:#888; padding:0 6px; text-align:right">uwagi</td>
|
|
|
</tr>
|
|
|
<?php foreach ($layData['data'] as $typeData) : ?>
|
|
|
<?php if (!$typeData['idType']) : ?>
|
|
|
@@ -1496,7 +1497,8 @@ SQL_FUN;
|
|
|
<?php $workPrice = (!empty($workCennik[$idType]['price']))? $workCennik[$idType]['price'] : 0; ?>
|
|
|
<?php $uwagi = (!empty($cennik[$idType]['notes']))? $cennik[$idType]['notes'] : '';// TODO: uwagi ?>
|
|
|
<tr>
|
|
|
- <td style="padding:0 6px" title="[<?php echo $idType; ?>] <?php echo $typeData['type']; ?>"> - <?php echo $typeData['type']; ?></td>
|
|
|
+ <td style="width:24px"></td>
|
|
|
+ <td style="padding:0 6px" title="[<?php echo $idType; ?>] <?php echo $typeData['type']; ?>"> – <?php echo $typeData['type']; ?></td>
|
|
|
<td style="padding:0 6px; text-align:right"><?php echo $typeData['ilosc']; ?></td>
|
|
|
<td style="padding:0 6px; text-align:right"><?php echo ProjectKosztorysSchema::getLayerJednostka($idLayer); ?></td>
|
|
|
<?php if ($showPrices) : ?>
|
|
|
@@ -1552,21 +1554,22 @@ SQL_FUN;
|
|
|
|
|
|
<?php if (!empty($additionalCosts)) : ?>
|
|
|
<tr>
|
|
|
- <td colspan="<?php echo $tblCols; ?>" style="padding:0 6px; font-size:1.2em; line-height:2em; font-style:italic">Koszty dodatkowe</td>
|
|
|
+ <td colspan="<?php echo $tblCols + 1; ?>" style="padding:0 6px; font-size:1.2em; line-height:2em">Koszty dodatkowe</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
- <td style="padding:0 6px">typ</td>
|
|
|
- <td style="width:60px; padding:0 6px; text-align:right">ilość</td>
|
|
|
- <td style="width:80px; padding:0 6px; text-align:right">jednostka</td>
|
|
|
- <td style="padding:0 6px; text-align:right">cena jednostkowa</td>
|
|
|
- <td style="padding:0 6px; text-align:right">cena jedn. (robocizna)</td>
|
|
|
+ <td style="width:24px"></td>
|
|
|
+ <td style="color:#888; padding:0 6px">typ</td>
|
|
|
+ <td style="color:#888; width:60px; padding:0 6px; text-align:right">ilość</td>
|
|
|
+ <td style="color:#888; width:80px; padding:0 6px; text-align:right">jednostka</td>
|
|
|
+ <td style="color:#888; padding:0 6px; text-align:right">cena jednostkowa</td>
|
|
|
+ <td style="color:#888; padding:0 6px; text-align:right">cena jedn. (robocizna)</td>
|
|
|
<?php if ($admin) : ?>
|
|
|
- <td style="padding:0 6px; text-align:right">cena jedn. (domyślna)</td>
|
|
|
+ <td style="color:#888; padding:0 6px; text-align:right">cena jedn. (domyślna)</td>
|
|
|
<?php endif; ?>
|
|
|
<?php if (!empty($summaryTypeCost)) : ?>
|
|
|
- <td style="padding:0 6px; text-align:right">szacowany koszt [zł]</td>
|
|
|
+ <td style="color:#888; padding:0 6px; text-align:right">szacowany koszt [zł]</td>
|
|
|
<?php endif; ?>
|
|
|
- <td style="padding:0 6px; text-align:right">uwagi</td>
|
|
|
+ <td style="color:#888; padding:0 6px; text-align:right">uwagi</td>
|
|
|
</tr>
|
|
|
<?php foreach ($additionalCosts as $idType => $additionalCost) : ?>
|
|
|
<?php $additionalPrice = 0;//TODO: get from $additionalCennik or $additionalCost ?>
|
|
|
@@ -1581,7 +1584,8 @@ SQL_FUN;
|
|
|
<?php $workPrice = 0;//TODO: fetch ?>
|
|
|
<?php $uwagi = '';//TODO: fetch ?>
|
|
|
<tr>
|
|
|
- <td style="padding:0 6px" >
|
|
|
+ <td style="width:24px"></td>
|
|
|
+ <td style="padding:0 6px">
|
|
|
<?php if ($admin || $companyAdmin) : ?>
|
|
|
<input type="text" style="text-align:right" class="form-control input-sm" name="additional_label_<?php echo $idType; ?>" value="<?php echo $typeLabel; ?>"/>
|
|
|
<?php else : ?>
|
|
|
@@ -1641,29 +1645,30 @@ SQL_FUN;
|
|
|
<p style="page-break-before:always; margin-top:60px"></p>
|
|
|
<h3>Składowe wg projektów podrzędnych:</h3>
|
|
|
<?php foreach ($dataSubProj as $idSubProj => $subProjData) : ?>
|
|
|
- <table class="tabel table-bordered" style="width:100%; margin-bottom:6px; page-break-inside:avoid">
|
|
|
+ <table class="tabel table-bordered table-hover" style="width:100%; margin-bottom:6px; page-break-inside:avoid">
|
|
|
<tbody>
|
|
|
<tr>
|
|
|
- <th colspan="<?php echo $tblCols; ?>"
|
|
|
+ <th colspan="<?php echo $tblCols + 1; ?>"
|
|
|
style="padding:0 6px">
|
|
|
<h4>Projekt <?php echo $idSubProj; ?>: <i><?php echo $this->getModel($idProject)->getProjectName($idSubProj); ?></i>:</h4>
|
|
|
</th>
|
|
|
</tr>
|
|
|
<?php foreach ($subProjData as $idLayer => $layData) : ?>
|
|
|
<tr>
|
|
|
- <td colspan="<?php echo $tblCols; ?>"
|
|
|
- style="padding:0 6px; font-size:1.2em; line-height:2em; font-style:italic"><?php echo $conf['layer'][$idLayer]['label']; ?></td>
|
|
|
+ <td colspan="<?php echo $tblCols + 1; ?>"
|
|
|
+ style="padding:0 6px; font-size:1.2em; line-height:2em"> — <?php echo $conf['layer'][$idLayer]['label']; ?></td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
- <td style="padding:0 6px">typ</td>
|
|
|
- <td style="padding:0 6px; text-align:right">ilość</td>
|
|
|
- <td style="padding:0 6px; text-align:right">jednostka</td>
|
|
|
+ <td style="width:24px"></td>
|
|
|
+ <td style="color:#888; padding:0 6px">typ</td>
|
|
|
+ <td style="color:#888; padding:0 6px; text-align:right">ilość</td>
|
|
|
+ <td style="color:#888; padding:0 6px; text-align:right">jednostka</td>
|
|
|
<?php if ($admin) : ?>
|
|
|
- <td style="padding:0 6px; text-align:right">cena jednostkowa</td>
|
|
|
- <td style="padding:0 6px; text-align:right">cena jedn. (domyślna)</td>
|
|
|
+ <td style="color:#888; padding:0 6px; text-align:right">cena jednostkowa</td>
|
|
|
+ <td style="color:#888; padding:0 6px; text-align:right">cena jedn. (domyślna)</td>
|
|
|
<?php endif; ?>
|
|
|
<?php if (!empty($subProjCost)) : ?>
|
|
|
- <td style="padding:0 6px; text-align:right">szacowany koszt [zł]</td>
|
|
|
+ <td style="color:#888; padding:0 6px; text-align:right">szacowany koszt [zł]</td>
|
|
|
<?php endif; ?>
|
|
|
</tr>
|
|
|
<?php foreach ($layData as $idType => $typeData) : ?>
|
|
|
@@ -1686,7 +1691,8 @@ SQL_FUN;
|
|
|
<?php $defPrice = (!empty($defCennik[$typeData['idType']]['price']))? $defCennik[$typeData['idType']]['price'] : 0; ?>
|
|
|
<?php $price = (!empty($cennik[$typeData['idType']]['price']))? $cennik[$typeData['idType']]['price'] : $defPrice; ?>
|
|
|
<tr>
|
|
|
- <td style="padding:0 6px" title="[<?php echo $typeData['idType']; ?>] <?php echo $typeData['type']; ?>"><?php echo $typeData['type']; ?></td>
|
|
|
+ <td style="width:24px"></td>
|
|
|
+ <td style="padding:0 6px" title="[<?php echo $typeData['idType']; ?>] <?php echo $typeData['type']; ?>"> – <?php echo $typeData['type']; ?></td>
|
|
|
<td style="padding:0 6px; text-align:right"><?php echo $typeData['ilosc']; ?></td>
|
|
|
<td style="padding:0 6px; text-align:right"><?php echo ProjectKosztorysSchema::getLayerJednostka($idLayer); ?></td>
|
|
|
<?php if ($admin) : ?>
|
|
|
@@ -1848,19 +1854,17 @@ SQL_FUN;
|
|
|
";
|
|
|
}
|
|
|
|
|
|
- public function getData($idProject, $admin = 0) {
|
|
|
+ public function getData($idProject, $idOrder = 0, $admin = 0) {// TODO: before was: ($idProject, $admin = 0)
|
|
|
static $_data = null;
|
|
|
if (null === $_data) {
|
|
|
$idSubProject = $this->getModel($idProject)->getSubProjectIds();
|
|
|
$idSubProject[] = $idProject;
|
|
|
- $_data = $this->fetchData($idSubProject, $admin);
|
|
|
+ $_data = $this->fetchData($idSubProject, $idOrder, $admin);
|
|
|
}
|
|
|
- //if (!array_key_exists($idProject, $_data)) $_data[$idProject] = $this->fetchData($idProject, $admin);
|
|
|
- //return $_data[$idProject];
|
|
|
return $_data;
|
|
|
}
|
|
|
|
|
|
- public function fetchData($idProject, $admin = 0) {
|
|
|
+ public function fetchData($idProject, $idOrder = 0, $admin = 0) {// TODO: before was: ($idProject, $admin = 0)
|
|
|
$data = array();
|
|
|
$data['summary'] = array();// [ $idType ] = ['type', 'jednostka', 'ilosc']
|
|
|
$data['rawDataByType'] = array();
|
