Skip to content

TT-221 #138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Ente merged 1 commit into from
Jan 3, 2026
Merged

TT-221 #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

* Added automatic update check within the Settings page allowing to see the changelogs and a link to the new Release.
* Updated `README.md`
* Admins can now select the default worktime type to be selected in the form within the app.json `config` section via the `default_worktime_type` key.
* Added function to automatically add keys to app.json after update

## v8.6

Expand Down
43 changes: 40 additions & 3 deletions api/v1/class/arbeitszeit.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ public function __construct()
if (isset($this->get_app_ini()["general"]["timezone"])) {
try {
date_default_timezone_set($this->get_app_ini()["general"]["timezone"]);
$this->app_ini_check();
} catch (\Exception $e) {
Exceptions::error_rep("Error setting timezone: " . $e->getMessage());
}
Expand All @@ -73,6 +74,42 @@ public function __destruct()
}
}

public function app_ini_check()
{
$base = dirname(__DIR__, 3) . "/api/v1/inc/";
$sample = json_decode(file_get_contents($base . "app.json.sample"), true);
$current = json_decode(file_get_contents($base . "app.json"), true);

$updated = false;

foreach ($sample as $section => $values) {

if (!isset($current[$section]) || !is_array($current[$section])) {
$current[$section] = [];
$updated = true;
Exceptions::error_rep("App config section '{$section}' was missing and has been created.");
}

foreach ($values as $key => $value) {
if (!array_key_exists($key, $current[$section])) {
$current[$section][$key] = $value;
$updated = true;
Exceptions::error_rep(
"App config key '{$key}' in section '{$section}' was missing and added with default value."
);
}
}
}

if ($updated) {
file_put_contents(
$base . "app.json",
json_encode($current, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)
);
}
}


public function init_lang()
{
Exceptions::error_rep("Initializing language for Arbeitszeit class");
Expand Down Expand Up @@ -128,8 +165,8 @@ public static function add_easymode_worktime($username)
return false;
} else {
Exceptions::error_rep("Creating easymode worktime entry for user '{$username}'...");
$sql = "INSERT INTO `arbeitszeiten` (`name`, `id`, `email`, `username`, `schicht_tag`, `schicht_anfang`, `schicht_ende`, `ort`, `active`, `review`) VALUES ( ?, '0', ?, ?, ?, ?, '00:00', '-', '1', '0');";
$data = $conn->sendQuery($sql)->execute([$usr["name"], $usr["email"], $username, $date, $time]);
$sql = "INSERT INTO `arbeitszeiten` (`name`, `id`, `email`, `username`, `schicht_tag`, `schicht_anfang`, `schicht_ende`, `ort`, `active`, `review`, `wtype`) VALUES ( ?, '0', ?, ?, ?, ?, '00:00', '-', '1', '0', ?);";
$data = $conn->sendQuery($sql)->execute([$usr["name"], $usr["email"], $username, $date, $time, Arbeitszeit::get_app_ini()["config"]["default_worktime_type"]]);
if ($data == false) {
Exceptions::error_rep("An error occurred while creating easymode worktime entry. See previous message for more information");
return false;
Expand Down Expand Up @@ -915,7 +952,7 @@ public function renderGUIUpdateCheck()
$text .= "<strong>Changelog for version {$current}:</strong><br>";
$parsedown = new \Parsedown();
$currentChanges = $this->getChanges($current);
if($currentChanges == null) {
if ($currentChanges == null) {
$currentChanges["body"] = "**No changelogs found. Either you are using a custom build or something went wrong while fetching the changelogs.**";
}
$text .= $parsedown->text($currentChanges["body"]);
Expand Down
9 changes: 8 additions & 1 deletion api/v1/class/mode/mode.arbeit.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,15 @@ public static function check($username)
public static function compute_html_worktime_types()
{
$data = "";
$selected = "";
foreach (Arbeitszeit::get_all_types() as $type => $value) {
$data .= "<option value=\"{$type}\">{$value}</option>";
$selected = "";

if((int)$type == Arbeitszeit::get_app_ini()["config"]["default_worktime_type"]) {
$selected = " selected";
}
print_r($type);
$data .= "<option value=\"{$type}\"{$selected}>{$value}</option>";
}
return $data;
}
Expand Down
3 changes: 2 additions & 1 deletion api/v1/inc/app.json.sample
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@
"config": {
"worktime_types": "/api/v1/inc/config/worktime_types.json",
"vacation_types": "/api/v1/inc/config/vacation_types.json",
"sickness_types": "/api/v1/inc/config/sickness_types.json"
"sickness_types": "/api/v1/inc/config/sickness_types.json",
"default_worktime_type": 1
},
"mobile": {
"allow_app_use": false,
Expand Down
Loading