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

Electrika 2024 #103

Merged
merged 19 commits into from
Jan 19, 2024
Merged
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
adf59ac
Fixed registration issue in Electrika.
Vignaraj-pai Jan 17, 2024
187c459
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 17, 2024
7d08a16
Refactor register function in views.py
Vignaraj-pai Jan 17, 2024
dc5326d
Merge branch 'electrika_2024' of https://github.com/Vignaraj-pai/corp…
Vignaraj-pai Jan 17, 2024
b88cde1
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 17, 2024
3636dd2
Update base.html and navbar_dropdown.html templates
Vignaraj-pai Jan 17, 2024
6b1600a
Redirect to registration page if user does not exist in ElectrikaUser…
Vignaraj-pai Jan 17, 2024
a6d3eb5
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 17, 2024
4665302
Merge branch 'IEEE-NITK:main' into electrika_2024
Vignaraj-pai Jan 17, 2024
c34e24c
Update team creation and acceptance logic
Vignaraj-pai Jan 17, 2024
55ca05b
Merge branch 'electrika_2024' of https://github.com/Vignaraj-pai/corp…
Vignaraj-pai Jan 17, 2024
e78d3a6
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 17, 2024
ac6e9cf
Fix team creation logic and update FAQ section
Vignaraj-pai Jan 18, 2024
90e2875
Merge branch 'electrika_2024' of https://github.com/Vignaraj-pai/corp…
Vignaraj-pai Jan 18, 2024
9ebbe43
Merge branch 'IEEE-NITK:main' into electrika_2024
Vignaraj-pai Jan 18, 2024
b3840b9
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 18, 2024
778879b
Add phone number and team-up option to user table
Vignaraj-pai Jan 19, 2024
6d5c767
Merge branch 'electrika_2024' of https://github.com/Vignaraj-pai/corp…
Vignaraj-pai Jan 19, 2024
37ee2e5
Merge branch 'IEEE-NITK:main' into electrika_2024
Vignaraj-pai Jan 19, 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
4 changes: 4 additions & 0 deletions corpus/templates/electrika/admin/users.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,13 @@ <h3>Stats</h3>
<th>S.No.</th>
<th>Name</th>
<th>Email</th>
<th>Phone Number</th>
<th>From NITK?</th>
<th>College Name</th>
<th>IEEE Member?</th>
<th>IEEE Membership Number</th>
<th>In a Team?</th>
<th>Opted for getting teamed up?</th>
</tr>
</thead>
<tbody>
Expand All @@ -44,11 +46,13 @@ <h3>Stats</h3>
<td>{{ forloop.counter }}</td>
<td>{{ user.user }}</td>
<td>{{ user.user.email }}</td>
<td>{{ user.user.phone_no }}</td>
<td>{{ user.from_nitk|yesno:"Yes,No" }}</td>
<td>{{ user.college_name }}</td>
<td>{{ user.ieee_member|yesno:"Yes,No" }}</td>
<td>{{ user.ieee_membership_no }}</td>
<td>{{ user.team|yesno:"Yes,No" }}</td>
<td>{{ user.to_be_teamed_up|yesno:"Yes,No" }}</td>
</tr>
{% endfor %}
</tbody>
Expand Down