Commit Graph

574 Commits

Author SHA1 Message Date
David Ormsbee
127467f20a Merge pull request #9023 from mcgachey/lti-collated-grades
[LTI Provider] Grade passback for non-leaf blocks.
2015-09-02 07:34:10 -04:00
Braden MacDonald
2438b27b9c Merge pull request #9330 from open-craft/fix-offline-gradecalc
Fix Offline Grade Calculation
2015-09-01 19:41:22 -07:00
Amir Qayyum Khan
e15732114d Fixed CCX display name issue in enrollment/unenrollment email templates for non EDX members 2015-09-01 13:22:50 +05:00
Sarina Canelake
25169ccc4d Merge pull request #9147 from open-craft/OC-791-answer-export
Move problem responses export from legacy instructor dash to new instructor dash
2015-08-31 15:12:55 -04:00
Phil McGachey
9e6c44911d [LTI Provider] Grade passback for non-leaf blocks.
This change allows graded assignments to be added to a campus LMS
regardless of the granularity at which the problem sits. Previously
a grade could only be returned if the usage ID for the problem itself
was specified in the LTI launch.

The code assumes that courses taking advantage of this functionality
are arranged in a hiearchy (with sections being parents to verticals,
and verticals being parents to problems). When a grading event occurs
it traverses the parent hiearchy to identify any previous graded LTI
launches for which the new scoring event should generate a grade
update. It then calculates and sends scores to each of those outcome
services.

Since grade calculation is an expensive operation, the code optimizes
the case where a problem has been added only once as a leaf unit. In
that case it is able to behave as before, just taking the grade from
the signal without having to calculate grades for the whole course.
2015-08-27 15:54:43 -04:00
Peter Fogg
5d26938158 Merge pull request #9366 from edx/peter-fogg/team-signals
Add signals for user's discussion activity.
2015-08-27 14:07:29 -04:00
David Ormsbee
7543e05baa PEP8 fix. 2015-08-26 15:08:38 -04:00
David Ormsbee
ff62a8eaaa Merge branch 'release' into release-2015-08-26-conflict 2015-08-26 14:28:35 -04:00
Peter Fogg
38fb6eaede Add signals for user's discussion activity.
These signals are caught by the Teams app and used to update
`last_activity_at` on both teams and individual users.

TNL-2497
2015-08-26 12:07:54 -04:00
David Ormsbee
2ecf7aec46 Update Instructor Dashboard tests to use SharedModuleStoreTestCase.
Also added reset_test_case() and @modifies_courseware to SharedModuleStoreTestCase.

Revert "More verbose test builds in Jenkins, for debugging."

