Skip to content

Commit faa2aee

Browse files
committed
Small Fixes
1 parent 662b7ce commit faa2aee

File tree

6 files changed

+13
-8
lines changed

6 files changed

+13
-8
lines changed

src/Calc/GF/Cone/Cona.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -367,8 +367,9 @@ public function analiza($okolje)
367367
}
368368
foreach ($this->ovoj->transparentneKonstrukcije as $elementOvoja) {
369369
$skupni_Uab += $elementOvoja->U * $elementOvoja->povrsina * $elementOvoja->b * $elementOvoja->stevilo;
370-
$this->povrsinaOvoja +=
371-
$elementOvoja->povrsina * (1 - $elementOvoja->delezOkvirja) * $elementOvoja->stevilo;
370+
$this->povrsinaOvoja += $elementOvoja->povrsina * $elementOvoja->stevilo;
371+
//$this->povrsinaOvoja +=
372+
// $elementOvoja->povrsina * (1 - $elementOvoja->delezOkvirja) * $elementOvoja->stevilo;
372373
$this->transparentnaPovrsina +=
373374
$elementOvoja->povrsina * (1 - $elementOvoja->delezOkvirja) * $elementOvoja->stevilo;
374375
}

src/Calc/GF/Cone/KlasifikacijeCone/GostinskaKlasifikacijaCone.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function kolicinaSvezegaZrakaZaPrezracevanje(Cona $cona): float
3636
$stOseb = 0.17 * $cona->ogrevanaPovrsina;
3737
$kolicinaZrakaNaOsebo = 25.2; // [m3/h] [7 l/s * 3600s / 1000 l/m3]
3838
$faktorSocasneUporabe = 0.46;
39-
$dnevnaUporabaStavbe = 20; // [h]
39+
$dnevnaUporabaStavbe = 20; // [h]
4040
$tedenskaUporabaStavbe = 7; // [dni/teden]
4141

4242
$volumenZraka = $kolicinaZrakaNaOsebo * $faktorSocasneUporabe * $stOseb *

src/Calc/GF/Cone/KlasifikacijeCone/KnjizniceMuzejiArhiviKlasifikacijaCone.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function kolicinaSvezegaZrakaZaPrezracevanje(Cona $cona): float
3636
$stOseb = 0.06 * $cona->ogrevanaPovrsina;
3737
$kolicinaZrakaNaOsebo = 25.2; // [m3/h] [7 l/s * 3600s / 1000 l/m3]
3838
$faktorSocasneUporabe = 0.6;
39-
$dnevnaUporabaStavbe = 14; // [h]
39+
$dnevnaUporabaStavbe = 14; // [h]
4040
$tedenskaUporabaStavbe = 7; // [dni/teden]
4141

4242
$volumenZraka = $kolicinaZrakaNaOsebo * $faktorSocasneUporabe * $stOseb *

src/Calc/GF/Cone/KlasifikacijeCone/PoslovnaKlasifikacijaCone.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ public function izracunTSVZaMesec(int $mesec, Cona $cona): float
2828
return $energijaTSV;
2929
}
3030

31-
3231
/**
3332
* @inheritDoc
3433
*/
@@ -37,7 +36,7 @@ public function kolicinaSvezegaZrakaZaPrezracevanje(Cona $cona): float
3736
$stOseb = 0.06 * $cona->ogrevanaPovrsina;
3837
$kolicinaZrakaNaOsebo = 16; // [m3/h] [7 l/s * 3600s / 1000 l/m3]
3938
$faktorSocasneUporabe = 0.55;
40-
$dnevnaUporabaStavbe = 14; // [h]
39+
$dnevnaUporabaStavbe = 14; // [h]
4140
$tedenskaUporabaStavbe = 7; // [dni/teden]
4241

4342
$volumenZraka = $kolicinaZrakaNaOsebo * $faktorSocasneUporabe * $stOseb *

src/Core/App.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,6 @@ public static function isLoggedIn()
252252
*/
253253
public static function getProjectFolder($area, $projectId, $subfolder = null)
254254
{
255-
256255
if (defined('CLI')) {
257256
if (empty($projectId)) {
258257
$destFolder = getcwd() . DS;

src/Core/CommandRunner.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,13 @@ public function run($args, $area = 'Pures')
2424

2525
$func = [$commandClass, 'run'];
2626
if (is_callable($func)) {
27-
call_user_func_array($func, array_slice($args, 2));
27+
$argsWithoutCommand = array_slice($args, 2);
28+
29+
// če ni podanega projekta, vseeno pa so podani switchi
30+
if (isset($argsWithoutCommand[0]) && substr($argsWithoutCommand[0], 0, 1) == '-') {
31+
$argsWithoutCommand = array_merge([null], $argsWithoutCommand);
32+
}
33+
call_user_func_array($func, $argsWithoutCommand);
2834
} else {
2935
throw new \Exception('Invalid Command.');
3036
}

0 commit comments

Comments
 (0)