Jingga/oms-Admin
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Admin.git synced 2026-02-14 11:38:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Organization + calendar fixes/extensions

Browse Source
This commit is contained in:
Dennis Eichhorn 2016-02-14 23:10:58 +01:00
parent e524562f82
commit 22d50dbe6e
4 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Admin/Installer.php
View File

@ -133,8 +133,8 @@ class Installer extends InstallerAbstract
`account_password` varchar(64) NOT NULL, `account_password` varchar(64) NOT NULL,
`account_email` varchar(70) NOT NULL, `account_email` varchar(70) NOT NULL,
`account_tries` tinyint(2) NOT NULL DEFAULT 0, `account_tries` tinyint(2) NOT NULL DEFAULT 0,
`account_lactive` datetime NOT NULL, `account_lactive` datetime DEFAULT NULL,
`account_created` datetime NOT NULL, `account_created_at` datetime NOT NULL,
PRIMARY KEY (`account_id`) PRIMARY KEY (`account_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;' ) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;'
)->execute(); )->execute();

2
Controller.php
View File

@ -17,8 +17,6 @@ namespace Modules\Admin;
use Modules\Admin\Models\AccountMapper; use Modules\Admin\Models\AccountMapper;
use Modules\Admin\Models\GroupMapper; use Modules\Admin\Models\GroupMapper;
use Modules\Navigation\Models\Navigation;
use Modules\Navigation\Views\NavigationView;
use phpOMS\Contract\RenderableInterface; use phpOMS\Contract\RenderableInterface;
use phpOMS\Message\RequestAbstract; use phpOMS\Message\RequestAbstract;
use phpOMS\Message\RequestDestination; use phpOMS\Message\RequestDestination;

6
Models/Account.php
View File

@ -17,10 +17,4 @@ namespace Modules\Admin\Models;
class Account extends \phpOMS\Account\Account class Account extends \phpOMS\Account\Account
{ {
protected $createdAt = null;
public function getCreatedAt() : \DateTime
{
return $this->createdAt ?? new \DateTime('NOW');
}
} }

24
Models/AccountMapper.php
View File

@ -27,19 +27,19 @@ class AccountMapper extends DataMapperAbstract
* @since 1.0.0 * @since 1.0.0
*/ */
protected static $columns = [ protected static $columns = [
'account_id' => ['name' => 'account_id', 'type' => 'int', 'internal' => 'id'], 'account_id' => ['name' => 'account_id', 'type' => 'int', 'internal' => 'id'],
'account_status' => ['name' => 'account_status', 'type' => 'int', 'internal' => 'status'], 'account_status' => ['name' => 'account_status', 'type' => 'int', 'internal' => 'status'],
'account_type' => ['name' => 'account_type', 'type' => 'int', 'internal' => 'type'], 'account_type' => ['name' => 'account_type', 'type' => 'int', 'internal' => 'type'],
'account_login' => ['name' => 'account_login', 'type' => 'string', 'internal' => 'login'], 'account_login' => ['name' => 'account_login', 'type' => 'string', 'internal' => 'login'],
'account_name1' => ['name' => 'account_name1', 'type' => 'string', 'internal' => 'name1'], 'account_name1' => ['name' => 'account_name1', 'type' => 'string', 'internal' => 'name1'],
'account_name2' => ['name' => 'account_name2', 'type' => 'string', 'internal' => 'name2'], 'account_name2' => ['name' => 'account_name2', 'type' => 'string', 'internal' => 'name2'],
'account_name3' => ['name' => 'account_name3', 'type' => 'string', 'internal' => 'name3'], 'account_name3' => ['name' => 'account_name3', 'type' => 'string', 'internal' => 'name3'],
'account_password' => ['name' => 'account_password', 'type' => 'string', 'internal' => 'password'], 'account_password' => ['name' => 'account_password', 'type' => 'string', 'internal' => 'password'],
'account_email' => ['name' => 'account_email', 'type' => 'string', 'internal' => 'email'], 'account_email' => ['name' => 'account_email', 'type' => 'string', 'internal' => 'email'],
'account_tries' => ['name' => 'account_tries', 'type' => 'int', 'internal' => 'tries'], //'account_tries' => ['name' => 'account_tries', 'type' => 'int', 'internal' => 'tries'],
'account_lactive' => ['name' => 'account_lactive', 'type' => 'DateTime', 'account_lactive' => ['name' => 'account_lactive', 'type' => 'DateTime',
'internal' => 'lastActive'], 'internal' => 'lastActive'],
'account_created' => ['name' => 'account_created', 'type' => 'int', 'internal' => 'created'], 'account_created_at' => ['name' => 'account_created_at', 'type' => 'DateTime', 'internal' => 'createdAt'],
]; ];
/** /**
@ -64,5 +64,5 @@ class AccountMapper extends DataMapperAbstract
* @var string * @var string
* @since 1.0.0 * @since 1.0.0
*/ */
protected static $createdAt = 'account_created'; protected static $createdAt = 'account_created_at';
} }