+ *
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program. If not, see
+ *
+ */
+namespace OCA\TimeTracker\AppFramework\Db;
+
+use OCP\AppFramework\Db\DoesNotExistException;
+use OCP\AppFramework\Db\Entity;
+use OCP\AppFramework\Db\MultipleObjectsReturnedException;
+use OCP\IDBConnection;
+
+/**
+ * Simple parent class for inheriting your data access layer from. This class
+ * may be subject to change in the future
+ * @since 7.0.0
+ * @deprecated 14.0.0 Move over to QBMapper
+ */
+abstract class OldNextcloudMapper {
+ protected $tableName;
+ protected $entityClass;
+ protected $db;
+
+ /**
+ * @param IDBConnection $db Instance of the Db abstraction layer
+ * @param string $tableName the name of the table. set this to allow entity
+ * @param string $entityClass the name of the entity that the sql should be
+ * mapped to queries without using sql
+ * @since 7.0.0
+ * @deprecated 14.0.0 Move over to QBMapper
+ */
+ public function __construct(IDBConnection $db, $tableName, $entityClass = null) {
+ $this->db = $db;
+ $this->tableName = '*PREFIX*' . $tableName;
+
+ // if not given set the entity name to the class without the mapper part
+ // cache it here for later use since reflection is slow
+ if ($entityClass === null) {
+ $this->entityClass = str_replace('Mapper', '', get_class($this));
+ } else {
+ $this->entityClass = $entityClass;
+ }
+ }
+
+
+ /**
+ * @return string the table name
+ * @since 7.0.0
+ * @deprecated 14.0.0 Move over to QBMapper
+ */
+ public function getTableName() {
+ return $this->tableName;
+ }
+
+
+ /**
+ * Deletes an entity from the table
+ * @param Entity $entity the entity that should be deleted
+ * @return Entity the deleted entity
+ * @since 7.0.0 - return value added in 8.1.0
+ * @deprecated 14.0.0 Move over to QBMapper
+ */
+ public function delete(Entity $entity) {
+ $sql = 'DELETE FROM `' . $this->tableName . '` WHERE `id` = ?';
+ $stmt = $this->execute($sql, [$entity->getId()]);
+ $stmt->closeCursor();
+ return $entity;
+ }
+
+
+ /**
+ * Creates a new entry in the db from an entity
+ * @param Entity $entity the entity that should be created
+ * @return Entity the saved entity with the set id
+ * @since 7.0.0
+ * @deprecated 14.0.0 Move over to QBMapper
+ */
+ public function insert(Entity $entity) {
+ // get updated fields to save, fields have to be set using a setter to
+ // be saved
+ $properties = $entity->getUpdatedFields();
+ $values = '';
+ $columns = '';
+ $params = [];
+
+ // build the fields
+ $i = 0;
+ foreach ($properties as $property => $updated) {
+ $column = $entity->propertyToColumn($property);
+ $getter = 'get' . ucfirst($property);
+
+ $columns .= '`' . $column . '`';
+ $values .= '?';
+
+ // only append colon if there are more entries
+ if ($i < count($properties) - 1) {
+ $columns .= ',';
+ $values .= ',';
+ }
+
+ $params[] = $entity->$getter();
+ $i++;
+ }
+
+ $sql = 'INSERT INTO `' . $this->tableName . '`(' .
+ $columns . ') VALUES(' . $values . ')';
+
+ $stmt = $this->execute($sql, $params);
+
+ $entity->setId((int) $this->db->lastInsertId($this->tableName));
+
+ $stmt->closeCursor();
+
+ return $entity;
+ }
+
+
+
+ /**
+ * Updates an entry in the db from an entity
+ * @throws \InvalidArgumentException if entity has no id
+ * @param Entity $entity the entity that should be created
+ * @return Entity the saved entity with the set id
+ * @since 7.0.0 - return value was added in 8.0.0
+ * @deprecated 14.0.0 Move over to QBMapper
+ */
+ public function update(Entity $entity) {
+ // if entity wasn't changed it makes no sense to run a db query
+ $properties = $entity->getUpdatedFields();
+ if (count($properties) === 0) {
+ return $entity;
+ }
+
+ // entity needs an id
+ $id = $entity->getId();
+ if ($id === null) {
+ throw new \InvalidArgumentException(
+ 'Entity which should be updated has no id');
+ }
+
+ // get updated fields to save, fields have to be set using a setter to
+ // be saved
+ // do not update the id field
+ unset($properties['id']);
+
+ $columns = '';
+ $params = [];
+
+ // build the fields
+ $i = 0;
+ foreach ($properties as $property => $updated) {
+ $column = $entity->propertyToColumn($property);
+ $getter = 'get' . ucfirst($property);
+
+ $columns .= '`' . $column . '` = ?';
+
+ // only append colon if there are more entries
+ if ($i < count($properties) - 1) {
+ $columns .= ',';
+ }
+
+ $params[] = $entity->$getter();
+ $i++;
+ }
+
+ $sql = 'UPDATE `' . $this->tableName . '` SET ' .
+ $columns . ' WHERE `id` = ?';
+ $params[] = $id;
+
+ $stmt = $this->execute($sql, $params);
+ $stmt->closeCursor();
+
+ return $entity;
+ }
+
+ /**
+ * Checks if an array is associative
+ * @param array $array
+ * @return bool true if associative
+ * @since 8.1.0
+ * @deprecated 14.0.0 Move over to QBMapper
+ */
+ private function isAssocArray(array $array) {
+ return array_values($array) !== $array;
+ }
+
+ /**
+ * Returns the correct PDO constant based on the value type
+ * @param $value
+ * @return int PDO constant
+ * @since 8.1.0
+ * @deprecated 14.0.0 Move over to QBMapper
+ */
+ private function getPDOType($value) {
+ switch (gettype($value)) {
+ case 'integer':
+ return \PDO::PARAM_INT;
+ case 'boolean':
+ return \PDO::PARAM_BOOL;
+ default:
+ return \PDO::PARAM_STR;
+ }
+ }
+
+
+ /**
+ * Runs an sql query
+ * @param string $sql the prepare string
+ * @param array $params the params which should replace the ? in the sql query
+ * @param int $limit the maximum number of rows
+ * @param int $offset from which row we want to start
+ * @return \PDOStatement the database query result
+ * @since 7.0.0
+ * @deprecated 14.0.0 Move over to QBMapper
+ */
+ protected function execute($sql, array $params = [], $limit = null, $offset = null) {
+ $query = $this->db->prepare($sql, $limit, $offset);
+
+ if ($this->isAssocArray($params)) {
+ foreach ($params as $key => $param) {
+ $pdoConstant = $this->getPDOType($param);
+ $query->bindValue($key, $param, $pdoConstant);
+ }
+ } else {
+ $index = 1; // bindParam is 1 indexed
+ foreach ($params as $param) {
+ $pdoConstant = $this->getPDOType($param);
+ $query->bindValue($index, $param, $pdoConstant);
+ $index++;
+ }
+ }
+
+ $query->execute();
+
+ return $query;
+ }
+
+ /**
+ * Returns an db result and throws exceptions when there are more or less
+ * results
+ * @see findEntity
+ * @param string $sql the sql query
+ * @param array $params the parameters of the sql query
+ * @param int $limit the maximum number of rows
+ * @param int $offset from which row we want to start
+ * @throws DoesNotExistException if the item does not exist
+ * @throws MultipleObjectsReturnedException if more than one item exist
+ * @return array the result as row
+ * @since 7.0.0
+ * @deprecated 14.0.0 Move over to QBMapper
+ */
+ protected function findOneQuery($sql, array $params = [], $limit = null, $offset = null) {
+ $stmt = $this->execute($sql, $params, $limit, $offset);
+ $row = $stmt->fetch();
+
+ if ($row === false || $row === null) {
+ $stmt->closeCursor();
+ $msg = $this->buildDebugMessage(
+ 'Did expect one result but found none when executing', $sql, $params, $limit, $offset
+ );
+ throw new DoesNotExistException($msg);
+ }
+ $row2 = $stmt->fetch();
+ $stmt->closeCursor();
+ //MDB2 returns null, PDO and doctrine false when no row is available
+ if (! ($row2 === false || $row2 === null)) {
+ $msg = $this->buildDebugMessage(
+ 'Did not expect more than one result when executing', $sql, $params, $limit, $offset
+ );
+ throw new MultipleObjectsReturnedException($msg);
+ } else {
+ return $row;
+ }
+ }
+
+ /**
+ * Builds an error message by prepending the $msg to an error message which
+ * has the parameters
+ * @see findEntity
+ * @param string $sql the sql query
+ * @param array $params the parameters of the sql query
+ * @param int $limit the maximum number of rows
+ * @param int $offset from which row we want to start
+ * @return string formatted error message string
+ * @since 9.1.0
+ * @deprecated 14.0.0 Move over to QBMapper
+ */
+ private function buildDebugMessage($msg, $sql, array $params = [], $limit = null, $offset = null) {
+ return $msg .
+ ': query "' . $sql . '"; ' .
+ 'parameters ' . print_r($params, true) . '; ' .
+ 'limit "' . $limit . '"; '.
+ 'offset "' . $offset . '"';
+ }
+
+
+ /**
+ * Creates an entity from a row. Automatically determines the entity class
+ * from the current mapper name (MyEntityMapper -> MyEntity)
+ * @param array $row the row which should be converted to an entity
+ * @return Entity the entity
+ * @since 7.0.0
+ * @deprecated 14.0.0 Move over to QBMapper
+ */
+ protected function mapRowToEntity($row) {
+ return call_user_func($this->entityClass .'::fromRow', $row);
+ }
+
+
+ /**
+ * Runs a sql query and returns an array of entities
+ * @param string $sql the prepare string
+ * @param array $params the params which should replace the ? in the sql query
+ * @param int $limit the maximum number of rows
+ * @param int $offset from which row we want to start
+ * @return array all fetched entities
+ * @since 7.0.0
+ * @deprecated 14.0.0 Move over to QBMapper
+ */
+ protected function findEntities($sql, array $params = [], $limit = null, $offset = null) {
+ $stmt = $this->execute($sql, $params, $limit, $offset);
+
+ $entities = [];
+
+ while ($row = $stmt->fetch()) {
+ $entities[] = $this->mapRowToEntity($row);
+ }
+
+ $stmt->closeCursor();
+
+ return $entities;
+ }
+
+
+ /**
+ * Returns an db result and throws exceptions when there are more or less
+ * results
+ * @param string $sql the sql query
+ * @param array $params the parameters of the sql query
+ * @param int $limit the maximum number of rows
+ * @param int $offset from which row we want to start
+ * @throws DoesNotExistException if the item does not exist
+ * @throws MultipleObjectsReturnedException if more than one item exist
+ * @return Entity the entity
+ * @since 7.0.0
+ * @deprecated 14.0.0 Move over to QBMapper
+ */
+ protected function findEntity($sql, array $params = [], $limit = null, $offset = null) {
+ return $this->mapRowToEntity($this->findOneQuery($sql, $params, $limit, $offset));
+ }
+}
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index b91ee9e..de801d7 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -25,6 +25,15 @@ class Application extends App {
*/
public function __construct(array $urlParams=array()){
parent::__construct('timetracker', $urlParams);
+
+ if (!\class_exists('\OCA\TimeTracker\AppFramework\Db\CompatibleMapper')) {
+ if (\class_exists(\OCP\AppFramework\Db\Mapper::class)) {
+ \class_alias(\OCP\AppFramework\Db\Mapper::class, 'OCA\TimeTracker\AppFramework\Db\CompatibleMapper');
+ } else {
+ \class_alias(\OCA\TimeTracker\AppFramework\Db\OldNextcloudMapper::class, 'OCA\TimeTracker\AppFramework\Db\CompatibleMapper');
+ }
+ }
+
$container = $this->getContainer();
/**
* Controllers
@@ -44,4 +53,4 @@ public function __construct(array $urlParams=array()){
});
}
-}
\ No newline at end of file
+}
diff --git a/lib/Db/ClientMapper.php b/lib/Db/ClientMapper.php
index 550c5cf..1cee7ba 100644
--- a/lib/Db/ClientMapper.php
+++ b/lib/Db/ClientMapper.php
@@ -4,9 +4,10 @@
namespace OCA\TimeTracker\Db;
use OCP\IDBConnection;
-use OCP\AppFramework\Db\Mapper;
-class ClientMapper extends Mapper {
+use OCA\TimeTracker\AppFramework\Db\CompatibleMapper;
+
+class ClientMapper extends CompatibleMapper {
public function __construct(IDBConnection $db) {
parent::__construct($db, 'timetracker_client');
diff --git a/lib/Db/GoalMapper.php b/lib/Db/GoalMapper.php
index 50004d3..a3ccf76 100644
--- a/lib/Db/GoalMapper.php
+++ b/lib/Db/GoalMapper.php
@@ -4,9 +4,10 @@
namespace OCA\TimeTracker\Db;
use OCP\IDBConnection;
-use OCP\AppFramework\Db\Mapper;
-class GoalMapper extends Mapper {
+use OCA\TimeTracker\AppFramework\Db\CompatibleMapper;
+
+class GoalMapper extends CompatibleMapper {
public function __construct(IDBConnection $db) {
parent::__construct($db, 'timetracker_goal');
@@ -43,4 +44,4 @@ public function findAll($user){
}
-}
\ No newline at end of file
+}
diff --git a/lib/Db/ProjectMapper.php b/lib/Db/ProjectMapper.php
index f6db52e..8c23921 100644
--- a/lib/Db/ProjectMapper.php
+++ b/lib/Db/ProjectMapper.php
@@ -4,9 +4,10 @@
namespace OCA\TimeTracker\Db;
use OCP\IDBConnection;
-use OCP\AppFramework\Db\Mapper;
-class ProjectMapper extends Mapper {
+use OCA\TimeTracker\AppFramework\Db\CompatibleMapper;
+
+class ProjectMapper extends CompatibleMapper {
public function __construct(IDBConnection $db) {
parent::__construct($db, 'timetracker_project');
diff --git a/lib/Db/ReportItemMapper.php b/lib/Db/ReportItemMapper.php
index 2ee180b..6728175 100644
--- a/lib/Db/ReportItemMapper.php
+++ b/lib/Db/ReportItemMapper.php
@@ -4,9 +4,10 @@
namespace OCA\TimeTracker\Db;
use OCP\IDBConnection;
-use OCP\AppFramework\Db\Mapper;
-class ReportItemMapper extends Mapper {
+use OCA\TimeTracker\AppFramework\Db\CompatibleMapper;
+
+class ReportItemMapper extends CompatibleMapper {
private $dbengine;
diff --git a/lib/Db/TagMapper.php b/lib/Db/TagMapper.php
index ce29fbd..187252f 100644
--- a/lib/Db/TagMapper.php
+++ b/lib/Db/TagMapper.php
@@ -4,9 +4,10 @@
namespace OCA\TimeTracker\Db;
use OCP\IDBConnection;
-use OCP\AppFramework\Db\Mapper;
-class TagMapper extends Mapper {
+use OCA\TimeTracker\AppFramework\Db\CompatibleMapper;
+
+class TagMapper extends CompatibleMapper {
public function __construct(IDBConnection $db) {
$this->dbengine = 'MYSQL';
diff --git a/lib/Db/TimelineEntryMapper.php b/lib/Db/TimelineEntryMapper.php
index 0c66a31..c0216c4 100644
--- a/lib/Db/TimelineEntryMapper.php
+++ b/lib/Db/TimelineEntryMapper.php
@@ -4,9 +4,10 @@
namespace OCA\TimeTracker\Db;
use OCP\IDBConnection;
-use OCP\AppFramework\Db\Mapper;
-class TimelineEntryMapper extends Mapper {
+use OCA\TimeTracker\AppFramework\Db\CompatibleMapper;
+
+class TimelineEntryMapper extends CompatibleMapper {
public function __construct(IDBConnection $db) {
parent::__construct($db, 'timetracker_timeline_entry');
@@ -31,4 +32,4 @@ public function findTimelineEntries($tid) {
return $this->findEntities($sql, [$tid]);
}
-}
\ No newline at end of file
+}
diff --git a/lib/Db/TimelineMapper.php b/lib/Db/TimelineMapper.php
index 3cbea06..4f434fb 100644
--- a/lib/Db/TimelineMapper.php
+++ b/lib/Db/TimelineMapper.php
@@ -4,9 +4,10 @@
namespace OCA\TimeTracker\Db;
use OCP\IDBConnection;
-use OCP\AppFramework\Db\Mapper;
-class TimelineMapper extends Mapper {
+use OCA\TimeTracker\AppFramework\Db\CompatibleMapper;
+
+class TimelineMapper extends CompatibleMapper {
public function __construct(IDBConnection $db) {
parent::__construct($db, 'timetracker_timeline');
@@ -63,4 +64,4 @@ public function findByStatus($status) {
}
}
-}
\ No newline at end of file
+}
diff --git a/lib/Db/UserToClientMapper.php b/lib/Db/UserToClientMapper.php
index 7884697..816598f 100644
--- a/lib/Db/UserToClientMapper.php
+++ b/lib/Db/UserToClientMapper.php
@@ -4,9 +4,10 @@
namespace OCA\TimeTracker\Db;
use OCP\IDBConnection;
-use OCP\AppFramework\Db\Mapper;
-class UserToClientMapper extends Mapper {
+use OCA\TimeTracker\AppFramework\Db\CompatibleMapper;
+
+class UserToClientMapper extends CompatibleMapper {
public function __construct(IDBConnection $db) {
parent::__construct($db, 'timetracker_user_to_client');
@@ -54,4 +55,4 @@ public function findForUserAndClient($uid, $client) {
-}
\ No newline at end of file
+}
diff --git a/lib/Db/UserToProjectMapper.php b/lib/Db/UserToProjectMapper.php
index f88eb2e..6337603 100644
--- a/lib/Db/UserToProjectMapper.php
+++ b/lib/Db/UserToProjectMapper.php
@@ -4,9 +4,10 @@
namespace OCA\TimeTracker\Db;
use OCP\IDBConnection;
-use OCP\AppFramework\Db\Mapper;
-class UserToProjectMapper extends Mapper {
+use OCA\TimeTracker\AppFramework\Db\CompatibleMapper;
+
+class UserToProjectMapper extends CompatibleMapper {
public function __construct(IDBConnection $db) {
parent::__construct($db, 'timetracker_user_to_project');
@@ -77,4 +78,4 @@ public function deleteAllForProject($project_id) {
-}
\ No newline at end of file
+}
diff --git a/lib/Db/WorkIntervalMapper.php b/lib/Db/WorkIntervalMapper.php
index a494ea6..4a94ec4 100644
--- a/lib/Db/WorkIntervalMapper.php
+++ b/lib/Db/WorkIntervalMapper.php
@@ -4,9 +4,10 @@
namespace OCA\TimeTracker\Db;
use OCP\IDBConnection;
-use OCP\AppFramework\Db\Mapper;
-class WorkIntervalMapper extends Mapper {
+use OCA\TimeTracker\AppFramework\Db\CompatibleMapper;
+
+class WorkIntervalMapper extends CompatibleMapper {
private $dbengine;
public function __construct(IDBConnection $db) {
diff --git a/lib/Db/WorkIntervalToTagMapper.php b/lib/Db/WorkIntervalToTagMapper.php
index 37d2083..d7bd2a5 100644
--- a/lib/Db/WorkIntervalToTagMapper.php
+++ b/lib/Db/WorkIntervalToTagMapper.php
@@ -4,9 +4,10 @@
namespace OCA\TimeTracker\Db;
use OCP\IDBConnection;
-use OCP\AppFramework\Db\Mapper;
-class WorkIntervalToTagMapper extends Mapper {
+use OCA\TimeTracker\AppFramework\Db\CompatibleMapper;
+
+class WorkIntervalToTagMapper extends CompatibleMapper {
public function __construct(IDBConnection $db) {
parent::__construct($db, 'timetracker_workint_to_tag');
@@ -69,4 +70,4 @@ public function deleteAllForTag($tagId) {
-}
\ No newline at end of file
+}
diff --git a/lib/Db/WorkItemMapper.php b/lib/Db/WorkItemMapper.php
index 0a8da3e..8517fc6 100644
--- a/lib/Db/WorkItemMapper.php
+++ b/lib/Db/WorkItemMapper.php
@@ -4,9 +4,10 @@
namespace OCA\TimeTracker\Db;
use OCP\IDBConnection;
-use OCP\AppFramework\Db\Mapper;
-class WorkItemMapper extends Mapper {
+use OCA\TimeTracker\AppFramework\Db\CompatibleMapper;
+
+class WorkItemMapper extends CompatibleMapper {
public function __construct(IDBConnection $db) {
parent::__construct($db, 'timetracker_work_item');
@@ -50,4 +51,4 @@ public function findAll($limit=null, $offset=null) {
return $this->findEntities($sql, $limit, $offset);
}
-}
\ No newline at end of file
+}
diff --git a/templates/index.php b/templates/index.php
index 9447dba..d9144c1 100644
--- a/templates/index.php
+++ b/templates/index.php
@@ -1,13 +1,20 @@
= 28) {
+ style('timetracker', 'style-compat');
+}
+
script('timetracker', $script);
?>
inc('navigation/index')); ?>
- inc('settings/index')); ?>