krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 15:17:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed task clone functionality and updated code organization/semantics

Browse Source
This commit is contained in:
TheHollidayInn
2015-06-15 19:46:28 -05:00
parent 9ed3fbf613
commit b81024bdd6
3 changed files with 65 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
test/spec/controllers/challengesCtrlSpec.js
View File

@@ -183,7 +183,9 @@ describe('Challenges Controller', function() {
}); });
}); });
describe('clone', function() {
it('Clones a challenge', function() { it('Clones a challenge', function() {
var copyChallenge = new challenges.Challenge({ var copyChallenge = new challenges.Challenge({
name: 'copyChallenge', name: 'copyChallenge',
description: 'copyChallenge', description: 'copyChallenge',
@@ -195,19 +197,47 @@ describe('Challenges Controller', function() {
group: "copyGroup", group: "copyGroup",
timestamp: +(new Date), timestamp: +(new Date),
members: [user], members: [user],
official: false, official: true,
_isMember: true _isMember: true,
prize: 1
}); });
copyChallenge.habits = [
{
_id: "ae2aa6fd-fae4-44bc-940f-11976ee202f3",
id: "ae2aa6fd-fae4-44bc-940f-11976ee202f3",
dateCreated: "2015-06-15T00:18:59.440Z",
down: true,
notes: "",
priority: 1,
text: "test",
type: "habit",
up: true,
value: 0,
}
];
scope.clone(copyChallenge) scope.clone(copyChallenge)
expect( scope.obj.name ).to.eql(copyChallenge.name ); expect( scope.newChallenge.name ).to.eql( copyChallenge.name );
expect( scope.obj.description ).to.eql(copyChallenge.description ); expect( scope.newChallenge.description ).to.eql( copyChallenge.description );
expect( scope.obj.habits ).to.eql(copyChallenge.habits );
expect( scope.obj.dailys ).to.eql(copyChallenge.dailys ); for( var property in copyChallenge.habits[0] ) {
expect( scope.obj.todos ).to.eql(copyChallenge.todos ); if ( property == "_id" || property == "id" ) {
expect( scope.obj.rewards ).to.eql(copyChallenge.rewards ); expect( scope.newChallenge.habits[0][property] ).to.not.eql( copyChallenge.habits[0][property] );
expect( scope.obj.leader ).to.eql(copyChallenge.leader ); } else {
expect( scope.obj.official ).to.eql(copyChallenge.official ); expect( scope.newChallenge.habits[0][property] ).to.eql( copyChallenge.habits[0][property] );
}
}
expect( scope.newChallenge.dailys ).to.eql( copyChallenge.dailys );
expect( scope.newChallenge.todos ).to.eql( copyChallenge.todos );
expect( scope.newChallenge.rewards ).to.eql( copyChallenge.rewards );
expect( scope.newChallenge.leader ).to.eql( copyChallenge.leader );
expect( scope.newChallenge.timestamp ).to.not.eql( copyChallenge.timestamp );
expect( scope.newChallenge.members ).to.eql( [] );
expect( scope.newChallenge.official ).to.eql( copyChallenge.official );
expect( scope.newChallenge.prize ).to.eql( copyChallenge.prize );
});
}); });

16
website/public/js/controllers/challengesCtrl.js
View File

@@ -101,9 +101,15 @@ habitrpg.controller("ChallengesCtrl", ['$rootScope','$scope', 'Shared', 'User',
reward: [] reward: []
}; };
function cloneTask(element, index, array) { function cloneTask(taskToClone, index, array) {
var task = Shared.taskDefaults(element); var tmpTask = {};
clonedTasks[element.type].push(task); for( var property in taskToClone ) {
if ( property !== "_id" && property !== "id" ) {
tmpTask[property] = taskToClone[property];
}
}
var task = Shared.taskDefaults(tmpTask);
clonedTasks[taskToClone.type].push(task);
} }
challenge.habits.forEach(cloneTask); challenge.habits.forEach(cloneTask);
@@ -111,8 +117,6 @@ habitrpg.controller("ChallengesCtrl", ['$rootScope','$scope', 'Shared', 'User',
challenge.todos.forEach(cloneTask); challenge.todos.forEach(cloneTask);
challenge.rewards.forEach(cloneTask); challenge.rewards.forEach(cloneTask);
//Use values from inc challenge. The reasons we don't use the whole challenge object is because
//Values like timestamp and memebers shouldn't be copied.
$scope.obj = $scope.newChallenge = new Challenges.Challenge({ $scope.obj = $scope.newChallenge = new Challenges.Challenge({
name: challenge.name, name: challenge.name,
shortName: challenge.shortName, shortName: challenge.shortName,
@@ -125,7 +129,7 @@ habitrpg.controller("ChallengesCtrl", ['$rootScope','$scope', 'Shared', 'User',
group: challenge.group._id, group: challenge.group._id,
timestamp: +(new Date), timestamp: +(new Date),
members: [], members: [],
official: false, official: challenge.official,
prize: challenge.prize prize: challenge.prize
}); });
}; };

2
website/views/options/social/challenges.jade
View File

@@ -25,7 +25,7 @@ script(type='text/ng-template', id='partials/options.social.challenges.detail.ht
div(bindonce='challenge', ng-if='challenge.leader._id==user._id') div(bindonce='challenge', ng-if='challenge.leader._id==user._id')
div(ng-hide='challenge._locked==false') div(ng-hide='challenge._locked==false')
button.btn.btn-sm.btn-default(ng-click='edit(challenge)')=env.t('edit') button.btn.btn-sm.btn-default(ng-click='edit(challenge)')=env.t('edit')
button.btn.btn-sm.btn-default(ng-click='clone(challenge)')=env.t('clone') button.btn.btn-sm.btn-success(ng-click='clone(challenge)')=env.t('clone')
button.btn.btn-sm.btn-warning(ng-click='close(challenge, $event)', tooltip=env.t('deleteOrSelect'))=env.t('endChallenge') button.btn.btn-sm.btn-warning(ng-click='close(challenge, $event)', tooltip=env.t('deleteOrSelect'))=env.t('endChallenge')
form(ng-show='challenge._locked==false') form(ng-show='challenge._locked==false')