iritmaximus/ohtuilmo
1
0
Fork 0
mirror of https://github.com/UniversityOfHelsinkiCS/ohtuilmo.git synced 2026-10-12 19:03:41 +03:00
Code Issues Packages Projects Releases Wiki Activity
2,516 Commits 1 Branch 5 Tags
main
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
RegularmuteandGitHub 1f059d8b49 Merge pull request #307 from Ohtuilmo/fix/display-instructor-timelogs 
Fetch all time logs for instructors
 2024-05-03 14:45:06 +03:00
RegularmuteandGitHub 027afc0bbd fix linting errors 2024-05-03 14:35:20 +03:00
RegularmuteandGitHub 5339245c57 Fetch all time logs for instructors 
Temporarily fetch all time logs for instructors.
 2024-05-03 14:30:53 +03:00
RegularmuteandGitHub 34d1bf9159 Fetch all groups for both instructors and admin 
This is to display time logs from all groups to instructors in addition to admin.
 2024-05-03 13:32:33 +03:00
regularmute 73db37ab5a Clarify the displayed group for instructor-timelogs 2024-05-02 19:35:16 +03:00
regularmute 6d489a8d02 enable sprint-specific chart results for groups in instructor-logs 
The user can click between sprints 0-100, which is reset to 0 every
time the user selects a new group.
 2024-05-02 19:30:50 +03:00
regularmute 8f56b36190 display charts for selected group's logs as admin/instructor 2024-05-02 18:48:49 +03:00
regularmute d2e1e439ec not try to map nonexistent mappedData in timelogChart component 
this prevents site from crashing when the component's mappedData
prop is null.
 2024-05-02 18:46:26 +03:00
regularmute 11d89da445 enable error messages through redux in instructor-logs page 2024-05-02 17:45:15 +03:00
RegularmuteandGitHub 91dc890cc0 Merge pull request #302 from Ohtuilmo/fix/add_confirmation_to_tag_deletion 
add confirmation to tag deletion
 2024-05-02 13:32:13 +03:00
regularmute 58ee4cbcbc edit checkInstructor: look for group's existence, not length 
No point checking the length of a null value.
 2024-04-30 20:13:31 +03:00
regularmute 7ff160b5b6 fix login checking instructors, show latest config's logs to instructor 
The problem with the login checking for an instructor seemed to be an
erroneous handling of the boolean value converted from fetched groups
the logged user instructs.

With the fixed instructor value stored in the session token, display
logs from groups of the latest configuration to a logged instructor.
 2024-04-30 19:55:37 +03:00
regularmute 5778a64244 remove broken instructorcheck from login-controller 2024-04-30 19:19:04 +03:00
regularmute bc7fb93b67 refactor instructor/admin timelog files 
Reorganize the backend files and service files into a separate file
from the regular timeLogs.js files. This is to prevent the likelihood
of exposing sensitive operations to regular users.
 2024-04-30 19:12:03 +03:00
regularmute 4e1c7abf80 fix: all timelogs being visible to all students 
Something seems to be wrong with the instructor checking, so this
commit prevents anyone but admin from fetching all time logs.
 2024-04-30 16:28:18 +03:00
regularmute faa1e2dcaa hotfix: commentout only Iconbtn to prevent removing timelogs 2024-04-29 12:11:38 +03:00
regularmute 85503638aa Revert "hotfix: remove log delete btn until log display fixed" 
This reverts commit 9a7730761b.
 2024-04-29 12:05:56 +03:00
regularmute 9a7730761b hotfix: remove log delete btn until log display fixed 2024-04-29 11:16:00 +03:00
RegularmuteandGitHub 2c5b6bb9a4 Merge pull request #292 from Ohtuilmo/fix/seeder-setup-for-staging 
Fix seeder config for staging
 2024-04-28 22:03:36 +03:00
regularmute 990d707c62 minor lint fixes: indentation, unused import 2024-04-26 00:00:47 +03:00
regularmute f90e0cc083 Add navigation link to instructor's time log page 2024-04-25 23:43:02 +03:00
regularmute 8e4264cdb3 Instructors an also view students' time logs 
Backend queries have been adjusted to retrieve limited version of the
groups and students data. Instructors should only have access to groups
and students that are participating in the latest configuration (time
period) of the course.

