Merge with develop

2024-11-06 10:59:26 +00:00
parent b50913eda8 f686985c6e
commit b5ac908d09
135 changed files with 9517 additions and 3617 deletions
--- a/src/pages/(admin)/BatchCreateUser/UserTable.tsx
+++ b/src/pages/(admin)/BatchCreateUser/UserTable.tsx
@@ -40,13 +40,9 @@ const columns = [
    cell: info => info.getValue(),
    header: () => 'Phone Number',
  }),
-  columnHelper.accessor('corporate', {
-    cell: info => info.getValue(),
-    header: () => 'Corporate (e-mail)',
-  }),
  columnHelper.accessor('groupName', {
    cell: info => info.getValue(),
-    header: () => 'Group Name',
+    header: () => 'Classroom Name',
  }),
  columnHelper.accessor('demographicInformation.country', {
    cell: info => info.getValue(),