Commit Graph

395 Commits

Author SHA1 Message Date
muzaffaryousaf
f5de0bbf43 Enable unit preview by default.
TNL-1261
2015-05-06 12:40:44 +05:00
Awais
19ab698f4c ECOM-1284 enabling re-generate certs. 2015-04-30 14:15:33 +05:00
aamir-khan
ca08b979b3 ECOM-1290: added the redirection back to courseware after re-verification 2015-04-10 19:44:35 +05:00
Awais Jibran
037a189828 Merge pull request #7555 from awaisdar001/aj/tnl382-fix-lms-progress-page-invalid-url
Fixed invalid URL in progress page.
2015-04-02 22:14:18 +05:00
MAC
973e3d0306 Fixed invalid URL in progress page.
TNL-382
2015-04-01 20:33:35 +05:00
Matt Drayer
cbf336e8e0 Merge pull request #7293 from edx/ziafazal/access-gating-for-entrance-exam
Entrance exam gating
2015-03-31 13:38:00 -04:00
Zia Fazal
cc04bb990e Add new gating logic to restrict users from accessing courseware when an entrance exam is required
- added entrance exam check on course info
- staff can by pass gating and added tests
- refined gating logic
- changes after rebasing with Asad's branch
- check ENTRANCE_EXAMS feature is enabled
- updated test to reflect new logic
- catering anonymous user in entrance exam permission
- fixed broken tests
- change after feedback on 16/3
- fix for a broken test
- created new entrance_exams module
- fixed quality error and improved test coverage
- put get_required_content back in milestones helper
- Refactored entrance exams logic
- Refactored tabs logic
- Fixed broken unit test
- changes after feedback from dan-f on 3/27
- removed unnecessary user.is_anonymous check
- Addressed PR feedback
- Addressed commit-specific feedback
- Rework guard clauses
- Add coverage for course info case
2015-03-31 12:12:04 -04:00
Calen Pennington
8341f1b7c8 Move type-checking of position earlier in courseware.views.index 2015-03-31 09:43:52 -04:00
Will Daly
659535365d Update error messaging for progress page self-gen certs
Clean up docstrings for gen cert POST.
2015-03-23 09:10:39 -04:00
Will Daly
704e8836f0 Course info page no longer creates enrollments.
The course info page was getting-or-creating
a course enrollment with is_active=0.  This commit
changes the operation to a "get" so that extra
enrollment records are not created.
2015-03-20 15:22:20 -04:00
Martyn James
7c942dddb5 Merge pull request #7219 from edx/mjames/SOL-289
Addresses problem with 'up' and 'down' errors within SOL-289
2015-03-19 09:51:36 -04:00
Martyn James
a495bb5f9e Addresses problem with 'up' and 'down' errors within SOL-289 2015-03-17 15:12:38 -04:00
Calen Pennington
9e7404cd4a Add test of courseware.views.index rendering with saved student state 2015-03-17 13:15:19 -04:00
Calen Pennington
11dcf12f14 Make XModule use the same get_children that XModuleDescriptor and XBlock do, and make it returned the same CombinedSystem 2015-03-17 13:15:18 -04:00
Ned Batchelder
7d799e34f3 Remove unused imports 2015-03-17 07:10:31 -04:00
asadiqbal
5a7ac441e5 Entrance Exam authoring and messaging updates
Multi-commit history:
- hide drag functionality for entrance exam section.
- hide entrance exam subsection elements e.g. delete, drag, name etc.
- show unit/verticals expanded in case of entrance exam
- modify code in order to allow user to update entrance exam score from UI.
- write down unit tests.
- write down Jasmine tests.
- add bok-choy test
- updated bok-choy test
- internationalize string
- repositioned sequential block creatori
- SOL-221 (entrance exam message)
- SOL-199 LMS Part (show entrance exam content) and hide the course navigation bar.
- redirect the view in case of entrance exam.
- update code structure as per suggestions
- write down unit tests
- fix pep8
- instead of hiding the exam requirement message, now also showing the exam the completion message (success state).
- write down unit test to show exam completion message.
- Update code as per review suggestions
- update doc string
- addressed review suggestions
- change sequential message text
- css adjustments
- added new css class for entrance exam score in studio
- added Jasmine test for remaning coverage
- sequential message should appear under the context of entrance exam subsection.
- updated text in CMS and LMS as per suggestions.
- added unit text to insure sequential message should not be present in other chapters rather then entrance exam.
- skip setter if empty prerequisite course list
- exclude logic from xblock_info.js that is specifically related to entrance exam.
- added js tests and updated code as per suggestions
- added tests
- addressed several PR issues
- Several small fixes (style, refactoring)
- Fixed score update issue
- added some more unit tests.
- code suggested changes.
- addressed PR feedback
2015-03-10 09:24:43 -04:00
Will Daly
940f892290 ECOM-1140: Instructor dashboard example certificates
Allow global staff to generate example certificates
on the instructor dashboard.

