Skip to content

Add XP adjustment input to Grading Workspace #335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 25 commits into from
Aug 28, 2018
Merged

Add XP adjustment input to Grading Workspace #335

merged 25 commits into from
Aug 28, 2018

Conversation

remo5000
Copy link
Contributor

@remo5000 remo5000 commented Aug 25, 2018

Features

  • XP has its own adjustments view and numeric input
  • Grading submission includes xp adjustments
  • renamed instances of adjustment -> gradeAdjustment

@coveralls
Copy link

coveralls commented Aug 25, 2018

Pull Request Test Coverage Report for Build 763

  • 10 of 52 (19.23%) changed or added relevant lines in 5 files are covered.
  • 59 unchanged lines in 8 files lost coverage.
  • Overall coverage decreased (-0.2%) to 25.893%

Changes Missing Coverage Covered Lines Changed/Added Lines %
src/sagas/backend.ts 0 2 0.0%
src/components/academy/grading/GradingHistory.tsx 3 15 20.0%
src/components/academy/grading/GradingEditor.tsx 0 12 0.0%
src/components/academy/grading/index.tsx 5 21 23.81%
Files with Coverage Reduction New Missed Lines %
src/mocks/backend.ts 1 25.4%
src/actions/session.ts 1 78.26%
src/components/academy/grading/GradingEditor.tsx 2 9.82%
src/components/academy/grading/GradingNavLink.tsx 2 71.43%
src/components/academy/grading/index.tsx 8 27.59%
src/mocks/gradingAPI.ts 10 25.0%
src/components/assessment/index.tsx 11 80.92%
src/sagas/backend.ts 24 4.86%
Totals Coverage Status
Change from base Build 758: -0.2%
Covered Lines: 894
Relevant Lines: 2928

💛 - Coveralls

@remo5000 remo5000 mentioned this pull request Aug 26, 2018
1 task
@remo5000 remo5000 added the blocking Finishing this opens up other stuff label Aug 26, 2018
@remo5000 remo5000 requested a review from rrtheonlyone August 26, 2018 05:58
Copy link
Contributor

@rrtheonlyone rrtheonlyone left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code looks good! Although it is a duplication of Grading Adjustment, it is difficult to abstract away without overhead!

This feature might need some work down the road though..

PR Adds:
XP Adjustment option when grading

@remo5000 remo5000 added blocked Something else needs pass review first blocking Finishing this opens up other stuff and removed blocking Finishing this opens up other stuff blocked Something else needs pass review first labels Aug 27, 2018
- input error when min === max
- error message
- hasUnsavedChanges returning true because of xp checking against grade
@remo5000 remo5000 changed the base branch from xp-grading-overview to xp August 28, 2018 07:36
@remo5000 remo5000 merged commit 84f1aa2 into xp Aug 28, 2018
remo5000 added a commit that referenced this pull request Sep 1, 2018
* Add XP to profile (duplicate) (#323)

* Add maxGrade and xp to state

* Pass props to Profile from State

* Remove IS_XP_IMPLEMENTED

* Unhide betcha

* Use xp and maxgrade for Profile

* Update tests and format

* Xp assessment (#320)

* Update IAssessmentOverview

Sticking to how the backend specifies the props, since it's already
camel case

* Remove maxGrade transform (IAssessmentOverview)

* Use maxGrade in assesment cards

* Update mock assessment data

* Add grade and xp into assessment overview

* Hide grade and xp for unopened assessments

* Show open date for unopened assessments

* Format and update tests

* Add XP for grading overview (#321)

* Update backend parsing

Fix lint error

* Modify grading shape

* Use new properties for grading overview table

* Update mock grading api

* Update table field

* Update text for editing grading

* Sort data by assessmentId, then submissionId

* Format file

* Improve UI/Functionality of Grading Table (#332)

* Improved Table UI and made functionality more intuitive

* Improved UI for grading table and made functionality more intutive

* Added comments and ran yarn format

* Ran Yarn format to fix all linting issues

* Formating Change and Fixing Conflicts

* Upgraded yarn version on TRAVIS

* Attempt to remove cache yarn

* Clean up formatting (again)

* Fix rebase error

* Used blueprintJS for Color instead of hex code

* Modified constant to original value

* Reenabled sorting for columns && refactored history to show popup over the grade/exp itself

* Update formatting - prettify

* Fix bug in filter

* Fix CSV export - show all required details

* update formatting

* Centralise and vertically align content in grading table

* Fixed formatting for scss file

* Fix bug in grade display

* Centralised filter input

* Add XP adjustment input to Grading Workspace (#335)

* Add parsing for new grading schema

* Add xp props to GradingQuestion

* Fix props in GradingWorkspace

* Update mock data

* Update mock data props

* Add props to saga

* Fix rebase errors

* Reorder props in type

* Add xp adjustment to action

* Rename dispatch function arguments

* Modify adjustment-related props

* Add xp OwnProps

Renamed a few usage of the props as well

* Add xp to validation and submit dispatch call

* Rename more props usage

* Duplicate some columns for XP

Most importantly, the numeric input

* Remove comment

* Pass in xp props to GradingEditor

* Add Final XP column

* Add xp and grade adjustment to mock backend

* Remove old TODO comment

* Use correct arguments for backend grading submit

* Use correct arguments for postGrading

* Format files

* Fix runtime errors

- input error when min === max
- error message
- hasUnsavedChanges returning true because of xp checking against grade

* Format file

* Revert travis to master's version

* Show programming solution (#336)

* Add additional types for solution prop

* Udpate mock data

* Use markdown to show solution

* Pass solution to GradingEditor

* Use code tag for solution instead

* Add parsing of solution in saga

* Add failsafes for solution value

and the maxGrade value as well. This is something that only happens in
staging, but could very well happen in prod as well.

* Use pre for solution

And fix a bug with xpAdjustment

* Add word wrapping to solution

* Fix wrapping for pre tag

It was not speicific to the pre tag

* Format files
@rrtheonlyone rrtheonlyone deleted the xp-grading branch September 12, 2018 01:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
blocking Finishing this opens up other stuff
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants