Skip to content
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.

Sign up for GitHub

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

TEST: Add module assert_helper #17

Closed
wants to merge 15 commits into from
Closed

TEST: Add module assert_helper #17

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
95e5cae
TEST: Add module assert_helper
Apr 15, 2016
ebd5fd5
FIX: Submission for needs help sets submission date
macite Apr 15, 2016
f1eec26
FIX: Switch Portfolio generation to Latex
macite Apr 29, 2016
23a19a4
FIX: Correct issues with task stats inc withdrawn students
macite Apr 29, 2016
1a16d55
FIX: Ensure portfolio includes additional files
macite Apr 29, 2016
8a5b016
FIX: Merge in UI fixes for portfolio, alerts, and filters
macite Apr 29, 2016
dda8cb8
FIX: Correct issue with task pdf creation
macite Apr 29, 2016
5f24416
FIX: Incorrect use of .nil
macite Apr 29, 2016
f617c42
FIX: Add validation to check uniqueness of tasks
macite Apr 30, 2016
8cb70fc
FIX: Concurrency issue with project tasks duplication
macite May 3, 2016
f211e8b
FIX: Update some log messages to include additional info
macite May 3, 2016
4d24e32
FIX: Ensure that Doubtfire logger does not rotate
macite May 4, 2016
3ad39b5
FIX: Messages from task processing fail
macite May 4, 2016
2c6f1c0
FIX: Switch to use new portfolio creation with latex
macite May 4, 2016
d4edc87
TEST: Add unit generation to test data
May 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
FIX: Correct issues with task stats inc withdrawn students 
Existing stats incorrectly included counts of task stats
that included withdrawn students as not started tasks.
  • Loading branch information
@macite
macite authored and Reuben Wilson committed May 7, 2016
commit 23a19a4637049893e2fe526aec440e86c34338af
2 changes: 1 addition & 1 deletion app/models/project.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def role_for(user)

def self.for_user(user, include_inactive)
if include_inactive
projects.where('projects.user_id = :user_id', user_id: user.id)
where('projects.user_id = :user_id', user_id: user.id)
else
active_projects.where('projects.user_id = :user_id', user_id: user.id)
end
Expand Down
2 changes: 1 addition & 1 deletion app/models/unit.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1106,7 +1106,7 @@ def task_status_stats
count = data.select{|r| r[:task_definition_id] == td.id && r[:tutorial_id] == t.id }.map{|r| r[:num]}.inject(:+)
count = 0 unless count

num = t.projects.where("projects.target_grade >= :grade", grade: td.target_grade).count
num = t.projects.where("projects.enrolled = TRUE AND projects.target_grade >= :grade", grade: td.target_grade).count
num = 0 unless num

if num - count > 0
Expand Down