Commit Graph

978 Commits

Author SHA1 Message Date
Joao Ramos
46b9fe50ef Added the missing radial progress 2024-01-15 19:32:11 +00:00
Tiago Ribeiro
1335c14acc Removed the ability for a Teacher to upload a file for the Group creation 2024-01-15 16:34:06 +00:00
Tiago Ribeiro
e47607597c Solved some bugs related to the payment page 2024-01-15 14:52:17 +00:00
Tiago Ribeiro
b7b2dca2dd Updated the user deletion to work in the backend 2024-01-15 11:02:40 +00:00
Tiago Ribeiro
a14c9f8b3c Updated the label of the cancel button on FillBlanks 2024-01-15 10:20:23 +00:00
Tiago Ribeiro
e59d36e892 Updated the UserCard to not show the Commission for corporate users 2024-01-15 10:11:18 +00:00
Tiago Ribeiro
f5bdedee2f Updated the message of the failed delete payment 2024-01-14 23:35:48 +00:00
Tiago Ribeiro
3f0821eb33 Added the corporate name to the user's top-right profile link 2024-01-14 23:31:50 +00:00
Tiago Ribeiro
31e09c94c7 Added an explanation for the Excel file format requested 2024-01-14 23:29:22 +00:00
Tiago Ribeiro
404e5a8a0c Added a * to required fields 2024-01-14 23:20:12 +00:00
Tiago Ribeiro
b7a3778f01 Solved another bug with the TrueFalse 2024-01-14 23:18:51 +00:00
Tiago Ribeiro
24ec336dca Updated the Record to start with the overall screen 2024-01-14 23:13:12 +00:00
Tiago Ribeiro
e324b37942 Prepared for partial exams 2024-01-14 22:36:39 +00:00
Tiago Ribeiro
066baa9492 Solved a bug with the WriteBlanks warning 2024-01-14 22:27:48 +00:00
Tiago Ribeiro
08aec9b54c Solved some bugs with reading the Excel file 2024-01-14 22:18:15 +00:00
Tiago Ribeiro
10a480aa81 Updated the Code generators select to depend on the type of user 2024-01-14 22:08:17 +00:00
Tiago Ribeiro
9baf3109c9 Merge branch 'develop' 2024-01-14 07:44:23 +00:00
João Ramos
360e6f8f60 Merged in bug-fixing-13-jan-24 (pull request #23)
Editing country manager is now only available for admins/dev
2024-01-14 00:10:25 +00:00
Tiago Ribeiro
eadddbf505 Merged develop into bug-fixing-13-jan-24 2024-01-14 00:09:32 +00:00
Joao Ramos
be03760cb9 Editing country amanger is now only available for admins/dev 2024-01-13 23:58:03 +00:00
Tiago Ribeiro
99758d860d BatchCodeGenerator.tsx edited online with Bitbucket 2024-01-13 18:54:21 +00:00
Tiago Ribeiro
8aca34e8b5 Merged in Tiago-Ribeiro/batchcodegeneratortsx-edited-online-with-1705170801981 (pull request #22)
BatchCodeGenerator.tsx edited online with Bitbucket
2024-01-13 18:34:01 +00:00
Tiago Ribeiro
aaaf7f646d BatchCodeGenerator.tsx edited online with Bitbucket 2024-01-13 18:33:26 +00:00
João Ramos
51dcb69b81 Merged in bug-fixing-12-jan-24 (pull request #21)
Bug fixing 12 jan 24

Approved-by: Tiago Ribeiro
2024-01-12 21:30:28 +00:00
Joao Ramos
580ddfd9e6 Fixed Pending payment page key 2024-01-12 21:27:46 +00:00
Joao Ramos
9e6dc4b4c2 Reviewed all IconCard for non-matching icons 2024-01-12 20:00:31 +00:00
Joao Ramos
72b9e1f11d Added payment done and pending visible to Admin and Developers without filters 2024-01-12 19:55:46 +00:00
Tiago Ribeiro
ad1dbaef27 Formatted the code to accept .xlsx 2024-01-12 13:49:27 +00:00
Tiago Ribeiro
6cdee9b268 Merge branch 'develop' into feature/62/upload-users-with-excel 2024-01-12 13:42:25 +00:00
João Ramos
7f4d82072f Merged in feature-payment-done-pending (pull request #20)
Added payment done and pending

Approved-by: Tiago Ribeiro
2024-01-12 10:15:12 +00:00
João Ramos
e365640620 Merged in bug-fixing-11-jan-24 (pull request #19)
Bug fixing 11 jan 24

Approved-by: Tiago Ribeiro
2024-01-12 07:55:42 +00:00
Joao Ramos
27a4014f63 Added payment done and pending 2024-01-12 01:38:34 +00:00
Joao Ramos
cb91acdded Removed some horizontal margins on PDFs 2024-01-12 00:32:02 +00:00
Joao Ramos
7714854338 Changed all corporate icons 2024-01-12 00:25:14 +00:00
Joao Ramos
5379cdb0d2 Blocked corporate user edit for corporate 2024-01-12 00:23:18 +00:00
Joao Ramos
39ea11bc9b Fixed naming of the table 2024-01-12 00:20:03 +00:00
Joao Ramos
bb1a2e477a Revert "Removed references to Referred corporated"
This reverts commit 21b612eaa4.
2024-01-12 00:19:35 +00:00
Tiago Ribeiro
34c1041182 Hard coded the CORS for the EnCoach website 2024-01-11 23:10:51 +00:00
Tiago Ribeiro
b2690f748b Merge branch 'develop' into feature/62/upload-users-with-excel 2024-01-11 21:55:57 +00:00
João Ramos
edbf405c30 Merged in bug-fixing-10-Jan-24 (pull request #17)
Exported Route for CORS usage

Approved-by: Tiago Ribeiro
2024-01-11 21:35:56 +00:00
Tiago Ribeiro
84c42ccf3e Adapted the BatchCodeGenerator to use an Excel file 2024-01-11 21:35:26 +00:00
Joao Ramos
5e283e358b Added CORS as .env var 2024-01-11 19:32:39 +00:00
Tiago Ribeiro
c9ed3b5a72 Merge branch 'develop' into feature/62/upload-users-with-excel 2024-01-11 14:39:40 +00:00
Tiago Ribeiro
3dfd65e161 Merged develop into bug-fixing-10-Jan-24 2024-01-11 14:31:56 +00:00
João Ramos
040102c835 Merged in feature-export-csv-roles (pull request #18)
Feature export csv roles

Approved-by: Tiago Ribeiro
2024-01-11 14:22:42 +00:00
Joao Ramos
c781c10fe9 Prevented an error that should only happen if the user had the type changed directly on the DB for testing purposes 2024-01-11 14:18:57 +00:00
Joao Ramos
a91539ec61 Download CSV is now also allowed for Agent and Corporates 2024-01-11 14:18:04 +00:00
Tiago Ribeiro
f79857fabe Started trying out reading Excel files 2024-01-11 13:55:37 +00:00
João Ramos
14d8c1e294 Merged in feature-report-export (pull request #16)
Feature report export

Approved-by: Tiago Ribeiro
2024-01-11 12:50:35 +00:00
Tiago Ribeiro
fd1af3efee Updated a bit of the conditions to show the Demographic input 2024-01-11 11:10:08 +00:00