This reverts commit 58cade4cc4288335026649470a48b7bbca969ee8.
2015-08-25 01:28:55 -04:00
Braden MacDonald
8cc82f7644 Fix Offline Grade Calculation 2015-08-24 18:20:49 -07:00
unknown
88a038aa1e Fixed email parm function for CCX email
modified:   lms/djangoapps/instructor/tests/test_enrollment.py
2015-08-24 20:34:11 +05:00
Chris Dodge
674b92f0b9 Only let global staff (is_staff=True) see the Proctoring tab in the Instructor Dashboard
Only let global staff (is_staff=True) see the Proctoring tab in the Instructor Dashboard if the feature flag is enabled.
2015-08-19 11:07:14 -04:00
Tim Krones
df5b2dadda Move functionality for exporting a CSV of all student answers to a given
problem from legacy instructor dash to new instructor dash.
2015-08-17 22:32:49 +02:00
Renzo Lucioni
8b704cc2ec Merge pull request #9351 from edx/release
Release
2015-08-17 13:17:55 -04:00
Peter Fogg
c13f296103 HTML-escape uses of course display name. 2015-08-17 12:22:10 -04:00
Chris Dodge
6cf5516a84 Integration of edx_proctoring into the LMS 2015-08-13 19:08:50 -04:00
Ned Batchelder
f54fe787c6 Remove needless 'disable=no-member' pragmas 2015-08-03 17:47:44 -04:00
cahrens
1b93dd122e Sort the grade cutoffs.
TNL-2848
2015-07-24 12:52:56 -04:00
Zia Fazal
5925edbfbc hiding generated certificate button in case of self paced courses 2015-07-23 17:02:34 +05:00
srpearce
93e31e6149 Merge pull request #8573 from edx/sylvia/docs/InstDashHousekeeping
Clean up some e-commerce strings on the Instructor Dashboard
2015-07-21 09:27:34 -04:00
Sylvia Pearce
3ab45fba0c Clean up some e-commerce strings on the Instructor Dashboard 2015-07-20 18:29:17 -04:00
Matt Drayer
4c0b00f45e Merge pull request #8952 from edx/ziafazal/SOL-1045
SOL-1045: Enable certificate generation by students for self-paced courses
2015-07-20 10:22:02 -04:00
Adam
2735b2b5bb Revert "Decorated instructor dashboard with sudo_required." 2015-07-17 12:11:38 -04:00
Zia Fazal
bed7d80777 enable certificate generation for html certificates
Enable Student-Generated Certificates for HTML certs flow
2015-07-16 13:32:14 +05:00
Waheed Ahmed
bc052db1ee Added DjangoSudo functionality for instructor dashboard and course team page 2015-07-16 11:14:11 +05:00
Sarina Canelake
376fe0a57c Remove outdated Analytics scripts, code, and css 2015-07-15 11:11:10 -04:00
Alison Hodges
747c6b7413 Merge pull request #8716 from edx/ahodges/staff_labeling
Ahodges/staff labeling
2015-07-08 17:34:29 -04:00
Zia Fazal
611d16b25a ziafazal/SOL-980: Generate certificates from instructor dashboard
* added generate certificates task and bok choy tests
* added unit tests
* changes based feedback and improved acceptance test
* Change header text
* changes based on feedback on 24/6
* added task_id to api output
* fixed broken test
* Remove "Instructor" from strings, per Docs team
* Fixed flaky entrance exam test
2015-07-02 14:32:36 -04:00
Alison Hodges
7410286104 Fixed pylint line-too-long violations 2015-07-01 15:23:15 -04:00
Alison Hodges
e473022c91 Additional references to "Pending Instructor Tasks" changed 2015-07-01 12:49:59 -04:00
Jonathan Piacenti
412f120547 Make resetting of attempts and student state on blocks recursive. 2015-06-29 13:08:01 +00:00
Will Daly
7cb41c7783 Merge pull request #8553 from edx/will/ecom-467
Add professional enrollments to the instructor dashboard.
2015-06-18 11:27:26 -04:00
Carlos de la Guardia
d56303dd0f Only enable the OverrideFieldData when there are active overrides on a course. 2015-06-17 15:26:10 -04:00
Will Daly
1223d88ebb Add professional enrollments to the instructor dashboard. 2015-06-17 11:54:31 -04:00
chrisndodge
302d3e6e06 Merge pull request #8206 from edx/afzaledx/sol-795-executive-summary-report
SOL-795 Executive Summary Report
2015-06-16 15:38:28 -04:00
Afzal Wali
0569a770ea Executive Summary Report 2015-06-16 14:48:16 -04:00
Afzal Wali
ac72e26256 Fixed the empty list price issue.
Added columns to the CC purchases report. (added Qty and Total Discount. Moved the Total Amount to the last index).
Coupon code report.
2015-06-16 17:46:05 +05:00
srpearce
d4b99561d1 Merge pull request #8326 from edx/sylvia/docs/SOL_ECOM
Sylvia/docs/sol ecom
2015-06-04 17:35:03 -04: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
Chris Dodge
ceb0fc79d0 update tests to match text changes 2015-06-03 19:00:46 -04:00
Muhammad Shoaib
4dff8ecf09 SOL-916 Add ability to query, enable, disable, unredeem Enrollment Codes 2015-06-03 14:46:01 -04: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
Sarina Canelake
9008548c25 Merge pull request #8207 from amir-qayyum-khan/add_ccx_enable_to_settings
Added ccx enable/disable flag to advance settings and show hide ccx coach option on lms
2015-06-02 11:52:17 -04:00
amir-qayyum-arbisoft
6a41cd7bfa Added ccx enable/disable flag to advance settings and show hide ccx coach option on lms 2015-06-02 19:43:42 +05:00
Ned Batchelder
cc5c1001d1 Fix simplifiable-range pylint warnings. 2015-06-02 09:47:13 -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
Muhammad Shoaib
392937d9e1 MAYN-68 fixed the bug, total credit card purchases amount does not include the bulk purchases. 2015-05-18 15:51:19 +05:00