Allow global staff to enable/disable self-generated
certificates for a course.
2015-03-06 13:20:48 -05:00
Will Daly
13cb2c2834 ECOM-1142: Management command for error certs.
Add a management comand to regenerate certificates with
status 'error', optionally restricted to a subset
of courses.
2015-03-04 07:51:38 -05:00
Awais
28b633f9df ECOM-1086 adding tracking event for cert generation. 2015-02-25 10:12:23 +00:00
Will Daly
badcb78ac9 Force English for email opt in text appearing on the marketing site 2015-02-23 11:40:41 -05:00
Awais
726b7f2cfe ECOM-1046 adding functionality for generating the certs.
ECOM-1046 minor change in code. rename file name.
2015-02-21 04:31:32 +05:00
stv
2e1400f842 Fix Pylint: W0613(unused-argument) 2015-02-19 19:56:51 -08:00
Giulio Gratta
6a037d05f7 BUGFIX: shopping_cart_enabled + cosmetic price
- pass through registration price for use in template
- change conditional for add-to-cart to use registration price
- change conditional for sidebar price field to also include registration price
- remove expected failure in test
- add test for shopping_cart + course without mode
2015-02-17 07:50:59 -08:00
Giulio Gratta
560ce55896 Add cosmetic price field to studio & logic
- Price field added to Advanced Settings
- Function that decides which price to display
- Test added to check that the function outputs correct price
- Added feature flag and conditional to decide whether to display course price or not
- Feature Flag to show or hide course price on Course About page sidebar when not using shopping cart
2015-02-03 09:40:00 -08:00
Ben Patterson
b71c20c031 Revert "Add Cosmetic Display Price field to studio & logic to show it" 2015-02-03 09:41:54 -05:00
Giulio Gratta
c18ee8cc09 Add cosmetic price field to studio & logic
- Price field added to Advanced Settings
- Function that decides which price to display
- Test added to check that the function outputs correct price
- Added feature flag and conditional to decide whether to display course price or not
- Feature Flag to show or hide course price on Course About page sidebar when not using shopping cart
2015-01-27 15:15:43 -08:00
Matt Drayer
3c669e3838 New feature contribution: Entrance Exams 2015-01-15 20:35:24 -05:00
Zia Fazal
ca3d84a5d4 New pre-requisite course feature via milestones app 2015-01-15 15:17:38 -05:00
jsa
0049c97d8f use bulk_ops on course_about 2015-01-15 10:37:25 -05:00
Andy Armstrong
561c57dbe9 Extend preview to support cohorted courseware
TNL-651
2015-01-15 10:33:44 -05:00
Fred Smith
251407d7d2 Merge pull request #6314 from edx/release
Release
2014-12-19 13:23:22 -05:00
Chris Dodge
483cccb657 also apply sorting rules overrides to the /courses view 2014-12-15 14:11:58 -05:00
Muhammad Shoaib
914ecac9ac added the course price in the course about page 2014-12-15 12:53:37 -05:00
Calen Pennington
d919d2ae46 Teach LMS how to render XBlockAsides
[PLAT-217]
2014-12-13 08:26:28 -05:00
Andy Armstrong
4d75c18098 Fix Mako templates to use latest request context
Fixed the edX middleware to lazily create request
context for Mako templates, so that it is based on
any changes made to the request object.

