Commit Graph

75 Commits

Author SHA1 Message Date
Dave St.Germain
f2fb57e196 Added manual refund page for support.
PR-615
2014-06-17 08:24:02 -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
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
Calen Pennington
d5029abfdc Make course ids and usage ids opaque to LMS and Studio [partial commit]
This commit updates lms/templates.

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-07 12:49:55 -04:00
marcotuts
909d6db4a3 Merge pull request #3629 from edx/jrbl/oops-fix-dashboard-template
Fix dashboard template around final grade status
2014-05-07 10:57:54 -04:00
Joe Blaylock
825ac1cd42 Fix dashboard template around final grade status
* ae8847cd6e checked in buggy conditional in the dashboard templates
  that caused an empty 'details being wrapped up' box to display
  regardless of whether it was true.
* Simplify conditional so that we care only whether output of the view's
  _cert_info() says 'processing', which should be the value computed when
  either no cert status exists or when the certs are, in fact processing.

  This should mean that the "details being wrapped up" message is
  displayed when certs haven't run and the grade box is displayed the
  rest of the time.
2014-05-06 15:12:36 -07:00
Diana Huang
aa8ae81034 Show same thing on dash for audit and honor code students. 2014-05-06 17:52:43 -04:00
Adam Palay
5613f19994 add quotation mark to _dashboard_course_listing.html 2014-05-06 14:44:40 -04:00
Waqas
a07da78a0f Add the "VERIFIED_CERTIFICATES" toggle on dashboard 2014-05-05 20:10:26 +05:00
Brian Talbot
316f25e6d5 LMS: copy change to refer to 'ID Verified' enrollment as 'Verified' in Dashboard UI 2014-05-05 19:34:23 +05:00
Brian Talbot
5365dbe2fb LMS: adding visual reinforcement of a user's enrollment type (per course) to Dashboard UI
LMS-1071
2014-05-05 19:34:23 +05:00
Joe Blaylock
ae8847cd6e Certificates: URL endpoint for cert gen
* API endpoint for certificate generation, an authenticated  post with course
  id requests that grading be carried out and a cert generated for
  request.user in that course, using the usual grading and certificate
  machinery (ie, it does not imply whitelisting, though whitelists and
  blacklists will be respected)
  - Logs each request as it comes in
  - Calls xq.add_cert() and consequently, does grading synchronously on
    this app host and then queues request for certificate agent.
  - example usage:
    ```
    curl --data "student_id=9999&course_id=Stanford/2013/Some_Class" http://127.0.0.1:8000/request_certificate
    ```

* Studio advanced setting added, "certificates_show_before_end", which
  determines whether a course should permit certificates to be downloadable
  by students before the coures's end date has passed.
  - Modifications to dashboard view and templates to allow display of
    certificate download links before course has ended.
    (XXX: may declare failing students as failing before the course has ended.)
  - To test, turn the setting on in a course which hasn't ended yet, and
    force certificate generation for a student, then check their
    dashboard.
2014-05-02 14:34:21 -07:00
Victor Shnayder
821d5874a8 Issue certificates to all students who earn them, even if they are in an audit track
LMS-2573
2014-04-30 14:44:08 -04:00
Chris Dodge
27d7c19c40 Merge branch 'release'
Conflicts:
	cms/templates/widgets/source-edit.html
2014-04-14 14:17:03 -04:00
Julia Hansbrough
d71aa87748 Revert refund instruction message 2014-04-08 19:34:55 +00:00
Sarina Canelake
9a352b9125 Unicode support for course names in reverification flow 2014-04-08 13:11:41 -04:00
Nimisha Asthagiri
e86b4a12dc Changes for viewing built-in tabs in studio
Changed "Status Page" -> "Page".

UX:
    support for displaying built-in tabs
    restored drag and drop on Studio Pages
    additional styling for fixed state on Studio Pages
    add a new page action added to bottom of Studio Pages

Dev
    changes for viewing tabs in studio,
    refactored the tab code,
    decoupled the code from django layer.
    is_hideable flag on tabs
    get_discussion method is needed to continue to support
external_discussion links for now since used by 6.00x course.
    override the __eq__ operator to support comparing with
dict-type tabs.

Test
    moved test code to common,
    added acceptance test for built-in pages
    added additional unit tests for tabs.
    changed test_split_modulestore test to support serializing objects
that are fields in a Course.

Env:
    updated environment configuration settings so they are
    consistent for both cms and lms.
