Compare commits

...

47 Commits

Author SHA1 Message Date
Simon Chen
e31c670938 Merge pull request #29 from edx/schen/percent
fix(UI): Update the percent number view so it is actually percent
2018-11-30 12:07:47 -05:00
Simon Chen
db9f683297 fix(UI): Update the percent number view so it is actually percent with symbols 2018-11-30 11:55:02 -05:00
Richard I Reilly
7a43cdcaea Merge pull request #27 from edx/rir/dynamic-assignments
Make it so the assignment time column filter is dynamic and api driven
2018-11-30 11:08:59 -05:00
Rick Reilly
d5637a4550 Make it so the assignment time column filter is dynamic and api driven 2018-11-30 10:56:08 -05:00
Simon Chen
0b9fa36fb7 Merge pull request #28 from edx/schen/styles
fix(Styles): Fix the gradebook styles to increase its width
2018-11-30 10:51:03 -05:00
Simon Chen
7bd0c49c14 fix(Styles): Fix the gradebook styles to increase its width 2018-11-30 10:30:59 -05:00
Alex Dusenbery
44f91bb453 Add documentation on platform configuration for local development. 2018-11-30 10:16:08 -05:00
Jansen Kantor
d8f229838f Merge pull request #25 from edx/pagination
fix(pagination) use paragon buttons, hide rather than disable
2018-11-29 16:22:38 -05:00
jkantor
7b5a095898 fix(pagination) use paragon buttons, hide rather than disable 2018-11-29 15:35:13 -05:00
Jansen Kantor
ff7937c2d7 Merge pull request #24 from edx/pagination
feat(pagination) added next and previous buttons to grades page
2018-11-29 14:34:56 -05:00
jkantor
d057497105 feat(pagination) added next and previous buttons to grades page 2018-11-29 13:11:11 -05:00
Richard I Reilly
e1402b0d4f Merge pull request #23 from edx/rir/update-auth
Update auth to the latest version of edx/frontend-auth
2018-11-28 15:41:24 -05:00
Rick Reilly
3ea337e3f8 Update auth to the latest version of edx/frontend-auth 2018-11-28 15:31:19 -05:00
Alex Dusenbery
9c2c16e378 Remove boilerplate README strings, add note about installing into LMS. 2018-11-28 10:30:12 -05:00
Simon Chen
7e9ef204a7 Merge pull request #22 from edx/schen/fix_search
fix(functionality): Fix search so results are rendered with proper heading
2018-11-27 15:02:07 -05:00
Simon Chen
f779e7fd35 fix(functionality): Fix search so results are rendered with proper heading 2018-11-27 14:47:57 -05:00
Richard I Reilly
a5a62922b5 Merge pull request #13 from edx/schen/clean
Clean up not needed example code
2018-11-26 14:41:00 -05:00
Richard I Reilly
2c6aa96f8e Merge pull request #20 from edx/rir/fix-sorting
Fix column sorting in the grade table
2018-11-26 14:29:48 -05:00
Rick Reilly
30e866128f Fix column sorting in the grade table 2018-11-26 14:25:11 -05:00
Simon Chen
ec81eb47d9 Merge pull request #18 from edx/aed/edit-modal
feat(editing): display a status alert after grades have updated.
2018-11-14 21:03:12 -05:00
Alex Dusenbery
cd2a5ae903 feat(editing): display a status alert after grades have updated. 2018-11-14 20:36:41 -05:00
Richard I Reilly
7a02330e9e Merge pull request #17 from edx/rir/frontend-auth-1-1
Return the frontend-auth npm package to 1.1.0
2018-11-14 16:45:51 -05:00
Rick Reilly
a929194a29 Return the frontend-auth npm package to 1.1.0 2018-11-14 16:16:47 -05:00
Simon Chen
febf4d99c6 Merge pull request #14 from edx/schen/add_links
fix(functionality): Add links and subtitles to the UI
2018-11-14 15:52:47 -05:00
Simon Chen
83ed8ab875 Merge pull request #16 from edx/schen/default-wording
fix(ui): update the default wording of the group filters
2018-11-14 15:51:10 -05:00
Simon Chen
6563f54590 fix(functionality): Add links and subtitles to the UI so it helps user navigate 2018-11-14 15:43:48 -05:00
Simon Chen
e1fe31dc94 fix(ui): update the default wording of the group filters 2018-11-14 15:39:56 -05:00
Richard I Reilly
8754263584 Merge pull request #15 from edx/rir/fix-category-filter
Rir/fix category filter
2018-11-14 15:35:34 -05:00
Rick Reilly
c660bd8d15 Fix the category filter 2018-11-14 15:16:40 -05:00
Richard I Reilly
df32123f34 Merge pull request #8 from edx/rir/fix-percent-absolute-filter
Rir/fix percent absolute filter
2018-11-14 14:50:40 -05:00
Rick Reilly
e81db01be2 Fix percent vs absolute radio buttons 2018-11-14 14:32:34 -05:00
Simon Chen
05c3468d93 Merge pull request #12 from edx/schen/fix_download_link
fix(functionality): Update the download report link URL
2018-11-14 14:18:39 -05:00
Simon Chen
1687a6ca1a Clean up not needed example code 2018-11-14 14:02:53 -05:00
Simon Chen
1a88343be9 fix(functionality): Update the download report link URL so it goes to the right place 2018-11-14 13:55:12 -05:00
Alex Dusenbery
6f752f3a18 fix(auth): Pin frontend-auth to 1.1.0 for now. 2018-11-14 13:35:09 -05:00
Alex Dusenbery
7bbc9a84dc fix(auth): use frontend-auth 1.2.0 (allows us to POST without CSRF violation). 2018-11-14 12:12:13 -05:00
Simon Chen
85cf3e35e4 Merge pull request #9 from edx/aed/prod-env
fix(packaging): Add default environment key/value pairs to prod webpack config
2018-11-14 10:35:40 -05:00
Alex Dusenbery
85fa6bca72 fix(packaging): Add default environment key/value pairs to prod webpack config. 2018-11-14 10:23:38 -05:00
Simon Chen
231685e78d Merge pull request #7 from edx/schen/cohorts
Create the cohorts and track dropdown for filtering students
2018-11-13 21:49:21 -05:00
Simon Chen
a4dc135129 feat(filter): Create the cohorts and track dropdown for filtering students
This is to provide the feature to filter students on the gradebook by
cohorts or enrollment tracks
2018-11-13 21:33:11 -05:00
Alex Dusenbery
2c890e53f8 Get the basic grade update working. 2018-11-13 13:03:50 -05:00
Richard I Reilly
33556fd749 Merge pull request #4 from edx/rir/hookup-redux
Hook up redux to get data for component
2018-11-09 15:58:35 -05:00
Rick Reilly
8a62e8b710 Hook search up to the backend 2018-11-09 15:54:05 -05:00
Alex Dusenbery
45272dd8b7 feat(auth): Use the frontend-auth client
- Also add some config
2018-11-09 14:42:08 -05:00
Rick Reilly
f94a0bd7f7 Hook up redux to get data for component 2018-11-09 14:42:08 -05:00
Simon Chen
1523c8a3c3 Merge pull request #3 from edx/schen/fix_publish
fix(package): Make sure the package is public for npm for publishing
2018-11-06 13:27:47 -05:00
Simon Chen
165529698c fix(package): Make sure the package is public for npm for publishing 2018-11-06 13:17:50 -05:00
35 changed files with 6846 additions and 6743 deletions

6
.gitignore vendored
View File

@@ -6,4 +6,8 @@ coverage
dist/
.python-version
### pyenv ###
.python-version
### Emacs ###
*~

View File

