galads/icehrm
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Update readme and fix code style issues

Browse Source
This commit is contained in:
Thilina Hasantha
2020-05-25 07:39:54 +02:00
parent d0be9c988b
commit 016fbe0f3b
4 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/Classes/DomainAwareInputCleaner.php
View File

@@ -3,7 +3,6 @@
namespace Classes; namespace Classes;
class DomainAwareInputCleaner class DomainAwareInputCleaner
{ {
public function cleanTableColumn($input) public function cleanTableColumn($input)
@@ -72,7 +71,8 @@ class DomainAwareInputCleaner
return $filters; return $filters;
} }
public function cleanSearch($searchTerm) { public function cleanSearch($searchTerm)
{
if (!$this->isValidFilterValue($searchTerm)) { if (!$this->isValidFilterValue($searchTerm)) {
return ''; return '';
} }

2
core/src/Reports/Admin/Reports/PayrollDataExport.php
View File

@@ -66,7 +66,7 @@ class PayrollDataExport extends ReportBuilder implements ReportBuilderInterface
'editable' => $col->editable, 'editable' => $col->editable,
'enabled' => $col->enabled, 'enabled' => $col->enabled,
'default_value' => $col->default_value, 'default_value' => $col->default_value,
'calculation_columns' => $col->calculation_columns, //[{"name":"O","column":"107","id":"calculation_columns_1"}] 'calculation_columns' => $col->calculation_columns,
'calculation_function' => $col->calculation_function, 'calculation_function' => $col->calculation_function,
]; ];

2
core/src/Utils/LogManager.php
View File

@@ -25,7 +25,7 @@ class LogManager
if (defined('LOG_STDERR') && LOG_STDERR === '1') { if (defined('LOG_STDERR') && LOG_STDERR === '1') {
self::$me->log->pushHandler(new StreamHandler('php://stderr', LOG_LEVEL)); self::$me->log->pushHandler(new StreamHandler('php://stderr', LOG_LEVEL));
} else if (is_writable(ini_get('error_log'))) { } elseif (is_writable(ini_get('error_log'))) {
self::$me->log->pushHandler(new StreamHandler(ini_get('error_log'), LOG_LEVEL)); self::$me->log->pushHandler(new StreamHandler(ini_get('error_log'), LOG_LEVEL));
} elseif (is_writable(CLIENT_BASE_PATH.'data/app.log')) { } elseif (is_writable(CLIENT_BASE_PATH.'data/app.log')) {
self::$me->log->pushHandler(new StreamHandler(CLIENT_BASE_PATH.'data/app.log', LOG_LEVEL)); self::$me->log->pushHandler(new StreamHandler(CLIENT_BASE_PATH.'data/app.log', LOG_LEVEL));

9
readme.md
View File

@@ -103,12 +103,7 @@ $ git clone https://github.com/gamonoid/icehrm.git
$ cd icehrm $ cd icehrm
$ docker-compose up $ docker-compose up
``` ```
- Navigate to [http://localhost:8080](http://localhost:8080) to load icehrm. (user:admin/pass:admin)
- Load icehrm Development preview
```
http://localhost:8080
```
- Make some changes and the changes will be reflected on the above url - Make some changes and the changes will be reflected on the above url
@@ -123,8 +118,6 @@ docker-compose -f docker-compose-testing.yaml up --exit-code-from cypress
$ docker-compose -f docker-compose-prod.yaml up -d --build $ docker-compose -f docker-compose-prod.yaml up -d --build
``` ```
- Navigate to [http://clients.icehrm-open.test/dev](http://clients.icehrm-open.test/dev) to load icehrm from VM. (user:admin/pass:admin)
### Building frontend assets ### Building frontend assets
- When ever you have done a change to JavaScript or CSS files in icehrm/web you need to rebuild the frontend - When ever you have done a change to JavaScript or CSS files in icehrm/web you need to rebuild the frontend