Skip to content

Commit

Permalink
Fix course setup and batch enrolling scripts (#16)
Browse files Browse the repository at this point in the history
Add  butch students enrolling script

Currently we do not update students parameters only if they are enrolled
and have started course, for students which are enrolled but they have not
started course yet parameters are updated.
  • Loading branch information
Igor Degtiarov authored Jan 12, 2017
1 parent 8a58feb commit 9b9cb84
Show file tree
Hide file tree
Showing 8 changed files with 359 additions and 190 deletions.
1 change: 1 addition & 0 deletions config.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@
EDXADAPT = {
'HOST': '52.210.53.36',
'PORT': '8080',
'COURSE_ID': 'CMU+STAT101+2014_T1'
}
84 changes: 84 additions & 0 deletions data/BKT/problems.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
axis_0,x axis
axis_1,y axis
b3,histogram
b3_2_0,center
b3_2_1,histogram
b3data_0,histogram
b3data_1,histogram
b3labels,histogram
b4,histogram
b4_2_0,histogram
b4_2_1,histogram
b5_center,center
b5_shape,shape
b5_spread,spread
labeling_a,y axis
match_d_to_h,d to h
match_h_to_d_0,h to d
match_h_to_d_1,h to d
match_h_to_d_a,h to d
matching_a,d to h
matching_b,d to h
matching_desc_hist_a,d to h
p3_0,histogram
p3_1,histogram
Post_assessment_0,center
Post_assessment_1,x axis
Post_assessment_10,h to d
Post_assessment_11,d to h
Post_assessment_12,h to d
Post_assessment_13,None
Post_assessment_2,y axis
Post_assessment_3,shape
Post_assessment_4,histogram
Post_assessment_5,x axis
Post_assessment_6,y axis
Post_assessment_7,shape
Post_assessment_8,center
Post_assessment_9,spread
practice_label_x,x axis
practice_label_y,y axis
practice_label2_x,x axis
practice_label2_y,y axis
practice_label3_x,x axis
practice_label3_y,y axis
practice_label_des,histogram
practice_label2_des,histogram
practice_label3_des,histogram
Pre_assessment_0,center
Pre_assessment_1,x axis
Pre_assessment_10,h to d
Pre_assessment_11,d to h
Pre_assessment_12,h to d
Pre_assessment_13,None
Pre_assessment_2,y axis
Pre_assessment_3,shape
Pre_assessment_4,histogram
Pre_assessment_5,x axis
Pre_assessment_6,y axis
Pre_assessment_7,shape
Pre_assessment_8,center
Pre_assessment_9,spread
shape_0,shape
shape_1,shape
skew_easy_0,None
skew_easy_1,shape
skew_easy_2,shape
skew_easy_3,shape
skew_easy_4,shape
skew_easy_5,shape
skew_easy_6,shape
skew_easy2_1,shape
skew_easy2_2,shape
skew_easy2_3,shape
skew_easy2_4,shape
skew_easy2_5,shape
skew_easy2_6,shape
T3,histogram
T3_2,center
t4_2_0,histogram
t4_2_1,histogram
t5_center,center
t5_shape,shape
t5_spread,spread
labels_we,None
84 changes: 0 additions & 84 deletions data/BKT/problist.tsv

This file was deleted.

File renamed without changes.
7 changes: 4 additions & 3 deletions edx_adapt/tests/logic_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@

import pymongo

import course_setup_test
from edx_adapt.api import adapt_api
from tools import course_setup_test
from tools import course_setup

COURSE_ID = 'CMUSTAT'

Expand All @@ -23,7 +24,7 @@ class BaseTestCase(unittest.TestCase):
def setUpClass(cls):
cls.skills = ['center', 'shape', 'spread', 'x axis', 'y axis', 'h to d', 'd to h', 'histogram', 'None']
cls.course_id = COURSE_ID + id_generator(3)
course_setup_test.setup_course_in_edxadapt(cls.course_id)
course_setup.setup_course_in_edxadapt(cls.course_id)

cls.headers = {'Content-type': 'application/json'}
cls.app = adapt_api.app.test_client()
Expand Down Expand Up @@ -100,7 +101,7 @@ def test_course_has_skills(self):
def test_course_problem_fulfilled(self):
problems = json.loads(self.app.get(base_api_path + '/{}'.format(self.course_id)).data)
self.assertTrue(problems, msg='Not any problem is found in course')
# NOTE(idegtiarov) Assert correct value is based on amount of problems defined in problist.tsv file, if this
# NOTE(idegtiarov) Assert correct value is based on amount of problems defined in problems.csv file, if this
# file is changed test will fail.
self.assertEqual(84, len(problems['problems']))

Expand Down
Loading

0 comments on commit 9b9cb84

Please sign in to comment.