Commit Graph

378 Commits

Author SHA1 Message Date
Carlos Mesquita
ef32226c6c Previous commit solved completion but messed up question modal, patched that and added the condition to show the submission modal when all questions are awnswered 2024-08-27 22:10:31 +01:00
Carlos Mesquita
c99dbab4b6 Merge remote-tracking branch 'origin/develop' into feature/training-content 2024-08-27 17:10:57 +01:00
Carlos Mesquita
845bccbe2a ENCOA-107, ENCOA-115 Fixed completion percentage, brought back the line numbers, 'Level Exam' was replaced by 'Placement Test', Next/Back instructions with quotes, 'Submit' on last level question 2024-08-27 17:08:33 +01:00
Tiago Ribeiro
7fb0ed884c Merge branch 'develop' of bitbucket.org:ecropdev/ielts-ui into develop 2024-08-27 11:04:22 +01:00
Tiago Ribeiro
eb38464aca ENCOA-112: Improve Answer Display 2024-08-27 11:02:39 +01:00
Carlos Mesquita
c464375414 Merge remote-tracking branch 'origin/develop' into feature/training-content 2024-08-27 09:44:22 +01:00
Carlos Mesquita
cc5be99b0f Bug fix on fillblanks calculateScore 2024-08-27 09:40:20 +01:00
Carlos Mesquita
72b498eb85 Fixed a bug in fill blanks where the input would be reset by the re-rendering of lines 2024-08-27 09:20:00 +01:00
Tiago Ribeiro
0aba6355ed ENCOA-90: Updated the instances of Level test to use the Grading System 2024-08-27 00:18:01 +01:00
Carlos Mesquita
22928ce283 ENCOA-94: Fixes the bug, refactored useStats to be useFilterRecordsByUser in order to not duplicate code and also refactored records.tsx and training.tsx to use a component which abstracts the user Selection for both stats and training. 2024-08-26 18:26:29 +01:00
carlos.mesquita
4a1a52bd61 Merged in feature/level-file-upload (pull request #78)
Shuffles fixed

Approved-by: Tiago Ribeiro
2024-08-25 17:36:17 +00:00
Joao Ramos
8d37e60f5d Merge branch 'develop' into features-21-08-24 2024-08-24 18:56:05 +01:00
Tiago Ribeiro
032d20b4b2 ENCOA-96: License Distribuition system from Master Corporate to Corporate 2024-08-24 01:02:34 +01:00
Carlos Mesquita
2146ef1a92 Found the bug 2024-08-24 00:54:55 +01:00
Carlos Mesquita
f0f38b335f Part and MC question grid jump to, has a bug on next going to refactor the whole thing 2024-08-23 21:17:32 +01:00
Joao Ramos
4379716e9b ENCOA-86: Stats page now filters assignments PDF download based on released 2024-08-22 23:16:16 +01:00
Carlos Mesquita
6dbc2f5ed2 Merge branch 'develop' of https://bitbucket.org/ecropdev/ielts-ui into feature/level-file-upload 2024-08-22 22:05:53 +01:00
Carlos Mesquita
1315e0b280 Shuffles fixed 2024-08-22 22:02:37 +01:00
Tiago Ribeiro
192324b891 ENCOA-99: Added a Student ID field to Students 2024-08-22 16:27:03 +01:00
Tiago Ribeiro
cfcff3cf3b ENCOA-93 2024-08-22 15:56:52 +01:00
Tiago Ribeiro
202632ff58 ENCOA-89, ENCOA-91, ENCOA-92, ENCOA-95
All changes related to permissions towards types of users
2024-08-22 12:27:15 +01:00
Carlos Mesquita
30da295c60 Merge branch 'develop' of https://bitbucket.org/ecropdev/ielts-ui into feature/level-file-upload 2024-08-20 19:37:06 +01:00
Carlos Mesquita
a82a399d52 Merge branch 'feature/level-file-upload' of https://bitbucket.org/ecropdev/ielts-ui into feature/level-file-upload 2024-08-20 18:53:25 +01:00
Carlos Mesquita
505df31d6b Part intro's, modals between parts and some fixes 2024-08-20 18:52:38 +01:00
Tiago Ribeiro
97b533bd3a Took care of some warnings 2024-08-20 10:07:18 +01:00
Tiago Ribeiro
75a45108a2 Upgraded @types/react and @types/react-dom 2024-08-20 09:52:22 +01:00
Tiago Ribeiro
688505b4eb Updated the permissions access 2024-08-20 00:01:59 +01:00
carlos.mesquita
d93d36c392 Merged develop into feature/level-file-upload 2024-08-19 22:47:48 +00:00
Carlos Mesquita
abddead402 Fixed question numbers for fillBlanks exercises, reverted multipleChoice underline prompt, added part label to module title, and changed some styles 2024-08-19 23:43:08 +01:00
Tiago Ribeiro
346b131388 Improved the sorting and filtering for the Student Performance page 2024-08-19 19:46:43 +01:00
Carlos Mesquita
5789688eab Previously commented a required line 2024-08-19 17:24:10 +01:00
Carlos Mesquita
37e356572b Merge branch 'develop' of https://bitbucket.org/ecropdev/ielts-ui into feature/level-file-upload 2024-08-19 16:53:39 +01:00
Carlos Mesquita
8669ef462d Commented all related to shuffle 2024-08-19 16:42:14 +01:00
Tiago Ribeiro
df1c0bad4d Created a student performance page 2024-08-19 16:41:35 +01:00
Carlos Mesquita
bcb1a0f914 If someone else wants to join in on the fun be my guest 2024-08-19 01:24:55 +01:00
Carlos Mesquita
edc9d4de2a Fill Blanks changes 2024-08-18 08:07:16 +01:00
Tiago Ribeiro
229275aaee Created a groups page for students and teachers 2024-08-17 20:18:28 +01:00
Tiago Ribeiro
f0ff6ac691 ENCOA-87: Allow MasterCorporate & Corporate to change the type of students and teachers 2024-08-17 19:15:20 +01:00
Joao Ramos
cb75ba6056 Updated permissions to have a key to group them 2024-08-14 18:44:35 +01:00
Tiago Ribeiro
58300e32ff Solved an issue where, for developers, because of the amount of permissions, the cookie was too big, so I separated the permissions logic into a hook 2024-08-12 19:35:11 +01:00
Carlos Mesquita
21e58e3b9c Tooltips for assessment criteria on Writing and Speaking 2024-08-07 13:04:42 +01:00
Carlos Mesquita
7fd56357e0 UI changes to Solutions (Writing, Speaking and Interactive Speaking) as requested 2024-08-06 17:02:17 +01:00
Carlos Mesquita
a4a40b9145 Bug fixes to training, added a spinner to record while it loads, made changes to speaking as requested 2024-08-05 21:44:14 +01:00
Carlos Mesquita
309dfba583 Fixed the training content view 2024-08-05 10:41:11 +01:00
Carlos Mesquita
96baa2a6e0 Dropdown on training view 2024-08-03 11:10:01 +01:00
Carlos Mesquita
12bb124d91 Merge branch 'develop' of https://bitbucket.org/ecropdev/ielts-ui into feature/training-content 2024-08-02 15:01:05 +01:00
Carlos Mesquita
a71e6632d6 Hooked training content to backend, did refactors to training components and record.tsx 2024-08-01 20:40:31 +01:00
Carlos Mesquita
a534126c61 training.tsx still a bit messy, all that is left is to retrieve data from firestore /training and /walkthrough and render it 2024-07-31 20:44:46 +01:00
Tiago Ribeiro
9b37b60be0 Improved the table 2024-07-30 23:22:30 +01:00
Tiago Ribeiro
4347d0cabb Merge branch 'develop' into feature/update-permission-ui 2024-07-30 23:20:16 +01:00