Commit Graph

150 Commits

Author SHA1 Message Date
Waheed Ahmed
57bc5c9314 Modified request method for change enrollment and bulk beta modify access on instructor dashboard.
LMS-11266
2014-08-27 13:20:04 +05:00
Braden MacDonald
c3abf326ff Friendly error if invalid student identifier is entered for due date extension 2014-08-20 17:09:57 -07:00
Braden MacDonald
9c93cd8dd6 Fix: Display error when attempting to reset nonexistent due date extension 2014-08-19 23:29:36 -07:00
Braden MacDonald
42eaa4b005 Unit tests for bugs in IDDE API, including LMS-6563 2014-08-19 23:23:06 -07:00
njdup
55521590d1 Email content history fix and additions
This addresses a bug in the email content history table where
"Unknown" was displayed in the number of emails sent column if any sort of
failure occurred during email sending. This behavior has been editted so now
the number of emails that failed to send is displayed, along with the number
of emails that were successfully sent. If the email task is still pending,
"0 sent" is displayed.

As a small addition, the table now also includes the authors of previously
sent emails, and the modal window for an email also displays its author.
2014-08-14 15:12:31 -07:00
Waheed Ahmed
05b87fd99b Implemented process_response method to clear requestcontext global variable in mako middleware.
LMS-6622
2014-08-06 19:58:20 +05:00
Muhammad Shoaib
33d5b49e81 added course price set/view/edit functionality
added CoursmodeArchive model to save the old prices history

analytics -> instructor_analytics

analytics -> instructor_analytics
2014-08-05 10:00:13 -04:00
asadiqbal08
dc46170f36 registration code checkout flow
Redirecting to dashboard after free user enrollment.
2014-08-05 10:00:12 -04:00
Muhammad Shoaib
4333e53997 added registration-codes generation functionality
rebased and resolve conficts with cdoge/registration_codes

feature enhancement request: added transaction group name text field to the download buttons as an extra optional query paramerter
2014-08-05 10:00:11 -04:00
asadiqbal08
5a9fc036a6 Course Instructor as financeadmin role, will be able to download all purchase transactions in the course as a CSV file 2014-08-05 10:00:10 -04:00
njdup
c5cf6db93d Cleaned pylint quality issues in instructor email content history code. 2014-08-04 16:01:11 -07:00
njdup
5791fd1087 Instructors can view previously sent email content
Previously on the send email page of the instructor dashboard, instructors could only view
task information about emails they've sent for their course in the past.
In addition to this, I've now added the ability to see the content of all previously sent emails.

A "Sent Email History" button has been added to the page. When clicked, a table displaying the
subject line, number of emails sent, and date/time of submission for each previously sent email
is created. An instructor can then click on any subject line to see the content of that email,
displayed in a modal window that appears on the page.

The window is also equipped with a "copy email to editor" button, which copies the emails contents
to the tinyMCE editor, so that an instructor can easily resend an email that they've sent
in the past.
2014-08-04 10:08:32 -07:00
Muhammad Shoaib
2d41ebe48f removed the discount value bug
check error handling if the discount value is not an integer
2014-07-21 09:12:57 -04:00
Chris Rossi
700504c52f Fix a bug in Individual Due Date Extensions (IDDE).
The IDDE implementation relied on a StudentModule being created for a
particular block in order to set the extended due date on that block.
Since StudentModules seem to be created on demand whenever data is
written to an attribute with Scope.user_state, it meant that if a
homework problem hadn't yet been touched by a student it was possible
that the due date extension wouldn't take effect for that problem, even
if the due date extension was successfully set for the parent unit.

This patch fixes this problem by creating new StudentModules as
necessary in order to make sure extended due dates propogate properly to
all problems in a unit.
2014-07-15 15:54:55 -04:00
asadiqbal08
5734d2a883 asadiqbal08:[EX-6] Set up data models and shopping cart enhancements in the LMS
Added username into Authors file

[Ex-12] Add user to input coupon code in the Shopping Cart

[Ex-13] Discount should be reflected in the Payment confirmation page and email

added E-commerce Tab in Instructor Dashboard

added name/email in authors file

removed the is_active column, change the colors scheme, fixed bugs

wip

wip

test github account

STORE_BILLING_INFO set to True

cybersource api update, reference number updated, merchant_data removed from params

View Course buttons on receipt

link for course added to receipt

receipt.html view course button - func update

receipt.html course link update

move new CyberSource implementation to a separate file so that we can keep the original

remove config changes

remove config changes

remove coupon redemption during clear cart and update test cases

[Ex-11]added test cases(E-commerce Tab Instuctor Dashboard)

update data model max_length to 255

remove array paid_course_ids init in views.py

removed the is_active filter=false, added styling to the inactive coupon codes