Verified that with this fix the "Instructor" tab is
correctly hidden when a staff member is viewing
the course as a student.
2014-12-09 23:38:31 -05:00
Renzo Lucioni
1d1baa5009 Improved support for multiple organization names
Updates copy used in the checkbox label, constructs strings within the view instead of passing through a separate context variable, and alleviates unipain
2014-12-08 14:10:09 -05:00
Renzo Lucioni
f5767a961c Prep marketing iframe and relevant courseware view for email opt-in
Feature flagged. Puts a checkbox in the iframe. The iframe uses an organization_full_name parameter forwarded from Drupal by the courseware views and POSTs an email_opt_in parameter to the student views, preserving it on 403.
2014-12-01 10:30:16 -05:00
Akiva Leffert
b009e4a5ca Merge pull request #5979 from edx/aleffert/sync-course-status
Add an endpoint for syncing a user's course status metadata
2014-11-25 10:15:51 -05:00
stv
dff5772cda Fix PEP8: E121 continuation line indentation
is not a multiple of four
2014-11-24 20:44:43 -05:00
Akiva Leffert
f4dc90b348 Add an endpoint for syncing a user's course status metadata
JIRA: MA-75
2014-11-24 17:55:51 -05:00
David Ormsbee
43d8c7a712 Merge branch 'release'
Conflicts:
	lms/djangoapps/shoppingcart/processors/CyberSource2.py
2014-11-13 10:11:12 -05:00
Chris Dodge
a93faad78b try importing the exact references we need rather than deferencing it from the djangoapp module 2014-11-11 21:49:13 -05:00
zubair-arbi
b7d526b907 avoid annonymous user from redirecting to survey form
WL-150
2014-11-11 14:22:26 +05:00
Chris Dodge
58b4982d2d harden down access to the shoppingcart if the ENABLE_PAID_COURSE_REGISTRATION flag is not set (either via the main Django configuration settings) or through microsite overrides 2014-11-10 15:09:48 -05:00
stv
cf9308144d Fix PEP8: E302 expected 2 blank lines, found 1 2014-11-10 11:00:11 -08:00
Chris Dodge
3c36f7cbad Add new course_module field which describes what the catalog visibility should be (both, about, none) 2014-11-09 10:36:00 -05:00
Chris Dodge
fea9432b50 Add the ability for course staff to specify a Survey and make it required so that a student must fill it out before starting the course 2014-10-30 13:11:02 -04:00
Usman Khalid
ca65b68636 Added commit_on_success_with_read_committed decorator to courseware.views.index.
TNL-367
2014-10-27 20:44:14 +05:00
asadiqbal08
4f7c494922 EX-71 New shopping Cart UI Single person purchase
Ex-74 Registration Code redemption

fix the translation issues

added a check if a user is already registered in a course. Changed the messages

added course depth=0 and removed pep8 violations

Ex-72-added additional billing information

Added a new CSV file in the instructor dashboard sales tab to download all the order sales separated from the invoice sales

fix path to image

updated the failed unit tests and add some minor tweaks in the Shoppingcart.scss

Ex-78 New UI In receipt page

EX-73 Purchasers can buy a course on behalf of a different student

WL-78 updated the receipt page UI.

Wl-72 updated Billing Information UI and removed the Order Address fields

WL-71 Remove Purchase Type Buttons from UI

WL-71 Updated minor UI issues and updated test cases

WL-78 updated the enrollment links in the receipt page

made changes in Order generated sales csv in Instructor Dashboard.
 The total_registration_codes and total_used_codes
  were not correctly stored in the csv file.

1) The total_registration_codes were not filtered with
 course_id.
2) The total_used_codes that a user had redeemed
 were not correctly included in the CSV.

added a fix in the courseware view to let the users visit the courseware if they have enrolled in the course by clicking on the enrollment link

rebase and resolved conflicts with master

WL-97 Bulk Registration Email Confirmation
Below is the commit summary.
- Make email text bold as per requirement.
- Improve email template quality and reorder points.
- Add text in billing details page : "if no additional billing details are populated the payment confirmation will be sent to the user making the purchase"
- Update text on receipt page "You have successfully purchase 3 course registration codes"

WL-100 fixed the bug on the edit/add coupon and set course price.
Ajax requests were duplicating in each callback. fixed this issue by creating the manual ajax request rather than the Lean Modal Ajax requests

allow for better White Label branding in shopping cart purchase emails

fix up typos and text

fix goof

fix

fix

incorporated model changes as suggested by Jason.

updated order sales csv

updated test cases for CourseRegCodeItem model and csv for the order generated sales

updated the migrations history

fixed the lms acceptance tests

Be sure to check for multiple types

address PR feedback

PR feedback

PR feedback

pep8 fix
2014-10-19 21:50:29 -04:00
John Eskew
18822bdb4e Wrap course info and dashboard in bulk ops wrapper to reduce Mongo calls. 2014-10-06 16:53:11 -04:00