feat: Grade marks #320

orronai · 2021-09-30T06:47:56Z

Added grade marks to solution`s
Added a menu to choose the grade mark for the admin in the solution view page
Added a test
Fixed some tests
Added to the user`s table the grade mark
Added migration

- Added grades table - Added backend and frontend implementaion

- Added the grade to the user`s table

codecov · 2021-09-30T06:53:33Z

Codecov Report

Merging #320 (8f7efff) into master (0e38fb9) will increase coverage by 0.06%.
The diff coverage is 79.34%.

@@            Coverage Diff             @@
##           master     #320      +/-   ##
==========================================
+ Coverage   84.02%   84.08%   +0.06%     
==========================================
  Files          62       63       +1     
  Lines        2823     2903      +80     
==========================================
+ Hits         2372     2441      +69     
- Misses        451      462      +11

Impacted Files	Coverage Δ
lms/lmsdb/bootstrap.py	`16.07% <13.33%> (-0.20%)`	⬇️
lms/lmsdb/models.py	`91.27% <89.47%> (+1.19%)`	⬆️
lms/lmsweb/views.py	`92.99% <100.00%> (+0.05%)`	⬆️
lms/models/solutions.py	`98.94% <100.00%> (ø)`
lms/utils/colors.py	`100.00% <100.00%> (ø)`
lms/utils/consts.py	`100.00% <100.00%> (ø)`

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 8a41e38...8f7efff. Read the comment docs.

yammesicka

An awesome start!

lms/lmsdb/models.py

lms/lmsweb/views.py

lms/static/checker.js

… grades-mark

lms/templates/view.html

lms/lmsdb/models.py

- added active color column - changed the way the user chooses colors

lms/templates/view.html

lms/lmsdb/models.py

yammesicka · 2021-10-02T22:23:58Z

lms/lmsdb/models.py

+    is_color_changed = not instance.color.startswith('#')
+    if created or is_color_changed:
+        instance.color = COLORS.get(instance.color, '#0d6efd')


Nice!

Another way that might prove useful:

hex_color = re.compile(r'#?(?P<hex>[a-f0-9]{3}|[a-f0-9{6}])') def get_hex(number: str) -> Optional[str]: if color := hex_color.match(number): return color.groupdict()['hex'] raise ValueError("This is not a valid hex color.") ... def evalutaion_on_save_handler etc try: instance.color = get_hex_color(...) except ValueError: instance.color = DEFAULT_PRIMARY_COLOR

Also, to be really awesome, you might want to support input like "red", "blue" etc.
There's probably a really easy way to convert these words into hex RGB representation, and this can be awesome.

I changed it like the way you did and added the COLORS dict in case the user entered a word like "red", "blue" and etc.

lms/lmsdb/models.py

lms/utils/colors.py

lms/templates/view.html

lms/templates/user.html

lms/lmsdb/models.py

yammesicka · 2021-10-03T18:59:47Z

lms/lmsdb/models.py

+class SolutionAssessment(BaseModel):
+    name = CharField()
+    icon = CharField(null=True)
+    color = CharField()
+    active_color = CharField()
+    order = IntegerField(default=0, index=True, unique=True)
+


I think we should support different assessments per course. WDYT?

Also: How we deal with a manager removing an assessment? (both 1. completely from the course and 2. de-selecting an evaluation from a specific solution)

lms/utils/consts.py

- Changed the exercise number pre_save - Removed unique from assessments oreder - Assessments are now per course

lgtm-com · 2021-10-04T13:09:10Z

This pull request introduces 1 alert when merging 5134179 into f18eeca - view on LGTM.com

new alerts:

1 for Missing variable declaration

lms/lmsdb/models.py

lms/static/checker.js

- Splitted a function - Changed some logics of the assessment

lms/lmsdb/models.py

… grades-mark

sourcery-ai · 2021-10-08T12:22:21Z

Sourcery Code Quality Report

✅ Merging this PR will increase code quality in the affected files by 0.06%.

Quality metrics	Before	After	Change
Complexity	1.53 ⭐	1.57 ⭐	0.04 👎
Method Length	42.72 ⭐	43.56 ⭐	0.84 👎
Working memory	7.25 🙂	7.20 🙂	-0.05 👍
Quality	77.76% ⭐	77.82% ⭐	0.06% 👍

Other metrics	Before	After	Change
Lines	3069	3245	176

Changed files	Quality Before	Quality After	Quality Change
lms/lmsdb/bootstrap.py	79.33% ⭐	79.29% ⭐	-0.04% 👎
lms/lmsdb/models.py	84.63% ⭐	84.22% ⭐	-0.41% 👎
lms/lmsweb/views.py	74.72% 🙂	74.68% 🙂	-0.04% 👎
lms/models/solutions.py	74.27% 🙂	74.06% 🙂	-0.21% 👎
lms/utils/consts.py	99.00% ⭐	90.75% ⭐	-8.25% 👎
tests/conftest.py	91.35% ⭐	90.98% ⭐	-0.37% 👎
tests/test_git_solution.py	78.51% ⭐	78.89% ⭐	0.38% 👍
tests/test_notifications.py	70.46% 🙂	70.44% 🙂	-0.02% 👎
tests/test_solutions.py	67.67% 🙂	69.11% 🙂	1.44% 👍

Here are some functions in these files that still need a tune-up:

File	Function	Complexity	Length	Working Memory	Quality	Recommendation
lms/lmsweb/views.py	comment	13 🙂	202 😞	8 🙂	50.15% 🙂	Try splitting into smaller methods
tests/test_solutions.py	TestSolutionBridge.test_staff_and_user_comments	0 ⭐	236 ⛔	12 😞	52.40% 🙂	Try splitting into smaller methods. Extract out complex expressions
tests/test_solutions.py	TestSolutionBridge.test_share_solution_function	0 ⭐	248 ⛔	11 😞	53.48% 🙂	Try splitting into smaller methods. Extract out complex expressions
tests/test_notifications.py	TestNotification.test_user_commented_after_check	0 ⭐	216 ⛔	12 😞	53.64% 🙂	Try splitting into smaller methods. Extract out complex expressions
lms/models/solutions.py	get_view_parameters	5 ⭐	139 😞	12 😞	55.53% 🙂	Try splitting into smaller methods. Extract out complex expressions

Legend and Explanation

The emojis denote the absolute quality of the code:

⭐ excellent
🙂 good
😞 poor
⛔ very poor

The 👍 and 👎 indicate whether the quality has improved or gotten worse with this pull request.

Please see our documentation here for details on how these metrics are calculated.

We are actively working on this report - lots more documentation and extra metrics to come!

Help us improve this quality report!

orronai added 3 commits September 29, 2021 10:28

feat: Add grades mark

b9f4735

- Added grades table - Added backend and frontend implementaion

- Added a test and fixed tests

0e030ba

- Added the grade to the user`s table

fixed to_choice function

c3de06b

orronai linked an issue Sep 30, 2021 that may be closed by this pull request

Mark exercise as excellent/plagarism/fail #106

Closed

yammesicka requested changes Sep 30, 2021

View reviewed changes

lms/lmsdb/models.py Outdated Show resolved Hide resolved

lms/lmsdb/models.py Show resolved Hide resolved

lms/lmsdb/models.py Outdated Show resolved Hide resolved

lms/lmsweb/views.py Outdated Show resolved Hide resolved

lms/static/checker.js Outdated Show resolved Hide resolved

orronai added 4 commits October 1, 2021 10:32

Merge branch 'master' of https://github.com/PythonFreeCourse/lms into…

2f1148e

… grades-mark

changed the way the user chooses colors

79b861e

changed the way the user chooses colors

25192ad

fix translations

955997c

yammesicka requested changes Oct 2, 2021

View reviewed changes

lms/templates/view.html Outdated Show resolved Hide resolved

lms/templates/view.html Outdated Show resolved Hide resolved

lms/templates/view.html Outdated Show resolved Hide resolved

lms/lmsdb/models.py Show resolved Hide resolved

lms/lmsdb/models.py Outdated Show resolved Hide resolved

- changed grades into evaluations

f4f0b2d

- added active color column - changed the way the user chooses colors

yammesicka requested changes Oct 2, 2021

View reviewed changes

lms/templates/view.html Outdated Show resolved Hide resolved

lms/templates/view.html Outdated Show resolved Hide resolved

yammesicka requested changes Oct 2, 2021

View reviewed changes

orronai added 2 commits October 3, 2021 10:07

fixed pre_save colors

4d4755d

fixed merge conflicts

4fb3dcd

yammesicka requested changes Oct 3, 2021

View reviewed changes

orronai added 3 commits October 4, 2021 10:31

- Added some tests

85ffa3a

- Changed the exercise number pre_save - Removed unique from assessments oreder - Assessments are now per course

Changed a test

3c8e385

Allow unselecting choice on second click

5134179

Added const

b87584a

yammesicka requested changes Oct 5, 2021

View reviewed changes

lms/lmsdb/models.py Outdated Show resolved Hide resolved

lms/lmsdb/models.py Show resolved Hide resolved

lms/lmsdb/models.py Show resolved Hide resolved

lms/lmsdb/models.py Outdated Show resolved Hide resolved

lms/static/checker.js Outdated Show resolved Hide resolved

- Added a test

83bb65c

- Splitted a function - Changed some logics of the assessment

yammesicka reviewed Oct 8, 2021

View reviewed changes

lms/lmsdb/models.py Outdated Show resolved Hide resolved

yammesicka approved these changes Oct 8, 2021

View reviewed changes

orronai added 3 commits October 8, 2021 15:08

removed a blank line

a315a0f

Merge branch 'master' of https://github.com/PythonFreeCourse/lms into…

56c0cff

… grades-mark

fixed a test

8f7efff

orronai merged commit f3ed156 into master Oct 8, 2021

orronai deleted the grades-mark branch October 8, 2021 12:27

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Grade marks #320

feat: Grade marks #320

orronai commented Sep 30, 2021 •

edited

Loading

codecov bot commented Sep 30, 2021 •

edited

Loading

yammesicka left a comment

yammesicka Oct 2, 2021

yammesicka Oct 2, 2021

orronai Oct 3, 2021

yammesicka Oct 3, 2021

lgtm-com bot commented Oct 4, 2021

sourcery-ai bot commented Oct 8, 2021

feat: Grade marks #320

feat: Grade marks #320

Conversation

orronai commented Sep 30, 2021 • edited Loading

codecov bot commented Sep 30, 2021 • edited Loading

Codecov Report

yammesicka left a comment

Choose a reason for hiding this comment

yammesicka Oct 2, 2021

Choose a reason for hiding this comment

yammesicka Oct 2, 2021

Choose a reason for hiding this comment

orronai Oct 3, 2021

Choose a reason for hiding this comment

yammesicka Oct 3, 2021

Choose a reason for hiding this comment

lgtm-com bot commented Oct 4, 2021

sourcery-ai bot commented Oct 8, 2021

Sourcery Code Quality Report

Legend and Explanation

orronai commented Sep 30, 2021 •

edited

Loading

codecov bot commented Sep 30, 2021 •

edited

Loading