Fixed a couple bugs with Achievements not getting schema defaults.

This commit is contained in:
Nick Winter 2014-09-02 16:48:16 -07:00
parent b20b819a1f
commit fa0f904fbb
5 changed files with 7 additions and 8 deletions

View file

@ -20,7 +20,7 @@ module.exports = class Achievement extends CocoModel
4: 'achievement-gold'
5: 'achievement-diamond'
getStyle: -> Achievement.styleMapping[@get 'difficulty']
getStyle: -> Achievement.styleMapping[@get 'difficulty', true]
@defaultImageURL: '/images/achievements/default.png'

View file

@ -18,6 +18,6 @@ else
td(style="width: 20px")
img.achievement-icon-small(src=achievement.getImageURL() alt="#{achievement.get('name') icon")
td
a(href="/editor/achievement/#{achievement.get('slug')}")= achievement.get('name')
td= achievement.get('description')
td= achievement.get('worth')
a(href="/editor/achievement/#{achievement.get('slug')}")= achievement.get('name', true)
td= achievement.get('description', true)
td= achievement.get('worth', true)

View file

@ -26,11 +26,11 @@ module.exports = class AchievementPopup extends CocoView
nextLevelXP = User.expForLevel(nextLevel)
totalExpNeeded = nextLevelXP - currentLevelExp
expFunction = @achievement.getExpFunction()
currentXP = me.get 'points'
currentXP = me.get 'points', true
if @achievement.isRepeatable()
achievedXP = expFunction(@earnedAchievement.get('previouslyAchievedAmount')) * @achievement.get('worth') if @achievement.isRepeatable()
else
achievedXP = @achievement.get 'worth'
achievedXP = @achievement.get 'worth', true
previousXP = currentXP - achievedXP
leveledUp = currentXP - achievedXP < currentLevelExp
#console.debug 'Leveled up' if leveledUp

View file

@ -37,7 +37,7 @@ module.exports = class LevelFeedbackView extends CocoView
context.allFeedback = []
context.averageRating = 0
context.totalRatings = 0
if @allFeedback
if @allFeedback?.models.length
context.allFeedback = (m.attributes for m in @allFeedback.models when @allFeedback.models.length < 20 or m.get('review'))
context.averageRating = _.reduce((m.get('rating') for m in @allFeedback.models), (acc, x) -> acc + (x ? 5)) / (@allFeedback.models.length)
context.totalRatings = @allFeedback.models.length

View file

@ -18,7 +18,6 @@ module.exports = class NewAchievementModal extends NewModelModal
getRenderData: ->
c = super()
c.level = @level
console.debug 'level', c.level
c
onAchievementSubmitted: (e) ->