2014-03-21 13:58:01 -04:00
Giulio Gratta
35112e9e78 Variable-ize "Certificate of Achievement" text 2014-02-25 10:19:03 -08:00
Brian Talbot
cb209fa0af LMS: revising color of language icon 2014-02-14 22:35:11 +00:00
Brian Talbot
a51ab4f1f4 LMS: adding iconography to language pref on dashboard UI 2014-02-14 22:35:11 +00:00
Diana Huang
a07d243fdb Clean up the display and dialog to use user preferences
instead of the current language.
2014-02-14 22:35:11 +00:00
Diana Huang
be189e607e Store user preferences for languages
Also, refactor tests such that we're not deleting users or prefs
2014-02-14 22:35:07 +00:00
Julia Hansbrough
d867e87b72 Acceptance test for language selector
Tests language selection feature for student dashboard
2014-02-14 10:32:11 -05:00
Julia Hansbrough
cb6b52f890 wiring for language selector 2014-02-14 10:32:10 -05:00
Brian Talbot
895bb5e029 LMS: adding language selector to user dashboard (WIP) 2014-02-14 10:32:10 -05:00
Jason Bau
7ac13bf81e Don't show course start date if it hasn't been set.
If neither start nor advertised_start has been changed from default
don't show the course start date.

This allows us to accept course registrations for courses whose start
date is yet TBD.
2014-02-03 16:20:39 -08:00
Julia Hansbrough
17869c5eee Midcourse reverification: i18n fixes
Fixed i18n in templates
2014-01-31 22:20:33 +00:00
Frances Botsford
63a22ad0e5 PR review changes for LMS reverification 2014-01-31 22:20:32 +00:00
Julia Hansbrough
69b5b033fd Midcourse reverifications: dismissal banner
Added a banner that students can use to dismiss the "you have failed reverification" message.  Also, removed unused code, wired up the sidebar for design
2014-01-31 22:20:32 +00:00
Frances Botsford
436a1ec7f6 downstairs fixxup on lms reverification 2014-01-31 22:11:57 +00:00
Julia Hansbrough
3aa80654cb Midcourse reverification: fixing broken tests
Also, refactored code representing ReverifyInfo
2014-01-31 22:08:09 +00:00
Frances Botsford
86588c492b added notification styles for re-verification and general on LMS 2014-01-31 22:08:09 +00:00
Julia Hansbrough
3e1519c62a Midcourse reverification: increased quality
Also, removed an unused template
2014-01-31 22:08:09 +00:00
Frances Botsford
5aea466093 styling complete on reverify dash 2014-01-31 22:08:08 +00:00
Julia Hansbrough
0b7594178b Moved reverification windows into common
Added verification sidebar, banner for major courseware sections, quality & test improvements
2014-01-31 22:08:08 +00:00
Julia Hansbrough
bf210398e6 Tests and cleanup
Improved tests, fixed javascript for photocapture, removed extraneous photocapture code, added time & course numbers to templates for design
2014-01-31 21:48:36 +00:00
Frances Botsford
6c7d715e0e re-verification dashboard styles 2014-01-31 21:48:35 +00:00
Julia Hansbrough
85030467ed Skeleton for follow-on verification behavior
Quick-and-dirty end-to-end flow, functional for at least the case of one course in need of re-verification.

Ready for design to start taking a look; still needs tests and code cleanup
2014-01-31 21:08:24 +00:00
Brian Talbot
fd94be6a01 LMS: resolves missing certificate download button styling
* adds in Sass placeholder to mirror older/inherited button styling used in LMS
* uses light theming Sass variables for button styling
* adds specific selector for certificate download button
2014-01-13 16:26:36 -05:00
Julia Hansbrough
2b7587d6a8 Added alternate upsell copy flag
For waffle / split testing purposes
2013-12-05 19:14:45 +00:00
Julia Hansbrough
f880bcb652 Response to CR 2013-12-05 19:14:45 +00:00
Brian Talbot
d2a2aaa716 LMS: adds in collapse/expand UI for dashboard view upsell 2013-11-25 16:40:32 -05:00
Diana Huang
1656876699 If student has not passed verification, issue an honor code cert.
Also, display a message on their dashboard.
2013-11-19 17:12:49 -05:00
Diana Huang
aa8348a7ed Add in a new hook for people who are embargoed in the verified cert track.
LMS-1477
2013-11-12 10:25:04 -05:00
Brian Talbot
b2c12cfe04 LMS: revises certificate download copy 2013-11-08 10:54:46 -05:00
Diana Huang
ded97b59da Add a new status for verified certificates.
LMS-1477
2013-11-07 17:41:11 -05:00
Diana Huang
05e1b99388 Refactor out certificate logic from the course listing.
LMS-1477
2013-11-07 16:47:29 -05:00
Julia Hansbrough
448f5cc41f Response to CR 2013-11-04 20:32:47 +00:00
Julia Hansbrough
b0fcadad31 Moved #unenroll-modal to different template 2013-11-04 18:38:49 +00:00
Julia Hansbrough
c375666d88 Added new copy, small CR fixes
* Changed text for "Are you sure you want to refund"...
* Addressed a CR comment adding clarity to student view code
* Converted UTC to pytz.utc
2013-11-04 18:38:46 +00:00