New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FIX for issue 915, added median, number of fails and number of zeros to dashboard #998

Merged
merged 5 commits into from Feb 26, 2013

Conversation

Projects
None yet
3 participants
@m-wu
Contributor

m-wu commented Feb 4, 2013

Added median, number of fails and number of zeros to dashboard (#915).
Adjusted dashboard UI so that all of the assignment statistics are aligned in a column.
French translations for “Number of zeros” and “Number of fails” are needed to replace the English placeholders.

Show outdated Hide outdated config/locales/fr.yml
@@ -1069,9 +1069,13 @@ fr:
account_disabled: "Ce compte a été désactivé"
#app/views/main/_assignment_info_summary.erb
assignment_average: "Moyenne : %{results_average} %"
percentage: "%{percentage}%"

This comment has been minimized.

@benjaminvialle

benjaminvialle Feb 4, 2013

Member

Please put a space between %{percentage} and % symbol :)

@benjaminvialle

benjaminvialle Feb 4, 2013

Member

Please put a space between %{percentage} and % symbol :)

Show outdated Hide outdated config/locales/fr.yml
assignments_submitted: "Projets envoyés :"
assignments_graded: "Projets corrigés :"
assignments_failed: "Number of fails:"

This comment has been minimized.

@benjaminvialle

benjaminvialle Feb 4, 2013

Member

Projets sous la moyenne :

@benjaminvialle

benjaminvialle Feb 4, 2013

Member

Projets sous la moyenne :

Show outdated Hide outdated config/locales/fr.yml
assignments_submitted: "Projets envoyés :"
assignments_graded: "Projets corrigés :"
assignments_failed: "Number of fails:"
assignments_zeros: "Number of zeros:"

This comment has been minimized.

@benjaminvialle

benjaminvialle Feb 4, 2013

Member

Projets à 0 :

@benjaminvialle

benjaminvialle Feb 4, 2013

Member

Projets à 0 :

@benjaminvialle

This comment has been minimized.

Show comment
Hide comment
@benjaminvialle

benjaminvialle Feb 4, 2013

Member

French translations updated. Thanks for your work.

Member

benjaminvialle commented Feb 4, 2013

French translations updated. Thanks for your work.

@m-wu

This comment has been minimized.

Show comment
Hide comment
@m-wu

m-wu Feb 4, 2013

Contributor

Thanks @benjaminvialle !

Contributor

m-wu commented Feb 4, 2013

Thanks @benjaminvialle !

Show outdated Hide outdated db/schema.rb
@@ -77,6 +77,9 @@
t.string "repository_folder", :null => false
t.boolean "invalid_override"
t.float "results_average"
t.float "results_median"

This comment has been minimized.

@benjaminvialle

benjaminvialle Feb 4, 2013

Member

You can't modify schema.rb by hand. You need to create a migration a then run bundle exec rake db:migrate (see http://guides.rubyonrails.org/migrations.html)

@benjaminvialle

benjaminvialle Feb 4, 2013

Member

You can't modify schema.rb by hand. You need to create a migration a then run bundle exec rake db:migrate (see http://guides.rubyonrails.org/migrations.html)

@m-wu

This comment has been minimized.

Show comment
Hide comment
@m-wu

m-wu Feb 5, 2013

Contributor

@benjaminvialle Sorry for not reading comments in the code carefully. I just created a migration. Please let me know if it's correct. Thanks!

Contributor

m-wu commented Feb 5, 2013

@benjaminvialle Sorry for not reading comments in the code carefully. I just created a migration. Please let me know if it's correct. Thanks!

Show outdated Hide outdated db/schema.rb
@@ -1,4 +1,3 @@
# encoding: UTF-8

This comment has been minimized.

@jerboaa

jerboaa Feb 5, 2013

Member

Please keep this. It's required for ruby 1.9 compatibility.

@jerboaa

jerboaa Feb 5, 2013

Member

Please keep this. It's required for ruby 1.9 compatibility.

This comment has been minimized.

@m-wu

m-wu Feb 6, 2013

Contributor

I've added it back. It wasn't automatically generated after I ran the migration. Thanks!

@m-wu

m-wu Feb 6, 2013

Contributor

I've added it back. It wasn't automatically generated after I ran the migration. Thanks!

Show outdated Hide outdated lib/tasks/results.rake
@@ -95,7 +95,7 @@ namespace :load do
end
end
# compute average for a1

This comment has been minimized.

@jerboaa

jerboaa Feb 5, 2013

Member

This comment seems wrong now :)

@jerboaa

jerboaa Feb 5, 2013

Member

This comment seems wrong now :)

This comment has been minimized.

@m-wu

m-wu Feb 6, 2013

Contributor

Fixed it and another comment. :)

@m-wu

m-wu Feb 6, 2013

Contributor

Fixed it and another comment. :)

@benjaminvialle

This comment has been minimized.

Show comment
Hide comment
@benjaminvialle

benjaminvialle Feb 26, 2013

Member

Thank you for your patch :)

Member

benjaminvialle commented Feb 26, 2013

Thank you for your patch :)

benjaminvialle added a commit that referenced this pull request Feb 26, 2013

Merge pull request #998 from m-wu/issue-915
Added median, number of fails and number of zeros to dashboard.
Closes #915

@benjaminvialle benjaminvialle merged commit a21d15d into MarkUsProject:master Feb 26, 2013

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment