"+escapeHtml(cutString(child.name,64))+
- "
"+escapeHtml(cutString(child.details,64))+"
"+"
"+
- "
"+
- "
"+
- "
"+tsToHour(child.start)+" - "+
- ((child.running == 1)?'':tsToHour(child.start+child.duration))+
- "
"+
- "
"+((child.running == 1)?'running...':secondsToTimer(child.duration))+"
"+
- "
");
- });
-
-
- dayItems.push("
"+"
"+
- ((children.length == 1)?"
":"
"+children.length+"
")+
- "
"+
- cutString(dayItemName,128)+"
"+secondsToTimer(workItem.totalTime)+
- "
"+
- "
"+"
");
- });
- days.push( "
- " +
- "
" + dayName +"
"+ dayItems.join("") + "
" );
- });
-
- $("#work-intervals").html($( "
", {
- "class": "my-new-list",
- html: days.join( "" )
- }));
-
-
- $(".wi-child-hours").each(function(){
- $(this).daterangepicker({
- timePicker: true,
- startDate:tsToDate($(this).data('start-date')),
- endDate:tsToDate($(this).data('end-date')),
- timePicker24Hour: true,
- locale: {
- format: 'DD/MM/YY hh:mm:ss'
- }
- });
-
- $(this).on('apply.daterangepicker', function(ev, picker) {
- var id = $(this).data('myid');
- var jqxhr = $.post( "ajax/update-work-interval/"+id,{start:picker.startDate.format('DD/MM/YY HH:mm'), end:picker.endDate.format('DD/MM/YY HH:mm'), tzoffset: new Date().getTimezoneOffset()}, function() {
- })
- .done(function(data, status, jqXHR) {
- var response = data;
- if ('Error' in response){
- alert(response.Error);
- }
- getWorkItems();
- })
- .fail(function() {
- alert( "error" );
- })
- .always(function() {
- });
- });
- });
- $('.wi-child-name').click(function(e) {
- e.preventDefault();
- dialogWorkItemEditForm.target = e.target;
-
- form = dialogWorkItemEditForm.find( "form" )
- form.find("#name").val($(e.target).data("name"));
- form.find("#details").val($(e.target).data("details"));
- dialogWorkItemEditForm.dialog("open");
- return false;
-
- })
- $('.wi-play').click(function(e) {
- e.preventDefault();
- $('#work-input').val($(this).data('work-name'));
- startTimer();
- return false;
- })
- $('.wi-trash').click(function(e) {
- $("#dialog-confirm").dialog({
- buttons : {
- "Confirm" : function() {
- var baseUrl = OC.generateUrl('/apps/timetracker/ajax/delete-work-interval/'+e.target.id);
- var jqxhr = $.post( baseUrl, function() {
- getWorkItems();
- $("#dialog-confirm").dialog("close");
- })
- .done(function(data, status, jqXHR) {
- var response = data;
- if ('Error' in response){
- alert(response.Error);
- }
- })
- .fail(function() {
- alert( "error" );
- })
- },
- "Cancel" : function() {
- $(this).dialog("close");
- }
- }
- });
- $("#dialog-confirm").dialog("open");
- return false;
- });
-
- $(".set-project").each(function(){
- var id = $(this).data('myid');
- var projectId = $(this).data('projectid');
-
- var projectName = $(this).data('projectname');
-
-
- $(this).select2({
- width: '200px',
- escapeMarkup : function(markup) { return markup; },
- placeholder: "
",
- allowClear: true,
- ajax: {
- url: OC.generateUrl('/apps/timetracker/ajax/projects'),
-
- dataType: 'json',
- delay: 250,
- results: function (data, page) { //json parse
- return {
- results: $.map(data.Projects,function(val, i){
- return { id: val.id, text:val.name};
- }),
- pagination: {
- more: false,
- }
- };
- },
- cache: false,
-
- },
- initSelection: function(element, callback) {
- var results;
- results = [];
- results.push({
- id: projectId,
- text: projectName,
- });
-
- callback(results[0]);
- }
- });
- $(this).data('myid',id);
-
- $(this).val(projectId).trigger('change');
-
- });
- $(".set-tag").each(function(){
- var id = $(this).data('myid');
- var tagIds = [];
- var tagNames = [];
- if(typeof($(this).data('tagids')) !== 'undefined'){
- tagIds = $(this).data('tagids').toString().split(',');
- tagNames = $(this).data('tagnames').toString().split(',');
- }
- $(this).select2({
- tags: true,
- width: '200px',
- placeholder: "Select tags...",
- allowClear: true,
- ajax: {
- url: OC.generateUrl('/apps/timetracker/ajax/tags')+'?workItem='+$(this).data('myid'),
- formatNoMatches: function() {
- return '';
- },
- dataType: 'json',
- delay: 250,
- results: function (data, page) { //json parse
- return {
- results: $.map(data.Tags,function(val, i){
- return { id: val.id, text:val.name};
- }),
- pagination: {
- more: false,
- }
- };
- },
- cache: false,
- },
- initSelection: function(element, callback) {
- var results;
- results = [];
- for(var x=0;x
span').addClass("stop-button").removeClass("play-button");
- getWorkItems();
- })
- .done(function(data, status, jqXHR) {
- var response = data;
- if ('Error' in response){
- alert(response.Error);
- }
- })
- .fail(function() {
- alert( "error" );
- });
-
- }
- function stopTimer(){
-
- var workName = $('#work-input').val();
- if (workName == ''){
- workName = 'no description';
- }
- var jqxhr = $.post( "ajax/stop-timer/"+workName, function() {
- localStorage.setItem('isTimerStarted', false);
- $('#start-tracking > span').addClass("play-button").removeClass("stop-button");
- getWorkItems();
- })
- .done(function(data, status, jqXHR) {
- var response = data;
- if ('Error' in response){
- alert(response.Error);
- }
- })
- .fail(function() {
- alert( "error" );
- })
- .always(function() {
- });
- }
- $( "#datepicker-from" ).datepicker();
- $( "#datepicker-to" ).datepicker();
-
- if(localStorage.getItem('isTimerStarted') === 'true'){
- $('#start-tracking > span').addClass("stop-button").removeClass("play-button");
- } else {
- $('#start-tracking > span').addClass("play-button").removeClass("stop-button");
- }
- $( "#start-tracking" ).click(function() {
- if(localStorage.getItem('isTimerStarted') === 'true'){
- stopTimer();
- } else {
- startTimer();
- }
- return false;
- });
- } );
-
-}());
\ No newline at end of file
diff --git a/js/webpack.config.js b/js/webpack.config.js
new file mode 100644
index 0000000..384f39b
--- /dev/null
+++ b/js/webpack.config.js
@@ -0,0 +1,37 @@
+module.exports = {
+ //mode: 'development',
+ devtool: 'cheap-module-source-map',
+ entry: {
+ timer: './src/timer.js',
+ clients: './src/clients.js',
+ dashboard: './src/dashboard.js',
+ projects: './src/projects.js',
+ reports: './src/reports.js',
+ tags: './src/tags.js',
+ goals: './src/goals.js',
+ timelines: './src/timelines.js',
+ timelinesadmin: './src/timelines-admin.js',
+ },
+ output: {
+ filename: '[name].js',
+ path: __dirname + '/dist'
+ },
+ resolve: {
+ alias: {
+ 'jquery-ui': 'jqueryui'
+ }
+ },
+ module: {
+ rules: [
+ {
+ test: /\.css$/,
+ use: ['style-loader', 'css-loader'],
+ },
+ {
+ test: /\.(jpg|png|jpeg|svg)$/,
+ loader: 'file-loader'
+ },
+ ]
+ },
+};
+
diff --git a/lib/AppFramework/Db/OldNextcloudMapper.php b/lib/AppFramework/Db/OldNextcloudMapper.php
new file mode 100644
index 0000000..ee45fb5
--- /dev/null
+++ b/lib/AppFramework/Db/OldNextcloudMapper.php
@@ -0,0 +1,373 @@
+
+ * @author Christoph Wurst
+ * @author Joas Schilling
+ * @author Lukas Reschke
+ * @author Morris Jobke
+ * @author Roeland Jago Douma
+ * @author Thomas Müller
+ *
+ * @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/Controller/AjaxController.php b/lib/Controller/AjaxController.php
index 2017de9..96e12d2 100644
--- a/lib/Controller/AjaxController.php
+++ b/lib/Controller/AjaxController.php
@@ -1,9 +1,11 @@
userId = $UserId;
$this->userSession = $userSession;
@@ -59,6 +65,7 @@ public function __construct($AppName, IRequest $request, IUserSession $userSessi
$this->userToProjectMapper = $userToProjectMapper;
$this->tagMapper = $tagMapper;
+ $this->goalMapper = $goalMapper;
$this->workIntervalToTagMapper = $workIntervalToTagMapper;
$this->reportItemMapper = $reportItemMapper;
@@ -67,6 +74,7 @@ public function __construct($AppName, IRequest $request, IUserSession $userSessi
$this->timelineEntryMapper = $timelineEntryMapper;
$this->request = $request;
+ $this->l10n = $l10n;
}
/**
@@ -74,16 +82,17 @@ public function __construct($AppName, IRequest $request, IUserSession $userSessi
* @NoAdminRequired
*/
public function workIntervals() {
- $i = 0;
- $tryIntervals=[90,180,365,365*5];
- do {
- $l = $this->workIntervalMapper->findLatestDays($this->userId,$tryIntervals[$i],0);
- $i++;
- } while ((count($l) == 0) && ($i < count($tryIntervals)));
+ $from = $this->request->from;
+ $to = $this->request->to;
+ $l = $this->workIntervalMapper->findLatestInterval($this->userId, $from, $to);
$days = [];
+ $tzoffset = 0;
+ if (isset($this->request->tzoffset)) {
+ $tzoffset = -($this->request->tzoffset * 60);
+ }
+ date_default_timezone_set('UTC');
foreach ($l as $wi){
- //$dt = date("d/m/Y", $wi->start);
- $dt = date("D, j M", $wi->start);
+ $dt = $this->l10n->l('date', $wi->start+$tzoffset, ['width' => 'medium']);
if (!isset($days[$dt])){
$days[$dt] = [];
}
@@ -94,13 +103,15 @@ public function workIntervals() {
if ($wi->projectId != null){
$project = $this->projectMapper->find($wi->projectId);
}
-
+
$tags = [];
$wiToTags = $this->workIntervalToTagMapper->findAllForWorkInterval($wi->id);
foreach($wiToTags as $wiToTag){
- $tags[] = $this->tagMapper->find($wiToTag->tagId);
+ $t = $this->tagMapper->find($wiToTag->tagId);
+ if ($t != null)
+ $tags[] = $t;
}
-
+
$wa = ['duration' => $wi->duration,
'id' => $wi->id,
'name' => $wi->name,
@@ -110,18 +121,20 @@ public function workIntervals() {
'start' => $wi->start,
'tags' => $tags,
'userUid' => $wi->userUid,
+ 'cost' => $wi->cost,
'projectName' => ($project === null)?null:$project->name,
+ 'projectColor' => ($project === null)?null:$project->color,
];
$days[$dt][$wi->name]['children'][] = $wa;
$days[$dt][$wi->name]['totalTime'] += $wa['duration'];
}
-
+
$running = $this->workIntervalMapper->findAllRunning($this->userId);
return new JSONResponse(["WorkIntervals" => $l, "running" => $running, 'days' => $days, 'now' => time()]);
}
-
+
public function isThisAdminUser(){
return \OC_User::isAdminUser(\OC_User::getUser());
}
@@ -136,9 +149,35 @@ public function isUserAdmin($user){
* @NoCSRFRequired
*/
public function index() {
-
+
}
+ /**
+ * @NoAdminRequired
+ */
+ public function addCost($id)
+ {
+ $wi = $this->workIntervalMapper->find($id);
+ $cost = $this->request->cost;
+ $cost = str_replace(',', '.', $cost);
+
+ if (!is_numeric($cost)) {
+ return new JSONResponse(['error' => 'Non numeric value'], Http::STATUS_BAD_REQUEST);
+ }
+
+ $costInCents = $cost * 100;
+
+ $wi->setCost($costInCents);
+
+ try {
+ $this->workIntervalMapper->update($wi);
+ } catch (\Exception $e) {
+ return new JSONResponse(['error' => true, 'message' => $e->getMessage()]);
+ }
+
+ return new JSONResponse(['success' => true, 'test' => $cost ?? 't']);
+ }
+
/**
*
* @NoAdminRequired
@@ -146,6 +185,17 @@ public function index() {
public function startTimer($name) {
//$this->endTimer();
+ $projectId = null;
+ $name = urldecode($name);
+ if (isset($this->request->projectId) && (!empty($this->request->projectId))){
+ $projectId = $this->request->projectId;
+ }
+
+ $tags = null;
+ if (isset($this->request->tags) && (!empty($this->request->tags))){
+ $tags = $this->request->tags;
+ }
+
if (strlen($name) > 255){
return new JSONResponse(["Error" => "Name too long"]);
}
@@ -154,15 +204,22 @@ public function startTimer($name) {
$winterval->setRunning(1);
$winterval->setName($name);
$winterval->setUserUid($this->userId);
+
+ // first get tags and project ids from the last work item with the same name
$lwinterval = $this->workIntervalMapper->findLatestByName($this->userId, $name);
- if ($lwinterval != null){
-
+ if ($projectId == null && $lwinterval != null){
+
$winterval->setProjectId($lwinterval->projectId);
}
+
+ if($projectId != null){
+ $winterval->setProjectId($projectId);
+ }
+
$this->workIntervalMapper->insert($winterval);
- if ($lwinterval != null){
- $tags = $this->workIntervalToTagMapper->findAllForWorkInterval($lwinterval->id);
- foreach($tags as $t){
+ if ($tags == null && $lwinterval != null){
+ $lastTags = $this->workIntervalToTagMapper->findAllForWorkInterval($lwinterval->id);
+ foreach($lastTags as $t){
$wtot = new WorkIntervalToTag();
$wtot->setWorkIntervalId($winterval->id);
$wtot->setTagId($t->tagId);
@@ -171,11 +228,25 @@ public function startTimer($name) {
}
}
-
-
+
+ if ($tags != null){
+ $tagsArray = explode(",", $tags);
+ foreach($tagsArray as $t){
+ $wtot = new WorkIntervalToTag();
+ $wtot->setWorkIntervalId($winterval->id);
+ $wtot->setTagId($t);
+ $wtot->setCreatedAt(time());
+ $this->workIntervalToTagMapper->insert($wtot);
+ }
+
+ }
+
+
+
+
//echo json_encode((array)$winterval);
return new JSONResponse(["WorkIntervals" => $winterval, "running" => 1]);
-
+
}
@@ -188,17 +259,19 @@ public function startTimer($name) {
*/
public function stopTimer($name) {
+ $name = urldecode($name);
if (strlen($name) > 255){
return new JSONResponse(["Error" => "Name too long"]);
}
$running = $this->workIntervalMapper->findAllRunning($this->userId);
-
+
$now = time();
foreach($running as $r){
$r->setRunning(0);
$r->setDuration($now - $r->start);
- $r->setName($name);
+ if ($name != 'no description')
+ $r->setName($name);
$this->workIntervalMapper->update($r);
}
return new JSONResponse(["WorkIntervals" => json_decode(json_encode($running), true)]);
@@ -213,7 +286,9 @@ public function stopTimer($name) {
public function deleteWorkInterval($id) {
$wi = $this->workIntervalMapper->find($id);
$this->workIntervalMapper->delete($wi);
-
+
+ $running = $this->workIntervalMapper->findAllRunning($this->userId);
+
return new JSONResponse(["WorkIntervals" => json_decode(json_encode($running), true)]);
}
@@ -223,9 +298,9 @@ public function deleteWorkInterval($id) {
*/
public function updateWorkInterval($id) {
-
+
$wi = $this->workIntervalMapper->find($id);
-
+
if (isset($this->request->name)) {
if (strlen($this->request->name) > 255){
return new JSONResponse(["Error" => "Name too long"]);
@@ -259,23 +334,42 @@ public function updateWorkInterval($id) {
$newWiToTag->setTagId($tag);
$newWiToTag->setCreatedAt(time());
$this->workIntervalToTagMapper->insert($newWiToTag);
-
+
}
-
+
}
}
}
+
if (isset($this->request->tagId)) {
- $tags = \explode(",", $this->request->tagId);
+ if (is_array($this->request->tagId)){
+ $tags = $this->request->tagId;
+ } else {
+
+ $tags = \explode(",", $this->request->tagId);
+ }
$this->workIntervalToTagMapper->deleteAllForWorkInterval($id);
$project = null;
$locked = 0;
-
+
foreach($tags as $tag){
if (empty($tag))
continue;
+ if(!is_numeric($tag)){
+ if ($wi->projectId != null){
+ $project = $this->projectMapper->find($wi->projectId);
+ if($project && $project->locked)
+ continue; // don't add new tags to locked projects
+ }
+ $c = new Tag();
+ $c->setName($tag);
+ $c->setUserUid($this->userId);
+ $c->setCreatedAt(time());
+ $this->tagMapper->insert($c);
+ $tag = $c->id;
+ }
$newWiToTag = new WorkIntervalToTag();
$newWiToTag->setWorkIntervalId($id);
$newWiToTag->setTagId($tag);
@@ -301,7 +395,8 @@ public function updateWorkInterval($id) {
}
$this->workIntervalMapper->update($wi);
-
+ $running = $this->workIntervalMapper->findAllRunning($this->userId);
+
return new JSONResponse(["WorkIntervals" => json_decode(json_encode($running), true)]);
}
@@ -312,13 +407,13 @@ public function updateWorkInterval($id) {
*/
public function addWorkInterval() {
-
+
$wi = new WorkInterval();
$wi->setUserUid($this->userId);
$wi->setRunning(0);
-
+
if (isset($this->request->name)) {
- $wi->setName($this->request->name);
+ $wi->setName(urldecode($this->request->name));
}
if (isset($this->request->details)) {
if (strlen($this->request->details) > 1024){
@@ -347,9 +442,9 @@ public function addWorkInterval() {
$newWiToTag->setTagId($tag);
$newWiToTag->setCreatedAt(time());
$this->workIntervalToTagMapper->insert($newWiToTag);
-
+
}
-
+
}
}
@@ -359,7 +454,7 @@ public function addWorkInterval() {
$this->workIntervalToTagMapper->deleteAllForWorkInterval($id);
$project = null;
$locked = 0;
-
+
foreach($tags as $tag){
if (empty($tag))
@@ -389,7 +484,9 @@ public function addWorkInterval() {
}
$this->workIntervalMapper->insert($wi);
-
+
+ $running = $this->workIntervalMapper->findAllRunning($this->userId);
+
return new JSONResponse(["WorkIntervals" => json_decode(json_encode($running), true)]);
}
@@ -457,7 +554,7 @@ public function deleteClient($id) {
$utoc = $this->userToClientMapper->findForUserAndClient($this->userId, $c);
if ($utoc != null){
-
+
$this->userToClientMapper->delete($utoc);
}
return $this->getClients();
@@ -470,12 +567,16 @@ public function deleteClient($id) {
* @NoCSRFRequired
*/
public function getClients(){
- $clients = $this->clientMapper->findAll($this->userId);
- return new JSONResponse(["Clients" => json_decode(json_encode($clients), true)]);
- }
+ $clientName = $this->request->term ?? null;
-
+ if ($clientName) {
+ $clients = $this->clientMapper->searchByName($this->userId, $clientName);
+ } else {
+ $clients = $this->clientMapper->findAll($this->userId);
+ }
+ return new JSONResponse(["Clients" => json_decode(json_encode($clients), true)]);
+ }
/**
*
@@ -486,6 +587,10 @@ public function addProject($name) {
if (isset($this->request->clientId)) {
$clientId = $this->request->clientId;
}
+ $color = '#ffffff';
+ if (isset($this->request->color) && !empty($this->request->color)) {
+ $color = $this->request->color;
+ }
if (trim($name) == ''){
return;
}
@@ -493,6 +598,7 @@ public function addProject($name) {
if ($p == null){
$p = new Project();
$p->setName($name);
+ $p->setColor($color);
$p->setCreatedAt(time());
$p->setCreatedByUserUid($this->userId);
$p->setClientId($clientId);
@@ -534,6 +640,10 @@ public function editProject($id) {
$p->setName($name);
}
}
+ if (isset($this->request->color)){
+ $color = $this->request->color;
+ $p->setColor($color);
+ }
if (isset($this->request->clientId)){
$clientId = $this->request->clientId;
$p->setClientId($clientId);
@@ -563,9 +673,10 @@ public function editProject($id) {
$this->userToProjectMapper->insert($up);
}
}
+
if (isset($this->request->archived) && $p->getArchived() != $this->request->archived){
if (($this->isThisAdminUser() || $p->createdByUserUid == $this->userId) ){
-
+
$archived = $this->request->archived;
$p->setArchived($archived);
} else {
@@ -574,7 +685,7 @@ public function editProject($id) {
}
$this->projectMapper->update($p);
-
+
return $this->getProjects();
}
/**
@@ -588,23 +699,50 @@ public function deleteProject($id) {
$utop = $this->userToProjectMapper->findForUserAndProject($this->userId, $p);
if ($utop != null){
-
+
$this->userToProjectMapper->delete($utop);
}
return $this->getProjects();
}
-
+ public function deleteProjectWithData($id) {
+ if (!$this->isThisAdminUser()){
+ return;
+ }
+ $this->userToProjectMapper->deleteAllForProject($id);
+ $wi = $this->workIntervalMapper->findAllForProject($id);
+ if ($wi != null){
+ foreach ($wi as $w){
+ $this->workIntervalToTagMapper->deleteAllForWorkInterval($w->id);
+ }
+ }
+ $this->workIntervalMapper->deleteAllForProject($id);
+ $this->tagMapper->allowedTags($id,[]);
+ $this->projectMapper->delete($id);
+
+
+ return $this->getProjects();
+ }
+
+
/**
*
* @NoAdminRequired
*/
public function getProjects(){
- $projects = $this->projectMapper->findAll($this->userId);
+ $projectName = $this->request->term ?? null;
+
+ if ($projectName) {
+ $projects = $this->projectMapper->searchByName($this->userId, $projectName);
+ } else {
+ $projects = $this->projectMapper->findAll($this->userId);
+ }
$parray = json_decode(json_encode($projects), true);
foreach($parray as $pi => $pv){
- $tags = $this->tagMapper->findAllAlowedForProject($pv->id);
- $parray[$pi]['allowedtags'] = $tags;
+ if (isset($pv->id)) {
+ $tags = $this->tagMapper->findAllAlowedForProject($pv->id);
+ $parray[$pi]['allowedtags'] = $tags;
+ }
}
return new JSONResponse(["Projects" => $parray]);
@@ -633,6 +771,7 @@ public function getProjectsTable(){
$out['name'] = $p->name;
$out['locked'] = $p->locked;
$out['archived'] = $p->archived;
+ $out['color'] = $p->color;
$out['client'] = null;
$tags = $this->tagMapper->findAllAlowedForProject($p->id);
$users = array_map(function ($utop) { return $utop->userUid;},$this->userToProjectMapper->findAllForProject($p->id));
@@ -645,7 +784,7 @@ public function getProjectsTable(){
$out['clientId'] = $client->id;
}
}
-
+
$outProjects[] = $out;
}
@@ -671,7 +810,7 @@ public function addTag($name) {
return new JSONResponse(["Error" => "This tag name already exists"]);
}
-
+
return $this->getTags();
}
/**
@@ -694,7 +833,7 @@ public function editTag($id) {
}
$c->setName($name);
$this->tagMapper->update($c);
-
+
return $this->getTags();
}
/**
@@ -719,11 +858,12 @@ public function deleteTag($id) {
public function getTags(){
$workItem = $this->request->workItem;
$project = null;
+ $q = $this->request->q;
if ($workItem != null){
$wi = $this->workIntervalMapper->find($workItem);
if ($wi->projectId != null){
$project = $this->projectMapper->find($wi->projectId);
-
+
}
}
if($project != null && $project->locked){
@@ -731,6 +871,15 @@ public function getTags(){
} else {
$tags = $this->tagMapper->findAll($this->userId);
}
+ if ($q != null){
+ $filteredTags = [];
+ foreach($tags as $t){
+ if (stripos($t->name, $q) !== FALSE){
+ $filteredTags[] = $t;
+ }
+ }
+ $tags = $filteredTags;
+ }
return new JSONResponse(["Tags" => json_decode(json_encode($tags), true)]);
}
@@ -760,7 +909,7 @@ public function getReport(){
$name = $this->userId;
}
-
+
if(!$this->isThisAdminUser()){
$allowedClients = $this->clientMapper->findAll($this->userId);
$allowedClientsId = array_map(function($client){ return $client->id;}, $allowedClients );
@@ -780,7 +929,7 @@ public function getReport(){
}
}
-
+
$filterTagId = [];
$groupOn1 = $this->request->group1;
$groupOn2 = $this->request->group2;
@@ -814,7 +963,7 @@ public function postTimeline(){
$name = $this->userId;
}
-
+
if(!$this->isThisAdminUser()){
$allowedClients = $this->clientMapper->findAll($this->userId);
$allowedClientsId = array_map(function($client){ return $client->id;}, $allowedClients );
@@ -834,12 +983,12 @@ public function postTimeline(){
}
}
-
+
$filterTagId = [];
$groupOn1 = $this->request->group1;
$groupOn2 = $this->request->group2;
$items = $this->reportItemMapper->report($name, $from, $to, $filterProjectId, $filterClientId, $filterTagId, $timegroup, $groupOn1, $groupOn2, $this->isThisAdminUser(), 0, 1000);
-
+
$timeline = new Timeline();
$timeline->setUserUid($this->userId);
$timeline->setGroup1($this->request->group1);
@@ -847,7 +996,7 @@ public function postTimeline(){
$timeline->setTimeGroup($this->request->timegroup);
$timeline->setFilterProjects(implode(', ',$filterProjectId));
$timeline->setFilterClients(implode(', ',$filterClientId));
- $timeline->setTimeInterval(gmdate("d/m/Y", $from). ' - '. gmdate("d/m/Y", $to));
+ $timeline->setTimeInterval($this->l10n->l('date', $from) . ' - '. $this->l10n->l('date', $to));
$totalDuration = 0;
foreach($items as $i){
$totalDuration += $i->totalDuration;
@@ -862,11 +1011,12 @@ public function postTimeline(){
$te->setTimelineId($timeline->id);
$te->setUserUid($timeline->userUid);
$te->setName($i->name);
- $te->setProjectName($i->project);
- //$te->setClientName();
+ $te->setProjectName($i->project ? $i->project : "");
+ $te->setClientName($i->client ? $i->client : "");
$te->setTimeInterval($i->time);
$te->setTotalDuration($i->totalDuration);
$te->setCreatedAt(time());
+ $te->setCost($i->cost);
$this->timelineEntryMapper->insert($te);
}
@@ -906,6 +1056,7 @@ public function secondsToTime($seconds){
$timeFormat = sprintf('%02d:%02d:%02d', $hours, $mins, $secs);
return $timeFormat;
}
+
/**
*
* @NoAdminRequired
@@ -913,7 +1064,7 @@ public function secondsToTime($seconds){
*/
public function downloadTimeline($id){
$te = $this->timelineEntryMapper->findTimelineEntries($id);
- if (count($te) == 0){
+ if (count($te) == 0){ // nothing to send
exit(0);
}
@@ -930,7 +1081,7 @@ public function downloadTimeline($id){
fputcsv($output, array('id', 'User Uid', 'Name', 'Project Name', 'Client Name', 'Time Interval', 'Total Duration'));
$totalDuration = 0;
foreach($te as $t){
-
+
fputcsv($output, [$t->id, $t->userUid, $t->name, $t->projectName, $t->clientName, $t->timeInterval, $this->secondsToTime($t->totalDuration)]);
$totalDuration += $t->totalDuration;
}
@@ -952,5 +1103,230 @@ public function editTimeline($id){
return new JSONResponse(["Timeline" => $timeline]);
}
+ /**
+ *
+ * @NoAdminRequired
+ */
+
+ public function deleteTimeline($id) {
+ $tl = $this->timelineMapper->find($id);
+ if ($tl->userUid == $this->userId){
+ $this->timelineMapper->delete($tl);
+ }
+ return $this->getTimelines();
+ }
+
+ /**
+ *
+ * @NoAdminRequired
+ */
+
+ public function emailTimeline($id) {
+
+ $te = $this->timelineEntryMapper->findTimelineEntries($id);
+ if (count($te) == 0){ // nothing to send
+ exit(0);
+ }
+ $user = $te[0]->userUid;
+
+ $email = $this->request->email;
+ $emails = explode(';',$email);
+ $subject = $this->request->subject;
+ $content = $this->request->content;
+
+ // output headers so that the file is downloaded rather than displayed
+ header('Content-Type: text/csv; charset=utf-8');
+ header('Content-Disposition: attachment; filename=timeline-'.$user.'-'.$id.'.csv');
+
+ // create a file pointer connected to the output stream
+ $id = (int)$id;
+ $path = sys_get_temp_dir() . DIRECTORY_SEPARATOR. 'timeline-'.$user.'-'.$id.'.csv';
+ $output = fopen($path, "w");
+ //$path = stream_get_meta_data($output)['uri'];
+ // output the column headings
+ fputcsv($output, array('id', 'User Uid', 'Name', 'Project Name', 'Client Name', 'Time Interval', 'Total Duration'));
+ $totalDuration = 0;
+ foreach($te as $t){
+
+ fputcsv($output, [$t->id, $t->userUid, $t->name, $t->projectName, $t->clientName, $t->timeInterval, $this->secondsToTime($t->totalDuration)]);
+ $totalDuration += $t->totalDuration;
+ }
+ fputcsv($output, ['TOTAL', '', '', '', '', '', $this->secondsToTime($totalDuration)]);
+
+
+
+ $mailer = \OC::$server->getMailer();
+ $message = $mailer->createMessage();
+ $attach = $mailer->createAttachmentFromPath($path);
+ $message->setSubject($subject);
+ //$message->setTo([$email => 'Recipient']);
+ $message->setTo($emails);
+ $message->setPlainBody($content);
+ //$message->setHtmlBody($content);
+ $message->attach($attach);
+ $mailer->send($message);
+
+ fclose($output);
+ unlink($path);
+ return new JSONResponse([]);
+ }
+
+
+
+
+
+ /**
+ *
+ * @NoAdminRequired
+ */
+ public function addGoal() {
+
+ $projectId = $this->request->projectId;
+ $hours = $this->request->hours;
+ $interval = $this->request->interval;
+
+ $g = $this->goalMapper->findByUserProject($this->userId, $projectId);
+ if ($g == null){
+ $g = new Goal();
+ $g->setProjectId($projectId);
+ $g->setUserUid($this->userId);
+ $g->setCreatedAt(time());
+ $g->setHours($hours);
+ $g->setInterval($interval);
+ $this->goalMapper->insert($g);
+ } else if ($g != null){
+ return new JSONResponse(["Error" => "There can be only one goal per project"]);
+ }
+
+
+ return $this->getGoals();
+ }
+
+ /**
+ *
+ * @NoAdminRequired
+ */
+ public function deleteGoal($id) {
+ $c = $this->goalMapper->find($id);
+ if ($c == null){
+ return;
+ }
+ if ($c->userUid != $this->userId){
+ return;
+ }
+ $this->goalMapper->delete($c);
+ return $this->getGoals();
+ }
+
+ public function getStartOfWeek($timestamp){
+ $date = new \DateTime('@'.$timestamp);
+ $weeknumber = $date->format("W");
+ $year = $date->format("Y");
+ $weekstartdt = new \DateTime();
+ $weekstartdt->setTime(0, 0, 0, 0);
+ $weekstartdt->setISODate($year, $weeknumber);
+
+ return $weekstartdt;
+ }
+ public function getStartOfMonth($timestamp){
+ $date = new \DateTime('@'.$timestamp);
+ $date->modify('first day of this month');
+ $date->setTime(0, 0, 0, 0);
+
+ return $date;
+ }
+
+ public function getWeeksSince($timestamp){
+ $start = $this->getStartOfWeek($timestamp);
+ $end = $this->getStartOfWeek(time());
+ $oneWeek = \DateInterval::createFromDateString('1 week');
+ $currentWeek = $start;
+ $weeks = [];
+ while ($currentWeek < $end){
+ $weeks[] = $currentWeek->format("Y-m-d");
+ $currentWeek->add($oneWeek);
+ }
+ return $weeks;
+ }
+ public function getMonthsSince($timestamp){
+ $start = $this->getStartOfMonth($timestamp);
+ $end = $this->getStartOfMonth(time());
+ $oneMonth = \DateInterval::createFromDateString('1 month');
+ $currentMonth = $start;
+ $months = [];
+ while ($currentMonth < $end){
+ $months[] = $currentMonth->format("Y-m");
+ $currentMonth->add($oneMonth);
+ }
+ return $months;
+ }
+ /**
+ *
+ * @NoAdminRequired
+ * @NoCSRFRequired
+ */
+
+ public function getGoals(){
+ $goals = $this->goalMapper->findAll($this->userId);
+ $weekStart = $this->getStartOfWeek(time())->format('Y-m-d');
+ $monthStart = $this->getStartOfMonth(time())->format('Y-m');
+
+ $ret = [];
+ foreach($goals as $goal){
+ $rgoal = [];
+ if ($goal->interval == 'Weekly'){
+ $goalWeekStart = $this->getStartOfWeek($goal->createdAt);
+ $repItems = $this->reportItemMapper->report($this->userId, $goalWeekStart->getTimestamp(),time(),[$goal->projectId],"","","week","project","",false,0,10000);
+ $intervals = $this->getWeeksSince($goalWeekStart->getTimestamp());
+ } elseif ($goal->interval == 'Monthly'){
+ $goalMonthStart = $this->getStartOfMonth($goal->createdAt);
+ $repItems = $this->reportItemMapper->report($this->userId, $goalMonthStart->getTimestamp(),time(),[$goal->projectId],"","","month","project","",false,0,10000);
+ $intervals = $this->getMonthsSince($goalMonthStart->getTimestamp());
+ }
+ $workedSecondsCurrentPeriod = 0;
+ $debtSeconds = 0;
+ foreach($intervals as $interval){
+ $workedInInterval = 0;
+ foreach($repItems as $repItem) {
+
+ if ($goal->interval == 'Weekly'){
+ if ($interval == $this->getStartOfWeek($repItem->time)->format('Y-m-d')) {
+ $workedInInterval += $repItem->totalDuration;
+ }
+ } elseif ($goal->interval == 'Monthly'){
+ if ($interval == $this->getStartOfMonth($repItem->time)->format('Y-m')) {
+ $workedInInterval += $repItem->totalDuration;
+ }
+ }
+ }
+ $debtSeconds += ($goal->hours*3600 - $workedInInterval);
+ }
+
+ foreach($repItems as $period){
+ if ($goal->interval == 'Weekly' && $this->getStartOfWeek($period->time)->format('Y-m-d') == $weekStart){
+ $workedSecondsCurrentPeriod += $period->totalDuration;
+ } elseif ($goal->interval == 'Monthly' && $this->getStartOfMonth($period->time)->format('Y-m') == $monthStart){
+ $workedSecondsCurrentPeriod += $period->totalDuration;
+ }
+ }
+
+ $rgoal = [
+ 'id' => $goal->id,
+ 'userUid' => $goal->userUid,
+ 'projectId' => $goal->projectId,
+ 'projectName' => $goal->projectName,
+ 'hours' => $goal->hours,
+ 'interval' => $goal->interval,
+ 'createdAt' => $goal->createdAt,
+ 'workedHoursCurrentPeriod' => round($workedSecondsCurrentPeriod / 3600, 2),
+ 'debtHours' => round($debtSeconds / 3600, 2),
+ 'remainingHours' => round($goal->hours - $workedSecondsCurrentPeriod / 3600, 2),
+ 'totalRemainingHours' => round(($debtSeconds + $goal->hours *3600 - $workedSecondsCurrentPeriod) / 3600, 2),
+ ];
+ $ret[] = $rgoal;
+ }
+ return new JSONResponse(["Goals" => json_decode(json_encode($ret), true)]);
+ }
}
+
diff --git a/lib/Controller/ClientsController.php b/lib/Controller/ClientsController.php
index 8df7143..fee8296 100644
--- a/lib/Controller/ClientsController.php
+++ b/lib/Controller/ClientsController.php
@@ -26,7 +26,7 @@ public function __construct($AppName, IRequest $request, IUserSession $userSessi
* @NoCSRFRequired
*/
public function index() {
- return new TemplateResponse('timetracker', 'index',['appPage' => 'content/clients', 'script' => 'clients']); // templates/index.php
+ return new TemplateResponse('timetracker', 'index',['appPage' => 'content/clients', 'script' => 'dist/clients']); // templates/index.php
}
diff --git a/lib/Controller/DashboardController.php b/lib/Controller/DashboardController.php
index 919ff4e..6b1f841 100644
--- a/lib/Controller/DashboardController.php
+++ b/lib/Controller/DashboardController.php
@@ -25,7 +25,7 @@ public function __construct($AppName, IRequest $request, IUserSession $userSessi
* @NoCSRFRequired
*/
public function index() {
- return new TemplateResponse('timetracker', 'index',['appPage' => 'content/dashboard', 'script' => 'dashboard']); // templates/index.php
+ return new TemplateResponse('timetracker', 'index',['appPage' => 'content/dashboard', 'script' => 'dist/dashboard']); // templates/index.php
}
diff --git a/lib/Controller/GoalsController.php b/lib/Controller/GoalsController.php
new file mode 100644
index 0000000..514df91
--- /dev/null
+++ b/lib/Controller/GoalsController.php
@@ -0,0 +1,32 @@
+userSession = $userSession;
+ $user = $this->userSession->getUser();
+
+ }
+
+ /**
+ *
+ * @NoAdminRequired
+ * @NoCSRFRequired
+ */
+ public function index() {
+ return new TemplateResponse('timetracker', 'index',['appPage' => 'content/goals', 'script' => 'dist/goals']); // templates/index.php
+ }
+
+
+}
diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
index cbf74ca..5599515 100644
--- a/lib/Controller/PageController.php
+++ b/lib/Controller/PageController.php
@@ -26,7 +26,7 @@ public function __construct($AppName, IRequest $request, IUserSession $userSessi
* @NoCSRFRequired
*/
public function index() {
- return new TemplateResponse('timetracker', 'index',['appPage' => 'content/index', 'script' => 'timer']); // templates/index.php
+ return new TemplateResponse('timetracker', 'index',['appPage' => 'content/index', 'script' => 'dist/timer']); // templates/index.php
}
diff --git a/lib/Controller/ProjectsController.php b/lib/Controller/ProjectsController.php
index cd7dfc3..25eae3b 100644
--- a/lib/Controller/ProjectsController.php
+++ b/lib/Controller/ProjectsController.php
@@ -30,7 +30,7 @@ public function __construct($AppName, IRequest $request, IUserSession $userSessi
* @NoCSRFRequired
*/
public function index() {
- return new TemplateResponse('timetracker', 'index',['appPage' => 'content/projects', 'script' => 'projects']); // templates/index.php
+ return new TemplateResponse('timetracker', 'index',['appPage' => 'content/projects', 'script' => 'dist/projects']); // templates/index.php
}
diff --git a/lib/Controller/ReportsController.php b/lib/Controller/ReportsController.php
index 25a34bd..e2e8fc5 100644
--- a/lib/Controller/ReportsController.php
+++ b/lib/Controller/ReportsController.php
@@ -25,7 +25,7 @@ public function __construct($AppName, IRequest $request, IUserSession $userSessi
* @NoCSRFRequired
*/
public function index() {
- return new TemplateResponse('timetracker', 'index',['appPage' => 'content/reports', 'script' => 'reports']); // templates/index.php
+ return new TemplateResponse('timetracker', 'index',['appPage' => 'content/reports', 'script' => 'dist/reports']); // templates/index.php
}
diff --git a/lib/Controller/TagsController.php b/lib/Controller/TagsController.php
index ea88894..95cdc1b 100644
--- a/lib/Controller/TagsController.php
+++ b/lib/Controller/TagsController.php
@@ -25,7 +25,7 @@ public function __construct($AppName, IRequest $request, IUserSession $userSessi
* @NoCSRFRequired
*/
public function index() {
- return new TemplateResponse('timetracker', 'index',['appPage' => 'content/tags', 'script' => 'tags']); // templates/index.php
+ return new TemplateResponse('timetracker', 'index',['appPage' => 'content/tags', 'script' => 'dist/tags']); // templates/index.php
}
diff --git a/lib/Controller/TimelinesAdminController.php b/lib/Controller/TimelinesAdminController.php
index 709a00b..3f414b7 100644
--- a/lib/Controller/TimelinesAdminController.php
+++ b/lib/Controller/TimelinesAdminController.php
@@ -25,7 +25,7 @@ public function __construct($AppName, IRequest $request, IUserSession $userSessi
* @NoCSRFRequired
*/
public function index() {
- return new TemplateResponse('timetracker', 'index',['appPage' => 'content/timelines-admin', 'script' => 'timelines-admin']); // templates/index.php
+ return new TemplateResponse('timetracker', 'index',['appPage' => 'content/timelines-admin', 'script' => 'dist/timelinesadmin']); // templates/index.php
}
diff --git a/lib/Controller/TimelinesController.php b/lib/Controller/TimelinesController.php
index e79c2be..62bbfeb 100644
--- a/lib/Controller/TimelinesController.php
+++ b/lib/Controller/TimelinesController.php
@@ -25,7 +25,7 @@ public function __construct($AppName, IRequest $request, IUserSession $userSessi
* @NoCSRFRequired
*/
public function index() {
- return new TemplateResponse('timetracker', 'index',['appPage' => 'content/timelines', 'script' => 'timelines']); // templates/index.php
+ return new TemplateResponse('timetracker', 'index',['appPage' => 'content/timelines', 'script' => 'dist/timelines']); // templates/index.php
}
diff --git a/lib/Db/ClientMapper.php b/lib/Db/ClientMapper.php
index 77e6f11..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');
@@ -16,14 +17,14 @@ public function __construct(IDBConnection $db) {
public function findByName($name) {
$sql = 'SELECT * FROM `*PREFIX*timetracker_client` ' .
'WHERE upper(`name`) = ?';
-
+
try {
$e = $this->findEntity($sql, [strtoupper($name)]);
return $e;
} catch (\OCP\AppFramework\Db\DoesNotExistException $e){
return null;
}
-
+
}
/**
@@ -36,11 +37,14 @@ public function find($id) {
return $this->findEntity($sql, [$id]);
}
-
public function findAll($user){
$sql = 'SELECT tc.* FROM `*PREFIX*timetracker_client` tc left join `*PREFIX*timetracker_user_to_client` uc on uc.client_id = tc.id where uc.user_uid = ? order by tc.name asc';
return $this->findEntities($sql, [$user]);
}
-
-}
\ No newline at end of file
+ public function searchByName($user, $name){
+ $name = strtoupper($name);
+ $sql = 'SELECT tc.* FROM `*PREFIX*timetracker_client` tc left join `*PREFIX*timetracker_user_to_client` uc on uc.client_id = tc.id where uc.user_uid = ? and upper(tc.name) LIKE ? order by tc.name asc';
+ return $this->findEntities($sql, [$user, "%" . $name . "%"]);
+ }
+}
diff --git a/lib/Db/Goal.php b/lib/Db/Goal.php
new file mode 100644
index 0000000..eb7bee3
--- /dev/null
+++ b/lib/Db/Goal.php
@@ -0,0 +1,29 @@
+addType('id', 'integer');
+ $this->addType('userUid', 'string');
+ $this->addType('projectId', 'integer');
+ $this->addType('projectName', 'string');
+ $this->addType('hours', 'integer');
+ $this->addType('interval', 'string');
+ $this->addType('createdAt', 'integer');
+ }
+}
\ No newline at end of file
diff --git a/lib/Db/GoalMapper.php b/lib/Db/GoalMapper.php
new file mode 100644
index 0000000..a3ccf76
--- /dev/null
+++ b/lib/Db/GoalMapper.php
@@ -0,0 +1,47 @@
+findEntity($sql, [$userUid, $projectId]);
+ return $e;
+ } catch (\OCP\AppFramework\Db\DoesNotExistException $e){
+ return null;
+ }
+
+ }
+
+ /**
+ * @throws \OCP\AppFramework\Db\DoesNotExistException if not found
+ * @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException if more than one result
+ */
+ public function find($id) {
+ $sql = 'SELECT * FROM `*PREFIX*timetracker_goal` ' .
+ 'WHERE `id` = ?';
+ return $this->findEntity($sql, [$id]);
+ }
+
+
+ public function findAll($user){
+ $sql = 'SELECT tg.*,p.name as project_name FROM `*PREFIX*timetracker_goal` tg join `*PREFIX*timetracker_project` p on p.id = tg.project_id where tg.user_uid = ? order by tg.created_at desc';
+ return $this->findEntities($sql, [$user]);
+ }
+
+
+}
diff --git a/lib/Db/Project.php b/lib/Db/Project.php
index 89011fe..2161b29 100644
--- a/lib/Db/Project.php
+++ b/lib/Db/Project.php
@@ -8,6 +8,7 @@ class Project extends Entity {
public $id;
public $name;
+ public $color;
public $clientId;
public $createdByUserUid;
public $createdAt;
@@ -20,6 +21,7 @@ public function __construct() {
$this->addType('id', 'integer');
$this->addType('name', 'string');
+ $this->addType('color', 'string');
$this->addType('clientId', 'integer');
$this->addType('createdByUserUid', 'string');
$this->addType('createdAt', 'integer');
diff --git a/lib/Db/ProjectMapper.php b/lib/Db/ProjectMapper.php
index 4ea2708..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');
@@ -16,14 +17,22 @@ public function __construct(IDBConnection $db) {
public function findByName($name) {
$sql = 'SELECT * FROM `*PREFIX*timetracker_project` ' .
'WHERE upper(`name`) = ?';
-
+
try {
$e = $this->findEntity($sql, [strtoupper($name)]);
return $e;
} catch (\OCP\AppFramework\Db\DoesNotExistException $e){
return null;
}
-
+
+ }
+
+ public function searchByName($user, string $name) {
+ $name = strtoupper($name);
+ $sql = 'SELECT tp.* FROM `*PREFIX*timetracker_project` tp LEFT JOIN `*PREFIX*timetracker_user_to_project` up ON up.project_id = tp.id WHERE up.`user_uid` = ? AND upper(tp.`name`) LIKE ? ORDER BY tp.`name`';
+
+ return $this->findEntities($sql, [$user,"%" . $name ."%"]);
+
}
/**
@@ -56,7 +65,16 @@ public function findAllAdmin($getArchived = 0){
return $this->findEntities($sql, []);
}
+ public function delete($project_id) {
+ $sql = 'delete FROM `*PREFIX*timetracker_project` ' .
+ ' where id = ?';
+ try {
+ $this->execute($sql, [$project_id]);
+ return;
+ } catch (\OCP\AppFramework\Db\DoesNotExistException $e){
+ return;
+ }
-
-}
\ No newline at end of file
+ }
+}
diff --git a/lib/Db/ReportItem.php b/lib/Db/ReportItem.php
index d847205..1388980 100644
--- a/lib/Db/ReportItem.php
+++ b/lib/Db/ReportItem.php
@@ -12,23 +12,27 @@ class ReportItem extends Entity {
public $projectId;
public $userUid;
public $time;
+ public $ftime;
public $totalDuration;
public $project;
public $clientId;
public $client;
+ public $cost;
public function __construct() {
// add types in constructor
-
+
$this->addType('id', 'integer');
$this->addType('name', 'string');
- $this->addType('name', 'details');
+ $this->addType('details', 'string');
$this->addType('projectId', 'integer');
$this->addType('userUid', 'string');
$this->addType('time', 'string');
+ $this->addType('ftime', 'string');
$this->addType('totalDuration', 'integer');
$this->addType('project', 'string');
+ $this->addType('cost', 'integer');
}
-}
\ No newline at end of file
+}
diff --git a/lib/Db/ReportItemMapper.php b/lib/Db/ReportItemMapper.php
index 9672668..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;
@@ -14,6 +15,8 @@ public function __construct(IDBConnection $db) {
$this->dbengine = 'MYSQL';
if (strpos(get_class($db->getDatabasePlatform()),'PostgreSQL') !== FALSE){
$this->dbengine = 'POSTGRES';
+ } else if (strpos(get_class($db->getDatabasePlatform()),'Sqlite') !== FALSE){
+ $this->dbengine = 'SQLITE';
}
parent::__construct($db, 'timetracker_work_interval');
}
@@ -30,12 +33,17 @@ public function __construct(IDBConnection $db) {
public $client;
*/
-
+
public function report($user, $from, $to, $filterProjectId, $filterClientId, $filterTagId, $timegroup, $groupOn1, $groupOn2, $admin, $start, $limit ){
-
+
$selectFields = ['min(wi.id) as id', 'sum(duration) as "totalDuration"'];
-
- $pg = 0;
+
+ if ($timegroup !== null) {
+ $selectFields[]= "SUM(wi.cost) as cost";
+ } else {
+ $selectFields[] = 'wi.cost as cost';
+ }
+
$aggregation = true;
if(empty($groupOn1) && empty($groupOn2) && empty($timegroup)) {
$selectFields[] = 'min(wi.details) as "details"';
@@ -51,42 +59,44 @@ public function report($user, $from, $to, $filterProjectId, $filterClientId, $fi
$selectFields[] = '\'*\' as "details"';
}
+ if (!$aggregation) {
+ $selectFields[]= "start as time";
+ } else {
+ $selectFields[]= "min(start) as time";
+ }
- if ($this->dbengine != 'MYSQL') {
- $pg = 1;
- if(empty($timegroup)){
- if (!$aggregation) {
- $selectFields[]= "to_char(to_timestamp(min(start))::date,'YYYY-MM-DD HH24:MI') as time";
- } else {
- $selectFields[]= "to_timestamp(min(start))::date as time";
- }
- } elseif ($timegroup == 'week') {
- $selectFields[]= "to_char(to_timestamp(start)::date, 'YYYY-WW') as time";
+ if ($this->dbengine == 'POSTGRES') {
+ if ($timegroup == 'week') {
+ $selectFields[]= "concat(date_part('year', to_timestamp(start)), 'W', to_char(to_timestamp(start), 'IW')) as ftime";
+ }elseif ($timegroup == 'year') {
+ $selectFields[]= "date_part('year', to_timestamp(start)) as ftime";
+ }elseif ($timegroup == 'month') {
+ $selectFields[]= "to_char(to_timestamp(start), 'YYYY-MM') as ftime";
}elseif ($timegroup == 'day') {
- $selectFields[]= "to_timestamp(start)::date as time";
+ $selectFields[]= "to_char(to_timestamp(start), 'YYYY-MM-DD') as ftime";
+ }
+ } else if ($this->dbengine == 'SQLITE') {
+ if ($timegroup == 'week') {
+ $selectFields[]= "strftime('%YW%W', datetime(start, 'unixepoch')) as ftime";
}elseif ($timegroup == 'year') {
- $selectFields[]= 'date_part(\'year\', to_timestamp(start)::date) as time';
+ $selectFields[]= "strftime('%Y', datetime(start, 'unixepoch')) as ftime";
}elseif ($timegroup == 'month') {
- $selectFields[]= "to_char(to_timestamp(start)::date, 'YYYY-MM') as time";
+ $selectFields[]= "strftime('%Y-%m', datetime(start, 'unixepoch')) as ftime";
+ }elseif ($timegroup == 'day') {
+ $selectFields[]= "strftime('%Y-%m-%d', datetime(start, 'unixepoch')) as ftime";
}
} else {
- if(empty($timegroup)){
- if (!$aggregation) {
- $selectFields[]= "DATE_FORMAT(FROM_UNIXTIME(start),'%Y-%m-%d %H:%i') as time";
- } else {
- $selectFields[]= "DATE_FORMAT(FROM_UNIXTIME(min(start)),'%Y-%m-%d') as time";
- }
- } elseif ($timegroup == 'week') {
- $selectFields[]= "STR_TO_DATE(CONCAT(YEARWEEK(FROM_UNIXTIME(start)),' Monday'), '%x%v %W') as time";
- }elseif ($timegroup == 'day') {
- $selectFields[]= "DATE_FORMAT(FROM_UNIXTIME(start),'%Y-%m-%d') as time";
+ if ($timegroup == 'week') {
+ $selectFields[]= "CONCAT(YEAR(FROM_UNIXTIME(start)), 'W', WEEK(FROM_UNIXTIME(start))) as ftime";
}elseif ($timegroup == 'year') {
- $selectFields[]= 'YEAR(FROM_UNIXTIME(start)) as time';
+ $selectFields[]= "YEAR(FROM_UNIXTIME(start)) as ftime";
}elseif ($timegroup == 'month') {
- $selectFields[]= "DATE_FORMAT(FROM_UNIXTIME(start),'%Y-%m') as time";
+ $selectFields[]= "DATE_FORMAT(FROM_UNIXTIME(start),'%Y-%m') as ftime";
+ }elseif ($timegroup == 'day') {
+ $selectFields[]= "DATE(FROM_UNIXTIME(start)) as ftime";
}
-
}
+
if ($aggregation){
if($groupOn1 != 'name'){
if ($this->dbengine != 'MYSQL') {
@@ -100,46 +110,46 @@ public function report($user, $from, $to, $filterProjectId, $filterClientId, $fi
}
}
-
+
if ($aggregation){
if(($groupOn1 != 'project') && ($groupOn2 != 'project')){
$selectFields[] = '\'*\' as "projectId"';
- if ($this->dbengine != 'MYSQL') {
+ if ($this->dbengine == 'POSTGRES') {
$selectFields[] = 'string_agg(distinct p.name, \',\') as project';
} else {
$selectFields[] = 'group_concat(distinct p.name) as project';
}
} else {
-
+
$selectFields[] = '\'*\' as "projectId"';
$selectFields[] = 'p.name as project';
}
-
-
+
+
if(($groupOn1 != 'client') && ($groupOn2 != 'client')){
$selectFields[] = '\'*\' as "clientId"';
- if ($this->dbengine != 'MYSQL') {
+ if ($this->dbengine == 'POSTGRES') {
$selectFields[] = 'string_agg(distinct c.name, \',\') as client';
} else {
$selectFields[] = 'group_concat(distinct c.name) as client';
}
-
+
} else {
$selectFields[] = '\'*\' as "clientId"';
$selectFields[] = 'c.name as client';
}
-
+
if(($groupOn1 != 'userUid') && ($groupOn2 != 'userUid') && $aggregation){
- if ($this->dbengine != 'MYSQL') {
+ if ($this->dbengine == 'POSTGRES') {
$selectFields[] = 'string_agg(distinct user_uid, \',\') as "userUid"';
} else {
$selectFields[] = 'group_concat(distinct user_uid) as "userUid"';
}
-
+
} else {
$selectFields[] = 'user_uid as "userUid"';
}
-
+
}
$selectItems = implode(", ",$selectFields).
@@ -164,7 +174,7 @@ public function report($user, $from, $to, $filterProjectId, $filterClientId, $fi
foreach($filterProjectId as $f){
$qm[] = '?';
$params[] = $f;
-
+
if($f == null) {
$append = ' or wi.project_id is null ';
}
@@ -200,16 +210,16 @@ public function report($user, $from, $to, $filterProjectId, $filterClientId, $fi
// } elseif ($timegroup == 'year') {
// $groups[] = "YEAR(start)";
// }
- $groups[] = 'time';
+ $groups[] = 'ftime';
}
-
+
if (!empty($groupOn1)){
if ($groupOn1 == "project" || $groupOn1 == "client" || $groupOn1 == "name" || $groupOn1 == "userUid")
// $groups[] = $groupOn1;
if ($groupOn1 == 'name'){
$groups[] = 'wi.name';
} else {
- if($pg) { // postgres needs quotes on names
+ if ($this->dbengine == 'POSTGRES') { // postgres needs quotes on names
$groups[] = '"'.$groupOn1.'"';
} else {
$groups[] = $groupOn1;
@@ -221,8 +231,8 @@ public function report($user, $from, $to, $filterProjectId, $filterClientId, $fi
if ($groupOn2 == 'name'){
$groups[] = 'wi.name';
} else {
- if($pg) {
- $groups[] = '"'.$groupOn2.'"';// postgres needs quotes on names
+ if ($this->dbengine == 'POSTGRES') { // postgres needs quotes on names
+ $groups[] = '"'.$groupOn2.'"';
} else {
$groups[] = $groupOn2;
}
@@ -241,12 +251,12 @@ public function report($user, $from, $to, $filterProjectId, $filterClientId, $fi
if (empty($limit)){
$limit = 10000;
}
- $sql = 'SELECT '.$selectItems.' where '.implode(" and ",$filters).' '.$group. ' order by time desc';
+ $sql = 'SELECT '.$selectItems.' where '.implode(" and ",$filters).' '.$group;
//var_dump($sql);
// var_dump($params);
return $this->findEntities($sql, $params, $limit, $start);
}
-
-}
\ No newline at end of file
+
+}
diff --git a/lib/Db/TagMapper.php b/lib/Db/TagMapper.php
index 9bee004..187252f 100644
--- a/lib/Db/TagMapper.php
+++ b/lib/Db/TagMapper.php
@@ -4,11 +4,18 @@
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';
+ if (strpos(get_class($db->getDatabasePlatform()),'PostgreSQL') !== FALSE){
+ $this->dbengine = 'POSTGRES';
+ } else if (strpos(get_class($db->getDatabasePlatform()),'Sqlite') !== FALSE){
+ $this->dbengine = 'SQLITE';
+ }
parent::__construct($db, 'timetracker_tag');
}
@@ -33,7 +40,12 @@ public function findByNameUser($name, $userUid) {
public function find($id) {
$sql = 'SELECT * FROM `*PREFIX*timetracker_tag` ' .
'WHERE `id` = ?';
- return $this->findEntity($sql, [$id]);
+ try {
+ $e = $this->findEntity($sql, [$id]);
+ return $e;
+ } catch (\OCP\AppFramework\Db\DoesNotExistException $e){
+ return null;
+ }
}
@@ -43,23 +55,29 @@ public function findAll($user){
}
public function findAllAlowedForProject($pid){
- $sql = 'SELECT tt.* FROM `*PREFIX*timetracker_tag` tt join `*PREFIX*timetracker_locked_project_allowed_tag` atg on tt.id = atg.tag_id where atg.project_id = ? order by tt.name asc';
+ $sql = 'SELECT tt.* FROM `*PREFIX*timetracker_tag` tt join `*PREFIX*timetracker_lpa_tags` atg on tt.id = atg.tag_id where atg.project_id = ? order by tt.name asc';
return $this->findEntities($sql, [$pid]);
}
public function allowedTags($id, $tag_ids){
- $sql = 'delete from `*PREFIX*timetracker_locked_project_allowed_tag` where project_id = ?';
+ $sql = 'delete from `*PREFIX*timetracker_lpa_tags` where project_id = ?';
$this->execute($sql, [$id]);
foreach ($tag_ids as $t){
if (empty($t))
continue;
- $sql = 'insert into `*PREFIX*timetracker_locked_project_allowed_tag` (project_id, tag_id, created_at) values(?,?,UNIX_TIMESTAMP(now())) ';
+ if ($this->dbengine == 'MYSQL'){
+ $sql = "insert into `*PREFIX*timetracker_lpa_tags` (project_id, tag_id, created_at) values(?,?,UNIX_TIMESTAMP(now()))";
+ } else if ($this->dbengine == 'POSTGRES'){
+ $sql = "insert into `*PREFIX*timetracker_lpa_tags` (project_id, tag_id, created_at) values(?,?,extract(epoch from now()))";
+ } else if ($this->dbengine == 'SQLITE'){
+ $sql = "insert into `*PREFIX*timetracker_lpa_tags` (project_id, tag_id, created_at) values(?,?,strftime('%s', 'now'))";
+ }
$this->execute($sql, [$id, $t]);
}
return;
}
-}
\ No newline at end of file
+}
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/UserToClient.php b/lib/Db/UserToClient.php
index 03f2660..048c986 100644
--- a/lib/Db/UserToClient.php
+++ b/lib/Db/UserToClient.php
@@ -22,7 +22,7 @@ public function __construct() {
$this->addType('clientId', 'integer');
$this->addType('admin', 'integer');
$this->addType('access', 'integer');
- $this->addType('createdAt', 'timestamp');
+ $this->addType('createdAt', 'integer');
}
}
\ 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/UserToProject.php b/lib/Db/UserToProject.php
index 52a441b..51dc4c9 100644
--- a/lib/Db/UserToProject.php
+++ b/lib/Db/UserToProject.php
@@ -22,7 +22,7 @@ public function __construct() {
$this->addType('projectId', 'integer');
$this->addType('admin', 'integer');
$this->addType('access', 'integer');
- $this->addType('createdAt', 'timestamp');
+ $this->addType('createdAt', 'integer');
}
}
\ 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/WorkInterval.php b/lib/Db/WorkInterval.php
index 998036d..d546f16 100644
--- a/lib/Db/WorkInterval.php
+++ b/lib/Db/WorkInterval.php
@@ -14,11 +14,12 @@ class WorkInterval extends Entity {
public $start;
public $duration;
public $running;
+ public $cost;
public function __construct() {
// add types in constructor
-
+
$this->addType('id', 'integer');
$this->addType('name', 'string');
$this->addType('details', 'string');
@@ -27,5 +28,6 @@ public function __construct() {
$this->addType('start', 'integer');
$this->addType('duration', 'integer');
$this->addType('running', 'integer');
+ $this->addType('cost', 'integer');
}
}
diff --git a/lib/Db/WorkIntervalMapper.php b/lib/Db/WorkIntervalMapper.php
index f788c8f..4a94ec4 100644
--- a/lib/Db/WorkIntervalMapper.php
+++ b/lib/Db/WorkIntervalMapper.php
@@ -4,16 +4,13 @@
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) {
- $this->dbengine = 'MYSQL';
- if (strpos(get_class($db->getDatabasePlatform()),'PostgreSQL') !== FALSE){
- $this->dbengine = 'POSTGRES';
- }
parent::__construct($db, 'timetracker_work_interval');
}
@@ -47,12 +44,12 @@ public function findAllForWorkItem($workItemId, $limit=null, $offset=null) {
}
public function findLatest($user, $limit = 10, $offset = 0){
- $sql = 'SELECT * FROM `*PREFIX*timetracker_work_interval` where user_uid = ? order by id desc';
+ $sql = 'SELECT * FROM `*PREFIX*timetracker_work_interval` where user_uid = ? order by start desc';
return $this->findEntities($sql, [$user],$limit, $offset);
}
public function findLatestByName($user, $name){
- $sql = 'SELECT * FROM `*PREFIX*timetracker_work_interval` where user_uid = ? and name = ? order by id desc';
+ $sql = 'SELECT * FROM `*PREFIX*timetracker_work_interval` where user_uid = ? and name = ? order by start desc';
try {
return $this->findEntity($sql, [$user, $name], 1, 0);
} catch (\OCP\AppFramework\Db\DoesNotExistException $e){
@@ -60,25 +57,27 @@ public function findLatestByName($user, $name){
}
}
- public function findLatestDays($user, $limitDays = 10, $startDay = 0, $limit = 100, $offset = 0){
- if ($this->dbengine == 'MYSQL'){
- $sql = 'SELECT * FROM `*PREFIX*timetracker_work_interval` where user_uid = ? and
- start > unix_timestamp(curdate() + interval 1 day - interval ? day) and
- start < unix_timestamp(curdate() + interval 1 day - interval ? day)
- order by id desc';
- return $this->findEntities($sql, [$user,$limitDays,$startDay],$limit, $offset);
- } else {
- $sql = 'SELECT * FROM `*PREFIX*timetracker_work_interval` where user_uid = ? and
- start > extract(epoch from current_date + interval \'1\' day - interval \''.(int)$limitDays.'\' day) and
- start < extract(epoch from current_date + interval \'1\' day - interval \''.(int)$startDay.'\' day)
- order by id desc';
- return $this->findEntities($sql, [$user],$limit, $offset);
+ public function findLatestInterval($user, $from, $to, $limit = 5000, $offset = 0){
+ $filters[] = "(user_uid = ?)";
+ $params[] = $user;
+
+ if (!empty($from)){
+ $filters[] = "(start > ?)";
+ $params[] = $from;
+
}
-
+ if (!empty($to)){
+ $filters[] = "(start < ?)";
+ $params[] = $to;
+
+ }
+
+ $sql = 'SELECT * FROM `*PREFIX*timetracker_work_interval` where '.implode(" and ",$filters).' order by start desc';
+ return $this->findEntities($sql, $params, $limit, $offset);
}
public function findAllRunning($user, $limit = 100, $offset = 0){
- $sql = 'SELECT * FROM `*PREFIX*timetracker_work_interval` where user_uid = ? and running = 1 order by id desc';
+ $sql = 'SELECT * FROM `*PREFIX*timetracker_work_interval` where user_uid = ? and running = 1 order by start desc';
return $this->findEntities($sql, [$user],$limit, $offset);
}
@@ -87,4 +86,22 @@ public function stopAllRunning($user, $limit = 100, $offset = 0){
return $this->findEntities($sql, [$user],$limit, $offset);
}
-}
\ No newline at end of file
+ public function findAllForProject($project_id){
+ $sql = 'SELECT * FROM `*PREFIX*timetracker_work_interval` where project_id = ?';
+ return $this->findEntities($sql, [$project_id]);
+ }
+
+ public function deleteAllForProject($project_id) {
+ $sql = 'delete FROM `*PREFIX*timetracker_work_interval` ' .
+ ' where project_id = ?';
+
+ try {
+ $this->execute($sql, [$project_id]);
+ return;
+ } catch (\OCP\AppFramework\Db\DoesNotExistException $e){
+ return;
+ }
+
+ }
+
+}
diff --git a/lib/Db/WorkIntervalToTag.php b/lib/Db/WorkIntervalToTag.php
index 628ec9b..28df902 100644
--- a/lib/Db/WorkIntervalToTag.php
+++ b/lib/Db/WorkIntervalToTag.php
@@ -18,7 +18,7 @@ public function __construct() {
$this->addType('id', 'integer');
$this->addType('workIntervalId', 'integer');
$this->addType('tagId', 'integer');
- $this->addType('createdAt', 'timestamp');
+ $this->addType('createdAt', 'integer');
}
}
\ No newline at end of file
diff --git a/lib/Db/WorkIntervalToTagMapper.php b/lib/Db/WorkIntervalToTagMapper.php
index 228228c..d7bd2a5 100644
--- a/lib/Db/WorkIntervalToTagMapper.php
+++ b/lib/Db/WorkIntervalToTagMapper.php
@@ -4,17 +4,18 @@
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_workinterval_to_tag');
+ parent::__construct($db, 'timetracker_workint_to_tag');
}
public function find($id) {
- $sql = 'SELECT * FROM `*PREFIX*timetracker_workinterval_to_tag` ' .
+ $sql = 'SELECT * FROM `*PREFIX*timetracker_workint_to_tag` ' .
'WHERE `id` = ?';
try {
@@ -27,7 +28,7 @@ public function find($id) {
}
public function findAllForWorkInterval($workIntervalId) {
- $sql = 'SELECT * FROM `*PREFIX*timetracker_workinterval_to_tag` ' .
+ $sql = 'SELECT * FROM `*PREFIX*timetracker_workint_to_tag` ' .
'WHERE `work_interval_id` = ?';
try {
@@ -40,7 +41,7 @@ public function findAllForWorkInterval($workIntervalId) {
}
public function deleteAllForWorkInterval($workIntervalId) {
- $sql = 'DELETE FROM `*PREFIX*timetracker_workinterval_to_tag` ' .
+ $sql = 'DELETE FROM `*PREFIX*timetracker_workint_to_tag` ' .
'WHERE `work_interval_id` = ?';
try {
@@ -53,7 +54,7 @@ public function deleteAllForWorkInterval($workIntervalId) {
}
public function deleteAllForTag($tagId) {
- $sql = 'DELETE FROM `*PREFIX*timetracker_workinterval_to_tag` ' .
+ $sql = 'DELETE FROM `*PREFIX*timetracker_workint_to_tag` ' .
'WHERE `tag_id` = ?';
try {
@@ -69,4 +70,4 @@ public function deleteAllForTag($tagId) {
-}
\ No newline at end of file
+}
diff --git a/lib/Db/WorkItem.php b/lib/Db/WorkItem.php
index 1208d0d..ccf5f2a 100644
--- a/lib/Db/WorkItem.php
+++ b/lib/Db/WorkItem.php
@@ -22,7 +22,7 @@ public function __construct() {
$this->addType('projectId', 'integer');
$this->addType('tagId', 'integer');
$this->addType('totalDuration', 'integer');
- $this->addType('createdAt', 'timestamp');
+ $this->addType('createdAt', 'integer');
$this->addType('userUid', 'string');
}
}
\ 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/lib/Migration/Version000000Date20210719124731.php b/lib/Migration/Version000000Date20210719124731.php
new file mode 100644
index 0000000..4963fa1
--- /dev/null
+++ b/lib/Migration/Version000000Date20210719124731.php
@@ -0,0 +1,479 @@
+connection = $connection;
+ }
+
+ /**
+ * @param IOutput $output
+ * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+ * @param array $options
+ * @return null|ISchemaWrapper
+ */
+ public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+ /** @var ISchemaWrapper $schema */
+ $schema = $schemaClosure();
+
+ if (!$schema->hasTable('timetracker_client')) {
+ $table = $schema->createTable('timetracker_client');
+ $table->addColumn('id', 'integer', [
+ 'autoincrement' => true,
+ 'notnull' => true,
+ ]);
+ $table->addColumn('name', 'string', [
+ 'notnull' => true,
+ 'length' => 64
+ ]);
+ $table->addColumn('created_at', 'integer', [
+ 'notnull' => true,
+ 'length' => 4,
+ ]);
+
+ $table->setPrimaryKey(['id']);
+ }
+
+ if (!$schema->hasTable('timetracker_project')) {
+ $table = $schema->createTable('timetracker_project');
+ $table->addColumn('id', 'integer', [
+ 'autoincrement' => true,
+ 'notnull' => true,
+ ]);
+ $table->addColumn('name', 'string', [
+ 'notnull' => true,
+ 'length' => 64,
+ ]);
+ $table->addColumn('client_id', 'integer', [
+ 'notnull' => false,
+ 'length' => 4,
+ ]);
+ $table->addColumn('created_by_user_uid', 'string', [
+ 'notnull' => true,
+ 'length' => 128,
+ ]);
+ $table->addColumn('locked', 'integer', [
+ 'notnull' => false,
+ 'default' => 0,
+ 'length' => 4,
+ ]);
+ $table->addColumn('archived', 'integer', [
+ 'notnull' => false,
+ 'default' => 0,
+ 'length' => 4,
+ ]);
+ $table->addColumn('created_at', 'integer', [
+ 'notnull' => true,
+ 'length' => 4,
+ ]);
+ $table->addColumn('color', 'string', [
+ 'notnull' => true,
+ 'default' => '#ffffff',
+ 'length' => 7,
+ ]);
+
+ $table->setPrimaryKey(['id']);
+ }
+
+ if (!$schema->hasTable('timetracker_user_to_project')) {
+ $table = $schema->createTable('timetracker_user_to_project');
+ $table->addColumn('id', 'integer', [
+ 'autoincrement' => true,
+ 'notnull' => true,
+ ]);
+ $table->addColumn('user_uid', 'string', [
+ 'notnull' => true,
+ 'length' => 128,
+ ]);
+ $table->addColumn('project_id', 'integer', [
+ 'notnull' => true,
+ 'length' => 4,
+ ]);
+ $table->addColumn('admin', 'integer', [
+ 'notnull' => true,
+ 'default' => 0,
+ 'length' => 4,
+ ]);
+ $table->addColumn('access', 'integer', [
+ 'notnull' => true,
+ 'default' => 1,
+ 'length' => 4,
+ ]);
+ $table->addColumn('created_at', 'integer', [
+ 'notnull' => true,
+ 'length' => 4,
+ ]);
+
+ $table->setPrimaryKey(['id'], 'tt_u_to_p_id_idx');
+ }
+
+ if (!$schema->hasTable('timetracker_user_to_client')) {
+ $table = $schema->createTable('timetracker_user_to_client');
+ $table->addColumn('id', 'integer', [
+ 'autoincrement' => true,
+ 'notnull' => true,
+ ]);
+ $table->addColumn('user_uid', 'string', [
+ 'notnull' => true,
+ 'length' => 128,
+ ]);
+ $table->addColumn('client_id', 'integer', [
+ 'notnull' => true,
+ 'length' => 4,
+ ]);
+ $table->addColumn('admin', 'integer', [
+ 'notnull' => true,
+ 'default' => 0,
+ 'length' => 4,
+ ]);
+ $table->addColumn('access', 'integer', [
+ 'notnull' => true,
+ 'default' => 1,
+ 'length' => 4,
+ ]);
+ $table->addColumn('created_at', 'integer', [
+ 'notnull' => true,
+ 'length' => 4,
+ ]);
+
+ $table->setPrimaryKey(['id'], 'tt_u_t_c_id_idx');
+ }
+
+ if (!$schema->hasTable('timetracker_work_interval')) {
+ $table = $schema->createTable('timetracker_work_interval');
+ $table->addColumn('id', 'integer', [
+ 'autoincrement' => true,
+ 'notnull' => true,
+ ]);
+ $table->addColumn('name', 'string', [
+ 'notnull' => true,
+ 'length' => 256,
+ ]);
+ $table->addColumn('details', 'string', [
+ 'notnull' => true,
+ 'default' => '',
+ 'length' => 1024,
+ ]);
+ $table->addColumn('project_id', 'integer', [
+ 'notnull' => false,
+ 'length' => 4,
+ ]);
+ $table->addColumn('user_uid', 'text', [
+ 'notnull' => true,
+ 'length' => 128,
+ ]);
+ $table->addColumn('start', 'integer', [
+ 'notnull' => true,
+ 'length' => 4,
+ ]);
+ $table->addColumn('duration', 'integer', [
+ 'notnull' => false,
+ 'length' => 4,
+ ]);
+ $table->addColumn('running', 'integer', [
+ 'notnull' => true,
+ 'length' => 4,
+ ]);
+
+ $table->setPrimaryKey(['id'], 'tt_w_i_id_idx');
+ }
+
+ if (!$schema->hasTable('timetracker_tag')) {
+ $table = $schema->createTable('timetracker_tag');
+ $table->addColumn('id', 'integer', [
+ 'autoincrement' => true,
+ 'notnull' => true,
+ ]);
+ $table->addColumn('name', 'string', [
+ 'notnull' => true,
+ 'length' => 64,
+ ]);
+ $table->addColumn('user_uid', 'string', [
+ 'notnull' => true,
+ 'length' => 128,
+ ]);
+ $table->addColumn('created_at', 'integer', [
+ 'notnull' => true,
+ 'length' => 4,
+ ]);
+
+ $table->setPrimaryKey(['id']);
+ }
+
+
+ if (!$schema->hasTable('timetracker_lpa_tags')) {
+ $table = $schema->createTable('timetracker_lpa_tags');
+ $table->addColumn('id', 'integer', [
+ 'autoincrement' => true,
+ 'notnull' => true,
+ ]);
+ $table->addColumn('project_id', 'integer', [
+ 'notnull' => true,
+ 'length' => 4,
+ ]);
+ $table->addColumn('tag_id', 'integer', [
+ 'notnull' => true,
+ 'length' => 4,
+ ]);
+ $table->addColumn('created_at', 'integer', [
+ 'notnull' => true,
+ 'length' => 4,
+ ]);
+
+ $table->setPrimaryKey(['id']);
+ }
+
+ if (!$schema->hasTable('timetracker_workint_to_tag')) {
+ $table = $schema->createTable('timetracker_workint_to_tag');
+ $table->addColumn('id', 'integer', [
+ 'autoincrement' => true,
+ 'notnull' => true,
+ ]);
+ $table->addColumn('work_interval_id', 'integer', [
+ 'notnull' => true,
+ 'length' => 4,
+ ]);
+ $table->addColumn('tag_id', 'integer', [
+ 'notnull' => true,
+ 'length' => 4,
+ ]);
+ $table->addColumn('created_at', 'integer', [
+ 'notnull' => true,
+ 'length' => 4,
+ ]);
+
+ $table->setPrimaryKey(['id'], 'tt_wi_to_tag_id_idx');
+ }
+
+ if (!$schema->hasTable('timetracker_timeline_entry')) {
+ $table = $schema->createTable('timetracker_timeline_entry');
+ $table->addColumn('id', 'integer', [
+ 'autoincrement' => true,
+ 'notnull' => true,
+ ]);
+ $table->addColumn('timeline_id', 'integer', [
+ 'notnull' => false,
+ 'length' => 4,
+ ]);
+ $table->addColumn('user_uid', 'text', [
+ 'notnull' => true,
+ 'length' => 128,
+ ]);
+ $table->addColumn('name', 'text', [
+ 'notnull' => true,
+ 'length' => 64,
+ ]);
+ $table->addColumn('project_name', 'text', [
+ 'notnull' => true,
+ 'length' => 64,
+ ]);
+ $table->addColumn('client_name', 'text', [
+ 'notnull' => true,
+ 'length' => 64,
+ ]);
+ $table->addColumn('time_interval', 'text', [
+ 'notnull' => true,
+ 'length' => 64,
+ ]);
+ $table->addColumn('total_duration', 'text', [
+ 'notnull' => true,
+ 'length' => 64,
+ ]);
+ $table->addColumn('created_at', 'integer', [
+ 'notnull' => true,
+ 'length' => 4,
+ ]);
+
+ $table->setPrimaryKey(['id'], 'tt_t_e_id_idx');
+ }
+
+ if (!$schema->hasTable('timetracker_timeline')) {
+ $table = $schema->createTable('timetracker_timeline');
+ $table->addColumn('id', 'integer', [
+ 'autoincrement' => true,
+ 'notnull' => true,
+ ]);
+ $table->addColumn('status', 'text', [
+ 'notnull' => true,
+ 'length' => 64,
+ ]);
+ $table->addColumn('user_uid', 'text', [
+ 'notnull' => true,
+ 'length' => 128,
+ ]);
+ $table->addColumn('group1', 'text', [
+ 'notnull' => false,
+ 'length' => 64,
+ ]);
+ $table->addColumn('group2', 'text', [
+ 'notnull' => false,
+ 'length' => 64,
+ ]);
+ $table->addColumn('time_group', 'text', [
+ 'notnull' => false,
+ 'length' => 64,
+ ]);
+ $table->addColumn('filter_projects', 'text', [
+ 'notnull' => false,
+ 'length' => 64,
+ ]);
+ $table->addColumn('filter_clients', 'text', [
+ 'notnull' => false,
+ 'length' => 64,
+ ]);
+ $table->addColumn('time_interval', 'text', [
+ 'notnull' => false,
+ 'length' => 64,
+ ]);
+ $table->addColumn('total_duration', 'text', [
+ 'notnull' => true,
+ 'length' => 64,
+ ]);
+ $table->addColumn('created_at', 'integer', [
+ 'notnull' => true,
+ 'length' => 4,
+ ]);
+
+ $table->setPrimaryKey(['id']);
+ }
+
+ if (!$schema->hasTable('timetracker_goal')) {
+ $table = $schema->createTable('timetracker_goal');
+ $table->addColumn('id', 'integer', [
+ 'autoincrement' => true,
+ 'notnull' => true,
+ ]);
+ $table->addColumn('user_uid', 'text', [
+ 'notnull' => true,
+ 'length' => 128,
+ ]);
+ $table->addColumn('project_id', 'integer', [
+ 'notnull' => true,
+ 'length' => 4,
+ ]);
+ $table->addColumn('hours', 'integer', [
+ 'notnull' => true,
+ 'length' => 4,
+ ]);
+ $table->addColumn('interval', 'text', [
+ 'notnull' => true,
+ 'length' => 12,
+ ]);
+ $table->addColumn('created_at', 'integer', [
+ 'notnull' => true,
+ 'length' => 4,
+ ]);
+
+ $table->setPrimaryKey(['id']);
+ }
+
+ return $schema;
+ }
+
+ /**
+ * @param IOutput $output
+ * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+ * @param array $options
+ * @since 13.0.0
+ */
+ public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options): void {
+ $this->moveTimeTrackerWorkIntervalToTag();
+ $this->moveTimeTrackerLockedProjectAllowedTag();
+ }
+
+ protected function moveTimeTrackerWorkIntervalToTag(): void {
+ if (!$this->connection->tableExists('timetracker_workint_to_tag') ||
+ !$this->connection->tableExists('timetracker_workinterval_to_tag')) {
+ return;
+ }
+
+ $insert = $this->connection->getQueryBuilder();
+ $insert->insert('timetracker_workint_to_tag')
+ ->values([
+ 'id' => $insert->createParameter('id'),
+ 'work_interval_id' => $insert->createParameter('work_interval_id'),
+ 'tag_id' => $insert->createParameter('tag_id'),
+ 'created_at' => $insert->createParameter('created_at'),
+ ]);
+
+ $query = $this->connection->getQueryBuilder();
+ $query->select('*')
+ ->from('timetracker_workint_to_tag');
+ $result = $query->execute();
+ if ($result->fetch()) {
+ $result->closeCursor();
+ return;
+ }
+
+ $query = $this->connection->getQueryBuilder();
+ $query->select('*')
+ ->from('timetracker_workinterval_to_tag');
+ $result = $query->execute();
+
+ while ($row = $result->fetch()) {
+ $insert
+ ->setParameter('id', (int) $row['id'], IQueryBuilder::PARAM_INT)
+ ->setParameter('work_interval_id', (int) $row['work_interval_id'], IQueryBuilder::PARAM_INT)
+ ->setParameter('tag_id', (int) $row['tag_id'], IQueryBuilder::PARAM_INT)
+ ->setParameter('created_at', (int) $row['created_at'], IQueryBuilder::PARAM_INT)
+ ;
+ $insert->execute();
+ }
+ $result->closeCursor();
+ }
+
+ protected function moveTimeTrackerLockedProjectAllowedTag(): void {
+ if (!$this->connection->tableExists('timetracker_lpa_tags') ||
+ !$this->connection->tableExists('timetracker_locked_project_allowed_tag')) {
+ return;
+ }
+
+ $insert = $this->connection->getQueryBuilder();
+ $insert->insert('timetracker_lpa_tags')
+ ->values([
+ 'id' => $insert->createParameter('id'),
+ 'project_id' => $insert->createParameter('project_id'),
+ 'tag_id' => $insert->createParameter('tag_id'),
+ 'created_at' => $insert->createParameter('created_at'),
+ ]);
+
+ $query = $this->connection->getQueryBuilder();
+ $query->select('*')
+ ->from('timetracker_lpa_tags');
+ $result = $query->execute();
+ if ($result->fetch()) {
+ $result->closeCursor();
+ return;
+ }
+
+ $query = $this->connection->getQueryBuilder();
+ $query->select('*')
+ ->from('timetracker_locked_project_allowed_tag');
+ $result = $query->execute();
+
+ while ($row = $result->fetch()) {
+ $insert
+ ->setParameter('id', (int) $row['id'], IQueryBuilder::PARAM_INT)
+ ->setParameter('project_id', (int) $row['project_id'], IQueryBuilder::PARAM_INT)
+ ->setParameter('tag_id', (int) $row['tag_id'], IQueryBuilder::PARAM_INT)
+ ->setParameter('created_at', (int) $row['created_at'], IQueryBuilder::PARAM_INT)
+ ;
+ $insert->execute();
+ }
+ $result->closeCursor();
+ }
+}
diff --git a/lib/Migration/Version000001Date20210719192031.php b/lib/Migration/Version000001Date20210719192031.php
new file mode 100644
index 0000000..01c4b4a
--- /dev/null
+++ b/lib/Migration/Version000001Date20210719192031.php
@@ -0,0 +1,118 @@
+hasTable('timetracker_project')) {
+ $table = $schema->getTable('timetracker_project');
+ if ($table->hasColumn('created_by_user_id')) {
+ $schema->dropTable('timetracker_project');
+ $table = $schema->createTable('timetracker_project');
+ $table->addColumn('id', 'integer', [
+ 'autoincrement' => true,
+ 'notnull' => true,
+ ]);
+ $table->addColumn('name', 'string', [
+ 'notnull' => true,
+ 'length' => 64,
+ ]);
+ $table->addColumn('client_id', 'integer', [
+ 'notnull' => false,
+ 'length' => 4,
+ ]);
+ $table->addColumn('created_by_user_uid', 'string', [
+ 'notnull' => true,
+ 'length' => 128,
+ ]);
+ $table->addColumn('locked', 'integer', [
+ 'notnull' => false,
+ 'default' => 0,
+ 'length' => 4,
+ ]);
+ $table->addColumn('archived', 'integer', [
+ 'notnull' => false,
+ 'default' => 0,
+ 'length' => 4,
+ ]);
+ $table->addColumn('created_at', 'integer', [
+ 'notnull' => true,
+ 'length' => 4,
+ ]);
+ $table->addColumn('color', 'string', [
+ 'notnull' => true,
+ 'default' => '#ffffff',
+ 'length' => 7,
+ ]);
+
+ $table->setPrimaryKey(['id']);
+ }
+ }
+
+ if ($schema->hasTable('timetracker_timeline_entry')) {
+ $table = $schema->getTable('timetracker_timeline_entry');
+ if ($table->hasColumn('user_id')) {
+ $schema->dropTable('timetracker_timeline_entry');
+ $table = $schema->createTable('timetracker_timeline_entry');
+ $table->addColumn('id', 'integer', [
+ 'autoincrement' => true,
+ 'notnull' => true,
+ ]);
+ $table->addColumn('timeline_id', 'integer', [
+ 'notnull' => false,
+ 'length' => 4,
+ ]);
+ $table->addColumn('user_uid', 'text', [
+ 'notnull' => true,
+ 'length' => 128,
+ ]);
+ $table->addColumn('name', 'text', [
+ 'notnull' => true,
+ 'length' => 64,
+ ]);
+ $table->addColumn('project_name', 'text', [
+ 'notnull' => true,
+ 'length' => 64,
+ ]);
+ $table->addColumn('client_name', 'text', [
+ 'notnull' => true,
+ 'length' => 64,
+ ]);
+ $table->addColumn('time_interval', 'text', [
+ 'notnull' => true,
+ 'length' => 64,
+ ]);
+ $table->addColumn('total_duration', 'text', [
+ 'notnull' => true,
+ 'length' => 64,
+ ]);
+ $table->addColumn('created_at', 'integer', [
+ 'notnull' => true,
+ 'length' => 4,
+ ]);
+
+ $table->setPrimaryKey(['id'], 'tt_t_e_id_idx');
+ }
+ }
+
+ return $schema;
+ }
+}
diff --git a/lib/Migration/Version000020Date20220528101009.php b/lib/Migration/Version000020Date20220528101009.php
new file mode 100644
index 0000000..6e2c6bf
--- /dev/null
+++ b/lib/Migration/Version000020Date20220528101009.php
@@ -0,0 +1,75 @@
+
+ *
+ * @author Harm Akkerman
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * 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
+ * along with this program. If not, see .
+ *
+ */
+
+namespace OCA\TimeTracker\Migration;
+
+use Closure;
+use OCP\DB\ISchemaWrapper;
+use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
+
+/**
+ * Auto-generated migration step: Please modify to your needs!
+ */
+class Version000020Date20220528101009 extends SimpleMigrationStep {
+
+ /**
+ * @param IOutput $output
+ * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+ * @param array $options
+ */
+ public function preSchemaChange(IOutput $output, Closure $schemaClosure, array $options): void {
+ }
+
+ /**
+ * @param IOutput $output
+ * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+ * @param array $options
+ * @return null|ISchemaWrapper
+ */
+ public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+ $schema = $schemaClosure();
+ if ($schema->hasTable('timetracker_work_interval')) {
+ $table = $schema->getTable('timetracker_work_interval');
+ if (!$table->hasColumn('cost')) {
+ $table->addColumn('cost', 'integer', [
+ 'notnull' => false,
+ 'length' => 10,
+ ]);
+ }
+ }
+
+ return $schema;
+ }
+
+ /**
+ * @param IOutput $output
+ * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+ * @param array $options
+ */
+ public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options): void {
+ }
+}
diff --git a/templates/content/clients.php b/templates/content/clients.php
index d4687f7..e0f12ac 100644
--- a/templates/content/clients.php
+++ b/templates/content/clients.php
@@ -1,28 +1,28 @@
-
Clients
-
+
+ Are you sure you want to delete this client?
+
+
+
+
+
-
Dashboard
+
Dashboard
-
-
-
-
Time (in minutes) allocated to each client in the last 30 days
-
-
-
+
+
+
+
Time (in minutes) allocated to each client in the last days
+
+
+
+
+
+
+
+
-
+
Goals
+
+
+
+
+ Are you sure you want to delete this goal?
+
+
+
+
+
-
-
-
Manual entry
-
- Are you sure you want to delete this work item?
-
-
+
+
All form fields are required.
-
-
All form fields are required.
-
-
-
+
+
-
-
-
-
\ No newline at end of file
diff --git a/templates/content/projects.php b/templates/content/projects.php
index 3a95452..4569291 100644
--- a/templates/content/projects.php
+++ b/templates/content/projects.php
@@ -1,61 +1,81 @@
-
-
Projects
-
+
+ Are you sure you want to delete this project?
+
+
+
-
-
+
+
\ No newline at end of file
diff --git a/templates/content/reports.php b/templates/content/reports.php
index 2ac76c8..f4005a9 100644
--- a/templates/content/reports.php
+++ b/templates/content/reports.php
@@ -1,80 +1,79 @@
-
-
Reports
+
Reports
+
+
+ Are you sure you want to delete this report?
+
+
-
-
+
+
\ No newline at end of file
diff --git a/templates/content/tags.php b/templates/content/tags.php
index 5fcf6df..10e6823 100644
--- a/templates/content/tags.php
+++ b/templates/content/tags.php
@@ -1,28 +1,28 @@
\ No newline at end of file
diff --git a/templates/content/timelines-admin.php b/templates/content/timelines-admin.php
index 8cc294a..e16f4ca 100644
--- a/templates/content/timelines-admin.php
+++ b/templates/content/timelines-admin.php
@@ -1,44 +1,43 @@
-
-
Timelines Admin
+
Timelines Admin
+
+
+ Are you sure you want to delete this timeline?
+
+
+
+
+
-
-
+
+
\ No newline at end of file
diff --git a/templates/content/timelines.php b/templates/content/timelines.php
index e6010fb..70c5a8f 100644
--- a/templates/content/timelines.php
+++ b/templates/content/timelines.php
@@ -1,80 +1,102 @@
-
-
Timelines
+
Timelines
+
+
+ Are you sure you want to delete this timeline?
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
Exported Timelines Statuses
-
-
-
+
+
+
+
Exported Timelines Statuses
+
+
+
\ No newline at end of file
diff --git a/templates/index.php b/templates/index.php
index c9f1513..d9144c1 100644
--- a/templates/index.php
+++ b/templates/index.php
@@ -1,35 +1,24 @@
= 28) {
+ style('timetracker', 'style-compat');
+}
+
script('timetracker', $script);
?>
-
-
- inc('navigation/index')); ?>
- inc('settings/index')); ?>
-
+
+ inc('navigation/index')); ?>
+
-
-
- inc($appPage)); ?>
-
+
-
diff --git a/templates/navigation/index.php b/templates/navigation/index.php
index 8f19325..6217972 100644
--- a/templates/navigation/index.php
+++ b/templates/navigation/index.php
@@ -1,13 +1,13 @@
-
- - Timer
- - Dashboard
- - Reports
- - Timelines
+
diff --git a/webfonts/fa-brands-400.svg b/webfonts/fa-brands-400.svg
index 7f23efa..1f1c4d9 100644
--- a/webfonts/fa-brands-400.svg
+++ b/webfonts/fa-brands-400.svg
@@ -1,1260 +1 @@
-
-
-
-
+
\ No newline at end of file
diff --git a/webfonts/fa-regular-400.svg b/webfonts/fa-regular-400.svg
index e789514..e3b9a24 100644
--- a/webfonts/fa-regular-400.svg
+++ b/webfonts/fa-regular-400.svg
@@ -1,471 +1 @@
-
-
-
-
+
\ No newline at end of file
diff --git a/webfonts/fa-solid-900.svg b/webfonts/fa-solid-900.svg
index f83fa4a..bd49cf0 100644
--- a/webfonts/fa-solid-900.svg
+++ b/webfonts/fa-solid-900.svg
@@ -1,2760 +1 @@
-
-
-
-
+
\ No newline at end of file