Skip to content
This repository has been archived by the owner on Aug 6, 2019. It is now read-only.

Commit

Permalink
Tasks totals + jpg -> png
Browse files Browse the repository at this point in the history
  • Loading branch information
nielsenramon committed Jun 20, 2012
1 parent ea4eb00 commit 057b78e
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 6 deletions.
Binary file modified app/public/desktop/img/2.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/public/desktop/img/3.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion app/public/desktop/js/tasks.knockout.js
Expand Up @@ -128,7 +128,6 @@
});
return d;
});

};

var tasksvm = new TasksViewModel();
Expand Down
6 changes: 5 additions & 1 deletion app/public/wall/css/wall.css
Expand Up @@ -268,7 +268,7 @@ hr {

/* Sidepanel */
#task_sidepanel {
width: 855px;
width: 854px;
height: 780px;
float: left;
padding-left: 60px;
Expand Down Expand Up @@ -316,6 +316,10 @@ hr {
width: 855px;
}

.inline {
display: inline-block;
}

/* -------------------------------------
Facebookscreen
------------------------------------- */
Expand Down
2 changes: 1 addition & 1 deletion app/public/wall/js/wall.kinect.js
Expand Up @@ -71,7 +71,7 @@
if( count[ 0 ] !== 0 )
return false;

if( count[ 1 ] === true )
if( count[ 2 ] === true )
{
setTimeout(function() {
window.location="/home";
Expand Down
6 changes: 6 additions & 0 deletions app/public/wall/js/wall.knockout.js
Expand Up @@ -213,6 +213,12 @@ $(document).ready(function () {
});
};

this.completedCount = ko.computed(function() {
return ko.utils.arrayFilter(self.tasks(), function(task) {
return task.completed();
}).length;
});

this.completedTasks = ko.computed(function() {
var d = ko.utils.arrayFilter(self.tasks(), function(task) {
return task.completed();
Expand Down
12 changes: 9 additions & 3 deletions app/views/desktop/wall.jade
Expand Up @@ -75,10 +75,16 @@ body
span.yellow_text major 
| of your student house! Your current stats are:
p#task_sidepanel_owner
span.yellow_text.bold_text(style='display: inline-block;') 250 points 
span.yellow_text.bold_text
- if (user.achievements.score_count && user.achievements.score_count > 0)
| #{user.achievements.score_count} points 
- else
| 0 points 
span(style='display: inline-block;') and
span.yellow_text.bold_text(style='display: inline-block;') 15 tasks 
span(style='display: inline-block;') completed!
span.yellow_text.bold_text
span(data-bind='text: completedCount')
span  tasks 
span completed!
hr
p#task_sidepanel_footnote Nothing to do? 
span.yellow_text Swipe it!
Expand Down

0 comments on commit 057b78e

Please sign in to comment.