Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added Event Attendance Feature in Admin and User Portal #2388

Merged
Merged
Show file tree
Hide file tree
Changes from 56 commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
846c89a
major changes event attendence stastics
duplixx Jul 30, 2024
9e29cf3
add bar chart adn recurring event count
duplixx Aug 4, 2024
65b1640
major chart and ui fixes
duplixx Aug 9, 2024
7f32fd2
modal sizing and filtering
duplixx Aug 10, 2024
58f7a99
“event”
duplixx Aug 14, 2024
e2f6a5a
Merge pull request #35 from kajalchoudhary1003/Gsoc'24-duplixx-Event-…
duplixx Aug 14, 2024
0461ee2
charts and recurring bugs
duplixx Aug 27, 2024
b33fda6
member details ui revamped
duplixx Sep 29, 2024
5738fd6
tested member details functionalities
duplixx Oct 5, 2024
3263112
added eventsattended in user portal
duplixx Oct 11, 2024
108cb91
added test files
duplixx Oct 18, 2024
37ceafc
added tests for eventstatics,eventdashboard and related components
duplixx Oct 27, 2024
7d7083a
added tests for Attendance and Statistics
duplixx Oct 30, 2024
497aa21
Merge branch 'develop' into Gsoc'24-duplixx-Event-Attendance
duplixx Oct 30, 2024
df23de8
suggestion added in files
duplixx Oct 31, 2024
eef8264
Update src/components/EventRegistrantsModal/EventRegistrantsModal.tsx
duplixx Oct 31, 2024
90c8cf8
error handling and short lines of code
duplixx Oct 31, 2024
4d9edec
Merge branch 'develop' into Gsoc'24-duplixx-Event-Attendance
duplixx Oct 31, 2024
9de7a1f
changes added
duplixx Oct 31, 2024
338aa60
Merge branch 'Gsoc'24-duplixx-Event-Attendance' of https://github.com…
duplixx Oct 31, 2024
14fe149
added null checks
duplixx Oct 31, 2024
66de4cb
refactored code
duplixx Nov 1, 2024
bfcf39b
refactoring
duplixx Nov 1, 2024
63faea3
improved refactoring statistics
duplixx Nov 1, 2024
99fdd0d
minor
duplixx Nov 1, 2024
62c574c
some iterations
duplixx Nov 1, 2024
d9ee88d
package changes
duplixx Nov 1, 2024
f3a4559
Merge branch 'develop' into Gsoc'24-duplixx-Event-Attendance
duplixx Nov 1, 2024
80b0e79
minor changes
duplixx Nov 2, 2024
84ee971
minor
duplixx Nov 2, 2024
05e8ba5
added translations and refactoring
duplixx Nov 2, 2024
31a5b2b
added translations and refactoring.
duplixx Nov 2, 2024
2e4ebab
Merge branch 'develop' into Gsoc'24-duplixx-Event-Attendance
duplixx Nov 2, 2024
837f42a
Added tsdoc comments
duplixx Nov 2, 2024
16d14d2
Added more docs
duplixx Nov 2, 2024
afcdf92
Added missed translations
duplixx Nov 2, 2024
ed410c7
..
duplixx Nov 2, 2024
11e2ad1
Revert ".."
duplixx Nov 2, 2024
85b91c7
..
duplixx Nov 2, 2024
e75d904
minor files
duplixx Nov 2, 2024
bef72c5
minor
duplixx Nov 2, 2024
2581c1f
Merge branch 'develop' into Gsoc'24-duplixx-Event-Attendance
duplixx Nov 3, 2024
2418ea4
added testing and schema
duplixx Nov 3, 2024
dae3ecf
minor
duplixx Nov 3, 2024
9851494
Merge branch 'develop' into Gsoc'24-duplixx-Event-Attendance
duplixx Nov 5, 2024
82e9baa
Added changes
duplixx Nov 7, 2024
bf29bb9
type fixes
duplixx Nov 7, 2024
93fdbfb
Merge branch 'develop' into Gsoc'24-duplixx-Event-Attendance
duplixx Nov 9, 2024
f36d7fc
added test for eventstats and eventattendance
duplixx Nov 9, 2024
a8d52db
minor formatting
duplixx Nov 9, 2024
f759f3b
add test cases
duplixx Nov 9, 2024
85c2008
Merge branch 'develop' into Gsoc'24-duplixx-Event-Attendance
duplixx Nov 10, 2024
f83f61e
added registrants test cases
duplixx Nov 10, 2024
48f7799
added orgs testcases
duplixx Nov 10, 2024
1e96c52
fixed orgdash change
duplixx Nov 10, 2024
53f9b54
increased code coverage
duplixx Nov 10, 2024
3685762
increased dateformatter files coverage
duplixx Nov 10, 2024
81c9412
minor change
duplixx Nov 10, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added dump.rdb
Binary file not shown.
5 changes: 4 additions & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@ export default {
],
testEnvironment: 'jsdom',
transform: {
'^.+\\.(js|jsx|ts|tsx)$': ['babel-jest', { configFile: "./config/babel.config.cjs" }], // Use babel-jest for JavaScript and TypeScript files
'^.+\\.(js|jsx|ts|tsx)$': [
'babel-jest',
{ configFile: './config/babel.config.cjs' },
], // Use babel-jest for JavaScript and TypeScript files
'^.+\\.(css|scss|sass|less)$': 'jest-preview/transforms/css', // CSS transformations
'^(?!.*\\.(js|jsx|ts|tsx|css|json)$)': 'jest-preview/transforms/file', // File transformations
},
Expand Down
83 changes: 62 additions & 21 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
"@mui/x-charts": "^7.22.1",
"@mui/x-data-grid": "^7.22.1",
"@mui/x-date-pickers": "^7.22.1",
"@pdfme/schemas": "^5.1.6",
"chart.js": "^4.4.6",
"@pdfme/generator": "^5.0.0",
"@reduxjs/toolkit": "^2.3.0",
"@vitejs/plugin-react": "^4.3.2",
Expand All @@ -40,9 +42,11 @@
"js-cookie": "^3.0.1",
"markdown-toc": "^1.2.0",
"prettier": "^3.3.3",
"prop-types": "^15.8.1",
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Consider using TypeScript instead of PropTypes.

