kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-10-14 17:24:07 +00:00
Code Issues Projects Releases Wiki Activity

Added possibility to track who did a habit (this implements and closes #21)

Browse Source
This commit is contained in:
Bernd Bestel
2018-07-24 20:45:14 +02:00
parent bcbdf58376
commit 249b01d7a8
16 changed files with 139 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
controllers/HabitsApiController.php
View File

@@ -22,9 +22,15 @@ class HabitsApiController extends BaseApiController
$trackedTime = $request->getQueryParams()['tracked_time'];
}
$doneBy = GROCY_USER_ID;
if (isset($request->getQueryParams()['done_by']) && !empty($request->getQueryParams()['done_by']))
{
$doneBy = $request->getQueryParams()['done_by'];
}
try
{
$this->HabitsService->TrackHabit($args['habitId'], $trackedTime);
$this->HabitsService->TrackHabit($args['habitId'], $trackedTime, $doneBy);
return $this->VoidApiActionResponse($response);
}
catch (\Exception $ex)

3
controllers/HabitsController.php
View File

@@ -38,7 +38,8 @@ class HabitsController extends BaseController
public function TrackHabitExecution(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
{
return $this->AppContainer->view->render($response, 'habittracking', [
'habits' => $this->Database->habits()->orderBy('name')
'habits' => $this->Database->habits()->orderBy('name'),
'users' => $this->Database->users()->orderBy('username')
]);
}

6
controllers/UsersApiController.php
View File

@@ -21,7 +21,7 @@ class UsersApiController extends BaseApiController
try
{
$this->UsersService->CreateUser($requestBody['username'], $requestBody['first_name'], $requestBody['last_name'], $requestBody['password']);
return $this->ApiResponse(array('success' => $success));
return $this->ApiResponse(array('success' => true));
}
catch (\Exception $ex)
{
@@ -33,7 +33,7 @@ class UsersApiController extends BaseApiController
{
try
{
$this->UsersService->DeleteUser($args['userId']);
$success = $this->UsersService->DeleteUser($args['userId']);
return $this->ApiResponse(array('success' => $success));
}
catch (\Exception $ex)
@@ -49,7 +49,7 @@ class UsersApiController extends BaseApiController
try
{
$this->UsersService->EditUser($args['userId'], $requestBody['username'], $requestBody['first_name'], $requestBody['last_name'], $requestBody['password']);
return $this->ApiResponse(array('success' => $success));
return $this->ApiResponse(array('success' => true));
}
catch (\Exception $ex)
{