@@ -29,6 +29,26 @@ If you don't, you can see the log messages for the docker container by executing
Note that `make up-detached` executes the `npm run start` script which will hot-reload JavaScript and Sass files changes, so you should (:crossed_fingers:) not need to do anything (other than wait) when making changes.
## Configuring for local use in edx-platform
Assuming you've got the UI running at `http://localhost:1991`, you can configure the LMS in edx-platform
to point to your local gradebook from the instructor dashboard by putting this settings in `lms/env/private.py`:
```
WRITABLE_GRADEBOOK_URL = 'http://localhost:1991'
```
There are also several edx-platform waffle and feature flags you'll have to enable from the Django admin:
1. Grades > Persistent grades enabled flag. Add this flag if it doesn't exist,
check the ``enabled`` and ``enabled for all courses`` boxes.
2. Waffle > Switches. Add the ``grades.assume_zero_grade_if_absent`` switch and make it active.
3. Waffle_utils > Waffle flag course overrides. You want to activate this flag for any course
in which you'd like to enable the gradebook. Add a course override flag using a course id and the flag name
``grades.writable_gradebook``. Make sure to check the ``enabled`` box. Alternatively, you could add this as a
regular waffle flag to enable the gradebook for all courses.
## Directory Structure
* `config`
@@ -46,61 +66,6 @@ Note that `make up-detached` executes the `npm run start` script which will hot-
* `constants`
* `reducers`
* Directory for `Redux` reducers
* [`.babelrc`](#babelrc)
* [`.dockerignore`](#dockerignore)
* [`.eslintignore`](#eslintignore)
* [`.eslintrc.js`](#eslintrcjs)
* `.gitignore`
* [`npmignore`](#npmignore)
* [`.travis.yml`](#travisyml)
* `docker-compose.yml`
* `Dockerfile`
* `LICENSE`
* `Makefile`
* `package-lock.json`
* [`package.json`](#packagejson)
### `.babelrc`
We use [`Babel`](https://babeljs.io/) to transpile `ES2015+` JavaScript to `ES5` JavaScript. `ES5` JavaScript has [greater browser compatibility](http://kangax.github.io/compat-table/es5/) than [`ES2015+`](http://kangax.github.io/compat-table/es6/).
The `.babelrc` file is used to specify a particular configuration - for example, we use the [`babel-preset-react`](https://babeljs.io/docs/plugins/preset-react/), which, among other things, allows `babel` to parse `JSX`.
### `.dockerignore`
The important thing to remember is to add the `node_modules` directory to `.dockerignore` - for more information [see the Docker documentation](https://docs.docker.com/engine/reference/builder/#dockerignore-file).
### `.eslintignore`
We use [`eslint`](https://eslint.org/) for our `JavaScript` linting needs. The `.eslintignore` file is used to [specify files or directories to, well, ignore](https://eslint.org/docs/user-guide/configuring#ignoring-files-and-directories).
While `eslint` automatically ignores `node_modules`, we like to add it to the `.eslintignore` just for the added explicitness. In addition, you probably want to add the directory for your compiled files (in our case, `./dist`) and your coverage directory (in our case, `./coverage`).
### `.eslintrc`
This is where the actual `eslint` configuration is specified. All `edX` JavaScript projects should extend either the [`eslint-config-edx`](https://github.com/edx/eslint-config-edx/blob/master/packages/eslint-config-edx/README.md) or [`eslint-config-edx-es5`](https://github.com/edx/eslint-config-edx/blob/master/packages/eslint-config-edx-es5/README.md) configurations (for `ES2015+` and `ES5` JavaScript, respectively). Both configurations can be found in [the `eslint-config-edx` repository](https://github.com/edx/eslint-config-edx).
### `.npmignore`
We are not currently publishing this package to [`npm`](https://www.npmjs.com/). If we did, we would want to exclude certain files from getting uploaded to `npm` (like our coverage files, for example). For more information, see [the `npm` documentation](https://docs.npmjs.com/misc/developers#keeping-files-out-of-your-package).
### `.travis.yml`
We use [`Travis CI`](https://travis-ci.org/) to build (and deploy) our application. The `.travis.yml` file specifies the configuration for `Travis` builds. For more information, see [the `Travis` documentation](https://docs.travis-ci.com/user/customizing-the-build/).
### `package.json`
Arguably, one of the **most important files in an `npm`-based application**, the `package.json` file specifies everything from the `name` of the application, were it to be published to `npm`, to it's `dependencies`.
For more information, see [the `npm` documentation](https://docs.npmjs.com/files/package.json).
## Helpful Applications
### [`Greenkeeper`](https://greenkeeper.io/)
[`Greenkeeper`](https://greenkeeper.io/) is basically a `GitHub` application that handles `npm` dependencies. It will automatically open PRs with `package.json` updates when new versions of your `npm` dependencies get published. There are ways to also automatically keep the `package-lock.json` in-line, in the same PR, using [`greenkeeper-lockfile`].
For more information, see [the `Greenkeeper` documentation](https://greenkeeper.io/docs.html#what-greenkeeper-does).
## Authentication with backend API services

View File

@@ -73,6 +73,22 @@ module.exports = Merge.smart(commonConfig, {
inject: true, // Appends script tags linking to the webpack bundles at the end of the body
template: path.resolve(__dirname, '../public/index.html'),
}),
new webpack.EnvironmentPlugin({
NODE_ENV: 'development',
BASE_URL: 'localhost:1991',
LMS_BASE_URL: 'http://localhost:18000',
LOGIN_URL: 'http://localhost:18000/login',
LOGOUT_URL: 'http://localhost:18000/login',
CSRF_TOKEN_API_PATH: '/csrf/api/v1/token',
REFRESH_ACCESS_TOKEN_ENDPOINT: 'http://localhost:18000/login',
DATA_API_BASE_URL: 'http://localhost:8000',
// LMS_CLIENT_ID should match the lms DOT client application id your LMS container
LMS_CLIENT_ID: 'login-service-client-id',
SEGMENT_KEY: null,
FEATURE_FLAGS: {},
ACCESS_TOKEN_COOKIE_NAME: 'edx-jwt-cookie-header-payload',
CSRF_COOKIE_NAME: 'csrftoken',
}),
// when the --hot option is not passed in as part of the command
// the HotModuleReplacementPlugin has to be specified in the Webpack configuration
// https://webpack.js.org/configuration/dev-server/#devserver-hot

View File

@@ -3,6 +3,7 @@
const Merge = require('webpack-merge');
const commonConfig = require('./webpack.common.config.js');
const path = require('path');
const webpack = require('webpack');
const ExtractTextPlugin = require('extract-text-webpack-plugin');
const HtmlWebpackPlugin = require('html-webpack-plugin');
@@ -91,5 +92,21 @@ module.exports = Merge.smart(commonConfig, {
inject: true, // Appends script tags linking to the webpack bundles at the end of the body
template: path.resolve(__dirname, '../public/index.html'),
}),
new webpack.EnvironmentPlugin({
NODE_ENV: 'production',
BASE_URL: null,
LMS_BASE_URL: null,
LOGIN_URL: null,
LOGOUT_URL: null,
CSRF_TOKEN_API_PATH: null,
REFRESH_ACCESS_TOKEN_ENDPOINT: null,
DATA_API_BASE_URL: null,
SEGMENT_KEY: null,
FEATURE_FLAGS: {},
ACCESS_TOKEN_COOKIE_NAME: null,
CSRF_COOKIE_NAME: 'csrftoken',
NEW_RELIC_APP_ID: null,
NEW_RELIC_LICENSE_KEY: null,
}),
],
});

10727
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -20,16 +20,20 @@
"author": "edX",
"license": "AGPL-3.0",
"homepage": "https://github.com/edx/gradebook#readme",
"publishConfig": {
"access": "public"
},
"dependencies": {
"@edx/edx-bootstrap": "^0.4.3",
"@edx/frontend-auth": "^1.0.3",
"@edx/paragon": "^3.5.2",
"@edx/frontend-auth": "^1.2.1",
"@edx/paragon": "^3.7.2",
"babel-polyfill": "^6.26.0",
"classnames": "^2.2.5",
"email-prop-type": "^1.1.5",
"font-awesome": "^4.7.0",
"history": "^4.7.2",
"prop-types": "^15.5.10",
"query-string": "^6.2.0",
"react": "^16.2.0",
"react-dom": "^16.2.0",
"react-redux": "^5.0.7",

View File

@@ -1,3 +1,27 @@
.gradebook-container{
width: 500px;
@media only screen and (min-width: 640px) {
width: 630px;
}
@media only screen and (min-width: 992px) {
width: 900px;
}
@media only screen and (min-width: 1200px) {
width: 1024px;
}
}
.back-link{
float:right;
}
.student-filters{
display: flex;
.label{
padding-top: 30px;
}
.form-group{
margin-left: 10px;
}
}
.gbook {
overflow-x: scroll;
@@ -20,9 +44,6 @@
display: block;
background-color: #fff;
}
.table tr td:not(:first-child) {
min-width: 250px;
}
.table tr td:nth-child(2) {
box-sizing: content-box;
padding-left: 170px;

View File

@@ -1,322 +1,354 @@
import React from 'react';
import PropTypes from 'prop-types';
import emailPropType from 'email-prop-type';
import { SearchField, Table, Modal } from '@edx/paragon';
import { Button, InputSelect, Modal, SearchField, StatusAlert, Table } from '@edx/paragon';
import queryString from 'query-string';
import { configuration } from '../../config';
export default class Gradebook extends React.Component {
constructor(props) {
super(props);
this.state = {
grades: this.mapUserEnteriesPercent(this.props.results).sort(this.sortAlphaDesc),
headings: this.mapHeadings(this.props.results[0]),
filterValue: '',
modalContent: (<h1>Hello, World!</h1>),
modalOpen: false,
modalModel: [{}],
updateVal: 0,
updateModuleId: null,
updateUserId: null,
};
}
sortAlphaDesc = (gradeRowA, gradeRowB) => {
const a = gradeRowA.username.toUpperCase();
const b = gradeRowB.username.toUpperCase();
if (a < b) {
return -1;
}
if (a > b) {
return 1;
}
return 0;
};
sortAlphaAsc = (gradeRowA, gradeRowB) => {
const a = gradeRowA.username.toUpperCase();
const b = gradeRowB.username.toUpperCase();
if (a < b) {
return 1;
}
if (a > b) {
return -1;
}
return 0;
};
sortNumerically = (colKey, direction) => {
function sortNumAsc(gradeRowA, gradeRowB) {
if (gradeRowA[colKey] < gradeRowB[colKey]) {
return -1;
}
if (gradeRowA[colKey] > gradeRowB[colKey]) {
return 1;
}
return 0;
}
function sortNumDesc(gradeRowA, gradeRowB) {
if (gradeRowA[colKey] < gradeRowB[colKey]) {
return 1;
}
if (gradeRowA[colKey] > gradeRowB[colKey]) {
return -1;
}
return 0;
};
this.setState({grades: [...this.state.grades].sort(direction === 'desc' ? sortNumDesc : sortNumAsc)});
componentDidMount() {
const urlQuery = queryString.parse(this.props.location.search);
this.props.getUserGrades(
this.props.match.params.courseId,
urlQuery.cohort,
urlQuery.track,
);
this.props.getTracks(this.props.match.params.courseId);
this.props.getCohorts(this.props.match.params.courseId);
this.props.getAssignmentTypes(this.props.match.params.courseId);
}
mapHeadings = entry => {
const results = [{
label: 'Username',
key: 'username',
columnSortable: true,
onSort: direction => {
this.setState({
grades: [...this.state.grades].sort(direction === 'desc' ? this.sortAlphaDesc : this.sortAlphaAsc)
})
},
}];
const assignmentHeadings = entry.section_breakdown
.filter(section => section.is_graded && section.label)
.map(s => ({
label: s.label,
key: s.label,
columnSortable: true,
onSort: direction => {this.sortNumerically(s.label, direction)},
}));
const totals = [{
label: 'Total',
key: 'total',
columnSortable: true,
onSort: direction => {this.sortNumerically('total', direction)},
}];
setNewModalState = (userEntry, subsection) => {
this.setState({
modalModel: [{
username: userEntry.username,
currentGrade: `${subsection.score_earned}/${subsection.score_possible}`,
adjustedGrade: (
<span>
<input
style={{ width: '25px' }}
type="text"
onChange={event => this.setState({ updateVal: event.target.value })}
/> / {subsection.score_possible}
</span>
),
assignmentName: `${subsection.subsection_name}`,
}],
modalOpen: true,
updateModuleId: subsection.module_id,
updateUserId: userEntry.user_id,
});
}
return results.concat(assignmentHeadings).concat(totals);
handleAdjustedGradeClick = () => {
this.props.updateGrades(this.props.match.params.courseId, [
{
user_id: this.state.updateUserId,
usage_id: this.state.updateModuleId,
grade: {
earned_graded_override: this.state.updateVal,
},
},
]);
this.setState({
modalModel: [{}],
modalOpen: false,
updateModuleId: null,
updateUserId: null,
});
}
updateQueryParams = (queryKey, queryValue) => {
const parsed = queryString.parse(this.props.location.search);
parsed[queryKey] = queryValue;
return `?${queryString.stringify(parsed)}`;
};
mapHeadingsHw = entry => {
const results = [{
label: 'Username',
key: 'username',
columnSortable: true,
onSort: direction => {
this.setState({
grades: [...this.state.grades].sort(direction === 'desc' ? this.sortAlphaDesc : this.sortAlphaAsc)
})
},
}];
const assignmentHeadings = entry.section_breakdown
.filter(section => section.is_graded && section.label && section.category == 'Homework' )
.map(s => ({
label: s.label,
key: s.label,
columnSortable: true,
onSort: direction => {this.sortNumerically(s.label, direction)},
}));
return results.concat(assignmentHeadings);
mapAssignmentTypeEntries = (entries) => {
const mapped = entries.map(entry => ({
id: entry,
label: entry,
}));
mapped.unshift({ id: 0, label: 'All' });
return mapped;
};
mapHeadingsExam = entry => {
const results = [{
label: 'Username',
key: 'username',
columnSortable: true,
onSort: direction => {
this.setState({
grades: [...this.state.grades].sort(direction === 'desc' ? this.sortAlphaDesc : this.sortAlphaAsc)
})
},
}];
const assignmentHeadings = entry.section_breakdown
.filter(section => section.is_graded && section.label && section.category == 'Exam' )
.map(s => ({
label: s.label,
key: s.label,
columnSortable: true,
onSort: direction => {this.sortNumerically(s.label, direction)},
}));
return results.concat(assignmentHeadings);
mapCohortsEntries = (entries) => {
const mapped = entries.map(entry => ({
id: entry.id,
label: entry.name,
}));
mapped.unshift({ id: 0, label: 'Cohort-All' });
return mapped;
};
mapUserEnteriesPercent = (entries) => entries.map(entry => {
const results = {username: entry.username};
const assignments = entry.section_breakdown
.filter(section => section.is_graded)
.reduce((acc,s) => {
acc[s.label]= (
<button
className="btn btn-header link-style"
onClick={()=> this.setState({
modalModel: [{
username: entry.username,
autoGrade: `${s.score_earned}/${s.score_possible}`,
adjustedGrade: (<span><input style={{width: '25px'}} type='text' value={this.updateVal}></input> / {s.score_possible}</span>),
assignmentName: `${s.subsection_name}`,
}],
modalOpen: true,
})}
>
{s.percent}
</button>);
return acc;
}, {});
const totals = {total: entry.percent * 100}
return Object.assign(results, assignments, totals);
});
mapTracksEntries = (entries) => {
const mapped = entries.map(entry => ({
id: entry.slug,
label: entry.name,
}));
mapped.unshift({ label: 'Track-All' });
return mapped;
};
mapUserEnteriesAbsolute = (entries) => entries.map(entry => {
const results = {username: entry.username};
const assignments = entry.section_breakdown
.filter(section => section.is_graded)
.reduce((acc,s) => {
acc[s.label]= (
<button
className="btn btn-header link-style"
onClick={()=> this.setState({
modalModel: [{
username: entry.username,
autoGrade: `${s.score_earned}/${s.score_possible}`,
adjustedGrade: (<span><input style={{width: '25px'}} type='text' value={this.updateVal}></input> / {s.score_possible}</span>),
assignmentName: `${s.subsection_name}`,
}],
modalOpen: true,
})}
>
{s.score_earned}/{s.score_possible}
</button>);
//TODO: This is a really hacky thing I'm doing just to get sorting to work. Should be able to clean this up drastically when I introduce the reducers
acc[`${s.label}Percent`] = s.percent
updateAssignmentTypes = (event) => {
this.props.filterColumns(event, this.props.grades[0]);
}
return acc;
}, {});
const totals = {total: entry.percent * 100}
return Object.assign(results, assignments, totals);
});
updateTracks = (event) => {
const selectedTrackItem = this.props.tracks.find(x => x.name === event);
let selectedTrackSlug = null;
if (selectedTrackItem) {
selectedTrackSlug = selectedTrackItem.slug;
}
this.props.getUserGrades(
this.props.match.params.courseId,
this.props.selectedCohort,
selectedTrackSlug,
);
const updatedQueryStrings = this.updateQueryParams('track', selectedTrackSlug);
this.props.history.push(updatedQueryStrings);
};
updateCohorts = (event) => {
const selectedCohortItem = this.props.cohorts.find(x => x.name === event);
let selectedCohortId = null;
if (selectedCohortItem) {
selectedCohortId = selectedCohortItem.id;
}
this.props.getUserGrades(
this.props.match.params.courseId,
selectedCohortId,
this.props.selectedTrack,
);
const updatedQueryStrings = this.updateQueryParams('cohort', selectedCohortId);
this.props.history.push(updatedQueryStrings);
};
mapSelectedAssignmentTypeEntry = (entry) => {
const selectedAssignmentTypeEntry = this.props.assignmentTypes
.find(x => x.id === parseInt(entry, 10));
if (selectedAssignmentTypeEntry) {
return selectedAssignmentTypeEntry.name;
}
return 'All';
};
mapSelectedCohortEntry = (entry) => {
const selectedCohortEntry = this.props.cohorts.find(x => x.id === parseInt(entry, 10));
if (selectedCohortEntry) {
return selectedCohortEntry.name;
}
return 'Cohorts';
};
mapSelectedTrackEntry = (entry) => {
const selectedTrackEntry = this.props.tracks.find(x => x.slug === entry);
if (selectedTrackEntry) {
return selectedTrackEntry.name;
}
return 'Tracks';
};
formatter = {
percent: entries => entries.map((entry) => {
const results = { username: entry.username };
const assignments = entry.section_breakdown
.filter(section => section.is_graded)
.reduce((acc, subsection) => {
acc[subsection.label] = (
<button
className="btn btn-header link-style"
onClick={() => this.setNewModalState(entry, subsection)}
>
{subsection.percent * 100}%
</button>);
return acc;
}, {});
const totals = { total: `${entry.percent * 100}%` };
return Object.assign(results, assignments, totals);
}),
absolute: entries => entries.map((entry) => {
const results = { username: entry.username };
const assignments = entry.section_breakdown
.filter(section => section.is_graded)
.reduce((acc, subsection) => {
acc[subsection.label] = (
<button
className="btn btn-header link-style"
onClick={() => this.setNewModalState(entry, subsection)}
>
{subsection.score_earned}/{subsection.score_possible}
</button>);
return acc;
}, {});
const totals = { total: `${entry.percent * 100}/100` };
return Object.assign(results, assignments, totals);
}),
};
lmsInstructorDashboardUrl = courseId => `${configuration.LMS_BASE_URL}/courses/${courseId}/instructor`;
render() {
return (
<div className="d-flex justify-content-center">
<div className="card" style={{width: '50rem'}}>
<div className="card gradebook-container">
<div className="card-body">
<a
href={this.lmsInstructorDashboardUrl(this.props.match.params.courseId)}
className="back-link"
>
Back to Dashboard
</a>
<h1>Gradebook</h1>
<hr/>
<h3> {this.props.match.params.courseId}</h3>
<hr />
<div className="d-flex justify-content-between" >
<div>
<div>
Score View:
Score View:
<span>
<input
id='score-view-percent'
className='ml-2'
type='radio'
name='score-view'
value='percent'
onClick={()=> {this.setState({
grades: this.mapUserEnteriesPercent(this.props.results).sort(this.sortAlphaDesc),
})}}
<input
id="score-view-percent"
className="ml-2 mr-1"
type="radio"
name="score-view"
value="percent"
onClick={() => this.props.toggleFormat('percent')}
/>
<label className='ml-2 mr-2' htmlFor='score-view-percent'>Percent</label>
<label className="mr-2" htmlFor="score-view-percent">Percent</label>
</span>
<span>
<input
id='score-view-absolute'
type='radio'
name='score-view'
value='absolute'
onClick={()=> {this.setState({
grades: this.mapUserEnteriesAbsolute(this.props.results).sort(this.sortAlphaDesc),
})}}
<input
id="score-view-absolute"
type="radio"
name="score-view"
value="absolute"
className="mr-1"
onClick={() => this.props.toggleFormat('absolute')}
/>
<label className='ml-2 mr-2' htmlFor='score-view-absolute'>Absolute</label>
<label htmlFor="score-view-absolute">Absolute</label>
</span>
</div>
<div>
Category:
<span>
<input
id='category-all'
className='ml-2'
type='radio'
name='category'
value='all'
onClick={()=> {this.setState({
headings: this.mapHeadings(this.props.results[0]),
})}}
/>
<label className='ml-2 mr-2' htmlFor='category-all'>All</label>
</span>
<span>
<input
id='category-homework'
className='ml-2'
type='radio'
name='category'
value='homework'
onClick={()=> {this.setState({
headings: this.mapHeadingsHw(this.props.results[0]),
})}}
/>
<label className='ml-2 mr-2' htmlFor='category-homework'>Homework</label>
</span>
<span>
<input
id='category-exam'
type='radio'
name='category'
value='exam'
onClick={()=> {this.setState({
headings: this.mapHeadingsExam(this.props.results[0]),
})}}
/>
<label className='ml-2 mr-2' htmlFor='Exam'>Exam</label>
</span>
</div>
</div>
<div>
<div style={{marginLeft: "10px" ,marginBottom: "10px"}}>
<a href="https://www.google./com">Download Grade Report</a>
</div>
<SearchField
onSubmit={() => {this.setState({
grades: this.mapUserEnteriesPercent(this.props.results).filter(entry => entry.username == '' || entry.username.includes(this.state.filterValue))
})}}
onChange={filterValue => this.setState({filterValue})}
onClear={() => {this.setState({grades: this.mapUserEnteriesPercent(this.props.results).sort(this.sortAlphaDesc)})}}
value={this.state.filterValue}
/>
</div>
</div>
<br/>
<div className="gbook">
<Table
columns={this.state.headings}
data={this.state.grades}
tableSortable={true}
defaultSortDirection='desc'
defaultSortedColumn='username'
/>
</div>
<Modal
open={this.state.modalOpen}
title="Edit Grades"
body={(
<div>
<h3>{this.state.modalModel[0].assignmentName}</h3>
<Table
columns={[{label: 'Username', key: 'username',},{label: 'Auto grade',key: 'autoGrade',},{label: 'Adjusted grade',key: 'adjustedGrade',}]}
data={this.state.modalModel}
tableSortable={true}
defaultSortDirection='desc'
defaultSortedColumn='username'
{ this.props.assignmnetTypes.length > 0 &&
<div className="student-filters">
<span className="label">
Assignment Types:
</span>
<InputSelect
name="assignment-types"
value={this.mapSelectedTrackEntry(this.props.selectedAssignmentType)}
options={this.mapAssignmentTypeEntries(this.props.assignmnetTypes)}
onChange={this.updateAssignmentTypes}
/>
</div>
)}
onClose={()=> this.setState({modalOpen: false,})}
}
{(this.props.tracks.length > 0 || this.props.cohorts.length > 0) &&
<div className="student-filters">
<span className="label">
Student Groups:
</span>
{this.props.tracks.length > 0 &&
<InputSelect
name="Tracks"
value={this.mapSelectedTrackEntry(this.props.selectedTrack)}
options={this.mapTracksEntries(this.props.tracks)}
onChange={this.updateTracks}
/>
}
{this.props.cohorts.length > 0 &&
<InputSelect
name="Cohorts"
value={this.mapSelectedCohortEntry(this.props.selectedCohort)}
options={this.mapCohortsEntries(this.props.cohorts)}
onChange={this.updateCohorts}
/>
}
</div>
}
</div>
<div>
<div style={{ marginLeft: '10px', marginBottom: '10px' }}>
<a href={`${this.lmsInstructorDashboardUrl(this.props.match.params.courseId)}#view-data_download`}>Download Grade Report</a>
</div>
<SearchField
onSubmit={value => this.props.searchForUser(this.props.match.params.courseId, value, this.props.selectedCohort, this.props.selectedTrack)}
onChange={filterValue => this.setState({ filterValue })}
onClear={() => this.props.getUserGrades(this.props.match.params.courseId, this.props.selectedCohort, this.props.selectedTrack)}
value={this.state.filterValue}
/>
<div className="d-flex justify-content-end" style={{ marginTop: '20px' }}>
<Button
label="Previous"
buttonType="primary"
style={{ visibility: (!this.props.prevPage ? 'hidden' : 'visible') }}
onClick={() => this.props.getPrevNextGrades(this.props.prevPage, this.props.selectedCohort, this.props.selectedTrack)}
/>
<div style={{ width: '10px' }} />
<Button
label="Next"
buttonType="primary"
style={{ visibility: (!this.props.nextPage ? 'hidden' : 'visible') }}
onClick={() => this.props.getPrevNextGrades(this.props.nextPage, this.props.selectedCohort, this.props.selectedTrack)}
/>
</div>
</div>
</div>
<br />
<StatusAlert
alertType="success"
dialog="The grade has been successfully edited."
onClose={() => this.props.updateBanner(false)}
open={this.props.showSuccess}
/>
<div className="gbook">
<Table
columns={this.props.headings}
data={this.formatter[this.props.format](this.props.grades)}
tableSortable
defaultSortDirection="asc"
defaultSortedColumn="username"
/>
</div>
<Modal
open={this.state.modalOpen}
title="Edit Grades"
body={(
<div>
<h3>{this.state.modalModel[0].assignmentName}</h3>
<Table
columns={[{ label: 'Username', key: 'username' }, { label: 'Current grade', key: 'currentGrade' }, { label: 'Adjusted grade', key: 'adjustedGrade' }]}
data={this.state.modalModel}
/>
</div>
)}
buttons={[
<Button
label="Edit Grade"
buttonType="primary"
onClick={this.handleAdjustedGradeClick}
/>,
]}
onClose={() => this.setState({
modalOpen: false,
modalModel: [{}],
updateVal: 0,
updateModuleId: null,
updateUserId: null,
})}
/>
</div>
</div>
@@ -325,1019 +357,3 @@ export default class Gradebook extends React.Component {
}
}
Gradebook.defaultProps = {
"results": [
{
"course_id": "course-v1:edX+DemoX+Demo_Course",
"email": "honor@example.com",
"user_id": 6,
"username": "honor",
"full_name": "",
"passed": false,
"percent": 0,
"letter_grade": null,
"progress_page_url": "/courses/course-v1:edX+DemoX+Demo_Course/progress/6/",
"section_breakdown": [
{
"are_grades_published": true,
"auto_grade": false,
"category": null,
"chapter_name": "Introduction",
"comment": "",
"detail": "",
"displayed_value": "0.00",
"is_graded": false,
"grade_description": "(0.00/0.00)",
"is_ag": false,
"is_average": false,
"is_manually_graded": false,
"label": null,
"letter_grade": null,
"module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@edx_introduction",
"percent": 0,
"score_earned": 0,
"score_possible": 0,
"section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@d8a6192ade314473a78242dfeedfbf5b",
"subsection_name": "Demo Course Overview"
},
{
"are_grades_published": true,
"auto_grade": false,
"category": null,
"chapter_name": "Example Week 1: Getting Started",
"comment": "",
"detail": "",
"displayed_value": "0.00",
"is_graded": false,
"grade_description": "(0.00/3.00)",
"is_ag": false,
"is_average": false,
"is_manually_graded": false,
"label": null,
"letter_grade": null,
"module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@19a30717eff543078a5d94ae9d6c18a5",
"percent": 0,
"score_earned": 0,
"score_possible": 3,
"section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@interactive_demonstrations",
"subsection_name": "Lesson 1 - Getting Started"
},
{
"are_grades_published": true,
"auto_grade": false,
"category": "Homework",
"chapter_name": "Example Week 1: Getting Started",
"comment": "",
"detail": "",
"displayed_value": "0.00",
"is_graded": true,
"grade_description": "(0.00/11.00)",
"is_ag": false,
"is_average": false,
"is_manually_graded": false,
"label": "Ex 01",
"letter_grade": null,
"module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@basic_questions",
"percent": 0,
"score_earned": 0,
"score_possible": 11,
"section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@interactive_demonstrations",
"subsection_name": "Homework - Question Styles"
},
{
"are_grades_published": true,
"auto_grade": false,
"category": null,
"chapter_name": "Example Week 2: Get Interactive",
"comment": "",
"detail": "",
"displayed_value": "0.00",
"is_graded": false,
"grade_description": "(0.00/0.00)",
"is_ag": false,
"is_average": false,
"is_manually_graded": false,
"label": null,
"letter_grade": null,
"module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@simulations",
"percent": 0,
"score_earned": 0,
"score_possible": 0,
"section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@graded_interactions",
"subsection_name": "Lesson 2 - Let's Get Interactive!"
},
{
"are_grades_published": true,
"auto_grade": false,
"category": "Homework",
"chapter_name": "Example Week 2: Get Interactive",
"comment": "",
"detail": "",
"displayed_value": "0.00",
"is_graded": true,
"grade_description": "(0.00/5.00)",
"is_ag": false,
"is_average": false,
"is_manually_graded": false,
"label": "Ex 02",
"letter_grade": null,
"module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@graded_simulations",
"percent": 0,
"score_earned": 0,
"score_possible": 5,
"section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@graded_interactions",
"subsection_name": "Homework - Labs and Demos"
},
{
"are_grades_published": true,
"auto_grade": false,
"category": null,
"chapter_name": "Example Week 2: Get Interactive",
"comment": "",
"detail": "",
"displayed_value": "0.00",
"is_graded": false,
"grade_description": "(0.00/19.00)",
"is_ag": false,
"is_average": false,
"is_manually_graded": false,
"label": null,
"letter_grade": null,
"module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@175e76c4951144a29d46211361266e0e",
"percent": 0,
"score_earned": 0,
"score_possible": 19,
"section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@graded_interactions",
"subsection_name": "Homework - Essays"
},
{
"are_grades_published": true,
"auto_grade": false,
"category": null,
"chapter_name": "Example Week 3: Be Social",
"comment": "",
"detail": "",
"displayed_value": "0.00",
"is_graded": false,
"grade_description": "(0.00/0.00)",
"is_ag": false,
"is_average": false,
"is_manually_graded": false,
"label": null,
"letter_grade": null,
"module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@48ecb924d7fe4b66a230137626bfa93e",
"percent": 0,
"score_earned": 0,
"score_possible": 0,
"section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@social_integration",
"subsection_name": "Lesson 3 - Be Social"
},
{
"are_grades_published": true,
"auto_grade": false,
"category": null,
"chapter_name": "Example Week 3: Be Social",
"comment": "",
"detail": "",
"displayed_value": "0.00",
"is_graded": false,
"grade_description": "(0.00/0.00)",
"is_ag": false,
"is_average": false,
"is_manually_graded": false,
"label": null,
"letter_grade": null,
"module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@dbe8fc027bcb4fe9afb744d2e8415855",
"percent": 0,
"score_earned": 0,
"score_possible": 0,
"section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@social_integration",
"subsection_name": "Homework - Find Your Study Buddy"
},
{
"are_grades_published": true,
"auto_grade": false,
"category": null,
"chapter_name": "Example Week 3: Be Social",
"comment": "",
"detail": "",
"displayed_value": "0.00",
"is_graded": false,
"grade_description": "(0.00/0.00)",
"is_ag": false,
"is_average": false,
"is_manually_graded": false,
"label": null,
"letter_grade": null,
"module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@6ab9c442501d472c8ed200e367b4edfa",
"percent": 0,
"score_earned": 0,
"score_possible": 0,
"section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@social_integration",
"subsection_name": "More Ways to Connect"
},
{
"are_grades_published": true,
"auto_grade": false,
"category": "Exam",
"chapter_name": "About Exams and Certificates",
"comment": "",
"detail": "",
"displayed_value": "0.00",
"is_graded": true,
"grade_description": "(0.00/6.00)",
"is_ag": false,
"is_average": false,
"is_manually_graded": false,
"label": null,
"letter_grade": null,
"module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@workflow",
"percent": 0,
"score_earned": 0,
"score_possible": 6,
"section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@1414ffd5143b4b508f739b563ab468b7",
"subsection_name": "edX Exams"
}
],
"aggregates": {
"Exam": {
"score_possible": 6,
"score_earned": 0
},
"Homework": {
"score_possible": 16,
"score_earned": 0
}
}
},
{
"course_id": "course-v1:edX+DemoX+Demo_Course",
"email": "audit@example.com",
"user_id": 7,
"username": "audit",
"full_name": "",
"passed": false,
"percent": 0.17,
"letter_grade": null,
"progress_page_url": "/courses/course-v1:edX+DemoX+Demo_Course/progress/7/",
"section_breakdown": [
{
"are_grades_published": true,
"auto_grade": false,
"category": null,
"chapter_name": "Introduction",
"comment": "",
"detail": "",
"displayed_value": "0.00",
"is_graded": false,
"grade_description": "(0.00/0.00)",
"is_ag": false,
"is_average": false,
"is_manually_graded": false,
"label": null,
"letter_grade": null,
"module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@edx_introduction",
"percent": 0,
"score_earned": 0,
"score_possible": 0,
"section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@d8a6192ade314473a78242dfeedfbf5b",
"subsection_name": "Demo Course Overview"
},
{
"are_grades_published": true,
"auto_grade": false,
"category": null,
"chapter_name": "Example Week 1: Getting Started",
"comment": "",
"detail": "",
"displayed_value": "0.00",
"is_graded": false,
"grade_description": "(0.00/3.00)",
"is_ag": false,
"is_average": false,
"is_manually_graded": false,
"label": null,
"letter_grade": null,
"module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@19a30717eff543078a5d94ae9d6c18a5",
"percent": 0,
"score_earned": 0,
"score_possible": 3,
"section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@interactive_demonstrations",
"subsection_name": "Lesson 1 - Getting Started"
},
{
"are_grades_published": true,
"auto_grade": false,
"category": "Homework",
"chapter_name": "Example Week 1: Getting Started",
"comment": "",
"detail": "",
"displayed_value": "0.45",
"is_graded": true,
"grade_description": "(5.00/11.00)",
"is_ag": false,
"is_average": false,
"is_manually_graded": false,
"label": "Ex 01",
"letter_grade": null,
"module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@basic_questions",
"percent": 0.45,
"score_earned": 5,
"score_possible": 11,
"section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@interactive_demonstrations",
"subsection_name": "Homework - Question Styles"
},
{
"are_grades_published": true,
"auto_grade": false,
"category": null,
"chapter_name": "Example Week 2: Get Interactive",
"comment": "",
"detail": "",
"displayed_value": "0.00",
"is_graded": false,
"grade_description": "(0.00/0.00)",
"is_ag": false,
"is_average": false,
"is_manually_graded": false,
"label": null,
"letter_grade": null,
"module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@simulations",
"percent": 0,
"score_earned": 0,
"score_possible": 0,
"section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@graded_interactions",
"subsection_name": "Lesson 2 - Let's Get Interactive!"
},
{
"are_grades_published": true,
"auto_grade": false,
"category": "Homework",
"chapter_name": "Example Week 2: Get Interactive",
"comment": "",
"detail": "",
"displayed_value": "0.00",
"is_graded": true,
"grade_description": "(0.00/5.00)",
"is_ag": false,
"is_average": false,
"is_manually_graded": false,
"label": "Ex 02",
"letter_grade": null,
"module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@graded_simulations",
"percent": 0,
"score_earned": 0,
"score_possible": 5,
"section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@graded_interactions",
"subsection_name": "Homework - Labs and Demos"
},
{
"are_grades_published": true,
"auto_grade": false,
"category": null,
"chapter_name": "Example Week 2: Get Interactive",
"comment": "",
"detail": "",
"displayed_value": "0.00",
"is_graded": false,
"grade_description": "(0.00/19.00)",
"is_ag": false,
"is_average": false,
"is_manually_graded": false,
"label": null,
"letter_grade": null,
"module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@175e76c4951144a29d46211361266e0e",
"percent": 0,
"score_earned": 0,
"score_possible": 19,
"section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@graded_interactions",
"subsection_name": "Homework - Essays"
},
{
"are_grades_published": true,
"auto_grade": false,
"category": null,
"chapter_name": "Example Week 3: Be Social",
"comment": "",
"detail": "",
"displayed_value": "0.00",
"is_graded": false,
"grade_description": "(0.00/0.00)",
"is_ag": false,
"is_average": false,
"is_manually_graded": false,
"label": null,
"letter_grade": null,
"module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@48ecb924d7fe4b66a230137626bfa93e",
"percent": 0,
"score_earned": 0,
"score_possible": 0,
"section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@social_integration",
"subsection_name": "Lesson 3 - Be Social"
},
{
"are_grades_published": true,
"auto_grade": false,
"category": null,
"chapter_name": "Example Week 3: Be Social",
"comment": "",
"detail": "",
"displayed_value": "0.00",
"is_graded": false,
"grade_description": "(0.00/0.00)",
"is_ag": false,
"is_average": false,
"is_manually_graded": false,
"label": null,
"letter_grade": null,
"module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@dbe8fc027bcb4fe9afb744d2e8415855",
"percent": 0,
"score_earned": 0,
"score_possible": 0,
"section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@social_integration",
"subsection_name": "Homework - Find Your Study Buddy"
},
{
"are_grades_published": true,
"auto_grade": false,
"category": null,
"chapter_name": "Example Week 3: Be Social",
"comment": "",
"detail": "",
"displayed_value": "0.00",
"is_graded": false,
"grade_description": "(0.00/0.00)",
"is_ag": false,
"is_average": false,
"is_manually_graded": false,
"label": null,
"letter_grade": null,
"module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@6ab9c442501d472c8ed200e367b4edfa",
"percent": 0,
"score_earned": 0,
"score_possible": 0,
"section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@social_integration",
"subsection_name": "More Ways to Connect"
},
{
"are_grades_published": true,
"auto_grade": false,
"category": "Exam",
"chapter_name": "About Exams and Certificates",
"comment": "",
"detail": "",
"displayed_value": "0.00",
"is_graded": true,
"grade_description": "(0.00/6.00)",
"is_ag": false,
"is_average": false,
"is_manually_graded": false,
"label": null,
"letter_grade": null,
"module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@workflow",
"percent": 0,
"score_earned": 0,
"score_possible": 6,
"section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@1414ffd5143b4b508f739b563ab468b7",
"subsection_name": "edX Exams"
}
],
"aggregates": {
"Exam": {
"score_possible": 6,
"score_earned": 0
},
"Homework": {
"score_possible": 16,
"score_earned": 5
}
}
},
{
"course_id": "course-v1:edX+DemoX+Demo_Course",
"email": "verified@example.com",
"user_id": 8,
"username": "verified",
"full_name": "",
"passed": false,
"percent": 0,
"letter_grade": null,
"progress_page_url": "/courses/course-v1:edX+DemoX+Demo_Course/progress/8/",
"section_breakdown": [
{
"are_grades_published": true,
"auto_grade": false,
"category": null,
"chapter_name": "Introduction",
"comment": "",
"detail": "",
"displayed_value": "0.00",
"is_graded": false,
"grade_description": "(0.00/0.00)",
"is_ag": false,
"is_average": false,
"is_manually_graded": false,
"label": null,
"letter_grade": null,
"module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@edx_introduction",
"percent": 0,
"score_earned": 0,
"score_possible": 0,
"section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@d8a6192ade314473a78242dfeedfbf5b",
"subsection_name": "Demo Course Overview"
},
{
"are_grades_published": true,
"auto_grade": false,
"category": null,
"chapter_name": "Example Week 1: Getting Started",
"comment": "",
"detail": "",
"displayed_value": "0.00",
"is_graded": false,
"grade_description": "(0.00/3.00)",
"is_ag": false,
"is_average": false,
"is_manually_graded": false,
"label": null,
"letter_grade": null,
"module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@19a30717eff543078a5d94ae9d6c18a5",
"percent": 0,
"score_earned": 0,
"score_possible": 3,
"section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@interactive_demonstrations",
"subsection_name": "Lesson 1 - Getting Started"
},
{
"are_grades_published": true,
"auto_grade": false,
"category": "Homework",
"chapter_name": "Example Week 1: Getting Started",
"comment": "",
"detail": "",
"displayed_value": "0.00",
"is_graded": true,
"grade_description": "(0.00/11.00)",
"is_ag": false,
"is_average": false,
"is_manually_graded": false,
"label": "Ex 01",
"letter_grade": null,
"module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@basic_questions",
"percent": 0,
"score_earned": 0,
"score_possible": 11,
"section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@interactive_demonstrations",
"subsection_name": "Homework - Question Styles"
},
{
"are_grades_published": true,
"auto_grade": false,
"category": null,
"chapter_name": "Example Week 2: Get Interactive",
"comment": "",
"detail": "",
"displayed_value": "0.00",
"is_graded": false,
"grade_description": "(0.00/0.00)",
"is_ag": false,
"is_average": false,
"is_manually_graded": false,
"label": null,
"letter_grade": null,
"module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@simulations",
"percent": 0,
"score_earned": 0,
"score_possible": 0,
"section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@graded_interactions",
"subsection_name": "Lesson 2 - Let's Get Interactive!"
},
{
"are_grades_published": true,
"auto_grade": false,
"category": "Homework",
"chapter_name": "Example Week 2: Get Interactive",
"comment": "",
"detail": "",
"displayed_value": "0.00",
"is_graded": true,
"grade_description": "(0.00/5.00)",
"is_ag": false,
"is_average": false,
"is_manually_graded": false,
"label": "Ex 02",
"letter_grade": null,
"module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@graded_simulations",
"percent": 0,
"score_earned": 0,
"score_possible": 5,
"section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@graded_interactions",
"subsection_name": "Homework - Labs and Demos"
},
{
"are_grades_published": true,
"auto_grade": false,
"category": null,
"chapter_name": "Example Week 2: Get Interactive",
"comment": "",
"detail": "",
"displayed_value": "0.00",
"is_graded": false,
"grade_description": "(0.00/19.00)",
"is_ag": false,
"is_average": false,
"is_manually_graded": false,
"label": null,
"letter_grade": null,
"module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@175e76c4951144a29d46211361266e0e",
"percent": 0,
"score_earned": 0,
"score_possible": 19,
"section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@graded_interactions",
"subsection_name": "Homework - Essays"
},
{
"are_grades_published": true,
"auto_grade": false,
"category": null,
"chapter_name": "Example Week 3: Be Social",
"comment": "",
"detail": "",
"displayed_value": "0.00",
"is_graded": false,
"grade_description": "(0.00/0.00)",
"is_ag": false,
"is_average": false,
"is_manually_graded": false,
"label": null,
"letter_grade": null,
"module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@48ecb924d7fe4b66a230137626bfa93e",
"percent": 0,
"score_earned": 0,
"score_possible": 0,
"section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@social_integration",
"subsection_name": "Lesson 3 - Be Social"
},
{
"are_grades_published": true,
"auto_grade": false,
"category": null,
"chapter_name": "Example Week 3: Be Social",
"comment": "",
"detail": "",
"displayed_value": "0.00",
"is_graded": false,
"grade_description": "(0.00/0.00)",
"is_ag": false,
"is_average": false,
"is_manually_graded": false,
"label": null,
"letter_grade": null,
"module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@dbe8fc027bcb4fe9afb744d2e8415855",
"percent": 0,
"score_earned": 0,
"score_possible": 0,
"section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@social_integration",
"subsection_name": "Homework - Find Your Study Buddy"
},
{
"are_grades_published": true,
"auto_grade": false,
"category": null,
"chapter_name": "Example Week 3: Be Social",
"comment": "",
"detail": "",
"displayed_value": "0.00",
"is_graded": false,
"grade_description": "(0.00/0.00)",
"is_ag": false,
"is_average": false,
"is_manually_graded": false,
"label": null,
"letter_grade": null,
"module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@6ab9c442501d472c8ed200e367b4edfa",
"percent": 0,
"score_earned": 0,
"score_possible": 0,
"section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@social_integration",
"subsection_name": "More Ways to Connect"
},
{
"are_grades_published": true,
"auto_grade": false,
"category": "Exam",
"chapter_name": "About Exams and Certificates",
"comment": "",
"detail": "",
"displayed_value": "0.00",
"is_graded": true,
"grade_description": "(0.00/6.00)",
"is_ag": false,
"is_average": false,
"is_manually_graded": false,
"label": null,
"letter_grade": null,
"module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@workflow",
"percent": 0,
"score_earned": 0,
"score_possible": 6,
"section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@1414ffd5143b4b508f739b563ab468b7",
"subsection_name": "edX Exams"
}
],
"aggregates": {
"Exam": {
"score_possible": 6,
"score_earned": 0
},
"Homework": {
"score_possible": 16,
"score_earned": 0
}
}
},
{
"course_id": "course-v1:edX+DemoX+Demo_Course",
"email": "staff@example.com",
"user_id": 9,
"username": "staff",
"full_name": "",
"passed": false,
"percent": 0,
"letter_grade": null,
"progress_page_url": "/courses/course-v1:edX+DemoX+Demo_Course/progress/9/",
"section_breakdown": [
{
"are_grades_published": true,
"auto_grade": false,
"category": null,
"chapter_name": "Introduction",
"comment": "",
"detail": "",
"displayed_value": "0.00",
"is_graded": false,
"grade_description": "(0.00/0.00)",
"is_ag": false,
"is_average": false,
"is_manually_graded": false,
"label": null,
"letter_grade": null,
"module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@edx_introduction",
"percent": 0,
"score_earned": 0,
"score_possible": 0,
"section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@d8a6192ade314473a78242dfeedfbf5b",
"subsection_name": "Demo Course Overview"
},
{
"are_grades_published": true,
"auto_grade": false,
"category": null,
"chapter_name": "Example Week 1: Getting Started",
"comment": "",
"detail": "",
"displayed_value": "0.00",
"is_graded": false,
"grade_description": "(0.00/3.00)",
"is_ag": false,
"is_average": false,
"is_manually_graded": false,
"label": null,
"letter_grade": null,
"module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@19a30717eff543078a5d94ae9d6c18a5",
"percent": 0,
"score_earned": 0,
"score_possible": 3,
"section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@interactive_demonstrations",
"subsection_name": "Lesson 1 - Getting Started"
},
{
"are_grades_published": true,
"auto_grade": false,
"category": "Homework",
"chapter_name": "Example Week 1: Getting Started",
"comment": "",
"detail": "",
"displayed_value": "0.00",
"is_graded": true,
"grade_description": "(0.00/11.00)",
"is_ag": false,
"is_average": false,
"is_manually_graded": false,
"label": "Ex 01",
"letter_grade": null,
"module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@basic_questions",
"percent": 0,
"score_earned": 0,
"score_possible": 11,
"section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@interactive_demonstrations",
"subsection_name": "Homework - Question Styles"
},
{
"are_grades_published": true,
"auto_grade": false,
"category": null,
"chapter_name": "Example Week 2: Get Interactive",
"comment": "",
"detail": "",
"displayed_value": "0.00",
"is_graded": false,
"grade_description": "(0.00/0.00)",
"is_ag": false,
"is_average": false,
"is_manually_graded": false,
"label": null,
"letter_grade": null,
"module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@simulations",
"percent": 0,
"score_earned": 0,
"score_possible": 0,
"section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@graded_interactions",
"subsection_name": "Lesson 2 - Let's Get Interactive!"
},
{
"are_grades_published": true,
"auto_grade": false,
"category": "Homework",
"chapter_name": "Example Week 2: Get Interactive",
"comment": "",
"detail": "",
"displayed_value": "0.00",
"is_graded": true,
"grade_description": "(0.00/5.00)",
"is_ag": false,
"is_average": false,
"is_manually_graded": false,
"label": "Ex 02",
"letter_grade": null,
"module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@graded_simulations",
"percent": 0,
"score_earned": 0,
"score_possible": 5,
"section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@graded_interactions",
"subsection_name": "Homework - Labs and Demos"
},
{
"are_grades_published": true,
"auto_grade": false,
"category": null,
"chapter_name": "Example Week 2: Get Interactive",
"comment": "",
"detail": "",
"displayed_value": "0.00",
"is_graded": false,
"grade_description": "(0.00/19.00)",
"is_ag": false,
"is_average": false,
"is_manually_graded": false,
"label": null,
"letter_grade": null,
"module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@175e76c4951144a29d46211361266e0e",
"percent": 0,
"score_earned": 0,
"score_possible": 19,
"section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@graded_interactions",
"subsection_name": "Homework - Essays"
},
{
"are_grades_published": true,
"auto_grade": false,
"category": null,
"chapter_name": "Example Week 3: Be Social",
"comment": "",
"detail": "",
"displayed_value": "0.00",
"is_graded": false,
"grade_description": "(0.00/0.00)",
"is_ag": false,
"is_average": false,
"is_manually_graded": false,
"label": null,
"letter_grade": null,
"module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@48ecb924d7fe4b66a230137626bfa93e",
"percent": 0,
"score_earned": 0,
"score_possible": 0,
"section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@social_integration",
"subsection_name": "Lesson 3 - Be Social"
},
{
"are_grades_published": true,
"auto_grade": false,
"category": null,
"chapter_name": "Example Week 3: Be Social",
"comment": "",
"detail": "",
"displayed_value": "0.00",
"is_graded": false,
"grade_description": "(0.00/0.00)",
"is_ag": false,
"is_average": false,
"is_manually_graded": false,
"label": null,
"letter_grade": null,
"module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@dbe8fc027bcb4fe9afb744d2e8415855",
"percent": 0,
"score_earned": 0,
"score_possible": 0,
"section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@social_integration",
"subsection_name": "Homework - Find Your Study Buddy"
},
{
"are_grades_published": true,
"auto_grade": false,
"category": null,
"chapter_name": "Example Week 3: Be Social",
"comment": "",
"detail": "",
"displayed_value": "0.00",
"is_graded": false,
"grade_description": "(0.00/0.00)",
"is_ag": false,
"is_average": false,
"is_manually_graded": false,
"label": null,
"letter_grade": null,
"module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@6ab9c442501d472c8ed200e367b4edfa",
"percent": 0,
"score_earned": 0,
"score_possible": 0,
"section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@social_integration",
"subsection_name": "More Ways to Connect"
},
{
"are_grades_published": true,
"auto_grade": false,
"category": "Exam",
"chapter_name": "About Exams and Certificates",
"comment": "",
"detail": "",
"displayed_value": "0.00",
"is_graded": true,
"grade_description": "(0.00/6.00)",
"is_ag": false,
"is_average": false,
"is_manually_graded": false,
"label": null,
"letter_grade": null,
"module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@workflow",
"percent": 0,
"score_earned": 0,
"score_possible": 6,
"section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@1414ffd5143b4b508f739b563ab468b7",
"subsection_name": "edX Exams"
},
{
"are_grades_published": true,
"auto_grade": false,
"category": null,
"chapter_name": "holding section",
"comment": "",
"detail": "",
"displayed_value": "0.00",
"is_graded": false,
"grade_description": "(0.00/0.00)",
"is_ag": false,
"is_average": false,
"is_manually_graded": false,
"label": null,
"letter_grade": null,
"module_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@07bc32474380492cb34f76e5f9d9a135",
"percent": 0,
"score_earned": 0,
"score_possible": 0,
"section_block_id": "block-v1:edX+DemoX+Demo_Course+type@chapter+block@9fca584977d04885bc911ea76a9ef29e",
"subsection_name": "New Subsection"
}
],
"aggregates": {
"Exam": {
"score_possible": 6,
"score_earned": 0
},
"Homework": {
"score_possible": 16,
"score_earned": 0
}
}
}
]
};
// CommentDetails.defaultProps = {
// id: null,
// postId: null,
// name: '',
// email: 'example@example.com',
// body: '',
// };
// CommentDetails.propTypes = {
// id: PropTypes.number,
// postId: PropTypes.number,
// name: PropTypes.string,
// email: emailPropType,
// body: PropTypes.string,
// };

17
src/config/index.js Normal file
View File

@@ -0,0 +1,17 @@
const configuration = {
BASE_URL: process.env.BASE_URL,
LMS_BASE_URL: process.env.LMS_BASE_URL,
LOGIN_URL: process.env.LOGIN_URL,
LOGOUT_URL: process.env.LOGOUT_URL,
CSRF_TOKEN_API_PATH: process.env.CSRF_TOKEN_API_PATH,
REFRESH_ACCESS_TOKEN_ENDPOINT: process.env.REFRESH_ACCESS_TOKEN_ENDPOINT,
DATA_API_BASE_URL: process.env.DATA_API_BASE_URL,
SECURE_COOKIES: process.env.NODE_ENV !== 'development',
SEGMENT_KEY: process.env.SEGMENT_KEY,
ACCESS_TOKEN_COOKIE_NAME: process.env.ACCESS_TOKEN_COOKIE_NAME,
CSRF_COOKIE_NAME: process.env.CSRF_COOKIE_NAME,
};
const features = {};
export { configuration, features };

View File

@@ -1,15 +1,67 @@
import { connect } from 'react-redux';
import Gradebook from '../../components/Gradebook';
import { fetchComment } from '../../data/actions/comment';
import {
fetchGrades,
fetchMatchingUserGrades,
fetchPrevNextGrades,
updateGrades,
toggleGradeFormat,
filterColumns,
updateBanner,
} from '../../data/actions/grades';
import { fetchCohorts } from '../../data/actions/cohorts';
import { fetchTracks } from '../../data/actions/tracks';
import { fetchAssignmentTypes } from '../../data/actions/assignmentTypes';
const mapStateToProps = state => (
{
grades: state.grades.results,
headings: state.grades.headings,
tracks: state.tracks.results,
cohorts: state.cohorts.results,
selectedTrack: state.grades.selectedTrack,
selectedCohort: state.grades.selectedCohort,
format: state.grades.gradeFormat,
showSuccess: state.grades.showSuccess,
prevPage: state.grades.prevPage,
nextPage: state.grades.nextPage,
assignmnetTypes: state.assignmentTypes.results || [],
}
);
const mapDispatchToProps = dispatch => (
{
getUserGrades: (courseId, cohort, track) => {
dispatch(fetchGrades(courseId, cohort, track));
},
searchForUser: (courseId, searchText, cohort, track) => {
dispatch(fetchMatchingUserGrades(courseId, searchText, cohort, track));
},
getPrevNextGrades: (endpoint, cohort, track) => {
dispatch(fetchPrevNextGrades(endpoint, cohort, track));
},
getCohorts: (courseId) => {
dispatch(fetchCohorts(courseId));
},
getTracks: (courseId) => {
dispatch(fetchTracks(courseId));
},
getAssignmentTypes: (courseId) => {
dispatch(fetchAssignmentTypes(courseId));
},
updateGrades: (courseId, updateData) => {
dispatch(updateGrades(courseId, updateData));
},
toggleFormat: (formatType) => {
dispatch(toggleGradeFormat(formatType));
},
filterColumns: (filterType, exampleUser) => {
dispatch(filterColumns(filterType, exampleUser));
},
updateBanner: (showSuccess) => {
dispatch(updateBanner(showSuccess));
},
}
);

View File

@@ -0,0 +1,32 @@
import {
STARTED_FETCHING_ASSIGNMENT_TYPES,
GOT_ASSIGNMENT_TYPES,
ERROR_FETCHING_ASSIGNMENT_TYPES,
} from '../constants/actionTypes/assignmentTypes';
import LmsApiService from '../services/LmsApiService';
const startedFetchingAssignmentTypes = () => ({ type: STARTED_FETCHING_ASSIGNMENT_TYPES });
const errorFetchingAssignmentTypes = () => ({ type: ERROR_FETCHING_ASSIGNMENT_TYPES });
const gotAssignmentTypes = assignmentTypes => ({ type: GOT_ASSIGNMENT_TYPES, assignmentTypes });
const fetchAssignmentTypes = courseId => (
(dispatch) => {
dispatch(startedFetchingAssignmentTypes());
return LmsApiService.fetchAssignmentTypes(courseId)
.then(response => response.data)
.then((data) => {
dispatch(gotAssignmentTypes(Object.keys(data.assignment_types)));
})
.catch((error) => {
dispatch(errorFetchingAssignmentTypes());
});
}
);
export {
fetchAssignmentTypes,
startedFetchingAssignmentTypes,
gotAssignmentTypes,
errorFetchingAssignmentTypes,
};

View File

@@ -0,0 +1,31 @@
import {
STARTED_FETCHING_COHORTS,
GOT_COHORTS,
ERROR_FETCHING_COHORTS,
} from '../constants/actionTypes/cohorts';
import LmsApiService from '../services/LmsApiService';
const startedFetchingCohorts = () => ({ type: STARTED_FETCHING_COHORTS });
const errorFetchingCohorts = () => ({ type: ERROR_FETCHING_COHORTS });
const gotCohorts = cohorts => ({ type: GOT_COHORTS, cohorts });
const fetchCohorts = courseId => (
(dispatch) => {
dispatch(startedFetchingCohorts());
return LmsApiService.fetchCohorts(courseId)
.then(response => response.data)
.then((data) => {
dispatch(gotCohorts(data.cohorts));
})
.catch((error) => {
dispatch(errorFetchingCohorts());
});
}
);
export {
fetchCohorts,
startedFetchingCohorts,
gotCohorts,
errorFetchingCohorts,
};

View File

@@ -1,38 +0,0 @@
import 'whatwg-fetch';
import {
STARTED_FETCHING_COMMENT,
FINISHED_FETCHING_COMMENT,
ERROR_FETCHING_COMMENT,
GET_COMMENT,
} from '../constants/actionTypes/comment';
const startedFetchingComment = () => ({ type: STARTED_FETCHING_COMMENT });
const finishedFetchingComment = () => ({ type: FINISHED_FETCHING_COMMENT });
const errorFetchingComment = () => ({ type: ERROR_FETCHING_COMMENT });
const getComment = comment => ({ type: GET_COMMENT, comment });
const fetchComment = commentId => (
(dispatch) => {
dispatch(startedFetchingComment());
return fetch(`https://jsonplaceholder.typicode.com/comments/${commentId}`)
.then((response) => {
if (response.ok) {
return response.json();
}
throw new Error();
})
.then((data) => {
dispatch(getComment(data));
dispatch(finishedFetchingComment());
})
.catch(() => dispatch(errorFetchingComment()));
}
);
export {
startedFetchingComment,
finishedFetchingComment,
errorFetchingComment,
getComment,
fetchComment,
};

166
src/data/actions/grades.js Normal file
View File

@@ -0,0 +1,166 @@
import {
STARTED_FETCHING_GRADES,
FINISHED_FETCHING_GRADES,
ERROR_FETCHING_GRADES,
GOT_GRADES,
GRADE_UPDATE_REQUEST,
GRADE_UPDATE_SUCCESS,
GRADE_UPDATE_FAILURE,
TOGGLE_GRADE_FORMAT,
SORT_GRADES,
FILTER_COLUMNS,
UPDATE_BANNER,
} from '../constants/actionTypes/grades';
import LmsApiService from '../services/LmsApiService';
import store from '../store';
import { headingMapper, gradeSortMap, sortAlphaAsc } from './utils';
import apiClient from '../apiClient';
const defaultAssignmentFilter = 'All';
const sortGrades = (columnName, direction) => {
const sortFn = gradeSortMap(columnName, direction);
const { results } = store.getState().grades;
results.sort(sortFn);
/* have to make a copy of results or React wont know there was
* a change and wont trigger a re-render
*/
return ({ type: SORT_GRADES, results: [...results] });
};
const startedFetchingGrades = () => ({ type: STARTED_FETCHING_GRADES });
const finishedFetchingGrades = () => ({ type: FINISHED_FETCHING_GRADES });
const errorFetchingGrades = () => ({ type: ERROR_FETCHING_GRADES });
const gotGrades = (grades, cohort, track, headings, prev, next) => ({
type: GOT_GRADES,
grades,
cohort,
track,
headings,
prev,
next,
});
const gradeUpdateRequest = () => ({ type: GRADE_UPDATE_REQUEST });
const gradeUpdateSuccess = responseData => ({
type: GRADE_UPDATE_SUCCESS,
payload: { responseData },
});
const gradeUpdateFailure = error => ({
type: GRADE_UPDATE_FAILURE,
payload: { error },
});
const toggleGradeFormat = formatType => ({ type: TOGGLE_GRADE_FORMAT, formatType });
const filterColumns = (filterType, exampleUser) => (
dispatch => dispatch({
type: FILTER_COLUMNS,
headings: headingMapper(filterType)(dispatch, exampleUser),
})
);
const updateBanner = showSuccess => ({ type: UPDATE_BANNER, showSuccess });
const fetchGrades = (courseId, cohort, track, showSuccess) => (
(dispatch) => {
dispatch(startedFetchingGrades());
return LmsApiService.fetchGradebookData(courseId, null, cohort, track)
.then(response => response.data)
.then((data) => {
dispatch(gotGrades(
data.results.sort(sortAlphaAsc),
cohort,
track,
headingMapper(defaultAssignmentFilter)(dispatch, data.results[0]),
data.previous,
data.next,
));
dispatch(finishedFetchingGrades());
dispatch(updateBanner(!!showSuccess));
})
.catch(() => {
dispatch(errorFetchingGrades());
});
}
);
const fetchMatchingUserGrades = (courseId, searchText, cohort, track) => (
(dispatch) => {
dispatch(startedFetchingGrades());
return LmsApiService.fetchGradebookData(courseId, searchText, cohort, track)
.then(response => response.data)
.then((data) => {
dispatch(gotGrades(
data.results.sort(sortAlphaAsc),
cohort,
track,
headingMapper(defaultAssignmentFilter)(dispatch, data.results[0]),
data.previous,
data.next,
));
dispatch(finishedFetchingGrades());
})
.catch(() => {
dispatch(errorFetchingGrades());
});
}
);
const fetchPrevNextGrades = (endpoint, cohort, track) => (
(dispatch) => {
dispatch(startedFetchingGrades());
return apiClient.get(endpoint)
.then(response => response.data)
.then((data) => {
dispatch(gotGrades(
data.results.sort(sortAlphaAsc),
cohort,
track,
headingMapper(defaultAssignmentFilter)(dispatch, data.results[0]),
data.previous,
data.next,
));
dispatch(finishedFetchingGrades());
})
.catch(() => {
dispatch(errorFetchingGrades());
});
}
);
const updateGrades = (courseId, updateData) => (
(dispatch) => {
dispatch(gradeUpdateRequest());
return LmsApiService.updateGradebookData(courseId, updateData)
.then(response => response.data)
.then((data) => {
dispatch(gradeUpdateSuccess(data));
dispatch(fetchGrades(courseId, null, null, true));
})
.catch((error) => {
dispatch(gradeUpdateFailure(error));
});
}
);
export {
startedFetchingGrades,
finishedFetchingGrades,
errorFetchingGrades,
gotGrades,
fetchGrades,
fetchMatchingUserGrades,
fetchPrevNextGrades,
gradeUpdateRequest,
gradeUpdateSuccess,
gradeUpdateFailure,
updateGrades,
toggleGradeFormat,
sortGrades,
filterColumns,
updateBanner,
};

View File

@@ -1,46 +0,0 @@
import 'whatwg-fetch';
import {
STARTED_FETCHING_POSTS,
FINISHED_FETCHING_POSTS,
GET_POSTS,
} from '../constants/actionTypes/posts';
const startedFetchingPosts = () => (
{
type: STARTED_FETCHING_POSTS,
}
);
const finishedFetchingPosts = () => (
{
type: FINISHED_FETCHING_POSTS,
}
);
const getPosts = posts => (
{
type: GET_POSTS,
posts,
}
);
const fetchPosts = () => (
(dispatch) => {
dispatch(startedFetchingPosts());
return fetch('https://jsonplaceholder.typicode.com/posts')
// TODO: handle response error
.then(response => response.json())
.then((data) => {
dispatch(getPosts(data));
dispatch(finishedFetchingPosts());
});
}
);
export {
startedFetchingPosts,
finishedFetchingPosts,
getPosts,
fetchPosts,
};

View File

@@ -1,65 +0,0 @@
import configureMockStore from 'redux-mock-store';
import thunk from 'redux-thunk';
import fetchMock from 'fetch-mock';
import {
startedFetchingPosts,
finishedFetchingPosts,
getPosts,
fetchPosts,
} from './posts';
import {
STARTED_FETCHING_POSTS,
GET_POSTS,
FINISHED_FETCHING_POSTS,
} from '../constants/actionTypes/posts';
const mockStore = configureMockStore([thunk]);
describe('actions', () => {
afterEach(() => {
fetchMock.reset();
fetchMock.restore();
});
it('sends started fetching post action', () => {
const expected = { type: STARTED_FETCHING_POSTS };
expect(startedFetchingPosts()).toEqual(expected);
});
it('sends finished fetching posts', () => {
const expected = { type: FINISHED_FETCHING_POSTS };
expect(finishedFetchingPosts()).toEqual(expected);
});
it('sends posts', () => {
const data = 'data';
const expected = { type: GET_POSTS, posts: data };
expect(getPosts(data)).toEqual(expected);
});
it('fetches posts', () => {
const posts = [
{
id: 1,
title: 'title',
body: 'body',
},
];
fetchMock.getOnce('https://jsonplaceholder.typicode.com/posts', {
body: JSON.stringify({ posts }),
headers: { 'content-type': 'application/json' },
});
const store = mockStore({ posts: [] });
const expectedActions = [
{ type: STARTED_FETCHING_POSTS },
{ type: GET_POSTS, posts: { posts } },
{ type: FINISHED_FETCHING_POSTS },
];
return store.dispatch(fetchPosts()).then(() => {
expect(store.getActions()).toEqual(expectedActions);
});
});
});

View File

@@ -0,0 +1,31 @@
import {
STARTED_FETCHING_TRACKS,
GOT_TRACKS,
ERROR_FETCHING_TRACKS,
} from '../constants/actionTypes/tracks';
import LmsApiService from '../services/LmsApiService';
const startedFetchingTracks = () => ({ type: STARTED_FETCHING_TRACKS });
const errorFetchingTracks = () => ({ type: ERROR_FETCHING_TRACKS });
const gotTracks = tracks => ({ type: GOT_TRACKS, tracks });
const fetchTracks = courseId => (
(dispatch) => {
dispatch(startedFetchingTracks());
return LmsApiService.fetchTracks(courseId)
.then(response => response.data)
.then((data) => {
dispatch(gotTracks(data.course_modes));
})
.catch((error) => {
dispatch(errorFetchingTracks());
});
}
);
export {
fetchTracks,
startedFetchingTracks,
gotTracks,
errorFetchingTracks,
};

125
src/data/actions/utils.js Normal file
View File

@@ -0,0 +1,125 @@
import { sortGrades } from './grades';
const sortAlphaAsc = (gradeRowA, gradeRowB) => {
const a = gradeRowA.username.toUpperCase();
const b = gradeRowB.username.toUpperCase();
if (a < b) {
return -1;
}
if (a > b) {
return 1;
}
return 0;
};
const sortAlphaDesc = (gradeRowA, gradeRowB) => {
const a = gradeRowA.username.toUpperCase();
const b = gradeRowB.username.toUpperCase();
if (a < b) {
return 1;
}
if (a > b) {
return -1;
}
return 0;
};
const sortNumerically = (colKey, direction) => {
function getPercents(gradeRowA, gradeRowB) {
if (colKey !== 'total') {
return {
a: gradeRowA.section_breakdown.find(x => x.label === colKey).percent,
b: gradeRowB.section_breakdown.find(x => x.label === colKey).percent,
};
}
return {
a: gradeRowA.percent,
b: gradeRowB.percent,
};
}
function sortNumAsc(gradeRowA, gradeRowB) {
const { a, b } = getPercents(gradeRowA, gradeRowB);
return a - b;
}
function sortNumDesc(gradeRowA, gradeRowB) {
const { a, b } = getPercents(gradeRowA, gradeRowB);
return b - a;
}
return direction === 'desc' ? sortNumDesc : sortNumAsc;
};
function gradeSortMap(columnName, direction) {
if (columnName === 'username' && direction === 'desc') {
return sortAlphaDesc;
} else if (columnName === 'username') {
return sortAlphaAsc;
}
return sortNumerically(columnName, direction);
}
const headingMapper = (filterKey) => {
function all(dispatch, entry) {
if (entry) {
const results = [{
label: 'Username',
key: 'username',
columnSortable: true,
onSort: (direction) => { dispatch(sortGrades('username', direction)); },
}];
const assignmentHeadings = entry.section_breakdown
.filter(section => section.is_graded && section.label)
.map(s => ({
label: s.label,
key: s.label,
columnSortable: true,
onSort: direction => dispatch(sortGrades(s.label, direction)),
}));
const totals = [{
label: 'Total',
key: 'total',
columnSortable: true,
onSort: direction => dispatch(sortGrades('total', direction)),
}];
return results.concat(assignmentHeadings).concat(totals);
}
return [];
}
function some(dispatch, entry) {
const results = [{
label: 'Username',
key: 'username',
columnSortable: true,
onSort: (direction) => { dispatch(sortGrades('username', direction)); },
}];
const assignmentHeadings = entry.section_breakdown
.filter(section => section.is_graded && section.label && section.category === filterKey)
.map(s => ({
label: s.label,
key: s.label,
columnSortable: false,
onSort: (direction) => { this.sortNumerically(s.label, direction); },
}));
const totals = [{
label: 'Total',
key: 'total',
columnSortable: true,
onSort: direction => dispatch(sortGrades('total', direction)),
}];
return results.concat(assignmentHeadings).concat(totals);
}
return filterKey === 'All' ? all : some;
};
export { headingMapper, gradeSortMap, sortAlphaAsc };

15
src/data/apiClient.js Normal file
View File

@@ -0,0 +1,15 @@
import { getAuthenticatedAPIClient } from '@edx/frontend-auth';
import { configuration } from '../config';
const apiClient = getAuthenticatedAPIClient({
appBaseUrl: configuration.BASE_URL,
loginUrl: configuration.LOGIN_URL,
logoutUrl: configuration.LOGOUT_URL,
csrfTokenApiPath: process.env.CSRF_TOKEN_API_PATH,
refreshAccessTokenEndpoint: configuration.REFRESH_ACCESS_TOKEN_ENDPOINT,
accessTokenCookieName: configuration.ACCESS_TOKEN_COOKIE_NAME,
csrfCookieName: configuration.CSRF_COOKIE_NAME,
});
export default apiClient;

View File

@@ -0,0 +1,10 @@
const STARTED_FETCHING_ASSIGNMENT_TYPES = 'STARTED_FETCHING_ASSIGNMENT_TYPES';
const GOT_ASSIGNMENT_TYPES = 'GOT_ASSIGNMENT_TYPES';
const ERROR_FETCHING_ASSIGNMENT_TYPES = 'ERROR_FETCHING_ASSIGNMENT_TYPES';
export {
STARTED_FETCHING_ASSIGNMENT_TYPES,
GOT_ASSIGNMENT_TYPES,
ERROR_FETCHING_ASSIGNMENT_TYPES,
};

View File

@@ -0,0 +1,9 @@
const STARTED_FETCHING_COHORTS = 'STARTED_FETCHING_COHORTS';
const GOT_COHORTS = 'GOT_COHORTS';
const ERROR_FETCHING_COHORTS = 'ERROR_FETCHING_COHORTS';
export {
STARTED_FETCHING_COHORTS,
GOT_COHORTS,
ERROR_FETCHING_COHORTS,
};

View File

@@ -1,11 +0,0 @@
const STARTED_FETCHING_COMMENT = 'STARTED_FETCHING_COMMENT';
const FINISHED_FETCHING_COMMENT = 'FINISHED_FETCHING_COMMENT';
const ERROR_FETCHING_COMMENT = 'ERROR_FETCHING_COMMENT';
const GET_COMMENT = 'GET_COMMENT';
export {
STARTED_FETCHING_COMMENT,
FINISHED_FETCHING_COMMENT,
ERROR_FETCHING_COMMENT,
GET_COMMENT,
};

View File

@@ -0,0 +1,27 @@
const STARTED_FETCHING_GRADES = 'STARTED_FETCHING_GRADES';
const FINISHED_FETCHING_GRADES = 'FINISHED_FETCHING_GRADES';
const ERROR_FETCHING_GRADES = 'ERROR_FETCHING_GRADES';
const GOT_GRADES = 'GOT_GRADES';
const GRADE_UPDATE_REQUEST = 'GRADE_UPDATE_REQUEST';
const GRADE_UPDATE_SUCCESS = 'GRADE_UPDATE_SUCCESS';
const GRADE_UPDATE_FAILURE = 'GRADE_UPDATE_FAILURE';
const TOGGLE_GRADE_FORMAT = 'TOGGLE_GRADE_FORMAT';
const SORT_GRADES = 'SORT_GRADES';
const FILTER_COLUMNS = 'FILTER_COLUMNS';
const UPDATE_BANNER = 'UPDATE_BANNER';
export {
STARTED_FETCHING_GRADES,
FINISHED_FETCHING_GRADES,
ERROR_FETCHING_GRADES,
GOT_GRADES,
GRADE_UPDATE_REQUEST,
GRADE_UPDATE_SUCCESS,
GRADE_UPDATE_FAILURE,
TOGGLE_GRADE_FORMAT,
SORT_GRADES,
FILTER_COLUMNS,
UPDATE_BANNER,
};

View File

@@ -1,9 +0,0 @@
const STARTED_FETCHING_POSTS = 'STARTED_FETCHING_POSTS';
const GET_POSTS = 'GET_POSTS';
const FINISHED_FETCHING_POSTS = 'FINISHED_FETCHING_POSTS';
export {
STARTED_FETCHING_POSTS,
GET_POSTS,
FINISHED_FETCHING_POSTS,
};

View File

@@ -0,0 +1,9 @@
const STARTED_FETCHING_TRACKS = 'STARTED_FETCHING_TRACKS';
const GOT_TRACKS = 'GOT_TRACKS';
const ERROR_FETCHING_TRACKS = 'ERROR_FETCHING_TRACKS';
export {
STARTED_FETCHING_TRACKS,
GOT_TRACKS,
ERROR_FETCHING_TRACKS,
};

View File

@@ -0,0 +1,39 @@
import {
STARTED_FETCHING_ASSIGNMENT_TYPES,
ERROR_FETCHING_ASSIGNMENT_TYPES,
GOT_ASSIGNMENT_TYPES,
} from '../constants/actionTypes/assignmentTypes';
const initialState = {
results: [],
startedFetching: false,
errorFetching: false,
};
const assignmentTypes = (state = initialState, action) => {
switch (action.type) {
case GOT_ASSIGNMENT_TYPES:
return {
...state,
results: action.assignmentTypes,
errorFetching: false,
};
case STARTED_FETCHING_ASSIGNMENT_TYPES:
return {
...state,
startedFetching: true,
};
case ERROR_FETCHING_ASSIGNMENT_TYPES:
return {
...state,
finishedFetching: true,
errorFetching: true,
};
default:
return state;
}
};
export default assignmentTypes;

View File

@@ -0,0 +1,39 @@
import {
STARTED_FETCHING_COHORTS,
ERROR_FETCHING_COHORTS,
GOT_COHORTS,
} from '../constants/actionTypes/cohorts';
const initialState = {
results: [],
startedFetching: false,
errorFetching: false,
};
const cohorts = (state = initialState, action) => {
switch (action.type) {
case GOT_COHORTS:
return {
...state,
results: action.cohorts,
errorFetching: false,
};
case STARTED_FETCHING_COHORTS:
return {
...state,
startedFetching: true,
};
case ERROR_FETCHING_COHORTS:
return {
...state,
finishedFetching: true,
errorFetching: true,
};
default:
return state;
}
};
export default cohorts;

View File

@@ -1,46 +0,0 @@
import {
STARTED_FETCHING_COMMENT,
ERROR_FETCHING_COMMENT,
GET_COMMENT,
} from '../constants/actionTypes/comment';
const initialState = {
details: {
id: null,
postId: null,
name: '',
email: 'example@example.com',
body: '',
},
startedFetching: false,
finishedFetching: false,
errorFetching: false,
};
const comment = (state = initialState, action) => {
switch (action.type) {
case GET_COMMENT:
return {
...state,
details: { ...action.comment },
finishedFetching: true,
errorFetching: false,
};
case STARTED_FETCHING_COMMENT:
return {
...state,
startedFetching: true,
finishedFetching: false,
};
case ERROR_FETCHING_COMMENT:
return {
...state,
finishedFetching: true,
errorFetching: true,
};
default:
return state;
}
};
export default comment;

View File

@@ -0,0 +1,75 @@
import {
STARTED_FETCHING_GRADES,
ERROR_FETCHING_GRADES,
GOT_GRADES,
TOGGLE_GRADE_FORMAT,
FILTER_COLUMNS,
GRADE_UPDATE_SUCCESS,
UPDATE_BANNER,
SORT_GRADES,
} from '../constants/actionTypes/grades';
const initialState = {
results: [],
headings: [],
startedFetching: false,
finishedFetching: false,
errorFetching: false,
gradeFormat: 'percent',
showSuccess: false,
prevPage: null,
nextPage: null,
};
const grades = (state = initialState, action) => {
switch (action.type) {
case GOT_GRADES:
return {
...state,
results: action.grades,
headings: action.headings,
finishedFetching: true,
errorFetching: false,
selectedTrack: action.track,
selectedCohort: action.cohort,
prevPage: action.prev,
nextPage: action.next,
};
case STARTED_FETCHING_GRADES:
return {
...state,
startedFetching: true,
finishedFetching: false,
};
case ERROR_FETCHING_GRADES:
return {
...state,
finishedFetching: true,
errorFetching: true,
};
case TOGGLE_GRADE_FORMAT:
return {
...state,
gradeFormat: action.formatType,
};
case FILTER_COLUMNS:
return {
...state,
headings: action.headings,
};
case UPDATE_BANNER:
return {
...state,
showSuccess: action.showSuccess,
};
case SORT_GRADES:
return {
...state,
results: action.results,
};
default:
return state;
}
};
export default grades;

View File

@@ -1,11 +1,15 @@
import { combineReducers } from 'redux';
import posts from './posts';
import comment from './comment';
import cohorts from './cohorts';
import grades from './grades';
import tracks from './tracks';
import assignmentTypes from './assignmentTypes';
const rootReducer = combineReducers({
posts,
comment,
grades,
cohorts,
tracks,
assignmentTypes,
});
export default rootReducer;

View File

@@ -1,31 +0,0 @@
import {
GET_POSTS,
STARTED_FETCHING_POSTS,
FINISHED_FETCHING_POSTS,
} from '../constants/actionTypes/posts';
const posts = (state = { posts: [], startedFetching: false, finishedFetching: false }, action) => {
switch (action.type) {
case GET_POSTS:
return {
...state,
posts: action.posts,
};
case STARTED_FETCHING_POSTS:
return {
...state,
startedFetching: true,
finishedFetching: false,
};
case FINISHED_FETCHING_POSTS:
return {
...state,
startedFetching: false,
finishedFetching: true,
};
default:
return state;
}
};
export default posts;

View File

@@ -1,45 +0,0 @@
import posts from './posts';
import {
GET_POSTS,
STARTED_FETCHING_POSTS,
FINISHED_FETCHING_POSTS,
} from '../constants/actionTypes/posts';
const initialState = {
posts: [],
startedFetching: false,
finishedFetching: false,
};
describe('posts reducer', () => {
it('has initial state', () => {
expect(posts(undefined, {})).toEqual(initialState);
});
it('adds posts', () => {
const fetchedPosts = [1, 2, 3];
const expected = {
...initialState,
posts: fetchedPosts,
};
expect(posts(undefined, { type: GET_POSTS, posts: fetchedPosts })).toEqual(expected);
});
it('updates started fetching posts state', () => {
const expected = {
...initialState,
startedFetching: true,
finishedFetching: false,
};
expect(posts(undefined, { type: STARTED_FETCHING_POSTS })).toEqual(expected);
});
it('updates finished fetching posts state', () => {
const expected = {
...initialState,
startedFetching: false,
finishedFetching: true,
};
expect(posts(undefined, { type: FINISHED_FETCHING_POSTS })).toEqual(expected);
});
});

View File

@@ -0,0 +1,39 @@
import {
STARTED_FETCHING_TRACKS,
ERROR_FETCHING_TRACKS,
GOT_TRACKS,
} from '../constants/actionTypes/tracks';
const initialState = {
results: [],
startedFetching: false,
errorFetching: false,
};
const tracks = (state = initialState, action) => {
switch (action.type) {
case GOT_TRACKS:
return {
...state,
results: action.tracks,
errorFetching: false,
};
case STARTED_FETCHING_TRACKS:
return {
...state,
startedFetching: true,
};
case ERROR_FETCHING_TRACKS:
return {
...state,
finishedFetching: true,
errorFetching: true,
};
default:
return state;
}
};
export default tracks;

View File

@@ -0,0 +1,64 @@
import apiClient from '../apiClient';
import { configuration } from '../../config';
class LmsApiService {
static baseUrl = configuration.LMS_BASE_URL;
static fetchGradebookData(courseId, searchText, cohort, track) {
let gradebookUrl = `${LmsApiService.baseUrl}/api/grades/v1/gradebook/${courseId}/`;
if (searchText || track || cohort) {
gradebookUrl += '?';
}
if (searchText) {
gradebookUrl += `username_contains=${searchText}&`;
}
if (cohort) {
gradebookUrl += `cohort_id=${cohort}&`;
}
if (track) {
gradebookUrl += `enrollment_mode=${track}`;
}
return apiClient.get(gradebookUrl);
}
static updateGradebookData(courseId, updateData) {
/*
updateData is expected to be a list of objects with the keys 'user_id' (an integer),
'usage_id' (a string) and 'grade', which is an object with the keys:
'earned_all_override', 'possible_all_override', 'earned_graded_override', and 'possible_graded_override',
each of which should be an integer.
Example:
[
{
"user_id": 9,
"usage_id": "block-v1:edX+DemoX+Demo_Course+type@sequential+block@basic_questions",
"grade": {
"earned_all_override": 11,
"possible_all_override": 11,
"earned_graded_override": 11,
"possible_graded_override": 11
}
}
]
*/
const gradebookUrl = `${LmsApiService.baseUrl}/api/grades/v1/gradebook/${courseId}/bulk-update`;
return apiClient.post(gradebookUrl, updateData);
}
static fetchTracks(courseId) {
const trackUrl = `${LmsApiService.baseUrl}/api/enrollment/v1/course/${courseId}`;
return apiClient.get(trackUrl);
}
static fetchCohorts(courseId) {
const cohortsUrl = `${LmsApiService.baseUrl}/courses/${courseId}/cohorts/`;
return apiClient.get(cohortsUrl);
}
static fetchAssignmentTypes(courseId) {
const assignmentTypesUrl = `${LmsApiService.baseUrl}/api/grades/v1/gradebook/${courseId}/grading-info?graded_only=true`;
return apiClient.get(assignmentTypesUrl);
}
}
export default LmsApiService;

View File

@@ -1,9 +1,10 @@
import 'babel-polyfill';
import React from 'react';
import ReactDOM from 'react-dom';
import { BrowserRouter as Router, Route, Switch, Link } from 'react-router-dom';
import { BrowserRouter as Router, Route, Switch } from 'react-router-dom';
import { Provider } from 'react-redux';
import apiClient from './data/apiClient';
import GradebookPage from './containers/GradebookPage';
import store from './data/store';
import './App.scss';
@@ -11,22 +12,15 @@ import './App.scss';
const App = () => (
<Provider store={store}>
<Router>
<div>
<header>
<nav>
<ul className="nav">
<li className="nav-item"><Link className="nav-link" to="/">Home</Link></li>
</ul>
</nav>
</header>
<main>
<Switch>
<Route exact path="/" component={GradebookPage} />
</Switch>
</main>
</div>
<main>
<Switch>
<Route exact path="/:courseId" component={GradebookPage} />
</Switch>
</main>
</Router>
</Provider>
);
ReactDOM.render(<App />, document.getElementById('root'));
if (apiClient.ensurePublicOrAuthencationAndCookies(window.location.pathname)) {
ReactDOM.render(<App />, document.getElementById('root'));
}