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

Device Update

Browse Source 
* Device Backups können nun automatisch übers Tool getriggert werden

Zeiterfassung Update
 * Vorbereitung für ZA Buchungen
This commit is contained in:
Spitzer Daniel
2024-03-10 21:25:23 +01:00
parent 901131fbce
commit 6e02b849bd
10 changed files with 124 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
application/Api/v1/DeviceApicontroller.php
View File

@@ -21,6 +21,7 @@ class DeviceApicontroller extends mfBaseApicontroller
$deviceReturn[$key]['serial'] = $device->serial;
$deviceReturn[$key]['last_config_backup'] = $device->last_config_backup;
$deviceReturn[$key]['manufactor'] = $device->devicetype->devicemanufactor->name;
$deviceReturn[$key]['autobackup'] = $device->autobackup;
}

5
application/Device/DeviceController.php
View File

@@ -102,6 +102,8 @@ class DeviceController extends mfBaseController
$data = [];
$data['name'] = trim($r->name);
$data['devicetype_id'] = $r->devicetype_id;
$data['autobackup'] = trim($r->autobackup);
if (trim($r->pop_id) == "0") {
$data['pop_id'] = NULL;
} else {
@@ -127,6 +129,9 @@ class DeviceController extends mfBaseController
$data['gps_lat'] = $r->gps_lat;
$data['gps_long'] = $r->gps_long;
}
if ($data['autobackup'] != "1") {
$data['autobackup'] = "0";
}
$data['ip'] = $r->ip;
$data['mac'] = $r->mac;
$data['serial'] = $r->serial;

1
application/Device/DeviceModel.php
View File

@@ -16,6 +16,7 @@ class DeviceModel
public $gps_lat = null;
public $addr_city = null;
public $gps_long = null;
public $autobackup = null;
public $create_by = null;
public $snmp_version = null;
public $edit_by = null;

2
application/TimerecordingCategory/TimerecordingCategoryModel.php
View File

@@ -9,7 +9,7 @@ class TimerecordingCategoryModel
private $require_comment;
private $only_admin;
private $businesstrip;
public static $hourday_definition = array(1 => "Uhrzeit (von/bis)", 2 => "Tage (von/bis)", 3 => "Startdatum", 4 => "Enddatum", 5 => "Anzahl Tage");
public static $hourday_definition = array(1 => "Uhrzeit (von/bis)", 2 => "Tage (von/bis)", 3 => "Startdatum", 4 => "Enddatum", 5 => "Anzahl Tage", 6 => "ZA Stunden");
public static $approval_definition = array(0 => "Nein", 1 => "Ja");
public static $require_comment_definition = array(0 => "Nein", 1 => "Ja");
public static $businesstrip_definition = array(0 => "Nein", 1 => "Ja");