Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ settings form, so there is no bespoke admin UI to learn.
| Setting | Default | What it does |
|---|---|---|
| HR group | `hr` | Which Nextcloud group holds HR powers |
| Default annual entitlement | 25 days | Seed for new entitlement rows |
| Default annual entitlement | 28 days | Seed for new entitlement rows |
| Escalation window | 3 working days | How long a manager may sit on a request before HR is pulled in |
| Reminder lead time | 1 day | How long before escalation the manager is nudged |
| Carry-over policy | `capped` | `none`, `unlimited` or `capped` |
Expand Down
2 changes: 1 addition & 1 deletion SPECIFICATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -663,7 +663,7 @@ new "Absence" settings section or "Personal info"/"Administration"):
| Setting | Default | Notes |
|---------|---------|-------|
| HR group id | `hr` | Which NC group is HR (§2). |
| Default annual entitlement (days) | 25 | Seed for new entitlement rows. |
| Default annual entitlement (days) | 28 | Seed for new entitlement rows. |
| Escalation window | 3 working days | For EscalationJob (§5.4). |
| Reminder lead time | 1 day before escalation | For ReminderJob. |
| Carry-over policy | `capped` | `none` / `unlimited` / `capped`. |
Expand Down
4 changes: 2 additions & 2 deletions lib/ConfigLexicon.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ public function getAppConfigs(): array {
return [
new Entry(self::KEY_HR_GROUP, ValueType::STRING, 'hr',
'Group whose members have the HR role'),
new Entry(self::KEY_DEFAULT_ENTITLEMENT, ValueType::FLOAT, 25.0,
'Default annual-leave entitlement in working days'),
new Entry(self::KEY_DEFAULT_ENTITLEMENT, ValueType::FLOAT, 28.0,
'Default annual-leave entitlement in working days (a full-time year)'),
new Entry(self::KEY_ESCALATION_WINDOW, ValueType::INT, 3,
'Days before an unanswered pending request is escalated to HR', lazy: true),
new Entry(self::KEY_REMINDER_LEAD, ValueType::INT, 1,
Expand Down
2 changes: 1 addition & 1 deletion lib/Settings/AdminDeclarativeSettings.php
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public function getSchema(): array {
'id' => ConfigLexicon::KEY_DEFAULT_ENTITLEMENT,
'title' => $this->l->t('Default annual entitlement (days)'),
'type' => DeclarativeSettingsTypes::NUMBER,
'default' => 25.0,
'default' => 28.0,
],
[
'id' => ConfigLexicon::KEY_ESCALATION_WINDOW,
Expand Down
2 changes: 1 addition & 1 deletion tests/Unit/ConfigLexiconTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public function testDefaultsAndTypesMatchTheDocumentedBehaviour(): void {
$this->assertSame('hr', $entries[ConfigLexicon::KEY_HR_GROUP]->getDefault(Preset::NONE));

$this->assertSame(ValueType::FLOAT, $entries[ConfigLexicon::KEY_DEFAULT_ENTITLEMENT]->getValueType());
$this->assertSame('25', $entries[ConfigLexicon::KEY_DEFAULT_ENTITLEMENT]->getDefault(Preset::NONE));
$this->assertSame('28', $entries[ConfigLexicon::KEY_DEFAULT_ENTITLEMENT]->getDefault(Preset::NONE));

$this->assertSame(ValueType::FLOAT, $entries[ConfigLexicon::KEY_CARRYOVER_CAP]->getValueType());
$this->assertSame(ValueType::INT, $entries[ConfigLexicon::KEY_ESCALATION_WINDOW]->getValueType());
Expand Down
Loading