Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

raspberrydisplay v2 init

Browse Source
This commit is contained in:
Luca Haid
2026-02-03 15:52:55 +01:00
parent 0cdb2140a9
commit 68e86f74f8
4 changed files with 241 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
application/RaspberryDisplay/RaspberryDisplayController.php
View File

@@ -70,6 +70,9 @@ class RaspberryDisplayController extends mfBaseController {
}
protected function createDisplayApi(): array|bool {
$monitorSize = $this->request->monitor_size ?? '27';
if (!in_array($monitorSize, ['27', '42', '55', '65'])) $monitorSize = '27';
$data = [
'display_label' => $this->request->display_label ?? '',
'hostname' => $this->request->hostname ?? '',
@@ -77,7 +80,7 @@ class RaspberryDisplayController extends mfBaseController {
'display_url' => $this->request->display_url ?? '',
'group_name' => $this->request->group_name ?? '',
'group_order' => (int)($this->request->group_order ?? 0),
'monitor_size' => $this->request->monitor_size ?? '27',
'monitor_size' => $monitorSize,
'hdmi_port' => (int)($this->request->hdmi_port ?? 0),
'agent_port' => (int)($this->request->agent_port ?? 5000),
'custom_style' => $this->request->custom_style ?? null,
@@ -234,10 +237,10 @@ class RaspberryDisplayController extends mfBaseController {
"BASE_URL" => self::getUrl("RaspberryDisplay"),
"DASHBOARD_URL" => self::getUrl("Dashboard"),
"MFAPPNAME" => MFAPPNAME_SLUG,
"PAGE_TITLE" => "NOC Display Manager",
"PAGE_TITLE" => "NOC Display Verwaltung",
"PATH" => [
["text" => MFAPPNAME_SLUG, "href" => self::getUrl("Dashboard")],
["text" => "NOC Display Manager", "href" => self::getUrl("RaspberryDisplay")]
["text" => "NOC Display Verwaltung", "href" => self::getUrl("RaspberryDisplay")]
]
]);
$this->layout()->set("additionalCSS", ["css/views/RaspberryDisplay.css"]);

24
application/RaspberryDisplay/RaspberryDisplayModel.php
View File

@@ -114,11 +114,10 @@ class RaspberryDisplayModel
}
}
// Set defaults
if ($model->group_order === null) {
$model->group_order = 0;
}
if ($model->monitor_size === null) {
if (!in_array($model->monitor_size, ['27', '42', '55', '65'])) {
$model->monitor_size = '27';
}
if ($model->hdmi_port === null) {
@@ -166,15 +165,30 @@ class RaspberryDisplayModel
{
$db = FronkDB::singleton();
$data = $model->data;
$data = [
'display_label' => $model->display_label,
'hostname' => $model->hostname,
'ip_address' => $model->ip_address,
'display_url' => $model->display_url,
'group_name' => $model->group_name,
'group_order' => (int)$model->group_order,
'monitor_size' => in_array($model->monitor_size, ['27', '42', '55', '65']) ? $model->monitor_size : '27',
'hdmi_port' => (int)$model->hdmi_port,
'agent_port' => (int)$model->agent_port,
'custom_style' => $model->custom_style,
'create_by' => $model->create_by,
'edit_by' => $model->edit_by,
];
$forceStr = ['monitor_size'];
if ($model->id) {
$data['edit'] = time();
$db->update("RaspberryDisplay", $data, "id=" . (int)$model->id);
$db->update("RaspberryDisplay", $data, "id=" . (int)$model->id, $forceStr);
} else {
$data['create'] = time();
$data['edit'] = time();
$model->id = $db->insert("RaspberryDisplay", $data);
$model->id = $db->insert("RaspberryDisplay", $data, $forceStr);
}
return $model;