Configuration and time log information is retrieved for instructors in
full.
 2024-04-25 23:38:04 +03:00
regularmute 93ca13fc45 store logged user's instructor status to header 
Check when user logins if their student number is stored in any group
that belong to the last created configuration. This information is
stored into the token.

Use this change to define a middleware function to check if a logged
token is classified as an instructor.

These cahanges are to enable alternate backend requests for data used
to develop admin and instructor views for time logs.
 2024-04-25 22:00:48 +03:00
regularmute 5069fa6ba5 Remove copypaste from wrapper components 2024-04-25 19:17:24 +03:00
regularmute 1dc88cefca add configuration selector to filter time logs 2024-04-25 19:14:50 +03:00
regularmute 78d947a86a reorder state hooks according to fetch order 2024-04-25 18:34:37 +03:00
regularmute 1b98d466b7 Rename variables student -> studentNumber for clarity 2024-04-25 18:28:38 +03:00
regularmute f50c59a01d add group selector to timelogviewer for admins 
The page fetches all groups and hides the student selector until
a group is selected. The available students are limited to the ones in
the selected group.

When the group is changed, the selectedStudent is set to null.
 2024-04-25 17:52:54 +03:00
regularmute a7c2ff4615 student-selector for logs shows full names 2024-04-25 16:46:48 +03:00
regularmute f62d23fc99 admin can see a student's recorded time logs 2024-04-25 16:44:09 +03:00
regularmute b63d9d1e82 remove debug console.log 2024-04-25 16:43:15 +03:00
regularmute 50d299ef95 rearrange imports, import necessary components/services 2024-04-25 16:41:50 +03:00
regularmute 415c8487ff backend controller can fetch all logs for admin 2024-04-25 16:40:23 +03:00
regularmute fd78bf175e fix timelogselectform missing currentStudent as param 2024-04-25 16:31:55 +03:00
regularmute bd0bd5f6f8 add student-selector to display their group's name 2024-04-25 15:38:32 +03:00
regularmute 057ae95f27 create component for timelog selector by student 2024-04-25 15:36:40 +03:00
regularmute d4d0d8635b Create and set up page for instructor's timelog view 2024-04-25 13:52:51 +03:00
RegularmuteandGitHub e256c47544 Merge pull request #274 from Ohtuilmo/fix/issue-with-markdown 
Fix issue with react-markdown
 2024-04-22 15:09:08 +03:00
RegularmuteandGitHub bd3731ca75 Merge pull request #237 from Ohtuilmo/feature/224-timelogs_chart 
Bar chart visualizaation of work time on Time Logs -page
 2024-04-22 14:41:29 +03:00
RegularmuteandGitHub 86fee04df9 Merge pull request #259 from Ohtuilmo/feature/tag_management 
Feature/tag management
 2024-04-19 13:18:34 +03:00
regularmuteandAntti Aarnio d1061669b5 style config and group selectors horizontally adjacent to each other 
the selectors sit on top of each other vertically by default
 2024-04-18 10:22:40 +03:00
regularmuteandAntti Aarnio b223dc9569 filter displayed groups by a specific id, or 'all groups' id of 0 2024-04-18 10:22:40 +03:00
regularmuteandAntti Aarnio 7fcff38fae update renamed prop calls, add default option for configs 'all groups' 2024-04-18 10:22:39 +03:00
regularmuteandAntti Aarnio 428c67366c remove logging messages from debugging 2024-04-18 10:22:39 +03:00
regularmuteandAntti Aarnio 2c343d47bb BREAKING: rename reducers to specify groupID 
Breaks because some instances of old variables are present
 2024-04-18 10:22:39 +03:00
