Skip to content

Commit

Permalink
Change the format routine to a filter
Browse files Browse the repository at this point in the history
  • Loading branch information
@alvfig
alvfig committed Jan 24, 2018
1 parent 39d047d commit a88a3ba
Showing 1 changed file with 21 additions and 19 deletions.
40 changes: 21 additions & 19 deletions calculator.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,25 +19,25 @@ <h2>Calculator for Lords Mobile Game</h2>
<div class="w3-cell-row">
<div class="w3-cell">
<div class="w3-bar-block">
<button class="w3-bar-item w3-btn w3-ripple" ng-click="addCard(1)">{{formatValue(1)}}</button>
<button class="w3-bar-item w3-btn w3-ripple" ng-click="addCard(5)">{{formatValue(5)}}</button>
<button class="w3-bar-item w3-btn w3-ripple" ng-click="addCard(15)">{{formatValue(15)}}</button>
<button class="w3-bar-item w3-btn w3-ripple" ng-click="addCard(60)">{{formatValue(60)}}</button>
<button class="w3-bar-item w3-btn w3-ripple" ng-click="addCard(480)">{{formatValue(480)}}</button>
<button class="w3-bar-item w3-btn w3-ripple" ng-click="addCard(1440)">{{formatValue(1440)}}</button>
<button class="w3-bar-item w3-btn w3-ripple" ng-click="addCard(10080)">{{formatValue(10080)}}</button>
<button class="w3-bar-item w3-btn w3-ripple" ng-click="addCard(1)">{{1|interval}}</button>
<button class="w3-bar-item w3-btn w3-ripple" ng-click="addCard(5)">{{5|interval}}</button>
<button class="w3-bar-item w3-btn w3-ripple" ng-click="addCard(15)">{{15|interval}}</button>
<button class="w3-bar-item w3-btn w3-ripple" ng-click="addCard(60)">{{60|interval}}</button>
<button class="w3-bar-item w3-btn w3-ripple" ng-click="addCard(480)">{{480|interval}}</button>
<button class="w3-bar-item w3-btn w3-ripple" ng-click="addCard(1440)">{{1440|interval}}</button>
<button class="w3-bar-item w3-btn w3-ripple" ng-click="addCard(10080)">{{10080|interval}}</button>
<button class="w3-bar-item w3-btn w3-ripple" ng-click="saveOnMemory()">&gt; Memory</button>
</div>
</div>
<div class="w3-cell">
<div class="w3-bar-block">
<button class="w3-bar-item w3-btn w3-ripple" ng-click="addCard(3)">{{formatValue(3)}}</button>
<button class="w3-bar-item w3-btn w3-ripple" ng-click="addCard(10)">{{formatValue(10)}}</button>
<button class="w3-bar-item w3-btn w3-ripple" ng-click="addCard(30)">{{formatValue(30)}}</button>
<button class="w3-bar-item w3-btn w3-ripple" ng-click="addCard(180)">{{formatValue(180)}}</button>
<button class="w3-bar-item w3-btn w3-ripple" ng-click="addCard(900)">{{formatValue(900)}}</button>
<button class="w3-bar-item w3-btn w3-ripple" ng-click="addCard(4320)">{{formatValue(4320)}}</button>
<button class="w3-bar-item w3-btn w3-ripple" ng-click="addCard(43200)">{{formatValue(43200)}}</button>
<button class="w3-bar-item w3-btn w3-ripple" ng-click="addCard(3)">{{3|interval}}</button>
<button class="w3-bar-item w3-btn w3-ripple" ng-click="addCard(10)">{{10|interval}}</button>
<button class="w3-bar-item w3-btn w3-ripple" ng-click="addCard(30)">{{30|interval}}</button>
<button class="w3-bar-item w3-btn w3-ripple" ng-click="addCard(180)">{{180|interval}}</button>
<button class="w3-bar-item w3-btn w3-ripple" ng-click="addCard(900)">{{900|interval}}</button>
<button class="w3-bar-item w3-btn w3-ripple" ng-click="addCard(4320)">{{4320|interval}}</button>
<button class="w3-bar-item w3-btn w3-ripple" ng-click="addCard(43200)">{{43200|interval}}</button>
<button class="w3-bar-item w3-btn w3-ripple" ng-click="clearMemory()">Clear Memory</button>
</div>
</div>
Expand All @@ -61,19 +61,19 @@ <h2>Calculator for Lords Mobile Game</h2>
</div>
<div ng-show="total" class="w3-col m2 w3-container w3-card">
<h4>Sum</h4>
<h3>{{formatValue(sum())}}</h3>
<h3>{{sum()|interval}}</h3>
<div ng-show="memory">
<h5>Memory</h5>
<p>{{formatValue(memory)}}</p>
<p>{{memory|interval}}</p>
<h5>Total</h5>
<p>{{formatValue(total)}}</p>
<p>{{total|interval}}</p>
</div>
</div>
<div class="w3-col w3-container w3-card">
<hr>
<button class="w3-btn w3-ripple" ng-click="toggleAbout()">About &amp; Help</button>
<div ng-show="about">
<h3>Calculator for Lords Mobile Game v0.3.1</h3>
<h3>Calculator for Lords Mobile Game v0.3.2</h3>
<p>This calculator can helps you sum up the accelerators/speed ups from Lords Mobile game. It runs on most modern browsers and should work equally well on desktops, laptops, tablets and mobiles.</p>
<p>Use the Time Interval buttons (minutes, hours and days), then place the correspondig quantity of accelerators and see the result on the display at the end (near the word "Sum").</p>
<p>Press the Remove buttons (&times;) to delete each accelerator. To remove all them at once, choose the Remove button located at the top, near the "Resource" header.</p>
Expand Down Expand Up @@ -123,7 +123,9 @@ <h3>Calculator for Lords Mobile Game v0.3.1</h3>
$scope.total = sum + $scope.memory;
return sum;
};
$scope.formatValue = function(minutes) {
});
app.filter("interval", function() {
return function(minutes) {
var str = '';
var remain = minutes;
var formatPart = function(divisor, unit) {
Expand Down

0 comments on commit a88a3ba

Please sign in to comment.