Commit Graph

1258 Commits

Author SHA1 Message Date
Dennis Jen
66b3e3828f added tests for instructor_dashboard.py, added docstring for _is_small_course, removed check for settings.ANALYTICS_DASHBOARD_URL when creating dashboard link 2014-11-05 17:14:33 -05:00
Muhammad Ammar
e8e7e78e09 Merge pull request #5655 from edx/ammar/unit-improvements
Unit Test Improvements
2014-11-05 19:55:39 +05:00
Dennis Jen
b27401554c Feature flagged enrollment counts on instructor dashboard.
* enrollments counts removed from legacy dashboard
2014-11-04 12:56:53 -05:00
Sarina Canelake
bc20ccb332 Merge pull request #5828 from edx/sarina/moar-pep8
Remove more pep8 violations
2014-11-04 08:58:17 -05:00
Sarina Canelake
725e4908e3 Remove more pep8 violations 2014-11-04 07:37:41 -05:00
muhammad-ammar
fcaa783e43 Unit Test Improvements
TE-489
2014-10-31 11:55:13 +00:00
Clinton Blackburn
13579ca9a8 Updates to Demographics Display
- Gating on feature enabled for Open edX users
- If feature disabled and Insights URL is set, displaying message pointing users to Insights
2014-10-29 12:31:44 -04:00
Clinton Blackburn
a3171eb8d8 Removed Analytics API Client
Instructors should use Insights instead.
2014-10-29 10:25:18 -04:00
John Eskew
831dd593c9 Add tests for empty analytics server info and url-encoded params. 2014-10-28 11:28:57 -04:00
John Eskew
38e88e3011 Check for empty URL and api key before old analytics api call.
Encode course key as a URL parameter.
2014-10-28 11:28:57 -04:00
asadiqbal08
1035d67a25 WL-98
fix typo and add more security on API

fix some bugs and typos

address PR feedback

be sure to send emails when accounts already exist

PR feedback

fix multiple uploads

pep8 fixes

pep8 fix

pylint fixes

fix url mapping

WL-98
- Complete code coverage
- Update code for error and warning messages.
- improve code as per some suggestions

updated the UI of the auto_enroll feature

fixed the errors

PR feedback

add test

add back file filtering

add some more error handling of input

remove unneeded coffeescript code

pylint fixes

add pep8 space

WL-98
- Updated and added test cases.
- Updated membership coffee file for errors display handling.
- fixed minor text issues.

allow for blank lines and add a test

add blank line (pep8)
2014-10-21 14:23:46 -04: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
Nimisha Asthagiri
b78bb976cc Merge pull request #5531 from edx/release
Merge Release
2014-10-09 09:58:51 -04:00
Chris Dodge
1809a28b89 Add the ability for Microsites to be able to send appropriately branded emails rather than the default system installed version
fix tests. Update Admin views/forms.

enforce uniqueness constraint in the Admin ModelForm submissions

Update bok_choy cached DBs with new schema changes

PR feedback
2014-10-08 13:04:41 -04:00
Nimisha Asthagiri
12f5d52b60 merge branch 'release' fix. 2014-10-07 16:32:16 -04:00
Nimisha Asthagiri
d7f850a764 Merge branch 'release'
Conflicts:
	lms/djangoapps/instructor/features/data_download.py
2014-10-07 16:23:28 -04:00
Don Mitchell
edffa73512 Convert acceptance to opaque keys 2014-10-03 10:55:58 -04:00
Daniel Friedman
ba3f7f9409 Make student profile CSV download a background task, add cohort column 2014-10-02 14:21:13 -04:00
Christina Roberts
7f4cc1c75c Merge pull request #5407 from edx/cohort-management
Cohorts UI
2014-10-01 11:01:03 -04:00
Adam
6a5fc054ba Merge pull request #5445 from edx/release
Release
2014-10-01 09:32:23 -04:00
Nimisha Asthagiri
b4c826e747 TNL-329 Client-side work for displaying cohort description. 2014-10-01 09:22:30 -04:00
Andy Armstrong
9e366fe202 Show cohorts on the new instructor dashboard
TNL-161

Remove placeholder text
2014-10-01 09:22:29 -04:00
Carlos Andrés Rocha
9145d72ccb Update copy for link to analytics dashboard. 2014-09-29 16:46:51 -04:00
Carlos Andrés Rocha
fa43a4490a Enable analytics dashboard link in instructor dashboard. 2014-09-29 16:24:28 -04:00
Don Mitchell
dc9654283e Fix unit tests for generated
course ids.
2014-09-29 11:25:56 -04:00
Don Mitchell
4ca5012f3c Use split to test views 2014-09-29 11:25:55 -04:00
Sarina Canelake
c57f1c818b Merge pull request #5290 from mitocw/bdero/fix-grade-summary-opaque-keys
Remove unimplemented legacy dashboard grade_summary feature
2014-09-28 16:02:49 -04:00
Brandon DeRosier
5bfa313dcb Remove unimplemented grade_summary feature. 2014-09-26 12:53:53 -04:00
Clinton Blackburn
4f9725a0c0 Displaying Insights Link for All Instructors 2014-09-25 17:58:38 -04:00
Andy Armstrong
0ed3a95d3a Merge branch 'release'
Conflicts:
	AUTHORS
	common/static/js/vendor/ova/OpenSeaDragonAnnotation.js
	common/test/acceptance/pages/lms/dashboard.py
2014-09-25 16:25:45 -04:00
Waqas Khalid
d0d225d8a9 Course admin should be able to de-admin dicussion admins
As a global staff or course staff once you added yourself
in the discussion admins you cannot revoke it back unless
you remove yourself as course staff. Any of the course staff
member should be able to remove others from discussion admins
whether they are course staff or not.

TNL-315
2014-09-24 22:26:31 +05:00
Chris Dodge
0c72e37374 change registration code email and attachments, per product requirements
remove extra lines

conditionalize address line 2
2014-09-24 09:13:37 -04:00
Chris Dodge
f34a1c9d11 Add the 'meta' column from the UserProfile table to the CSV download
add special case logic to get the 'meta' field into the downloaded CSV

wip

wip
2014-09-23 15:08:38 -04:00
Clinton Blackburn
8705694743 Hiding Insights link for non-staff users 2014-09-19 10:47:54 -04:00
asadiqbal08
47cd0f3e62 EX-81 / Ex-84 changes 2014-09-16 18:43:48 +05:00
Clinton Blackburn
9f8e2cf5aa Merge pull request #5132 from edx/insights-message-update
Updated Analytics Dashboard Message
2014-09-10 15:11:59 -04:00
Carson Gee
6b95ec8de2 Corrected NameError for invalid variable 2014-09-08 21:45:14 -04:00
Clinton Blackburn
ee036ecaa6 Updated Analytics Dashboard Message
Message to dashboard now includes the name of the application.
2014-09-08 15:37:34 -04:00
Sarina Canelake
467f2988e1 Quality cleanup 2014-09-08 12:02:31 -04:00
Don Mitchell
afa57f505b Remove client side parsing of module_id
in analytics dashboard.
LMS-11209
2014-09-03 21:59:29 -04:00
Muhammad Shoaib
2cc0433833 Implement mediated bulk purchase epic
Updating EX-60 logic
2014-09-02 13:03:24 -04:00
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
Don Mitchell
4d701bebef Fix check and show answer for split
LMS-11237
2014-08-25 10:29:50 -04: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
f4e021093a Fix: 500 response if indiv. due date deleted after normal due date was deleted 2014-08-19 23:23:07 -07:00
Braden MacDonald
3ab8779190 Fix: API allowed an individual due date extension on units with no due date 2014-08-19 23:23:06 -07:00
Braden MacDonald
a08ab9ff11 Fix: an individual extended due date must not precede the normal due date LMS-6563 2014-08-19 23:23:06 -07:00
Braden MacDonald
42eaa4b005 Unit tests for bugs in IDDE API, including LMS-6563 2014-08-19 23:23:06 -07:00
Justin Helbert
dd7f09d36a This confirms the data api upgrade 2014-08-19 19:03:58 +00:00