regularmuteandAntti Aarnio 18effd1991 add tests to see the group filtering works correctly 2024-04-18 10:22:39 +03:00
regularmuteandAntti Aarnio 19e8f2638d improve instructorpage test readability, clear groups/reviews at start 2024-04-18 10:22:39 +03:00
regularmuteandAntti Aarnio c53c4779ce add second group to test group filtering for instructors 2024-04-18 10:22:39 +03:00
regularmuteandAntti Aarnio 082e315b7d add missing newline at end of file 2024-04-18 10:22:39 +03:00
regularmuteandAntti Aarnio 39e28a2829 seed a group in a separate configuration for test instructor 
This enables the developer to find any side-effects and bugs when
switching between groups and connfigurations. Streamlines upcoming
feature.
 2024-04-18 10:22:39 +03:00
regularmuteandAntti Aarnio ba953e2044 add a dropdown menu to choose a group to display, currently inactive 2024-04-18 10:22:39 +03:00
RegularmuteandGitHub 51cc41a15f Merge pull request #261 from Ohtuilmo/setup/update-node 
Update frontend node version and migrate configuration from create-react-app to Vite
 2024-04-16 15:27:52 +03:00
regularmute 8a5c693a9e Merge branch 'instructor_page_group_filter' of github.com:Ohtuilmo/ohtuilmo into instructor_page_group_filter 2024-04-15 14:38:17 +03:00
regularmute c7850499ec style config and group selectors horizontally adjacent to each other 
the selectors sit on top of each other vertically by default
 2024-04-15 14:36:15 +03:00
regularmute 869ef2b44e filter displayed groups by a specific id, or 'all groups' id of 0 2024-04-15 14:36:14 +03:00
regularmute dd25cdb2b1 update renamed prop calls, add default option for configs 'all groups' 2024-04-15 14:36:13 +03:00
regularmute 938dc27746 remove logging messages from debugging 2024-04-15 14:36:12 +03:00
regularmute 996cdbf4d2 BREAKING: rename reducers to specify groupID 
Breaks because some instances of old variables are present
 2024-04-15 14:36:11 +03:00
regularmute 8f7997b464 add tests to see the group filtering works correctly 2024-04-15 14:36:10 +03:00
regularmute c6b09e9399 improve instructorpage test readability, clear groups/reviews at start 2024-04-15 14:36:10 +03:00
regularmute a1565306a4 add second group to test group filtering for instructors 2024-04-15 14:36:09 +03:00
regularmute 8cd6d4dae7 add missing newline at end of file 2024-04-15 14:36:08 +03:00
regularmute 2d8cc37705 seed a group in a separate configuration for test instructor 
This enables the developer to find any side-effects and bugs when
switching between groups and connfigurations. Streamlines upcoming
feature.
 2024-04-15 14:36:08 +03:00
regularmute e835c24ffa add a dropdown menu to choose a group to display, currently inactive 2024-04-15 14:36:07 +03:00
regularmute 405579d3e9 style config and group selectors horizontally adjacent to each other 
the selectors sit on top of each other vertically by default
 2024-04-15 14:24:58 +03:00
regularmute fa0d29d676 filter displayed groups by a specific id, or 'all groups' id of 0 2024-04-15 14:24:57 +03:00
regularmute 3e2e92ce99 update renamed prop calls, add default option for configs 'all groups' 2024-04-15 14:24:56 +03:00
regularmute fad94a2363 remove logging messages from debugging 2024-04-15 14:24:55 +03:00
regularmute 319e5fed6d BREAKING: rename reducers to specify groupID 
Breaks because some instances of old variables are present
 2024-04-15 14:24:54 +03:00
regularmute 976af9f8bf add tests to see the group filtering works correctly 2024-04-15 14:24:54 +03:00
regularmute 9fb1070e4e improve instructorpage test readability, clear groups/reviews at start 2024-04-15 14:24:53 +03:00
regularmute cb80e548b9 add second group to test group filtering for instructors 2024-04-15 14:24:52 +03:00
regularmute 8c541be3f6 add missing newline at end of file 2024-04-15 14:24:52 +03:00
regularmute 0c9b7c46cf seed a group in a separate configuration for test instructor 
This enables the developer to find any side-effects and bugs when
switching between groups and connfigurations. Streamlines upcoming
feature.
 2024-04-15 14:24:51 +03:00
