Skip to content

Commit

Permalink
refactoring fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
MathieuNls committed Jan 4, 2016
1 parent 795d8bc commit 3171dd1
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
4 changes: 3 additions & 1 deletion application/models/Measure.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ function getMeasuresByUser($userId, $userWatches) {

foreach ($userWatches as $watch) {
//Get measure couple that are on measure or accuracy status
$watchMeasures = $this->select()->where('watchId', $watch->watchId)
$watchMeasures = $this->select()
->join("watch", "watch.watchId = ".$watch->watchId)
->where('measure.watchId', $watch->watchId)
->where('(`statusId` = 1 OR `statusId` = 2)', null, false)
->find_all();

Expand Down
2 changes: 2 additions & 0 deletions application/views/measure/all.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<span>'.$success.'</span></div>';
}
var_dump($allMeasure);
?>

<table class="table table-bordered table-striped table-condensed">
<thead>
<tr>
Expand Down
2 changes: 1 addition & 1 deletion application/views/measure/audio.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
$('.sync-time').html('Go!');
$('.userTime').show();
$('button[name="syncDone"]').removeAttr('disabled');
$.post('/ajax/getReferenceTime');
$.post('/measures/getReferenceTime');
}
}

Expand Down

0 comments on commit 3171dd1

Please sign in to comment.