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.

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

Add progress blocks visualization to the student overview #407

Draft
wants to merge 49 commits into
base: main
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
266f385
initial refactoring of submitting
stgm Jan 9, 2020
0980229
Merge branch 'master' into new_submissions_system
stgm Jan 9, 2020
72c10c7
ch
stgm Jan 9, 2020
6db770c
fix
stgm Jan 9, 2020
857baa1
fix
stgm Jan 9, 2020
3fd13db
move components into features folder
stgm Jan 9, 2020
f168c84
Merge branch 'master' into new_submissions_system
stgm Jan 10, 2020
360afa5
Merge branch 'master' into new_submissions_system
stgm Jan 13, 2020
084f887
Merge branch 'master' into new_submissions_system
stgm Jan 13, 2020
5bc53f8
Merge branch 'master' into new_submissions_system
stgm Jan 13, 2020
f72e257
Merge branch 'master' into new_submissions_system
stgm Jan 13, 2020
cd10cfe
clean up submit model
stgm Jan 14, 2020
80c04de
cleanup
stgm Jan 14, 2020
4cc7fea
refactoring
stgm Jan 14, 2020
4d74f7d
update user last submit time on each submit
stgm Jan 15, 2020
83bdb4b
bugfix
stgm Jan 15, 2020
4e7e533
add grading details to modal grade viewer
stgm Jan 15, 2020
04c6d65
deleting grades
stgm Jan 15, 2020
8cb5516
admin can't always change schedule
stgm Jan 15, 2020
79f9c88
add modal browser to schedules and grading views
stgm Jan 15, 2020
e8c26a5
fix brand
stgm Jan 20, 2020
e7edc8c
brand
stgm Jan 21, 2020
2894b55
brand
stgm Jan 21, 2020
6f477f6
always do grade calculations
stgm Jan 22, 2020
4a27ebc
reorganize features
stgm Jan 22, 2020
f91c83c
fix student modal view
stgm Jan 22, 2020
72f16ea
allow strings
stgm Jan 23, 2020
e80e52f
recheck
stgm Jan 23, 2020
86d8248
blocks
stgm Jan 23, 2020
fad4cdf
cosmetics
stgm Jan 23, 2020
98af8d2
dates
stgm Jan 23, 2020
09c74b3
cosmetics
stgm Jan 23, 2020
4452179
cosmetics
stgm Jan 23, 2020
011dfaa
cosmetics
stgm Jan 23, 2020
3a8882e
cosmetics
stgm Jan 23, 2020
d8752e6
submits
stgm Jan 24, 2020
4c1790b
testing
stgm Jan 25, 2020
e44c5ae
testing
stgm Jan 25, 2020
53ecc70
testing
stgm Jan 25, 2020
3377098
testing
stgm Jan 25, 2020
0bdd2bb
testing
stgm Jan 25, 2020
b570fac
add some caching
stgm Jan 26, 2020
f262b1f
more
stgm Jan 26, 2020
aa961e8
more
stgm Jan 26, 2020
b9037e9
touch on grade
stgm Jan 27, 2020
3273f7e
show design
stgm Jan 29, 2020
bd8a33d
Merge branch 'master' into blocks
stgm Jan 30, 2020
c6355d0
bugfix
stgm Jan 30, 2020
b567d70
Merge branch 'main' into blocks
stgm Jul 16, 2021
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
reorganize features
  • Loading branch information
stgm committed Jan 22, 2020
commit 4a27ebc8c28f8c69349c13a458b9e34e3038f6ef
File renamed without changes.
4 changes: 2 additions & 2 deletions app/controllers/submissions_controller.rb
Original file line number Diff line number Diff line change
@@ -68,11 +68,11 @@ def should_upload_to_dropbox?
end

def should_perform_auto_check?
AutoCheckSender.enabled? && @pset.config['check'].present?
AutoCheck::Sender.enabled? && @pset.config['check'].present?
end

def upload_files_to_check_server
@token = AutoCheckSender.new(@attachments.zipped, @pset.config['check'], request.host).start
@token = AutoCheck::Sender.new(@attachments.zipped, @pset.config['check'], request.host).start
end

def record_submission
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module AutoCheckFeedbackFormatter
module AutoCheck::FeedbackFormatter

extend ActiveSupport::Concern

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module AutoCheckReceiver
module AutoCheck::Receiver

extend ActiveSupport::Concern

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module AutoCheckScoreCalculator
module AutoCheck::ScoreCalculator

extend ActiveSupport::Concern

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
class AutoCheckSender
class AutoCheck::Sender

def self.enabled?
ENV['CHECK_SERVER_URL'].present? && ENV['CHECK_SERVER_SECRET'].present?
2 changes: 1 addition & 1 deletion app/features/course/git.rb
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
# Get remote git data, either by pulling existing, or cloning anew.
#

module Course::Git
class Course::Git

def self.pull
if git = self.existing_local_repo
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module GradeCalculator
module Grading::GradeCalculator

extend ActiveSupport::Concern

@@ -7,7 +7,7 @@ module GradeCalculator
end

def set_calculated_grade
# This always runs, even if no subgrades have been changes. This is to ensure that grades are also recalculated after the grade formula has changed.
# This always runs, even if no subgrades have been changed. This is to ensure that grades are also recalculated after the grade formula has changed.
calculated_grade = calculate_grade
if calculated_grade.present?
case self.pset.grade_type
2 changes: 1 addition & 1 deletion app/models/grade.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
class Grade < ApplicationRecord

include GradeCalculator
include Grading::GradeCalculator

belongs_to :submit

6 changes: 3 additions & 3 deletions app/models/submit.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
class Submit < ApplicationRecord

include AutoCheckReceiver
include AutoCheckScoreCalculator
include AutoCheckFeedbackFormatter
include AutoCheck::Receiver
include AutoCheck::ScoreCalculator
include AutoCheck::FeedbackFormatter

belongs_to :user
delegate :name, to: :user, prefix: true, allow_nil: true