Jingga/oms-Organization
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Organization.git synced 2026-02-16 16:28:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Dennis Eichhorn 2024-01-02 23:34:18 +00:00
parent fbed090251
commit 9855b02278
11 changed files with 33 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Admin/Install/unit_attributes.json
View File

@ -24,5 +24,18 @@
"is_required": false, "is_required": false,
"default_value": "", "default_value": "",
"values": [] "values": []
},
{
"name": "business_year_start",
"l11n": {
"en": "Business year start",
"de": "Geschäftsjahresbeginn"
},
"value_type": 1,
"is_custom_allowed": true,
"validation_pattern": "",
"is_required": false,
"default_value": "",
"values": []
} }
] ]

4
Admin/Installer.php
View File

@ -49,8 +49,6 @@ final class Installer extends InstallerAbstract
{ {
parent::install($app, $info, $cfgHandler); parent::install($app, $info, $cfgHandler);
self::installDefaultUnit();
/* Unit Attributes */ /* Unit Attributes */
$fileContent = \file_get_contents(__DIR__ . '/Install/unit_attributes.json'); $fileContent = \file_get_contents(__DIR__ . '/Install/unit_attributes.json');
if ($fileContent === false) { if ($fileContent === false) {
@ -78,6 +76,8 @@ final class Installer extends InstallerAbstract
$attrTypes = self::createAddressAttributeTypes($app, $attributes); $attrTypes = self::createAddressAttributeTypes($app, $attributes);
$attrValues = self::createAddressAttributeValues($app, $attrTypes, $attributes); $attrValues = self::createAddressAttributeValues($app, $attrTypes, $attributes);
self::installDefaultUnit();
} }
/** /**

2
Controller/ApiController.php
View File

@ -363,7 +363,7 @@ final class ApiController extends Controller
} }
/** /**
* Routing end-point for application behaviour. * Routing end-point for application behavior.
* *
* @param RequestAbstract $request Request * @param RequestAbstract $request Request
* @param ResponseAbstract $response Response * @param ResponseAbstract $response Response

20
Controller/BackendController.php
View File

@ -38,7 +38,7 @@ use phpOMS\Views\View;
final class BackendController extends Controller final class BackendController extends Controller
{ {
/** /**
* Routing end-point for application behaviour. * Routing end-point for application behavior.
* *
* @param RequestAbstract $request Request * @param RequestAbstract $request Request
* @param ResponseAbstract $response Response * @param ResponseAbstract $response Response
@ -73,7 +73,7 @@ final class BackendController extends Controller
} }
/** /**
* Routing end-point for application behaviour. * Routing end-point for application behavior.
* *
* @param RequestAbstract $request Request * @param RequestAbstract $request Request
* @param ResponseAbstract $response Response * @param ResponseAbstract $response Response
@ -110,7 +110,7 @@ final class BackendController extends Controller
} }
/** /**
* Routing end-point for application behaviour. * Routing end-point for application behavior.
* *
* @param RequestAbstract $request Request * @param RequestAbstract $request Request
* @param ResponseAbstract $response Response * @param ResponseAbstract $response Response
@ -180,7 +180,7 @@ final class BackendController extends Controller
} }
/** /**
* Routing end-point for application behaviour. * Routing end-point for application behavior.
* *
* @param RequestAbstract $request Request * @param RequestAbstract $request Request
* @param ResponseAbstract $response Response * @param ResponseAbstract $response Response
@ -211,7 +211,7 @@ final class BackendController extends Controller
} }
/** /**
* Routing end-point for application behaviour. * Routing end-point for application behavior.
* *
* @param RequestAbstract $request Request * @param RequestAbstract $request Request
* @param ResponseAbstract $response Response * @param ResponseAbstract $response Response
@ -256,7 +256,7 @@ final class BackendController extends Controller
} }
/** /**
* Routing end-point for application behaviour. * Routing end-point for application behavior.
* *
* @param RequestAbstract $request Request * @param RequestAbstract $request Request
* @param ResponseAbstract $response Response * @param ResponseAbstract $response Response
@ -289,7 +289,7 @@ final class BackendController extends Controller
} }
/** /**
* Routing end-point for application behaviour. * Routing end-point for application behavior.
* *
* @param RequestAbstract $request Request * @param RequestAbstract $request Request
* @param ResponseAbstract $response Response * @param ResponseAbstract $response Response
@ -320,7 +320,7 @@ final class BackendController extends Controller
} }
/** /**
* Routing end-point for application behaviour. * Routing end-point for application behavior.
* *
* @param RequestAbstract $request Request * @param RequestAbstract $request Request
* @param ResponseAbstract $response Response * @param ResponseAbstract $response Response
@ -350,7 +350,7 @@ final class BackendController extends Controller
} }
/** /**
* Routing end-point for application behaviour. * Routing end-point for application behavior.
* *
* @param RequestAbstract $request Request * @param RequestAbstract $request Request
* @param ResponseAbstract $response Response * @param ResponseAbstract $response Response
@ -383,7 +383,7 @@ final class BackendController extends Controller
} }
/** /**
* Routing end-point for application behaviour. * Routing end-point for application behavior.
* *
* @param RequestAbstract $request Request * @param RequestAbstract $request Request
* @param ResponseAbstract $response Response * @param ResponseAbstract $response Response

2
Models/PermissionCategory.php
View File

@ -17,7 +17,7 @@ namespace Modules\Organization\Models;
use phpOMS\Stdlib\Base\Enum; use phpOMS\Stdlib\Base\Enum;
/** /**
* Permision state enum. * Permission category enum.
* *
* @package Modules\Organization\Models * @package Modules\Organization\Models
* @license OMS License 2.0 * @license OMS License 2.0

2
Theme/Backend/Components/DepartmentTagSelector/department-selector.tpl.php
View File

@ -18,7 +18,7 @@
data-autocomplete="off" data-autocomplete="off"
data-src="api/organization/find/department?search={!#i<?= $this->id; ?>}"> data-src="api/organization/find/department?search={!#i<?= $this->id; ?>}">
<div id="<?= $this->id; ?>-popup" class="popup" data-active="true"> <div id="<?= $this->id; ?>-popup" class="popup" data-active="true">
<table class="default"> <table class="default sticky">
<thead> <thead>
<tr> <tr>
<td>ID<i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i> <td>ID<i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>

2
Theme/Backend/Components/PositionTagSelector/position-selector.tpl.php
View File

@ -18,7 +18,7 @@
data-autocomplete="off" data-autocomplete="off"
data-src="api/organization/find/position?search={!#i<?= $this->id; ?>}"> data-src="api/organization/find/position?search={!#i<?= $this->id; ?>}">
<div id="<?= $this->id; ?>-popup" class="popup" data-active="true"> <div id="<?= $this->id; ?>-popup" class="popup" data-active="true">
<table class="default"> <table class="default sticky">
<thead> <thead>
<tr> <tr>
<td>ID<i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i> <td>ID<i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>

2
Theme/Backend/Components/UnitTagSelector/unit-selector.tpl.php
View File

@ -18,7 +18,7 @@
data-autocomplete="off" data-autocomplete="off"
data-src="api/organization/find/unit?search={!#i<?= $this->id; ?>}"> data-src="api/organization/find/unit?search={!#i<?= $this->id; ?>}">
<div id="<?= $this->id; ?>-popup" class="popup" data-active="true"> <div id="<?= $this->id; ?>-popup" class="popup" data-active="true">
<table class="default"> <table class="default sticky">
<thead> <thead>
<tr> <tr>
<td>ID<i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i> <td>ID<i class="sort-asc g-icon">expand_less</i><i class="sort-desc g-icon">expand_more</i>

2
tests/Models/DepartmentTest.php
View File

@ -44,7 +44,7 @@ final class DepartmentTest extends \PHPUnit\Framework\TestCase
self::assertEquals('', $this->department->name); self::assertEquals('', $this->department->name);
self::assertEquals('', $this->department->description); self::assertEquals('', $this->department->description);
self::assertEquals('', $this->department->descriptionRaw); self::assertEquals('', $this->department->descriptionRaw);
self::assertEquals(null, $this->department->parent); self::assertNull($this->department->parent);
self::assertEquals(0, $this->department->unit->id); self::assertEquals(0, $this->department->unit->id);
self::assertEquals(Status::INACTIVE, $this->department->getStatus()); self::assertEquals(Status::INACTIVE, $this->department->getStatus());
} }

2
tests/Models/PositionTest.php
View File

@ -44,7 +44,7 @@ final class PositionTest extends \PHPUnit\Framework\TestCase
self::assertEquals('', $this->position->name); self::assertEquals('', $this->position->name);
self::assertEquals('', $this->position->description); self::assertEquals('', $this->position->description);
self::assertEquals('', $this->position->descriptionRaw); self::assertEquals('', $this->position->descriptionRaw);
self::assertEquals(null, $this->position->parent); self::assertNull($this->position->parent);
self::assertEquals(0, $this->position->department->id); self::assertEquals(0, $this->position->department->id);
self::assertEquals(Status::INACTIVE, $this->position->getStatus()); self::assertEquals(Status::INACTIVE, $this->position->getStatus());
} }

2
tests/Models/UnitTest.php
View File

@ -44,7 +44,7 @@ final class UnitTest extends \PHPUnit\Framework\TestCase
self::assertEquals('', $this->unit->name); self::assertEquals('', $this->unit->name);
self::assertEquals('', $this->unit->description); self::assertEquals('', $this->unit->description);
self::assertEquals('', $this->unit->descriptionRaw); self::assertEquals('', $this->unit->descriptionRaw);
self::assertEquals(null, $this->unit->parent); self::assertNull($this->unit->parent);
self::assertInstanceOf('Modules\Media\Models\NullMedia', $this->unit->image); self::assertInstanceOf('Modules\Media\Models\NullMedia', $this->unit->image);
self::assertEquals(Status::INACTIVE, $this->unit->getStatus()); self::assertEquals(Status::INACTIVE, $this->unit->getStatus());
} }