Skip to content

Commit f21fd4e

Browse files
malamalcamalamalca
committed
Dodana naslovnica elaborata
1 parent 4ce99e6 commit f21fd4e

File tree

9 files changed

+122
-7
lines changed

9 files changed

+122
-7
lines changed

‎projects/TestniProjekt/izracuni/cone.json‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,22 @@
3838
"mocSvetilk": 4
3939
},
4040
"prezracevanje": {
41+
"_vrsta": "mehansko",
42+
"_regulacija": "brez",
43+
"_volumenProjekt": 200,
44+
"_volumenDovedenegaZraka": {
45+
"ogrevanje": 200,
46+
"hlajenje": 200
47+
},
48+
"__vrsta": "naravno",
49+
"__izmenjava": {
50+
"ogrevanje": 0.5,
51+
"hlajenje": 0.5
52+
},
4153
"vrsta": "rekuperacija",
4254
"regulacija": "brez",
4355
"izkoristek": 0.9,
56+
"volumenProjekt": 200,
4457
"volumenDovedenegaZraka": {
4558
"ogrevanje": 200,
4659
"hlajenje": 200

‎projects/TestniProjekt/pdf/elaborat.pdf‎

36.4 KB
Binary file not shown.

‎projects/TestniProjekt/pdf/izkaz.pdf‎

0 Bytes
Binary file not shown.

‎projects/TestniProjekt/podatki/splosniPodatki.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,6 @@
2323
],
2424
"vodjaProjektiranja": "Franc Pavlin, udia, ZAPS 1122",
2525
"izdelovalec": "Franc Pavlin, udia, ZAPS 1122",
26+
"stevilkaElaborata": "2023-01",
2627
"datum": "april 2023"
2728
}

‎src/Command/PdfIzvoz.php‎

Lines changed: 31 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,13 @@ public function run($projectId = null)
3232
$view->set('cone', App::loadProjectCalculation($projectId, 'cone'));
3333
$view->set('tKons', App::loadProjectCalculation($projectId, 'konstrukcije' . DS . 'transparentne'));
3434
$view->set('ntKons', App::loadProjectCalculation($projectId, 'konstrukcije' . DS . 'netransparentne'));
35-
$view->set('sistemiOgrevanja', App::loadProjectCalculation($projectId, 'TSS' . DS . 'ogrevanje'));
36-
$view->set('sistemiRazsvetljave', App::loadProjectCalculation($projectId, 'TSS' . DS . 'razsvetljava'));
37-
$view->set('sistemiPrezracevanja', App::loadProjectCalculation($projectId, 'TSS' . DS . 'prezracevanje'));
38-
$view->set('sistemiSTPE', App::loadProjectCalculation($projectId, 'TSS' . DS . 'fotovoltaika'));
35+
$view->set('sistemiOgrevanja', (array)App::loadProjectCalculation($projectId, 'TSS' . DS . 'ogrevanje'));
36+
$view->set('sistemiRazsvetljave', (array)App::loadProjectCalculation($projectId, 'TSS' . DS . 'razsvetljava'));
37+
$view->set(
38+
'sistemiPrezracevanja',
39+
(array)App::loadProjectCalculation($projectId, 'TSS' . DS . 'prezracevanje')
40+
);
41+
$view->set('sistemiSTPE', (array)App::loadProjectCalculation($projectId, 'TSS' . DS . 'fotovoltaika'));
3942

4043
$tssFolder = App::getProjectFolder($projectId, 'izracuni') . 'TSS' . DS;
4144
$vgrajeniSistemi = array_filter((array)scandir($tssFolder), fn($d) => is_file($tssFolder . $d));
@@ -60,6 +63,7 @@ private function elaborat($projectId, $view)
6063
$pdfEngine = Configure::read('PDF.engine');
6164
$pdf = PdfFactory::create($pdfEngine, Configure::read('PDF.' . $pdfEngine, []));
6265

66+
$pdf->newPage((string)$view->render('Projekti', 'naslovnica'));
6367
$pdf->newPage((string)$view->render('Projekti', 'view'));
6468
$pdf->newPage((string)$view->render('Projekti', 'analiza'));
6569

@@ -70,15 +74,37 @@ private function elaborat($projectId, $view)
7074

7175
foreach ($view->get('cone') as $cona) {
7276
$view->set('cona', $cona);
73-
$pdf->newPage((string)$view->render('Cone', 'analiza'));
7477
$pdf->newPage((string)$view->render('Cone', 'ovoj'));
78+
$pdf->newPage((string)$view->render('Cone', 'analiza'));
79+
}
80+
81+
foreach ($view->get('sistemiOgrevanja') as $sistem) {
82+
$view->set('sistem', $sistem);
83+
$pdf->newPage((string)$view->render('TSS', 'ogrevanje'));
84+
}
85+
86+
foreach ($view->get('sistemiPrezracevanja') as $sistem) {
87+
$view->set('sistem', $sistem);
88+
$pdf->newPage((string)$view->render('TSS', 'prezracevanje'));
89+
}
90+
91+
foreach ($view->get('sistemiRazsvetljave') as $sistem) {
92+
$view->set('sistem', $sistem);
93+
$pdf->newPage((string)$view->render('TSS', 'razsvetljava'));
94+
}
95+
96+
foreach ($view->get('sistemiSTPE') as $sistem) {
97+
$view->set('sistem', $sistem);
98+
$pdf->newPage((string)$view->render('TSS', 'fotovoltaika'));
7599
}
76100

