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
1,906 Commits 1 Branch 5 Tags
a7c2ff46155a300cb84a2b50fbd82ba23c226b9b
Commit Graph
99 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
RegularmuteandGitHub 1258d50bdf Merge pull request #212 from Ohtuilmo/feature/test-time-logs-and-sprints 
Add tests for time logs and sprints, fix time logs current sprint logic
 2024-03-19 15:16:13 +02:00
RegularmuteandGitHub b2bd978e49 Merge pull request #210 from Ohtuilmo/fix/time_logs_validation 
Fix/time logs validation
 2024-03-19 11:39:40 +02:00
RegularmuteandGitHub 402ac1cfe9 fix typo in timeLogs.spec.js 2024-03-19 11:28:18 +02:00
regularmuteandmiahro ff1a069e7e create test file for time logs, test form is hidden with 0 sprints 2024-03-18 18:42:45 +02:00
RegularmuteandGitHub ae86020268 Merge pull request #187 from Ohtuilmo/test_bug/185-topicListPage 
debugging potentially flaky test
 2024-03-16 18:04:41 +02:00
RegularmuteandGitHub c224eea96b Merge pull request #1 from Ohtuilmo/redfox-workflow_rewrite 
Setup GitHub Actions
 2024-03-15 19:09:20 +02:00
RegularmuteandGitHub 765b3cf691 Merge pull request #114 from Ohtuilmo/fix/113-loginInterval-removal 
Fix App.js loginInterval
 2024-02-27 10:44:18 +02:00
RegularmuteandGitHub 269b1b0825 Merge pull request #112 from Ohtuilmo/fix/sequelize-logging 
Fix/sequelize logging
 2024-02-25 17:47:58 +02:00
RegularmuteandGitHub da944be1b7 Merge pull request #55 from Ohtuilmo/fix/local-docker-environment 
Fix OpenShift configuration
 2024-02-25 16:53:43 +02:00
RegularmuteandGitHub eb8888828f Merge pull request #35 from Ohtuilmo/patch/dev_installation_script 
Patch/dev installation script
 2024-01-23 13:55:37 +02:00
regularmute 202a4e9c8d Add instruction for submitting a Draft PR 2024-01-22 11:19:54 +02:00
regularmute 19b261105e Update devteam practices after 1st sprint planning 2024-01-22 11:17:26 +02:00
RegularmuteandGitHub 979568e8aa Merge pull request #29 from Ohtuilmo/delete_test 
Delete test commit text from README
 2024-01-19 11:38:08 +02:00
RegularmuteandGitHub 1f0fb8a892 Merge pull request #28 from Ohtuilmo/Move_documentation 
Move documentation folder to root
 2024-01-19 11:21:13 +02:00
regularmute 99e094eaaa docs(README): add links and update formatting 
Added links to developer workflow, conventional commits, old project's
repositories.
Updated work record's link to the version that enables inserting hours.
 2024-01-17 14:43:08 +02:00
regularmute 7943bc445f docs: create developer_workflow.md 2024-01-17 14:42:45 +02:00
regularmute e79edb8894 docs(team_practices): add work practices 
Atmosphere, task limit, attendance and version control.
 2024-01-17 14:41:27 +02:00
regularmute e0094a8968 docs(README): add mention of sprint planning 2024-01-17 13:45:52 +02:00
regularmute 479786ac15 docs(README): add links to original ohtuilmo-repositories 
These repositories run the front- and backend of the original software,
and will be moved into this repository, probably in separate
directories.
 2024-01-17 13:18:43 +02:00
regularmute cfe3f15e27 fix(README): broken link to slack channel 2024-01-17 12:52:27 +02:00
regularmute 5919648788 docs(team_practices): add section on commit mesages 2024-01-17 12:28:56 +02:00
regularmute 90b5f8688d docs(README): add link to product backlog 2024-01-17 12:28:36 +02:00
regularmute b679cc0f79 docs(README): add and edit links to documentation and Slack channel 
Links added:
- Work schedule
- Team practices
- Slack channel

Working hours link text changed to English.
 2024-01-17 11:11:09 +02:00
regularmute e067977a8e docs(work_schedule): fix minor grammar. 2024-01-17 10:54:05 +02:00
regularmute 0b819a620e docs(team_practices): Add practices and formatting 2024-01-17 10:53:33 +02:00
regularmute f0714c75ec docs: create team_practices.md 2024-01-17 10:43:44 +02:00
regularmute c5de51cc75 docs:create work_schedule.md 2024-01-17 10:37:58 +02:00