Skip to content

FIX for issue 1013 and 1020 - also includes fixes to related bugs that were found (not logged)#1064

Merged
benjaminvialle merged 3 commits into
MarkUsProject:masterfrom
alyshakwok:issue-1013
Apr 8, 2013
Merged

FIX for issue 1013 and 1020 - also includes fixes to related bugs that were found (not logged)#1064
benjaminvialle merged 3 commits into
MarkUsProject:masterfrom
alyshakwok:issue-1013

Conversation

@alyshakwok

Copy link
Copy Markdown
Contributor

Fixes issue #1013 - included a new partial view for a non-editable result summary view for the extra percentage table

Came across the following issues while working on this (also fixed):

  • invalid method call if extra percentage was from Penalty Decay setting
  • missing UI text if extra percentage was from Penalty Decay setting
  • fixed "remove" update of text (translation to points was not being updated after removal)

Added fix to related issue #1020 - rollover of "Show Old Mark Summary" correctly displays old mark summary for penalties/bonuses

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Conflict here ;)

@benjaminvialle

Copy link
Copy Markdown
Member

Ok. The code is good.

Could you add some tests and I will merge it!

@alyshakwok

Copy link
Copy Markdown
Contributor Author

Hi Benjamin,
What kind of tests would you like me to add? I've only modified views to incorporate either calling the methods on an original result or a remark result. These methods already have unit tests written for them.

@benjaminvialle

Copy link
Copy Markdown
Member

Yes, you're right :)

benjaminvialle added a commit that referenced this pull request Apr 8, 2013
Includes fixes to related bugs that were found (not logged)
Closes #1013 ; Closes #1020
@benjaminvialle benjaminvialle merged commit b06d85f into MarkUsProject:master Apr 8, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants