Commit Graph

231 Commits

Author SHA1 Message Date
Ahsan Ulhaq
20e6c7625c LMS: Modification in enrollment API
Added CourseEnrollmentAttribute model

ECOM-1719
2015-06-16 10:39:04 +05:00
cewing
6a0c9aee9d MIT CCX: Use CCX Keys
Implement the use of CCX opaque keys throughout the ccx code base

include the new custom ccx id package in the github checkouts list

update the coach dashboard wrapper to get CCX information from the incoming course_id, if possible

update function signatures for all view functions to expect CCX as passed by the dashboard wrapper (default to None), remove calls to get_ccx_for_coach as the ccx is passed in.

update reverse calls in python view code to use a CCXLocator for the URL instead of a CourseLocator

use CCXLocator where necessary

use course id to find ccx, instead of thread local

remove unused method and related tests

use course id for getting ccx

provide course id to the get_current_ccx method

ensure the course id passed in is a CourseKey instance of some type whether it starts out as a string or not

use the provided block to figure out what the course_id should be, then get the ccx for that

redirect to ccx dashboard using coach ccx if no ccx is passed in

update student dashboard listing for ccx to build an appropriate url from a CCXLocator, not from the course locator.

refactor building the ccx locator so we don't have to do it repeatedly

begin test refactoring after ccx_keys introduction

Ensure that when access checking happens, the course_locator form of a ccx locator is used.  This ensures that the access check happens against the course and it is not necesarry to duplicate the entire access control structure for the course.

pick up api change in ccx-keys

create and conditionally use a wrapper for the mixed modulestore returned by xmodule.modulestore.django.modulestore

the wrapper will strip and restore ccx values from CourseKey and UsageKey objects

fix return values on a few methods

remove unused symbol

pull updated ccx-keys package

set course_id on the caching descriptor system to avoid api incompatibilities in some subsystems

use ccx.course instead of self.course

fix get method to find course keys from blocks that are not themselves keys but have a location attribute (which will be a key)

if an item coming out of the db has children, restore the ccx to them as well

if the block passed in has a CCX key, unwrap that before we try to look up the override, otherwise it will never be found.

pick up a change in the ccx keys package that allows for stripping CCX identity from a usage key

begin writing tests to cover this modulestore wrapper

remove the switch_pocs view, the url pattern for it, and the tests that covered it

remove the ccx context and the middleware responsible for setting the current CCX.  These are no longer needed

all dashboard views should raise 404 if a ccx is not provided by the coach_dashboard decorator

code quality

prevent errors resulting from trying to `get` a ccx based on non-unique criteria.

remove obsolete usage of ACTIVE_CCX_KEY

fix setUp method for grading tests to properly create grades for the ccx rather than for the course.

clean up reverse calls

code quality

adding docstrings to clarify purpose of this patch

fix bug in getting ccx for coach

fix grading views to properly fetch a ccx-ified course so that grades for that version will be calculated

fix small errors in modulestore implementation

fix errant merge marker

update call to get_current_ccx after key refactoring merged with tab changes
2015-06-12 00:01:24 -07:00
Tim Krones
f711a32e3d TNL-1652: Allow instructors to obtain CSV file listing students who may
enroll in a course but have not signed up yet.
2015-06-04 20:50:04 +02:00
Ben McMorran
9d336c33eb TNL-1897 Implement Course Team API 2015-06-03 18:04:17 +00:00
Diana Huang
15291aa43b Merge pull request #8015 from edx/andya/add-tab-extensions
Add extensible course view types for edX platform
2015-06-02 17:08:45 -04:00
Muhammad Shoaib
65c4f1df89 SOL-236 Manual Enrollments 2015-06-02 13:19:32 -04:00
Andy Armstrong
94e1c42314 Add extensible course view types for edX platform 2015-06-02 13:12:40 -04:00
Muhammad Shoaib
b555c869bf SOL-794 Detailed Enrollment Report
- added the abstract and concrete layers of enrollment report provider
- created a celery task.
-added the button in the e-commerce reports section

added the enrollment data backend

added the payment data and start writing the test cases.

updated the code with the feedback suggestions and wrote some test cases.
- all the downloadable reports are now visible in the ecommerce download section.
Pending instructor tasks is also visible in the ecommerce section

added the fields in the user profile information
changed the report store configuration key
added the new http endpoint for financial reports to add more permissions for finance_admin to access.

fix quality issues

added test cases to check csv content data

rebased with master and resolved conflicts

changed the log messages

added the changes as per code clintonb suggestions during code review

updated the test cases for the finance_admin decorator

changes suggested by clinton.

Created and moved Table level filters to the Custom Manager for the CourseEnrollment model.

ecommerce.js file was loaded twice in the instructor_dashboard.js fixed the issues

added the registration code column in the csv

added the full gender in the csv file

Update data sources and add display name translations for the report columns

fix meta name

Make sure the reports section does not appear on non whitelabel courses

pylint fixes

expand out enumerated values
2015-05-22 15:16:57 -04:00
cahrens
4af79d6f76 Don't event first_name and last_name.
TNL-2044
2015-04-21 16:03:59 -04:00
Andy Armstrong
17392ef3bf Code review feedback and test cleanup. 2015-04-17 17:23:19 -04:00
cahrens
4797a74e5c Emit events for language proficiencies from the update_account_settings method. 2015-04-17 17:23:18 -04:00
Daniel Friedman
97c43adaa4 Track user settings changed events on User save 2015-04-17 17:23:18 -04:00
Diana Huang
3f20a6f304 Add model change event tracking to UserProfile. 2015-04-17 17:23:18 -04:00
Andy Armstrong
c3a39934a0 Limit the size of the user profile's "bio" field
TNL-1990
2015-04-17 17:23:16 -04:00
jsa
bb2599cecd Include profile image version in URLs.
TNL-1860
2015-04-17 17:23:13 -04:00
Daniel Friedman
97e44ed20f Implement language proficiencies.
TNL-1488
2015-04-17 17:23:12 -04:00
Andy Armstrong
650a9a9b85 Implement parental controls for user profiles
TNL-1606
2015-04-17 17:23:11 -04:00
Daniel Friedman
6f6fdbfb5f Integrate profile images into Accounts API
TNL-1545
2015-04-17 17:23:11 -04:00
cahrens
fad63938e5 New bio field in UserProfile. 2015-04-17 17:23:11 -04:00
zubair-arbi
d0126959fc change education level option label to read "Associate" degree
ECOM-579
2015-03-31 13:31:16 +05:00
Awais
3a996155f5 ECOM-1162 2015-03-18 01:24:27 +05:00
Ned Batchelder
7d799e34f3 Remove unused imports 2015-03-17 07:10:31 -04:00
Awais
4bab316bb9 ECOM-911 no-id-professional mode registration flow 2015-03-13 10:03:05 +00:00
Zia Fazal
e21ff20375 backend changes based on feedback
Conflicts:
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/instructor_task/api.py

refined entrance exam student attempts reset

Quality improvements 1/16

added rescore, delete state and task history functionality

added unit tests for entrance exam reset attempts

added unit tests for re scoring of entrance exam and task history

improved test coverage

Got rid of pep violation

feedback changes and added jasmine test

added more jasmine tests for Javascript changes

added bok-choy tests for UI changes

replaced input containing <p> tags with <label>

Removed ee element assertions to avoid js error

Added call to super.setUp()

changes based on feedback on 2/18

Writing tests in JS instead of coffee script

commit related to skip entrance exam 2/13

fixed bad-continuation quality error

fixed broken bok-choy test

changes based on feedback on 2/18

added js tests and removed coffee script tests

fixed broken bok-choy and unit tests

changes left while rebasing

rephrase test titles

do not need these libs

changes based on feedback on 2/24

changes text which was left

Changes based on feedback on 3/3
2015-03-04 15:32:56 +05:00
cahrens
3ed31c2b1b Add name change and email change support to accounts API.
Name change is immediate, email change is multi-step.
2015-02-27 16:35:05 -05:00
cahrens
61a108d377 Delete unused code for changing email. 2015-02-27 13:20:57 -05:00
Awais
1e53a79705 ECOM-985 fixing the 'NoneType' object has no attribute 'profile'. 2015-02-25 10:10:16 +00:00
Will Daly
f854726efc Add tracking code to LinkedIn URL.
Add client-side analytics event for LinkedIn Add to Profile button click.

Add management command for generating certs for testing.

Update styling of the certificate messages.
2015-02-23 11:52:47 -05:00
Will Daly
368554754b Make the linked in configuration migration backwards compatible 2015-02-23 11:40:41 -05:00
Will Daly
a18e0c6bc7 Rename LinkedIn configuration field to "company_identifier"
Add "source" parameter to LinkedIn add-to-profile URL.

