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

Core adjustments for pending issues

Browse Source
This commit is contained in:
Dennis Eichhorn 2016-10-02 12:07:05 +02:00
parent a34021a4da
commit 379afce9d3
1 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
Models/ProjectMapper.php
View File

@ -16,7 +16,6 @@
namespace Modules\ProjectManagement\Models; namespace Modules\ProjectManagement\Models;
use Modules\Calendar\Models\CalendarMapper; use Modules\Calendar\Models\CalendarMapper;
use Modules\Tasks\Models\TaskMapper;
use phpOMS\DataStorage\Database\DataMapperAbstract; use phpOMS\DataStorage\Database\DataMapperAbstract;
use phpOMS\DataStorage\Database\Query\Builder; use phpOMS\DataStorage\Database\Query\Builder;
use phpOMS\DataStorage\Database\Query\Column; use phpOMS\DataStorage\Database\Query\Column;
@ -44,14 +43,14 @@ class ProjectMapper extends DataMapperAbstract
*/ */
protected static $columns = [ protected static $columns = [
'projectmanagement_project_id' => ['name' => 'projectmanagement_project_id', 'type' => 'int', 'internal' => 'id'], 'projectmanagement_project_id' => ['name' => 'projectmanagement_project_id', 'type' => 'int', 'internal' => 'id'],
'projectmanagement_project_name' => ['name' => 'projectmanagement_project_name', 'type' => 'string', 'internal' => 'name'], 'projectmanagement_project_name' => ['name' => 'projectmanagement_project_name', 'type' => 'string', 'internal' => 'name'],
'projectmanagement_project_description' => ['name' => 'projectmanagement_project_description', 'type' => 'string', 'internal' => 'description'], 'projectmanagement_project_description' => ['name' => 'projectmanagement_project_description', 'type' => 'string', 'internal' => 'description'],
'projectmanagement_project_calendar' => ['name' => 'projectmanagement_project_calendar', 'type' => 'int', 'internal' => 'calendar'], 'projectmanagement_project_calendar' => ['name' => 'projectmanagement_project_calendar', 'type' => 'int', 'internal' => 'calendar'],
'projectmanagement_project_costs' => ['name' => 'projectmanagement_project_costs', 'type' => 'Serializable', 'internal' => 'costs'], 'projectmanagement_project_costs' => ['name' => 'projectmanagement_project_costs', 'type' => 'Serializable', 'internal' => 'costs'],
'projectmanagement_project_budget' => ['name' => 'projectmanagement_project_budget', 'type' => 'Serializable', 'internal' => 'budget'], 'projectmanagement_project_budget' => ['name' => 'projectmanagement_project_budget', 'type' => 'Serializable', 'internal' => 'budget'],
'projectmanagement_project_earnings' => ['name' => 'projectmanagement_project_earnings', 'type' => 'Serializable', 'internal' => 'earnings'], 'projectmanagement_project_earnings' => ['name' => 'projectmanagement_project_earnings', 'type' => 'Serializable', 'internal' => 'earnings'],
'projectmanagement_project_start' => ['name' => 'projectmanagement_project_start', 'type' => 'DateTime', 'internal' => 'start'], 'projectmanagement_project_start' => ['name' => 'projectmanagement_project_start', 'type' => 'DateTime', 'internal' => 'start'],
'projectmanagement_project_end' => ['name' => 'projectmanagement_project_end', 'type' => 'DateTime', 'internal' => 'end'], 'projectmanagement_project_end' => ['name' => 'projectmanagement_project_end', 'type' => 'DateTime', 'internal' => 'end'],
]; ];
/** /**
@ -60,7 +59,7 @@ class ProjectMapper extends DataMapperAbstract
* @var array<string, array> * @var array<string, array>
* @since 1.0.0 * @since 1.0.0
*/ */
protected static $hasOne = [ protected static $ownsOne = [
'calendar' => [ 'calendar' => [
'mapper' => CalendarMapper::class, 'mapper' => CalendarMapper::class,
'src' => 'projectmanagement_project_calendar', 'src' => 'projectmanagement_project_calendar',
@ -109,20 +108,20 @@ class ProjectMapper extends DataMapperAbstract
$objId = parent::create($obj, $relations); $objId = parent::create($obj, $relations);
$query = new Builder(self::$db); $query = new Builder(self::$db);
$query->prefix(self::$db->getPrefix()) $query->prefix(self::$db->getPrefix())
->insert( ->insert(
'account_permission_account', 'account_permission_account',
'account_permission_from', 'account_permission_from',
'account_permission_for', 'account_permission_for',
'account_permission_id1', 'account_permission_id1',
'account_permission_id2', 'account_permission_id2',
'account_permission_r', 'account_permission_r',
'account_permission_w', 'account_permission_w',
'account_permission_m', 'account_permission_m',
'account_permission_d', 'account_permission_d',
'account_permission_p' 'account_permission_p'
) )
->into('account_permission') ->into('account_permission')
->values($obj->getCreatedBy(), 'calendar_project', 'calendar_project', 1, $objId, 1, 1, 1, 1, 1); ->values($obj->getCreatedBy(), 'calendar_project', 'calendar_project', 1, $objId, 1, 1, 1, 1, 1);
self::$db->con->prepare($query->toSql())->execute(); self::$db->con->prepare($query->toSql())->execute();
} catch (\Exception $e) { } catch (\Exception $e) {
@ -147,9 +146,9 @@ class ProjectMapper extends DataMapperAbstract
public static function find(...$columns) : Builder public static function find(...$columns) : Builder
{ {
return parent::find(...$columns)->from('account_permission') return parent::find(...$columns)->from('account_permission')
->where('account_permission.account_permission_for', '=', 'calendar_project') ->where('account_permission.account_permission_for', '=', 'calendar_project')
->where('account_permission.account_permission_id1', '=', 1) ->where('account_permission.account_permission_id1', '=', 1)
->where('calendar_project.calendar_project_id', '=', new Column('account_permission.account_permission_id2')) ->where('calendar_project.calendar_project_id', '=', new Column('account_permission.account_permission_id2'))
->where('account_permission.account_permission_r', '=', 1); ->where('account_permission.account_permission_r', '=', 1);
} }
} }