wbrawner/interval-timer
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages 1 Wiki Activity Actions

More progress on time remaining

Browse source
This commit is contained in:
William Brawner 2015-11-22 09:51:11 -06:00
parent cbb4350cec
commit 6845851039
3 changed files with 31 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
css/styles.css
View file

@ -173,17 +173,17 @@ a:link, a:hover, a:visited, a:active {
to {right: 100%;}
}
.slideIn {
-moz-animation: slideIn 0.25s ease-in;
-webkit-animation: slideIn 0.25s ease-in;
-o-animation: slideIn 0.25s ease-in;
animation: slideIn 0.25s ease-in;
-moz-animation: slideIn 0.5s ease-out;
-webkit-animation: slideIn 0.5s ease-out;
-o-animation: slideIn 0.5s ease-out;
animation: slideIn 0.5s ease-out;
right: 0;
}
.slideOut {
-moz-animation: slideOut 0.25s ease-out;
-webkit-animation: slideOut 0.25s ease-out;
-o-animation: slideOut 0.25s ease-out;
animation: slideOut 0.25s ease-out;
-moz-animation: slideOut 0.5s ease-in;
-webkit-animation: slideOut 0.5s ease-in;
-o-animation: slideOut 0.5s ease-in;
animation: slideOut 0.5s ease-in;
right: 100%;
}

4
index.html
View file

@ -15,7 +15,7 @@
</div>
<div class="timer-box">
<div class="timer-info">
<p class="time-info">{{ round }}/{{ timer.cycles }}</p>
<p class="time-info">Round: {{ round + 1 }}/{{ timer.rounds }} - Cycle: {{ cycle + 1 }}/{{ timer.cycles }}</p>
<p class="time">{{ time * 1000 | date : "mm:ss" }}</p>
</div>
<div class="timer-controls">
@ -45,6 +45,8 @@
<label>Cool Down:</label>
<input type="number" ng-model="timer.coolDownTime">
<label>Rounds:</label>
<input type="number" ng-model="timer.rounds">
<label>Cycles:</label>
<input type="number" ng-model="timer.cycles">
<a class="form-button" id="save" ng-click="settingsOpen = false; closeSettings = true; time = warmUpTime; resetTimer(); saveTimer()" href="#"> Save Changes</a>
</form>

43
js/app.js
View file

@ -15,7 +15,7 @@
// objectStore.createIndex("name", "name", { unique: false });
// objectStore.createIndex("high_intensity", "high_intensity", { unique: false });
// objectStore.createIndex("low_intensity", "low_intensity", { unique: false });
// objectStore.createIndex("cycles", "cycles", { unique: false });
// objectStore.createIndex("rounds", "rounds", { unique: false });
// objectStore.transaction.oncomplete = function(event) {};
// };
// request.onsuccess = function(event) {
@ -28,8 +28,8 @@
"highIntensityTime" : 20,
"lowIntensityTime" : 10,
"coolDownTime" : 300,
"cycles" : 8,
"repeat": 6
"rounds" : 8,
"cycles": 6
};
app.controller('timerCtrl', ['$scope', '$cookies', function($scope, $cookies) {
$scope.defaults = defaultTimer;
@ -47,15 +47,15 @@
$scope.highIntensityBeep = new Audio('audio/button-42(1).mp3');
$scope.coolDownBeep = new Audio('audio/beep-10.mp3');
$scope.warmUp = true;
$scope.round = 1;
$scope.cycle = 1;
$scope.round = 0;
$scope.cycle = 0;
$scope.time = $scope.timer.warmUpTime;
$scope.settingsOpen = false;
$scope.closeSettings = false;
$scope.getTimeRemaining = function() {
var totalWarmUpTime = $scope.timer.warmUpTime * $scope.timer.repeat;
var totalLowIntensityTime = ($scope.timer.lowIntensityTime * $scope.timer.repeat * $scope.timer.cycles) - ($scope.round * $scope.timer.lowIntensityTime) - ($scope.timer.cycles * $scope.cycle * $scope.timer.lowIntensityTime);
var totalHighIntensityTime = ($scope.timer.highIntensityTime * $scope.timer.repeat * $scope.timer.cycles) - ($scope.round * $scope.timer.highIntensityTime) - ($scope.timer.cycles * $scope.cycle * $scope.timer.highIntensityTime);
var totalWarmUpTime = $scope.timer.warmUpTime * $scope.timer.cycles;
var totalLowIntensityTime = ($scope.timer.lowIntensityTime * $scope.timer.cycles * $scope.timer.rounds) - ($scope.round * $scope.timer.lowIntensityTime) - ($scope.timer.rounds * $scope.cycle * $scope.timer.lowIntensityTime);
var totalHighIntensityTime = ($scope.timer.highIntensityTime * $scope.timer.cycles * $scope.timer.rounds) - ($scope.round * $scope.timer.highIntensityTime) - ($scope.timer.rounds * $scope.cycle * $scope.timer.highIntensityTime);
var totalCoolDownTime = $scope.timer.coolDownTime;
return (totalWarmUpTime + totalLowIntensityTime + totalHighIntensityTime + totalCoolDownTime) * 1000;
}
@ -91,7 +91,7 @@
$scope.startWarmUp = function() {
if ($scope.time == 0) {
$scope.warmUp = false;
$scope.setHighIntensity();
$scope.setLowIntensity();
};
$scope.$apply(function() {
$scope.time--;
@ -120,16 +120,17 @@
};
$scope.startHighIntensity = function() {
if ($scope.time == 0) {
$scope.round++;
if ($scope.round !== $scope.timer.rounds) {
$scope.round++;
}
$scope.highIntensity = false;
console.log("This runs");
if ($scope.round < $scope.timer.cycles) {
if ($scope.round < $scope.timer.rounds) {
$scope.setLowIntensity();
} else {
$scope.cycle++;
// console.log($scope.cycle);
// console.log($scope.timer.repeat);
if ($scope.cycle < $scope.timer.repeat) {
// console.log($scope.timer.cycles);
if ($scope.cycle < $scope.timer.cycles) {
$scope.warmUp = true;
$scope.setWarmUp();
} else {
@ -208,12 +209,12 @@
};
if ($scope.highIntensity) {
$scope.highIntensity = false;
if ($scope.round == $scope.timer.cycles && $scope.cycle == $scope.timer.repeat) {
if ($scope.round == $scope.timer.rounds && $scope.cycle == $scope.timer.cycles) {
$scope.setCoolDown();
return;
} else if ($scope.round == $scope.timer.cycles && $scope.cycle < $scope.timer.repeat) {
} else if ($scope.round == $scope.timer.rounds && $scope.cycle < $scope.timer.cycles) {
$scope.cycle++;
$scope.round = 1;
$scope.round = 0;
$scope.setWarmUp();
return;
}
@ -225,8 +226,8 @@
$scope.resetTimer = function() {
clearInterval($scope.countdown);
$scope.timerActive = false;
$scope.round = 1;
$scope.cycle = 1;
$scope.round = 0;
$scope.cycle = 0;
$scope.lowIntensity = false;
$scope.highIntensity = false;
$scope.coolDown = false;
@ -234,11 +235,7 @@
$scope.time = $scope.timer.warmUpTime;
};
$scope.saveTimer = function() {
console.log("Saved timer:");
console.log($scope.timer);
$cookies.putObject("timer", $scope.timer);
console.log("timer saved");
console.log($cookies.getObject("timer"));
};
}]);
})();