regularmuteandAntti Aarnio 4fa026c2c6 create component for delete confirmation window 2024-04-10 14:19:22 +03:00
regularmuteandAntti Aarnio f4da1970a1 remove unused test that was meant for another branch 2024-04-10 14:14:50 +03:00
regularmuteandAntti Aarnio e8051d4d56 add missing spaces before and after curly braces 2024-04-10 14:12:13 +03:00
regularmuteandAntti Aarnio bd82d427c5 fix double quotes to single quotes to follow style 2024-04-10 14:12:12 +03:00
regularmuteandAntti Aarnio ce692f2c9d fix seeders so that instructor can see peer reviews from groups 2024-04-10 14:12:12 +03:00
regularmute c287044607 add a dropdown menu to choose a group to display, currently inactive 2024-04-09 15:06:56 +03:00
regularmute 0327b8efd1 remove unused test that was meant for another branch 2024-04-09 11:24:14 +03:00
regularmute 98097af063 add missing spaces before and after curly braces 2024-04-09 11:15:09 +03:00
regularmute 3bfb8db6f1 fix double quotes to single quotes to follow style 2024-04-09 11:12:32 +03:00
regularmute bc4fde7d9f fix seeders so that instructor can see peer reviews from groups 2024-04-09 11:05:38 +03:00
regularmute 0714c142ef create test for sprint deletion confirmation and add idtags for cypress 2024-04-08 11:10:19 +03:00
regularmuteandAntti Aarnio de72b3cc5f create and update tests to check timelog deletion confirmation 2024-04-05 17:04:46 +03:00
regularmuteandAntti Aarnio c9e5e2e4b7 ask for confirmation before deleting a time log 2024-04-05 17:04:45 +03:00
regularmuteandAntti Aarnio 0c4bd31ecd fix doube quotes to single quotes for import lines 2024-04-05 17:04:45 +03:00
regularmuteandAntti Aarnio d16e094e6f create component for delete confirmation window 2024-04-05 17:04:45 +03:00
regularmute 4de858b573 create and update tests to check timelog deletion confirmation 2024-03-26 13:07:00 +02:00
regularmute 741d80298b ask for confirmation before deleting a time log 2024-03-26 13:06:11 +02:00
regularmute f99fa8f8cb fix doube quotes to single quotes for import lines 2024-03-26 13:04:11 +02:00
regularmute 0d536f9a05 create component for delete confirmation window 2024-03-26 13:00:32 +02:00
RegularmuteandGitHub bf4a51ee89 Merge pull request #217 from Ohtuilmo/feature/209-bar_group_name 
group assignment indicator and tests for it
 2024-03-22 21:51:50 +02:00
regularmute 87593e23ff refactor TimeLogForm to not need states for error status of fields 
Also refactor an if-else clause to be more intuitive.
 2024-03-22 14:20:32 +02:00
regularmute 846d0273cc adjust language and referred elements in timelog tests to fit changes 
During the merge, some element names and test name phrasing changed,
so this commit will adjust some tests to fit the rest of the file.
 2024-03-19 16:03:45 +02:00
regularmute 58689efab4 remove deprecated test that reappeared when merging 2024-03-19 16:02:29 +02:00
regularmute 10f7ce9ef8 move sprint deletion to the end of timelog testing to fit merged edits 
As a result of the merge, tests from one branch fail because sprints
are deleted before running the tests. This is simply fixed by moving
the sprint deletion to the end of testing.
 2024-03-19 15:45:17 +02:00
regularmute 0799ed54f3 validate timelog-form's time and description fields 
Set states to keep track of whether or not the specific fields have
errors, and what error message they should display.

Add separate validation function that is checked upon submitting the
form.

Add appropriate properties for the time and description fields to
adjust their behavior avvording to possible errors.
 2024-03-19 15:29:05 +02:00
regularmute 5f86865cbf create initial tests for front-end timelogs form validation 2024-03-19 15:27:36 +02:00