template fixes + bug fixes + style fixes

This commit is contained in:
Dennis Eichhorn 2024-04-02 21:40:48 +00:00
parent 5f42f821fa
commit fb54903257
13 changed files with 128 additions and 115 deletions

View File

@ -141,7 +141,7 @@ final class BackendController extends Controller
$view->setTemplate('/Modules/RiskManagement/Theme/Backend/risk-list'); $view->setTemplate('/Modules/RiskManagement/Theme/Backend/risk-list');
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response);
$risks = RiskMapper::getAll()->execute(); $risks = RiskMapper::getAll()->executeGetArray();
$view->data['risks'] = $risks; $view->data['risks'] = $risks;
return $view; return $view;
@ -210,7 +210,7 @@ final class BackendController extends Controller
$view->setTemplate('/Modules/RiskManagement/Theme/Backend/cause-list'); $view->setTemplate('/Modules/RiskManagement/Theme/Backend/cause-list');
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response);
$causes = CauseMapper::getAll()->with('risk')->execute(); $causes = CauseMapper::getAll()->with('risk')->executeGetArray();
$view->data['causes'] = $causes; $view->data['causes'] = $causes;
return $view; return $view;
@ -258,7 +258,7 @@ final class BackendController extends Controller
$view->setTemplate('/Modules/RiskManagement/Theme/Backend/solution-list'); $view->setTemplate('/Modules/RiskManagement/Theme/Backend/solution-list');
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response);
$solutions = SolutionMapper::getAll()->with('risk')->with('cause')->execute(); $solutions = SolutionMapper::getAll()->with('risk')->with('cause')->executeGetArray();
$view->data['solutions'] = $solutions; $view->data['solutions'] = $solutions;
return $view; return $view;
@ -367,7 +367,7 @@ final class BackendController extends Controller
$view->data['categories'] = CategoryMapper::getAll() $view->data['categories'] = CategoryMapper::getAll()
->with('title') ->with('title')
->where('title/language', $response->header->l11n->language) ->where('title/language', $response->header->l11n->language)
->execute(); ->executeGetArray();
return $view; return $view;
} }
@ -462,7 +462,7 @@ final class BackendController extends Controller
$view->setTemplate('/Modules/RiskManagement/Theme/Backend/process-list'); $view->setTemplate('/Modules/RiskManagement/Theme/Backend/process-list');
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1003001001, $request, $response);
$processes = ProcessMapper::getAll()->execute(); $processes = ProcessMapper::getAll()->executeGetArray();
$view->data['processes'] = $processes; $view->data['processes'] = $processes;
return $view; return $view;

View File

@ -15,7 +15,6 @@ declare(strict_types=1);
namespace Modules\RiskManagement\Models; namespace Modules\RiskManagement\Models;
use Modules\Organization\Models\Department; use Modules\Organization\Models\Department;
use Modules\Organization\Models\Unit;
/** /**
* Risk Management class. * Risk Management class.

View File

@ -15,7 +15,6 @@ declare(strict_types=1);
namespace Modules\RiskManagement\Models; namespace Modules\RiskManagement\Models;
use Modules\Organization\Models\DepartmentMapper; use Modules\Organization\Models\DepartmentMapper;
use Modules\Organization\Models\UnitMapper;
use phpOMS\DataStorage\Database\Mapper\DataMapperFactory; use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
/** /**

View File

@ -88,15 +88,23 @@ class Risk
public \DateTimeImmutable $createdAt; public \DateTimeImmutable $createdAt;
public float $grossLikelihoodR = 0.0; public float $grossLikelihoodR = 0.0;
public int $grossLikelihoodLevel = 0; public int $grossLikelihoodLevel = 0;
public int $grossCostLevel = 0; public int $grossCostLevel = 0;
public FloatInt $grossCost; public FloatInt $grossCost;
public FloatInt $grossExpectedCost; public FloatInt $grossExpectedCost;
public float $netLikelihoodR = 0.0; public float $netLikelihoodR = 0.0;
public int $netLikelihoodLevel = 0; public int $netLikelihoodLevel = 0;
public int $netCostLevel = 0; public int $netCostLevel = 0;
public FloatInt $netCost; public FloatInt $netCost;
public FloatInt $netExpectedCost; public FloatInt $netExpectedCost;
/** /**

View File

@ -51,15 +51,23 @@ class RiskHistory
public \DateTimeImmutable $createdAt; public \DateTimeImmutable $createdAt;
public float $grossLikelihoodR = 0.0; public float $grossLikelihoodR = 0.0;
public int $grossLikelihoodLevel = 0; public int $grossLikelihoodLevel = 0;
public int $grossCostLevel = 0; public int $grossCostLevel = 0;
public FloatInt $grossCost; public FloatInt $grossCost;
public FloatInt $grossExpectedCost; public FloatInt $grossExpectedCost;
public float $netLikelihoodR = 0.0; public float $netLikelihoodR = 0.0;
public int $netLikelihoodLevel = 0; public int $netLikelihoodLevel = 0;
public int $netCostLevel = 0; public int $netCostLevel = 0;
public FloatInt $netCost; public FloatInt $netCost;
public FloatInt $netExpectedCost; public FloatInt $netExpectedCost;
/** /**
@ -75,7 +83,6 @@ class RiskHistory
$this->grossExpectedCost = new FloatInt(); $this->grossExpectedCost = new FloatInt();
$this->netCost = new FloatInt(); $this->netCost = new FloatInt();
$this->netExpectedCost = new FloatInt(); $this->netExpectedCost = new FloatInt();
} }
use \Modules\Media\Models\MediaListTrait; use \Modules\Media\Models\MediaListTrait;

View File

@ -84,7 +84,7 @@ final class RiskHistoryMapper extends DataMapperFactory
'risk' => [ 'risk' => [
'mapper' => RiskMapper::class, 'mapper' => RiskMapper::class,
'external' => 'riskmngmt_history_risk', 'external' => 'riskmngmt_history_risk',
] ],
]; ];
/** /**

View File

@ -128,7 +128,7 @@ final class RiskMapper extends DataMapperFactory
'department' => [ 'department' => [
'mapper' => DepartmentMapper::class, 'mapper' => DepartmentMapper::class,
'external' => 'riskmngmt_risk_department', 'external' => 'riskmngmt_risk_department',
] ],
]; ];
/** /**