Add XP for grading overview #321
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Pull Request Test Coverage Report for Build 725
💛 - Coveralls |
rrtheonlyone
approved these changes
Aug 25, 2018
There was a problem hiding this comment.
Changes look good especially the sorting functionality!
I have built on this and did a PR #332
Fix lint error
remo5000
force-pushed
the
xp-grading-overview
branch
from
c343ca5 to
dfa889f
Compare
remo5000
added
blocked
* 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
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Features
Issues fixed: