Commit Graph

Select branches

Hide Pull Requests

ENCOA-131_MasterStatistical

ENCOA-314

ENCOA-316-ENCOA-317

ENCOA-38/add-validity-date-for-discounts

ENCOA-83_MasterStatistical

addedAccess-bugfixes

approval-workflows

bug-fixing-16-jan-24

bugfix/mongo-migration-bugs

develop

faeture/payment-history

feature-generate_questions_page

feature-paypal-simple

feature/99/send-email-on-assignment-creation

feature/ENCOA-42/update-payment-system-paymob

feature/ExamGenRework

feature/corporate-model-implementation

feature/diagnostic-exam

feature/exam-session-persistence

feature/level-file-upload

feature/level-test

feature/payment-record-changes

feature/speaking-gender-selector

feature/training-content

feature/update-permission-ui

fixStudentPerformanceFreeze

improvement-37/writing-evaluation-perfect-answer

main

migration-mongodb

release/async-be

settings-import-users

task/design/dashboard-redesign

vocabulary-grammar

workflow-permissions

Mono Color

• 02564c8426 Had the type hardcoded Carlos Mesquita 2024-09-08 22:47:43 +01:00
• eab6ab03b7 Not shown when not completed Tiago Ribeiro 2024-09-08 22:46:09 +01:00
• 6f534662e1 Shuffles bugfix Carlos Mesquita 2024-09-08 22:45:24 +01:00
• fbc7abdabb Solved a bug Tiago Ribeiro 2024-09-08 22:35:14 +01:00
• 392eac2ef9 Merge branch 'main' into develop Tiago Ribeiro 2024-09-08 19:57:57 +01:00
• b7349b5df8 Tried to solve some more issues with counts Tiago Ribeiro 2024-09-08 19:56:44 +01:00
• 298901a642 Updated the UserList to show the corporates Tiago Ribeiro 2024-09-08 19:50:59 +01:00
• 88eafafe12 Stopped sessions from being cached Tiago Ribeiro 2024-09-08 19:36:04 +01:00
• 31a01a3157 Allow admins create other admins Tiago Ribeiro 2024-09-08 19:27:12 +01:00
• a5b3a7e94d Solved a problem with the _id Tiago Ribeiro 2024-09-08 19:25:14 +01:00
• 49e8237e99 A bit of error handling I guess Tiago Ribeiro 2024-09-08 18:54:44 +01:00
• d5769c2cb9 Updated more of the page Tiago Ribeiro 2024-09-08 18:39:52 +01:00
• e49a325074 Had a small error on the groups Tiago Ribeiro 2024-09-08 18:00:47 +01:00
• e6528392a2 Changed the totals of the admin pretty much Tiago Ribeiro 2024-09-08 16:06:54 +01:00
• a073ca1cce Temporarily disabled Play Again button Joao Ramos 2024-09-08 13:56:08 +01:00
• 620e4dd787 Solved some problems, bypassed some stuff Tiago Ribeiro 2024-09-08 11:35:09 +01:00
• 7e30ca5750 Merged in bug-fixing-8-sep-24_2 (pull request #100) João Ramos 2024-09-08 09:22:05 +00:00
• e3847baadb Merged in bug-fixing-8-sep-24 (pull request #99) João Ramos 2024-09-08 09:21:53 +00:00
• 2e065eddcb Added an workaround for the broken email system Joao Ramos 2024-09-08 10:19:49 +01:00
• 4e91b2f1fb ENCOA-202: Fixed issue updating user Joao Ramos 2024-09-08 10:08:24 +01:00
• 4282c1d021 useUsers refactor feature/level-file-upload Carlos Mesquita 2024-09-08 09:37:19 +01:00
• 5b8631ab6a Readded master statistical to corporate Joao Ramos 2024-09-08 01:30:12 +01:00
• f9f29eabb3 Fixed an issue after merging Joao Ramos 2024-09-08 01:23:56 +01:00
• 898edb152f Moved the Dockerfile env Tiago Ribeiro 2024-09-07 23:59:58 +01:00
• bf0d696b2f Some hard coding at least for now Tiago Ribeiro 2024-09-07 23:51:04 +01:00
• d91b1c14e7 Removed an error Tiago Ribeiro 2024-09-07 23:41:01 +01:00
• cdd42b2f07 Merge branch 'main' into migration-mongodb migration-mongodb Tiago Ribeiro 2024-09-07 23:09:37 +01:00
• 34bc9df9ea Merged in ENCOA-200_StatisticalCorporate (pull request #97) João Ramos 2024-09-07 21:57:22 +00:00
• 15cc7c8cc9 Improved a bit of the pagination Tiago Ribeiro 2024-09-07 22:48:52 +01:00
• b4ab620c78 lint warnings Carlos Mesquita 2024-09-07 22:42:22 +01:00
• 6e4ef249b8 Finished refactoring Carlos Mesquita 2024-09-07 22:39:14 +01:00
• c2b4bb29d6 Refactored /api/users Carlos Mesquita 2024-09-07 21:50:29 +01:00
• cab469007b Refactored /api/tickets /api/training Carlos Mesquita 2024-09-07 21:25:51 +01:00
• d6782bd86e Refactored /api/paypal, /api/permissions, /api/reset /api/sessions, /api/stats Carlos Mesquita 2024-09-07 20:43:55 +01:00
• 6251f8f4db Continued migrating more and more files Tiago Ribeiro 2024-09-07 18:29:20 +01:00
• fb9d11f38d ENCOA-200: Added Master Statistical to Corporate Joao Ramos 2024-09-07 18:19:25 +01:00
• bb8dca69cf Merge conflict Carlos Mesquita 2024-09-07 18:09:14 +01:00
• 53b31b306d /api/packages refactored, forgot to commit some changes Carlos Mesquita 2024-09-07 18:08:03 +01:00
• d173cdb02a Updated the Grading System Tiago Ribeiro 2024-09-07 18:00:05 +01:00
• 07f0ea25bb Merge branch 'migration-mongodb' of bitbucket.org:ecropdev/ielts-ui into migration-mongodb Tiago Ribeiro 2024-09-07 17:55:33 +01:00
• e7ee55d608 Merge branch 'migration-mongodb' of https://bitbucket.org/ecropdev/ielts-ui into migration-mongodb Carlos Mesquita 2024-09-07 17:54:19 +01:00
• 7fa4edf37d /api/groups and /api/invites refactored, fixed some inserts/updates in which I didn't include the id Carlos Mesquita 2024-09-07 17:54:10 +01:00
• 49022394b0 Did the same treatment to Corporate and Teacher dashboards Tiago Ribeiro 2024-09-07 17:53:16 +01:00
• 3be0d158e3 Improved the performance of the MasterCorporate Tiago Ribeiro 2024-09-07 17:34:41 +01:00
• 56f374bbfe Updated the pagination on the useUsers and migrading the grading Tiago Ribeiro 2024-09-07 16:53:58 +01:00
• 417c9176fe /api/exam refactor Carlos Mesquita 2024-09-07 16:39:07 +01:00
• e3400e8564 /api/evaluate refactor Carlos Mesquita 2024-09-07 16:17:24 +01:00
• d680905a87 Merge branch 'migration-mongodb' of https://bitbucket.org/ecropdev/ielts-ui into migration-mongodb Carlos Mesquita 2024-09-07 16:03:32 +01:00
• c07e3f86fb Refactored discounts and replaced my previous commit id queries to use id not _id Carlos Mesquita 2024-09-07 16:03:26 +01:00
• 238a25aaeb Updated the make_user to use MongoDB Tiago Ribeiro 2024-09-07 16:01:03 +01:00
• 171231cd21 Refactored codes Carlos Mesquita 2024-09-07 15:41:09 +01:00
• 6ed342bb6f Merge branch 'migration-mongodb' of https://bitbucket.org/ecropdev/ielts-ui into migration-mongodb Carlos Mesquita 2024-09-07 15:15:17 +01:00
• 6f7ef1abef Refactored pages/api/assignments to mongodb Carlos Mesquita 2024-09-07 15:13:41 +01:00
• e33fa00fa3 Updated the groups and users Tiago Ribeiro 2024-09-07 15:13:13 +01:00
• c0b814081e Updated the register endpoint to use MongoDB Tiago Ribeiro 2024-09-07 13:58:52 +01:00
• e8b7c5ff80 Started migrating the DB to MongoDB Tiago Ribeiro 2024-09-07 13:37:08 +01:00
• 8c94bcac52 Corrected a problem with too many participants Tiago Ribeiro 2024-09-07 13:02:47 +01:00
• 8803a8c166 Merged in feature/training-content (pull request #95) carlos.mesquita 2024-09-07 11:42:06 +00:00
• 2f63fd196b Merged in ENCOA-183_MasterCorporateGrouping (pull request #96) João Ramos 2024-09-07 11:41:29 +00:00
• 42471170ce Improved grouping for master statistical Joao Ramos 2024-09-07 12:38:28 +01:00
• 2bf9afca9c Merge remote-tracking branch 'origin/develop' into feature/training-content Carlos Mesquita 2024-09-07 11:38:18 +01:00
• 9c41ddee60 Training update, most of the styles in the old tips were standardized, before all the styles were hardcoded into the tip, the new tips may still have some hardcoded styles but the vast majority only uses standard html or custom ones that are picked up in FormatTip to attribute styles Carlos Mesquita 2024-09-07 11:37:04 +01:00
• 9993c7a8a7 ENCOA-183: Initial test changes for corporates grouped by name Joao Ramos 2024-09-07 11:04:00 +01:00
• a22c9d102f Merged in ENCOA-131_MasterStatistical (pull request #94) João Ramos 2024-09-07 08:13:29 +00:00
• 2d0cb8eefb Added level part display on excel and a pseudo sorting ENCOA-131_MasterStatistical Joao Ramos 2024-09-07 00:14:56 +01:00
• 58448a391f Fixed infinite loop on the dashboards Joao Ramos 2024-09-06 23:48:18 +01:00
• f6550e6a36 Merge branch 'develop' of bitbucket.org:ecropdev/ielts-ui into develop Tiago Ribeiro 2024-09-06 17:07:45 +01:00
• cfe297cc38 Continued improving this Tiago Ribeiro 2024-09-06 17:06:49 +01:00
• 4530e4079f Did the same to all of the dashboards Tiago Ribeiro 2024-09-06 15:35:26 +01:00
• de35e1a8b7 Updated the MasterCorporate with the improved queries Tiago Ribeiro 2024-09-06 14:57:23 +01:00
• a6bf53e84c Disabled the review buttons Tiago Ribeiro 2024-09-06 14:45:44 +01:00
• d7ffdc3031 Merged in feature/level-file-upload (pull request #93) carlos.mesquita 2024-09-06 10:24:12 +00:00
• 98f2527fed Merged develop into feature/level-file-upload carlos.mesquita 2024-09-06 10:23:32 +00:00
• d8bf10eaea Small bug fix Carlos Mesquita 2024-09-06 11:21:35 +01:00
• f9216637df Extracted the function Tiago Ribeiro 2024-09-06 10:39:16 +01:00
• 08945bfbdd Forgot to add this one Tiago Ribeiro 2024-09-06 10:13:30 +01:00
• b92a4285c9 Removed the user itself Tiago Ribeiro 2024-09-06 10:12:19 +01:00
• 271ca7069e Updated it so it also appears to teachers Tiago Ribeiro 2024-09-06 10:10:50 +01:00
• 08ed8fcb32 Merged in feature/level-file-upload (pull request #92) carlos.mesquita 2024-09-06 08:53:29 +00:00
• 17f678a3ac Merged in ENCOA-131_MasterStatistical (pull request #91) João Ramos 2024-09-06 08:53:07 +00:00
• 6bd9816edd Merge remote-tracking branch 'origin/develop' into feature/level-file-upload Carlos Mesquita 2024-09-06 09:41:01 +01:00
• 77ac15c2bb ENCOA-182, ENCOA-185, ENCOA-177, ENCOA-168, ENCOA-186, ENCOA-176, ENCOA-189, ENCOA-167 Carlos Mesquita 2024-09-06 09:39:38 +01:00
• 55cc9765e2 Updated the backend so the users list only returns the correct ones Tiago Ribeiro 2024-09-06 09:33:30 +01:00
• e433a150a9 Added level export to excel Joao Ramos 2024-09-05 23:30:03 +01:00
• a61ad2cc7e Added an export feature for the master statisticl screen Joao Ramos 2024-09-05 22:42:46 +01:00
• 680f4cfa95 Made it so it will show always the corporate Tiago Ribeiro 2024-09-05 19:55:19 +01:00
• 311824e8b7 ENCOA-175: When a Corporate Create another Corporate, the created corporate should have access to the same students and teachers as the creator Tiago Ribeiro 2024-09-05 19:24:28 +01:00
• 2fb73cc3a3 ENCOA-166: Increased the probability of this being fixed even more Tiago Ribeiro 2024-09-05 18:54:36 +01:00
• 70de97766e Added search to table Joao Ramos 2024-09-05 18:25:39 +01:00
• c7ff11d0fc ENCOA-172: Updated it so if an assignment has already been started, they can't start it again Tiago Ribeiro 2024-09-05 17:33:15 +01:00
• e312af36bb Added the assignment to the Session Card Tiago Ribeiro 2024-09-05 17:25:22 +01:00
• ac980023b5 Negated a simple change Tiago Ribeiro 2024-09-05 16:59:39 +01:00
• 3b43803b7e ENCOA-180: Prevented users from checking their results if not released yet Tiago Ribeiro 2024-09-05 16:54:45 +01:00
• c8be2f1255 Prevented sessions from appearing when an assignment is done Tiago Ribeiro 2024-09-05 16:52:16 +01:00
• b6b5f3a9f1 Solved a problem related to not showing corporates if they are not in the correct group Tiago Ribeiro 2024-09-05 12:02:46 +01:00
• 6ce81b300a Removed a part of the make_user Tiago Ribeiro 2024-09-05 11:35:53 +01:00
• 3d3c4448ae Removed the group for when it's a corporate creating another corporate Tiago Ribeiro 2024-09-04 18:50:35 +01:00
• cb2c1641f5 Made the corporate name being the creator's one Tiago Ribeiro 2024-09-04 17:40:26 +01:00
• 7bcd0f863f ENCOA-133: Teachers within a Group should be able to view the Group assignments Tiago Ribeiro 2024-09-04 15:26:42 +01:00
• 2d95cbd3dc ENCOA-137: Top right side Next Button on the exams Tiago Ribeiro 2024-09-04 15:10:17 +01:00