Add platform name to certification name.

Style changes for linked in sharing on dashboard
2015-02-13 12:23:51 -05:00
Awais
57ef60de0a ECOM-1028 adding linked-in button , config model and migration for linked url.
ECOM-1028 update the migration and move the code into class method.
2015-02-11 19:09:30 +05:00
Sarina Canelake
01064fcc79 Fix logging calls to use unicode, and lazy logging 2015-02-04 10:53:33 +02:00
Omar Al-Ithawi
4e733c6e1f Unicode fixes for log messages and other things 2015-02-04 09:55:44 +02:00
stephensanchez
aed89e422a Improve Django Admin Panel for Course Access Roles. Related to ECOM-857. Allows internal staff to easily use the Django Admin view to create new finance and sales admins. 2015-01-13 21:57:28 +00:00
David Baumgold
08a8afa619 For methods on PasswordHistory, only calculate if necessary
Check settings.FEATURES["ADVANCED_SECURITY"] first
2014-12-12 11:53:02 -05:00
David Baumgold
36e77c7463 Fixing pep8 issues 2014-12-11 13:04:49 -05:00
Muhammad Shoaib
829f7dba5f Remove items from the shopping cart if they are for a course whose course enrollment window has closed
changed the url name to verify_cart and change the color of the message in the shopping cart
2014-12-09 12:20:37 +05:00
Sarina Canelake
13946fb844 s/pylint: disable=W0511/pylint: disable=fixme/ 2014-12-01 11:22:12 -05:00
Stephen Sanchez
fc8b2a5f37 Merge pull request #5720 from edx/sanchez/avoid_event_suppression
Changing event suppression to signal suppression.
2014-11-12 12:46:26 -05:00
stephensanchez
6e85ec0739 Changing event suppression to signal suppression.
Code review changes.

Fix test and pylint.

pylint error.

Updating the test to verify the signal is fired.

Test for all analytics events

Import pylint error.

Pylint error
2014-11-12 16:26:29 +00:00
stv
cf9308144d Fix PEP8: E302 expected 2 blank lines, found 1 2014-11-10 11:00:11 -08:00
stephensanchez
c876c4ae93 Merge remote-tracking branch 'origin/release' into rc/2014-10-20 2014-10-20 16:19:08 +00:00
stephensanchez
b6f0c8dd30 Update the student transfer command to transfer to multiple courses.
Quick cleanup

Making kwarg to suppress unenroll events.

pylint and pep8 errors cleaned up.

add commit on success.

Changing transactional behavior of the management command.
2014-10-17 16:59:22 +00:00
Will Daly
ad11c1b6f4 Update django-countries to 2.1.2, override country name for Taiwan 2014-10-14 13:12:36 -04:00
Braden MacDonald
a8f622af7f Consistently ensure dog_stats_api tags are formatted correctly 2014-10-09 12:35:26 -07:00
Stephen Sanchez
bf112f7ef0 Add new enrollment message to the dashboard
The body of the enrollment message template

Tokenize platform name in message.

Changing to a datetime enrollment approach

Adding sorting. A little refactoring.

Adding confguration model for time delta

Adding admin registration and basic form for new config model.

Fixing docstring typo

Updating default time delta to 0, adding test to show it disabled functionality.

Removing the form from configuration and tweaking the enrollment message html
2014-10-02 12:32:35 +00:00
Sarina Canelake
fbd9cc1310 Merge pull request #5386 from open-craft/fix-anonymous-ids-unicode
Fix UnicodeError with anonymous student IDs
2014-09-25 16:43:18 -04:00
Julia Hansbrough
c5ae921dea Merge pull request #5328 from edx/flowerhack/auto-login
Automatically log in users who access third party login after trying to register for a course
2014-09-25 10:40:33 -04:00
Will Daly
7f8c6bb058 Add Django apps for student account and profile.
Add Python APIs for account/profile information to user_api
Updating profile page to have social linking

Authors: Renzo Lucioni, Alasdair Swan, Stephen Sanchez, Will Daly
2014-09-25 08:36:22 -04:00
Braden MacDonald
8e32672228 Fix UnicodeError with anonymous student IDs 2014-09-24 20:17:47 -07:00