While adding prop-types is valid, the project already uses TypeScript. Consider using TypeScript interfaces/types instead of runtime prop-types for better type safety and development experience.

"react": "^18.3.1",
"react-beautiful-dnd": "^13.1.1",
"react-bootstrap": "^2.10.5",
"react-chartjs-2": "^5.2.0",
"react-datepicker": "^7.5.0",
"react-dom": "^18.3.1",
"react-google-recaptcha": "^3.1.0",
Expand Down Expand Up @@ -117,6 +121,7 @@
"@types/node-fetch": "^2.6.10",
"@types/react": "^18.3.3",
"@types/react-beautiful-dnd": "^13.1.8",
"@types/react-chartjs-2": "^2.5.7",
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Update @types/react-chartjs-2 to match react-chartjs-2 version.

The @types/react-chartjs-2 version (2.5.7) seems outdated compared to the main package version (5.2.0). This might cause type mismatches.

Consider updating to the latest compatible type definitions:

-    "@types/react-chartjs-2": "^2.5.7",
+    "@types/react-chartjs-2": "^5.2.0",
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
"@types/react-chartjs-2": "^2.5.7",
"@types/react-chartjs-2": "^5.2.0",

"@types/react-bootstrap": "^0.32.37",
"@types/react-datepicker": "^7.0.0",
"@types/react-dom": "^18.3.0",
Expand Down
10 changes: 10 additions & 0 deletions public/images/svg/arrow-left.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions public/images/svg/arrow-right.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions public/images/svg/attendees.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions public/images/svg/feedback.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading