Skip to content
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

Add New Assessment Framework #219

Merged
merged 136 commits into from
Jan 20, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
136 commits
Select commit Hold shift + click to select a range
eb59a20
Add Assessment and Question Independent of Google
Nephelite Sep 27, 2024
bbdf033
Implement Sprint 3 Leftovers
Nephelite Oct 2, 2024
db3e650
Add Assessment Taking UI
Nephelite Oct 4, 2024
4bc8a13
Add Submission and Answer Schema
Nephelite Oct 5, 2024
00f35c1
Add Student Selection Question and Submission Viewing
Nephelite Oct 9, 2024
a1cf009
Fix Submission Edit Permission Bugs
Nephelite Oct 10, 2024
5b584cf
Add Delete Draft Button
Nephelite Oct 10, 2024
13acdff
Merge pull request #226 from NUS-CRISP/staging
dexter-sim Oct 11, 2024
f539019
Implement Student Searching in Student Selection Question
Nephelite Oct 12, 2024
e56e590
Merge pull request #229 from NUS-CRISP/staging
dexter-sim Oct 13, 2024
4e436ed
Merge branch 'NUS-CRISP:main' into main
Nephelite Oct 13, 2024
6edf90e
Merge pull request #231 from NUS-CRISP/staging
dexter-sim Oct 14, 2024
e94f150
Merge branch 'NUS-CRISP:main' into main
Nephelite Oct 14, 2024
9f9d4c0
Add Scoring Element to Questions
Nephelite Oct 17, 2024
b9a982b
Merge pull request #239 from NUS-CRISP/staging
dexter-sim Oct 17, 2024
649996f
Add Submission Score Viewing
Nephelite Oct 21, 2024
ee3df79
Add TA Team Assignment UI
Nephelite Oct 21, 2024
850815e
Add Backend for Custom Team Assignments
Nephelite Oct 22, 2024
17f34c5
Add Result Viewing and Custom Team Assignment
Nephelite Oct 24, 2024
90da3a5
Fix Questions not Saving and Improper AssignmentSet Fetching
Nephelite Oct 24, 2024
8a3c86f
Fix Crashing on NaN
Nephelite Oct 24, 2024
0fc65d7
Add .csv Downloading
Nephelite Oct 24, 2024
2f20a41
Remove gradedBy Field in InternalAssessments
Nephelite Oct 29, 2024
d40446a
Merge branch 'NUS-CRISP:main' into main
Nephelite Oct 30, 2024
268aa32
Add Missing Submission Status For Results
Nephelite Oct 30, 2024
6f8cfff
Fix Improper Hook Usage
Nephelite Oct 31, 2024
9fe027e
Run Prettier
Nephelite Oct 31, 2024
f1c47b7
Add Missing Field to getTableUser
Nephelite Oct 31, 2024
8f94910
Disable EsLint for SubmissionCard
Nephelite Oct 31, 2024
1bb8e76
Add Preliminary Test Files
Nephelite Oct 31, 2024
3f00651
Remove Deprecated Information
Nephelite Oct 31, 2024
c997987
Fix Type Issues with Frontend Build
Nephelite Oct 31, 2024
e2e0a40
Fix Improper Routing of Imports
Nephelite Oct 31, 2024
bd2a531
Fix Compilation Issues and Conflicting Discriminator Keys
Nephelite Nov 1, 2024
7812845
Fix Various Test Cases
Nephelite Nov 2, 2024
cdfab27
Fix Team Related Test Issues
Nephelite Nov 3, 2024
b8401fc
Add Randomizer Exclusion to Grader Assignment
Nephelite Nov 12, 2024
1fdbc59
Fix Submission, Results Viewing Bugs
Nephelite Nov 14, 2024
584bda7
Fix Marking Filters
Nephelite Nov 15, 2024
411f1cd
Ensure Graders can only Submit for Unmarked Assignments
Nephelite Nov 15, 2024
baf400e
Fix Style Issue
Nephelite Nov 16, 2024
e0cb45d
Add Question Type Grouping in Dropdown Selection Based on Auto-Gradin…
Nephelite Nov 17, 2024
cbce2e0
Remove Check Marking Route
Nephelite Nov 21, 2024
857b731
Fix Typo
Nephelite Nov 21, 2024
a6ad022
Fix Internal Assessment Service Test
Nephelite Nov 21, 2024
b706c71
Fixed Incorrect Loading of Team Id in Submission Edit
Nephelite Nov 21, 2024
3e551a2
Fix Submission Test Issues and Remove Async For Loop in Submission Se…
Nephelite Nov 21, 2024
db3f9c0
Merge branch 'staging' into main
Nephelite Nov 21, 2024
738a6d9
Run Prettierrc
Nephelite Nov 21, 2024
316ce76
Merge branch 'main' of https://github.com/Nephelite/CRISP
Nephelite Nov 21, 2024
6e8e7c6
Fix Incorrect Type Cast (string | null Cannot be Cast)
Nephelite Nov 21, 2024
b5030cf
Fix Submission Controller Test File
Nephelite Nov 21, 2024
4a7b913
Run Prettierrc
Nephelite Nov 22, 2024
162e9b8
Break up AssessmentMakeQuestionCard into Smaller Files
Nephelite Nov 23, 2024
283e30d
Merge branch 'staging' into main
Nephelite Nov 23, 2024
70c27bf
Break up TakeAssessmentCard into Smaller Files
Nephelite Nov 23, 2024
032ab25
Adjust Submission Card Display
Nephelite Dec 7, 2024
c3635ae
Add More MRQ Customization
Nephelite Dec 7, 2024
472ef11
Fix Incorrect Wrong Answer Checkbox Display Logic
Nephelite Dec 10, 2024
04ee877
Fix Style Issues (Missing Padding)
Nephelite Dec 10, 2024
3ce4469
Add Check for Grading Completion in Assessment Overview
Nephelite Dec 10, 2024
6364a7a
Add Initial Random Assignments to Unassigned Teams in the TeamSet
Nephelite Dec 10, 2024
328ceb2
Balanced Randomization Function in TA Assignments and Added Validatio…
Nephelite Dec 10, 2024
b39237d
Refactor out TA Assignment Modal
Nephelite Dec 10, 2024
f9ffef9
Fix Bug Involving Missing TeamSet Creating Phantom Assessments
Nephelite Dec 10, 2024
bea7f59
Require Max Marks for Assessments
Nephelite Dec 10, 2024
8f18e91
Add Score Scaling
Nephelite Dec 10, 2024
26b1b22
Fix Formatting
Nephelite Dec 10, 2024
cdbbf22
Fix Test Files
Nephelite Dec 10, 2024
041757a
Remove Console Logs
Nephelite Dec 10, 2024
84bf7e7
Add CSV Uploading of Questions
Nephelite Dec 23, 2024
455f7ec
Add CSV Upload to Assessment Creation
Nephelite Dec 23, 2024
53f703e
Implement CSV Uploading of Team/Student and TA Assignments
Nephelite Dec 23, 2024
019ac09
Add Documentation to AssessmentAssignmentSetController
Nephelite Dec 26, 2024
295e3d6
Add Documentation to AssessmentAssignmentSetService
Nephelite Dec 26, 2024
2c91798
Add Documentation to InternalAssessmentController and InternalAssessm…
Nephelite Dec 26, 2024
78e49b7
Style changes
Nephelite Dec 26, 2024
4ba1942
Add Documentation to submissionController and submissionService
Nephelite Dec 26, 2024
964fc95
Adjust style of documentation
Nephelite Dec 26, 2024
b1b9693
Add documentation for assessmentResultController and Service
Nephelite Dec 26, 2024
fc291c1
Add status codes for return documentation
Nephelite Dec 26, 2024
54c0103
Merge branch 'staging' into main
Nephelite Dec 27, 2024
9a17dc0
Fix style issues
Nephelite Dec 27, 2024
891fea1
Fix error feedback expectation difference
Nephelite Dec 27, 2024
aee5130
Use correct AssessmentResult import
Nephelite Dec 27, 2024
8b3f2f4
Add Regrading of Submissions on Release
Nephelite Dec 27, 2024
6ccb564
Add Optional Score Scaling
Nephelite Dec 27, 2024
d1e7556
Disable Changing of Question After Saving
Nephelite Dec 27, 2024
e50acd9
Fix Style Issues
Nephelite Dec 27, 2024
d0dad38
Add Bulk Soft Deletion of Submissions on Recall of Assessment
Nephelite Dec 28, 2024
df68ef5
Add Lazy Loading to Results View
Nephelite Dec 29, 2024
e56d1ac
Add Lazy Loading to Grader Assignment Modal
Nephelite Dec 29, 2024
1d28d03
Remove Comments
Nephelite Dec 30, 2024
114119b
Fix Regrading on Re-Release
Nephelite Dec 30, 2024
2bc1bb3
Remove Console Logs
Nephelite Dec 30, 2024
28e1250
Fix Incorrect Guard Check and Remove Unnecessary .toObject that Cause…
Nephelite Dec 30, 2024
3fd99f5
Add Adaptive View/Edit Button to Submission Card
Nephelite Dec 30, 2024
cf1a800
Run Prettier-Format
Nephelite Dec 30, 2024
bde0f60
Fix Delete Submission Tests
Nephelite Jan 1, 2025
875874c
Add Question Reordering
Nephelite Jan 1, 2025
2d20d5e
Fix Tests
Nephelite Jan 3, 2025
5567fff
Complete Assessment Assignment Set Controller Test Files
Nephelite Jan 4, 2025
dffc3eb
Complete Assessment Result Controller Test
Nephelite Jan 4, 2025
3be0f71
Fix Incorrect Handling of Async in Bulk Add Question
Nephelite Jan 5, 2025
f11e33b
Complete Internal Assessment Controller Test File
Nephelite Jan 5, 2025
b5c57ba
Remove Comments
Nephelite Jan 5, 2025
ea7bebc
Add TA Access to Get All Submissions
Nephelite Jan 5, 2025
b4db7cf
Complete Submission Controller Test File
Nephelite Jan 5, 2025
3aef383
Add Internal Assessment Tests to Course Controller Test File
Nephelite Jan 5, 2025
fde75a4
Add Missing Tests for Newer Functions
Nephelite Jan 5, 2025
04e4365
Add Tests for New Function
Nephelite Jan 5, 2025
9837d14
Complete Question Model Test File
Nephelite Jan 5, 2025
3b2ed41
Fix Race Condition Allowing Set 2 to Pass
Nephelite Jan 5, 2025
7509ca1
Add Back in the Removed Release Form and CSV Buttons
Nephelite Jan 6, 2025
2ce9db5
Fix Response Placeholder
Nephelite Jan 6, 2025
98ab568
Complete AsseignmentSetService Test File
Nephelite Jan 6, 2025
fc350fb
Fix Formatting
Nephelite Jan 6, 2025
8dd8423
Add Test for getUserByAccountId
Nephelite Jan 6, 2025
af5b3f7
Complete Assessment Result Service Test File
Nephelite Jan 6, 2025
890ab5b
Add Test Functions to Internal Assessment Service Test File
Nephelite Jan 7, 2025
aafb4c2
Add Guards to Update Question Function
Nephelite Jan 7, 2025
55729be
Complete Internal Service Test File
Nephelite Jan 7, 2025
499d751
Fix Formatting
Nephelite Jan 7, 2025
bc8eab3
Fix Regrading of Results not Triggering
Nephelite Jan 9, 2025
59e5b4b
Update Submission Service Tests
Nephelite Jan 9, 2025
8236cef
Improve Submission Service Tests
Nephelite Jan 9, 2025
493f54d
Remove Redundant Code
Nephelite Jan 11, 2025
1f74fc2
Complete Submission Service Tests
Nephelite Jan 11, 2025
6c0fd4c
Add Test for getTeamsByTAIdAndCourseId
Nephelite Jan 11, 2025
88de706
Add getInternalAssessmentsFromCourse Test
Nephelite Jan 11, 2025
496021a
Formatting
Nephelite Jan 11, 2025
6ef79c7
Formatting
Nephelite Jan 11, 2025
083ff8c
Add Disabling of Editing Grader Assignments when Assessment is Release
Nephelite Jan 13, 2025
a4f8a5e
Add Tooltips to Checkboxes in Question Editing Components
Nephelite Jan 13, 2025
42f3351
Fix Missing Order Field in CSV Upload
Nephelite Jan 19, 2025
02c6b4f
Remove Reorder Model but Maintain Functionality
Nephelite Jan 19, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Adjust Submission Card Display
  • Loading branch information
Nephelite committed Dec 7, 2024
commit 032ab25a39cbb111bba47774d463957c20438e66
6 changes: 4 additions & 2 deletions backend/services/submissionService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -698,8 +698,10 @@ export const updateSubmission = async (
submission.answers = answers;
submission.isDraft = isDraft;
submission.submittedAt = new Date();
submission.score = totalScore;
submission.adjustedScore = undefined;
if (submission.score !== totalScore) {
submission.score = totalScore;
submission.adjustedScore = undefined;
}

await submission.save();

Expand Down
8 changes: 6 additions & 2 deletions multi-git-dashboard/src/components/cards/SubmissionCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -86,14 +86,18 @@ const SubmissionCard: React.FC<SubmissionCardProps> = ({

{/* Display score and adjusted score */}
<Text size="sm">
{hasFacultyPermission ? (
{hasFacultyPermission ? submission.adjustedScore ? (
<>
<strong>Adjusted Score:</strong> {totalScore} <br />
<strong>Original Score:</strong> {originalScore}
</>
) : (
<>
<strong>Total Score:</strong> {totalScore}
<strong>Score:</strong> {originalScore}
</>
) : (
<>
<strong>Score:</strong> {totalScore}
</>
)}
</Text>
Expand Down
Loading