remove coupon redemption during clear cart and update test cases

[Ex-11]added test cases(E-commerce Tab Instuctor Dashboard)

update data model max_length to 255

Add column to the list of coupons in the E-Commerce tab

Add ability for microsites to specify custom CyberSource secret configuration, i.e. run under different accounts

make the new CyberSource2 also microsite aware

updating migration for student and shopping cart apps

added user signup functionality that orignated from the Microsites

added non-microsite user signup tests

fix the hard coded callback URL to localhost

add comment

Modify e-commerce instructor tab to show a total amount above the coupon listings for admin finance user

made changes as suggested by diana khuang

add the CourseAccessRoles table to the Django Admin website

shopping cart coupon checkout changes as suggested by Jason Bau

changes are made according to the suggesstions on PR#4172

changes made in the coupons file

changes in the coupons get_coupon_info view

fix merge conflict resolution error

changes in the remove_coupon view json response

changes as suggested by David Baumgold

pep8/pylint fixes

Changes as suggested by jasonBau

don't assume item in shopping cart is a PaidCourseRegistration

fix up some logging

changed the urls of the coupon views and use the post to get the values from the request
2014-07-10 09:35:32 -04:00
Nimisha Asthagiri
eecff6e0aa ModulestoreEnum class. 2014-06-27 14:37:35 -04:00
David Baumgold
0c9d682df3 Merge pull request #3196 from mtyaka/enrollment-emails-http
Don't hardcode https protocol in enrollment emails.
2014-05-30 09:30:43 -04:00
Calen Pennington
cfcbdc0145 Move to OpaqueKey implementations from the external library
[LMS-2757]
2014-05-29 17:03:35 -04:00
Matjaz Gregoric
b755863639 Don't hardcode https protocol in enrollment emails.
Use http or https, depending on the value of `request.is_secure()`.
That is how links in most other emails are handled.
2014-05-28 22:44:42 +02:00
Usman Khalid
3824e234fe Do not persist anonymous ids when exporting for all students of a course.
For large courses this causes export to take a long time and to time out.

LMS-2747
2014-05-28 20:48:43 +05:00
Sarina Canelake
1a4fcb055b Make SPOC gradebook an API implementation
rather than just hacked in to the instructor_dashboard base file.
Also move the tests from the legacy implementation to the new dash API implementation.
2014-05-27 10:59:16 -04:00
Sarina Canelake
110719deae StaffFactories accept course_keys, not courses. Make that clear in the interface. 2014-05-24 18:49:06 -04:00
Sarina Canelake
265fa826ca Opaque-keys: fix pylint violations 2014-05-23 14:23:12 -04:00
Calen Pennington
8699a13b09 Use old deprecated form for instructor api calls, and in staff debug info 2014-05-22 11:24:05 -04:00
Calen Pennington
ddf1874ca4 Fix merge conflicts 2014-05-14 15:59:25 -04:00
Calen Pennington
661f37ecd6 Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master
Conflicts:
	lms/djangoapps/courseware/tests/test_views.py
	lms/djangoapps/instructor/tests/test_api.py
	lms/djangoapps/instructor/tests/test_legacy_anon_csv.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/legacy.py
2014-05-14 15:57:38 -04:00
Calen Pennington
6ca0a7a1d6 Merge remote-tracking branch 'edx/opaque-keys' into opaque-keys-merge-master 2014-05-14 10:00:25 -04:00
Stephen Sanchez
5cc41a6c9b Changing Student Anon ID Dump to return Course Specific IDs. 2014-05-14 09:56:36 -04:00
Calen Pennington
6c546fbf1f Fix merge conflicts 2014-05-13 15:31:40 -04:00
Calen Pennington
240d91daeb Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master
Conflicts:
	cms/djangoapps/contentstore/management/commands/tests/test_import.py
	cms/djangoapps/contentstore/tests/test_import.py
	common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
	lms/djangoapps/bulk_email/tests/test_course_optout.py
	lms/djangoapps/bulk_email/tests/test_email.py
	lms/djangoapps/bulk_email/tests/test_err_handling.py
	lms/djangoapps/class_dashboard/tests/test_dashboard_data.py
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/django_comment_client/base/views.py
	lms/djangoapps/instructor/tests/test_email.py
	lms/djangoapps/instructor/tests/test_legacy_anon_csv.py
	lms/djangoapps/instructor/tests/test_legacy_download_csv.py
	lms/djangoapps/instructor/tests/test_legacy_email.py
	lms/djangoapps/instructor/tests/test_legacy_enrollment.py
	lms/djangoapps/instructor/tests/test_legacy_forum_admin.py
	lms/djangoapps/instructor/tests/test_legacy_gradebook.py
	lms/djangoapps/instructor/tests/test_legacy_raw_download_csv.py
	lms/djangoapps/instructor/tests/test_legacy_reset.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/djangoapps/instructor/views/legacy.py
	lms/templates/courseware/instructor_dashboard.html
2014-05-13 15:30:56 -04:00
Will Daly
c6a02870e1 Update instructor dash to support ora2 submissions API with opaque keys 2014-05-13 13:28:55 -04:00
Calen Pennington
a4df0e1515 Fix failing tests 2014-05-12 14:45:38 -04:00
Calen Pennington
94c8d86a42 Fix failing tests from merge with master 2014-05-12 11:34:39 -04:00
Sarina Canelake
b7a0de7f3b Change URL patterns for instructor dashboard
Fix acceptance and unit tests

LMS-1296
2014-05-12 10:18:28 -04:00
Calen Pennington
155ffe37ca Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master
Conflicts:
	cms/djangoapps/contentstore/views/item.py
	cms/djangoapps/contentstore/views/tests/test_container.py
	cms/djangoapps/contentstore/views/tests/test_tabs.py
	common/lib/xmodule/xmodule/modulestore/mongo/draft.py
	lms/djangoapps/certificates/management/commands/gen_cert_report.py
	lms/djangoapps/certificates/queue.py
	lms/djangoapps/certificates/views.py
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/tests/test_module_render.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/djangoapps/instructor/views/legacy.py
	lms/djangoapps/shoppingcart/tests/test_models.py
	lms/djangoapps/verify_student/views.py
2014-05-09 15:29:32 -04:00
Don Mitchell
7be81341d7 Revert StudentModule.module_state_key to field rather than computed property 2014-05-09 10:41:12 -04:00
Calen Pennington
cd746bf8e5 Make course ids and usage ids opaque to LMS and Studio [partial commit]
This commit adds the non-courseware lms/djangoapps and lms/lib.

These keys are now objects with a limited interface, and the particular
internal representation is managed by the data storage layer (the
modulestore).

For the LMS, there should be no outward-facing changes to the system.
The keys are, for now, a change to internal representation only. For
Studio, the new serialized form of the keys is used in urls, to allow
for further migration in the future.

Co-Author: Andy Armstrong <andya@edx.org>
Co-Author: Christina Roberts <christina@edx.org>
Co-Author: David Baumgold <db@edx.org>
Co-Author: Diana Huang <dkh@edx.org>
Co-Author: Don Mitchell <dmitchell@edx.org>
Co-Author: Julia Hansbrough <julia@edx.org>
Co-Author: Nimisha Asthagiri <nasthagiri@edx.org>
Co-Author: Sarina Canelake <sarina@edx.org>

[LMS-2370]
2014-05-08 12:09:23 -04:00
Usman Khalid
8ee682d44b Fixed and added more tests for bulk email.
LMS-2565
2014-05-05 16:58:10 +05:00
Usman Khalid
c955fd0bce When sending bulk email check if course is authorized.
Also the idash_mode property is stored seperately for each course.

LMS-2565
2014-05-02 20:09:25 +05:00
Sarina Canelake
d408f174e3 Wording for batch beta email add with autoenroll (LMS-2551) 2014-04-18 10:13:19 -04:00
Sarina Canelake
1622216b58 Merge pull request #3084 from edx/sarina/improve-bulk-beta-add
Improve the batch beta tester add feature
2014-04-16 14:07:51 -04:00
Sarina Canelake
bddae213f6 Accept usernames in Batch Enrollment widget
Respond to pull request comments
2014-04-16 10:46:54 -04:00
Will Daly
0b40354c12 Reset submission API scores in beta and legacy instructor dash 2014-04-16 09:25:53 -04:00
Sarina Canelake
ede21224a8 Add "Auto Enroll" option for bulk beta add 2014-04-16 09:20:23 -04:00
Sarina Canelake
4f38b69eba Allow batch beta enrollment by username 2014-04-16 09:20:23 -04:00
Sarina Canelake
338a242e22 Fix course urls in enrollment emails (LMS-2217) 2014-04-11 18:43:43 -04:00
Adam Palay
aefa456ed5 add failing tests 2014-04-02 16:07:46 -04:00
Carson Gee
9e58ef692d fix raw grade dump in standard instructor dashboard
Added test and cleaned up code formatting
Review based changes
Converting class method and attributes to private
2014-03-28 11:10:14 -04:00
Sarina Canelake
c2ede18de5 More helpful UX in beta membership widget
LMS-2262
2014-03-24 12:16:41 -04:00
Sarina Canelake
bbf4471d92 Merge pull request #2992 from edx/sarina/fix-beta-batch-enrollment
Simple email checking for batch enrollment on inst dash
2014-03-21 07:45:09 -04:00