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

Use default database connection

Browse Source
This commit is contained in:
Dennis Eichhorn 2017-09-23 13:58:09 +02:00
parent b04b4ee24a
commit 2ad006e339
3 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
Admin/Installer.php
View File

@ -38,10 +38,10 @@ class Installer extends InstallerAbstract
{ {
parent::install(__DIR__ . '/..', $dbPool, $info); parent::install(__DIR__ . '/..', $dbPool, $info);
switch ($dbPool->get('core')->getType()) { switch ($dbPool->get()->getType()) {
case DatabaseType::MYSQL: case DatabaseType::MYSQL:
$dbPool->get('core')->con->prepare( $dbPool->get()->con->prepare(
'CREATE TABLE if NOT EXISTS `' . $dbPool->get('core')->prefix . 'hr_staff` ( 'CREATE TABLE if NOT EXISTS `' . $dbPool->get()->prefix . 'hr_staff` (
`hr_staff_id` int(11) NOT NULL AUTO_INCREMENT, `hr_staff_id` int(11) NOT NULL AUTO_INCREMENT,
`hr_staff_account` int(11) DEFAULT NULL, `hr_staff_account` int(11) DEFAULT NULL,
PRIMARY KEY (`hr_staff_id`), PRIMARY KEY (`hr_staff_id`),
@ -49,13 +49,13 @@ class Installer extends InstallerAbstract
)ENGINE=InnoDB DEFAULT CHARSET=utf8;' )ENGINE=InnoDB DEFAULT CHARSET=utf8;'
)->execute(); )->execute();
$dbPool->get('core')->con->prepare( $dbPool->get()->con->prepare(
'ALTER TABLE `' . $dbPool->get('core')->prefix . 'hr_staff` 'ALTER TABLE `' . $dbPool->get()->prefix . 'hr_staff`
ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'hr_staff_ibfk_1` FOREIGN KEY (`hr_staff_account`) REFERENCES `' . $dbPool->get('core')->prefix . 'account` (`account_id`);' ADD CONSTRAINT `' . $dbPool->get()->prefix . 'hr_staff_ibfk_1` FOREIGN KEY (`hr_staff_account`) REFERENCES `' . $dbPool->get()->prefix . 'account` (`account_id`);'
)->execute(); )->execute();
$dbPool->get('core')->con->prepare( $dbPool->get()->con->prepare(
'CREATE TABLE if NOT EXISTS `' . $dbPool->get('core')->prefix . 'hr_staff_history` ( 'CREATE TABLE if NOT EXISTS `' . $dbPool->get()->prefix . 'hr_staff_history` (
`hr_staff_history_id` int(11) NOT NULL AUTO_INCREMENT, `hr_staff_history_id` int(11) NOT NULL AUTO_INCREMENT,
`hr_staff_history_staff` int(11) DEFAULT NULL, `hr_staff_history_staff` int(11) DEFAULT NULL,
`hr_staff_history_position` int(11) DEFAULT NULL, `hr_staff_history_position` int(11) DEFAULT NULL,
@ -69,15 +69,15 @@ class Installer extends InstallerAbstract
)ENGINE=InnoDB DEFAULT CHARSET=utf8;' )ENGINE=InnoDB DEFAULT CHARSET=utf8;'
)->execute(); )->execute();
$dbPool->get('core')->con->prepare( $dbPool->get()->con->prepare(
'ALTER TABLE `' . $dbPool->get('core')->prefix . 'hr_staff_history` 'ALTER TABLE `' . $dbPool->get()->prefix . 'hr_staff_history`
ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'hr_staff_history_ibfk_1` FOREIGN KEY (`hr_staff_history_staff`) REFERENCES `' . $dbPool->get('core')->prefix . 'hr_staff` (`hr_staff_id`), ADD CONSTRAINT `' . $dbPool->get()->prefix . 'hr_staff_history_ibfk_1` FOREIGN KEY (`hr_staff_history_staff`) REFERENCES `' . $dbPool->get()->prefix . 'hr_staff` (`hr_staff_id`),
ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'hr_staff_history_ibfk_2` FOREIGN KEY (`hr_staff_history_department`) REFERENCES `' . $dbPool->get('core')->prefix . 'organization_department` (`organization_department_id`), ADD CONSTRAINT `' . $dbPool->get()->prefix . 'hr_staff_history_ibfk_2` FOREIGN KEY (`hr_staff_history_department`) REFERENCES `' . $dbPool->get()->prefix . 'organization_department` (`organization_department_id`),
ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'hr_staff_history_ibfk_3` FOREIGN KEY (`hr_staff_history_position`) REFERENCES `' . $dbPool->get('core')->prefix . 'organization_position` (`organization_position_id`);' ADD CONSTRAINT `' . $dbPool->get()->prefix . 'hr_staff_history_ibfk_3` FOREIGN KEY (`hr_staff_history_position`) REFERENCES `' . $dbPool->get()->prefix . 'organization_position` (`organization_position_id`);'
)->execute(); )->execute();
$dbPool->get('core')->con->prepare( $dbPool->get()->con->prepare(
'CREATE TABLE if NOT EXISTS `' . $dbPool->get('core')->prefix . 'hr_staff_contract` ( 'CREATE TABLE if NOT EXISTS `' . $dbPool->get()->prefix . 'hr_staff_contract` (
`hr_staff_contract_id` int(11) NOT NULL AUTO_INCREMENT, `hr_staff_contract_id` int(11) NOT NULL AUTO_INCREMENT,
`hr_staff_contract_stype` tinyint(1) DEFAULT NULL, `hr_staff_contract_stype` tinyint(1) DEFAULT NULL,
`hr_staff_contract_salary` decimal(8,2) DEFAULT NULL, `hr_staff_contract_salary` decimal(8,2) DEFAULT NULL,
@ -94,13 +94,13 @@ class Installer extends InstallerAbstract
)ENGINE=InnoDB DEFAULT CHARSET=utf8;' )ENGINE=InnoDB DEFAULT CHARSET=utf8;'
)->execute(); )->execute();
$dbPool->get('core')->con->prepare( $dbPool->get()->con->prepare(
'ALTER TABLE `' . $dbPool->get('core')->prefix . 'hr_staff_contract` 'ALTER TABLE `' . $dbPool->get()->prefix . 'hr_staff_contract`
ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'hr_staff_contract_ibfk_1` FOREIGN KEY (`hr_staff_contract_employee`) REFERENCES `' . $dbPool->get('core')->prefix . 'hr_staff` (`hr_staff_id`);' ADD CONSTRAINT `' . $dbPool->get()->prefix . 'hr_staff_contract_ibfk_1` FOREIGN KEY (`hr_staff_contract_employee`) REFERENCES `' . $dbPool->get()->prefix . 'hr_staff` (`hr_staff_id`);'
)->execute(); )->execute();
$dbPool->get('core')->con->prepare( $dbPool->get()->con->prepare(
'CREATE TABLE if NOT EXISTS `' . $dbPool->get('core')->prefix . 'hr_planning_shift` ( 'CREATE TABLE if NOT EXISTS `' . $dbPool->get()->prefix . 'hr_planning_shift` (
`HRPlanningShiftID` int(11) NOT NULL AUTO_INCREMENT, `HRPlanningShiftID` int(11) NOT NULL AUTO_INCREMENT,
`amount` int(11) DEFAULT NULL, `amount` int(11) DEFAULT NULL,
`position` int(11) DEFAULT NULL, `position` int(11) DEFAULT NULL,
@ -113,13 +113,13 @@ class Installer extends InstallerAbstract
)->execute(); )->execute();
/* /*
$dbPool->get('core')->con->prepare( $dbPool->get()->con->prepare(
'ALTER TABLE `' . $dbPool->get('core')->prefix . 'hr_planning_shift` 'ALTER TABLE `' . $dbPool->get()->prefix . 'hr_planning_shift`
ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'hr_planning_shift_ibfk_1` FOREIGN KEY (`department`) REFERENCES `' . $dbPool->get('core')->prefix . 'organization_department` (`organization_department_id`);' ADD CONSTRAINT `' . $dbPool->get()->prefix . 'hr_planning_shift_ibfk_1` FOREIGN KEY (`department`) REFERENCES `' . $dbPool->get()->prefix . 'organization_department` (`organization_department_id`);'
)->execute();*/ )->execute();*/
$dbPool->get('core')->con->prepare( $dbPool->get()->con->prepare(
'CREATE TABLE if NOT EXISTS `' . $dbPool->get('core')->prefix . 'hr_planning_staff` ( 'CREATE TABLE if NOT EXISTS `' . $dbPool->get()->prefix . 'hr_planning_staff` (
`HRPlanningStaffID` int(11) NOT NULL AUTO_INCREMENT, `HRPlanningStaffID` int(11) NOT NULL AUTO_INCREMENT,
`person` int(11) DEFAULT NULL, `person` int(11) DEFAULT NULL,
`start` datetime DEFAULT NULL, `start` datetime DEFAULT NULL,
@ -140,9 +140,9 @@ class Installer extends InstallerAbstract
)ENGINE=InnoDB DEFAULT CHARSET=utf8;' )ENGINE=InnoDB DEFAULT CHARSET=utf8;'
)->execute(); )->execute();
$dbPool->get('core')->con->prepare( $dbPool->get()->con->prepare(
'ALTER TABLE `' . $dbPool->get('core')->prefix . 'hr_planning_staff` 'ALTER TABLE `' . $dbPool->get()->prefix . 'hr_planning_staff`
ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'hr_planning_staff_ibfk_1` FOREIGN KEY (`person`) REFERENCES `' . $dbPool->get('core')->prefix . 'account` (`account_id`);' ADD CONSTRAINT `' . $dbPool->get()->prefix . 'hr_planning_staff_ibfk_1` FOREIGN KEY (`person`) REFERENCES `' . $dbPool->get()->prefix . 'account` (`account_id`);'
)->execute(); )->execute();
break; break;
} }

2
Admin/Uninstall.php
View File

@ -39,7 +39,7 @@ class Uninstall extends UninstallAbstract
$query = new Builder($dbPool->get()); $query = new Builder($dbPool->get());
$query->prefix($dbPool->get('core')->getPrefix())->drop( $query->prefix($dbPool->get()->getPrefix())->drop(
'hr_planning_staff', 'hr_planning_staff',
'hr_planning_shift', 'hr_planning_shift',
'hr_staff_contract', 'hr_staff_contract',

12
Models/StaffList.php
View File

@ -65,20 +65,20 @@ class StaffList
{ {
$result = null; $result = null;
switch ($this->dbPool->get('core')->getType()) { switch ($this->dbPool->get()->getType()) {
case DatabaseType::MYSQL: case DatabaseType::MYSQL:
$search = $this->dbPool->get('core')->generate_sql_filter($filter, true); $search = $this->dbPool->get()->generate_sql_filter($filter, true);
$sth = $this->dbPool->get('core')->con->prepare('SELECT $sth = $this->dbPool->get()->con->prepare('SELECT
`' . $this->dbPool->get('core')->prefix . 'hr_staff`.* `' . $this->dbPool->get()->prefix . 'hr_staff`.*
FROM FROM
`' . $this->dbPool->get('core')->prefix . 'hr_staff` ' `' . $this->dbPool->get()->prefix . 'hr_staff` '
. $search . 'LIMIT ' . $offset . ',' . $limit); . $search . 'LIMIT ' . $offset . ',' . $limit);
$sth->execute(); $sth->execute();
$result['list'] = $sth->fetchAll(); $result['list'] = $sth->fetchAll();
$sth = $this->dbPool->get('core')->con->prepare('SELECT FOUND_ROWS();'); $sth = $this->dbPool->get()->con->prepare('SELECT FOUND_ROWS();');
$sth->execute(); $sth->execute();
$result['count'] = $sth->fetchAll()[0][0]; $result['count'] = $sth->fetchAll()[0][0];