goeranh/fitness-api
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

anzahl der sets einer übung #6

Manually merged
goeranh merged 1 commits from development into master 2020-03-31 13:10:22 +02:00
Conversation 0 Commits 1 Files Changed 2 +7 -5
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
html/api/Models/Exercise.php
View File

@ -3,24 +3,26 @@
class Exercise
{
public $id, $name, $description, $amount, $type, $unit, $current;
public $id, $name, $description, $amount, $sets, $type, $unit, $current;
/**
* Workout constructor.
* Exercise constructor.
* @param $id
* @param $name
* @param $description
* @param $amount
* @param $sets
* @param $type
* @param $unit
* @param $current
*/
public function __construct($id, $name, $description, $amount, $type, $unit, $current = 0)
public function __construct($id, $name, $description, $amount, $sets, $type, $unit, $current = 0)
{
$this->id = $id;
$this->name = $name;
$this->description = $description;
$this->amount = $amount;
$this->sets = $sets;
$this->type = $type;
$this->unit = $unit;
$this->current = $current;

4
html/api/workout.php
View File

@ -13,7 +13,7 @@ if (isset($_GET['token'])){
$userID = $userData[0]['user'];
if(isset($_GET['workout'])){
$sql = "SELECT exercises_in_workout.id, name, description, amount, type, unit FROM exercises_in_workout inner join workout_types on workout_types.id=exercises_in_workout.workout_type inner JOIN workout_type_measurements on workout_type_measurements.id=workout_types.measurement where exercises_in_workout.workout_routine=? order by exercises_in_workout.id asc ";
$sql = "SELECT exercises_in_workout.id, name, description, amount, sets, type, unit FROM exercises_in_workout inner join workout_types on workout_types.id=exercises_in_workout.workout_type inner JOIN workout_type_measurements on workout_type_measurements.id=workout_types.measurement where exercises_in_workout.workout_routine=? order by exercises_in_workout.id asc ";
$stmt = $pdo->prepare($sql);
$stmt->bindParam(1, $_GET['workout']);
if ($stmt->execute()){
@ -21,7 +21,7 @@ if (isset($_GET['token'])){
$returnExercises = array();
foreach($exercises as $exercise){
$returnExercises[] = new Exercise($exercise['id'], $exercise['name'], $exercise['description'], $exercise['amount'], $exercise['type'], $exercise['unit']);
$returnExercises[] = new Exercise($exercise['id'], $exercise['name'], $exercise['description'], $exercise['amount'], $exercise['sets'], $exercise['type'], $exercise['unit']);
}
header('Content-Type: application/json');
echo json_encode($returnExercises);