From 51b2d2f9cc23d3183de7a86e079241b63312fd8b Mon Sep 17 00:00:00 2001
From: Tadej Novak <tadej@tano.si>
Date: Sat, 29 Nov 2014 13:18:12 +0100
Subject: [PATCH] Fix achievements

---
 index.html        |  2 +-
 js/app.js         |  2 +-
 js/gameobjects.js |  7 ++++---
 js/ui.js          | 21 +++++++++++++++++++++
 mobile.html       |  2 +-
 5 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/index.html b/index.html
index 00969f8..5478168 100644
--- a/index.html
+++ b/index.html
@@ -203,7 +203,7 @@
           <div class="modal-body">
             <p class="text-center"><strong>Progress</strong> <span class="label label-info">{{ progress() }} / {{ achievements.length }}</span></p>
             <ul class="list-group">
-              <li class="list-group-item" ng-repeat="a in achievements | reverse" ng-show="a.isAchieved()">
+              <li class="list-group-item" ng-repeat="a in achievements | orderBy:'state.dateAchieved' | reverse" ng-show="a.isAchieved()">
                 <i class="fa {{ a.icon }}"></i>
                 {{ a.description }}
                 <span class="badge">{{ a.state.dateAchieved | date }}</span>
diff --git a/js/app.js b/js/app.js
index dd6b5c4..6b14532 100644
--- a/js/app.js
+++ b/js/app.js
@@ -124,7 +124,7 @@
   app.controller('AchievementsController', function($scope) {
     $scope.achievements = achievements;
     $scope.progress = function() {
-      return achievements.filter(function(a) { a.isAchieved(); }).length;
+      return achievements.filter(function(a) { return a.isAchieved(); }).length;
     };
   });
 
diff --git a/js/gameobjects.js b/js/gameobjects.js
index 3f56fa0..91b96d1 100644
--- a/js/gameobjects.js
+++ b/js/gameobjects.js
@@ -247,9 +247,10 @@ var GameObjects = (function() {
       return true;
     }
     if (this._allObjects.hasOwnProperty(this.targetKey) &&
-        this._allObjects[this.targetKey].state.hasOwnProperty(
-            this.targetProperty)) {
-      this.state.dateAchieved = new Date();
+        this._allObjects[this.targetKey].state.hasOwnProperty(this.targetProperty) &&
+        this._allObjects[this.targetKey].state[this.targetProperty] >= this.threshold) {
+      this.state.dateAchieved = new Date().getTime();
+      UI.showAchievement(this);
       return true;
     }
     return false;
diff --git a/js/ui.js b/js/ui.js
index 6553599..7791351 100644
--- a/js/ui.js
+++ b/js/ui.js
@@ -69,6 +69,26 @@ var UI = (function () {
     }});
   }
 
+  var showAchievement = function(obj) {
+    var alert = '<div class="alert alert-success alert-dismissible" role="alert">';
+    alert += '<button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>';
+    alert += '<span class="fa ' + obj.icon + ' alert-glyph"></span> <span class="alert-text">' + obj.description + '</span>';
+    alert += '</div>';
+
+    alert = $(alert);
+
+    $('#achievements-container').prepend(alert);
+    var remove = function(a)
+    {
+      return function()
+      {
+        a.slideUp(300, function() { a.remove(); });
+      };
+    };
+
+    window.setTimeout(remove(alert), 2000);
+  }
+
   var validateVersion = function(version) {
     if (version != Helpers.version) {
       var alert = '<div id="outofdate" class="alert alert-info alert-dismissible" role="alert">';
@@ -104,6 +124,7 @@ var UI = (function () {
   }
 
   return {
+    showAchievement: showAchievement,
     showModal: showModal,
     showLevels: showLevels,
     showUpdateValue: showUpdateValue,
diff --git a/mobile.html b/mobile.html
index 7e2bbbe..7dcdc8b 100644
--- a/mobile.html
+++ b/mobile.html
@@ -94,7 +94,7 @@
           <div class="tab-pane" id="achievements" ng-controller="AchievementsController as ac">
             <p class="text-center"><strong>Progress</strong> <span class="label label-info">{{ ac.achievements.length }} / {{ ac.achievementsAll.length }}</span></p>
             <ul class="list-group">
-              <li class="list-group-item" ng-repeat="a in ac.achievements | reverse">
+              <li class="list-group-item" ng-repeat="a in achievements | orderBy:'state.dateAchieved' | reverse">
                 <span class="badge">{{ a.time }}</span>
                 <span class="glyphicon {{ a.icon }}"></span>
                   {{ a.description }}