77101
$pdfFolder = App::getProjectFolder($projectId, 'pdf');
78102
if (!is_dir($pdfFolder)) {
79103
mkdir($pdfFolder, 0777, true);
80104
}
81105

106+
$pdf->newPage((string)$view->render('Projekti', 'snes'));
107+
82108
$pdf->saveAs($pdfFolder . 'elaborat.pdf');
83109
}
84110

‎src/Controller/ProjektiController.php‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,4 +69,16 @@ public function snes($projectId)
6969
App::set('stavba', App::loadProjectCalculation($projectId, 'stavba'));
7070
App::set('sistemi', App::loadProjectCalculation($projectId, 'TSS' . DS . 'ogrevanje.json'));
7171
}
72+
73+
/**
74+
* Prikaz naslovnice
75+
*
76+
* @param string $projectId Building name
77+
* @return void
78+
*/
79+
public function naslovnica($projectId)
80+
{
81+
App::set('projectId', $projectId);
82+
App::set('splosniPodatki', App::loadProjectData($projectId, 'splosniPodatki'));
83+
}
7284
}

‎templates/Konstrukcije/view.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
use \App\Lib\Calc;
33
?>
4-
<h1></h1>
4+
<h1>Analiza netransparentne konstrukcije</h1>
55

66
<table>
77
<tr>

‎templates/Projekti/naslovnica.php‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
<?php
2+
use App\Core\App;
3+
use App\Lib\Calc;
4+
?>
5+
<h1>Energijska učinkovitost stavb</h1>
6+
<p class="actions">
7+
<a class="button" href="<?= App::url('/projekti/view/' . $projectId) ?>">&larr; Nazaj</a>
8+
</p>
9+
<p>Po Pravilniku o učinkoviti rabi energije v stavbah (Uradni list RS, št. 70/22 z dne 20. 5. 2022) in
10+
Pravilniku o spremembah Pravilnika o učinkoviti rabi energije v stavbah (Uradni list RS, št. 161/22 z dne 23. 12. 2022).
11+
</p>
12+
<table width="100%">
13+
<tr><td colspan="2">&nbsp;</td></tr>
14+
<?php
15+
foreach ($splosniPodatki->investitorji as $investitor) {
16+
?>
17+
<tr>
18+
<td class="w-30">Investitor:</td>
19+
<td class="w-70"><?= h($investitor->naziv) ?></td>
20+
</tr>
21+
<tr>
22+
<td class="w-30"></td>
23+
<td class="w-70"><?= h($investitor->naslov) ?></td>
24+
</tr>
25+
<?php
26+
}
27+
?>
28+
<tr><td colspan="2">&nbsp;</td></tr>
29+
30+
<tr>
31+
<td class="w-30">Naziv projekta:</td>
32+
<td class="w-70"><h3><?= h($splosniPodatki->stavba->naziv) ?></h3></td>
33+
</tr>
34+
<tr><td colspan="2">&nbsp;</td></tr>
35+
36+
<tr>
37+
<td class="w-30">Izdelovalec elaborata:</td>
38+
<td class="w-70"><?= h($splosniPodatki->izdelovalec) ?></td>
39+
</tr>
40+
<tr><td colspan="2">&nbsp;</td></tr>
41+
<tr><td colspan="2">&nbsp;</td></tr>
42+
<tr><td colspan="2">&nbsp;</td></tr>
43+
<tr><td colspan="2">&nbsp;</td></tr>
44+
<tr><td colspan="2">&nbsp;</td></tr>
45+
<tr>
46+
<td class="w-30">Vodja projektiranja:</td>
47+
<td class="w-70"><?= h($splosniPodatki->vodjaProjektiranja) ?></td>
48+
</tr>
49+
<tr><td colspan="2">&nbsp;</td></tr>
50+
<tr><td colspan="2">&nbsp;</td></tr>
51+
<tr><td colspan="2">&nbsp;</td></tr>
52+
<tr><td colspan="2">&nbsp;</td></tr>
53+
<tr><td colspan="2">&nbsp;</td></tr>
54+
<tr>
55+
<td class="w-30">Številka elaborata:</td>
56+
<td class="w-70"><?= h($splosniPodatki->stevilkaElaborata) ?></td>
57+
</tr>
58+
<tr>
59+
<td class="w-30">Datum elaborata:</td>
60+
<td class="w-70"><?= h($splosniPodatki->datum) ?></td>
61+
</tr>
62+
<tr><td colspan="2">&nbsp;</td></tr>
63+
</table>

‎templates/TSS/prezracevanje.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
use App\Core\App;
33
use App\Lib\Calc;
44
?>
5-
<h1>Analiza prezracevalnega sistema "<?= h($sistem->id) ?>"</h1>
5+
<h1>Analiza prezračevalnega sistema "<?= h($sistem->id) ?>"</h1>
66

77
<p class="actions">
88
<a class="button" href="<?= App::url('/projekti/view/' . $projectId) ?>">&larr; Nazaj</a>

0 commit comments

Comments
 (0)