Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
5c61a54
GAD-5: Fix responsiveness (#1125)
Lawful2002 Feb 23, 2023
9a4fc4d
Merge branch 'main' into gad-5
akshatnema Mar 15, 2023
b295d7f
Merge branch 'main' into gad-5
akshatnema Mar 15, 2023
72e34e7
Merge branch 'main' into gad-5
akshatnema Mar 18, 2023
721ee82
Merge branch 'main' into gad-5
akshatnema Mar 19, 2023
91ef4e9
Merge branch 'main' into gad-5
akshatnema Mar 23, 2023
da49572
Merge branch 'main' into gad-5
akshatnema Mar 26, 2023
c29fdb7
feat: new use case implementation and fixes in existing APIs
MaheshPulivarthi18 Feb 16, 2024
0b94f63
refactored: new club registration form only availablt to designated p…
shokushwaha Feb 16, 2024
a4479fa
removed conflicts from approve request from dean
RishabhSharma96 Feb 16, 2024
cfb40a7
refactored: minor changes
Anurag607 Feb 16, 2024
6361945
removed conflicts from approve request from dean (#4)
RishabhSharma96 Feb 17, 2024
d292bbf
Merge branch 'Anurag607:main' into main
RishabhSharma96 Feb 17, 2024
f76c737
change co and coco api working
RishabhSharma96 Feb 17, 2024
aa1f77e
Merge branch 'main' of https://github.com/RishabhSharma96/Fusion
RishabhSharma96 Feb 17, 2024
3168445
Error fix:Change co and coco api now working (#5)
RishabhSharma96 Feb 17, 2024
910f1f2
Merge branch 'Anurag607:main' into main
RishabhSharma96 Feb 17, 2024
bb97dd3
Update serializers.py
ast008 Feb 17, 2024
26ed656
Update views.py
ast008 Feb 17, 2024
a2576df
Update urls.py
ast008 Feb 17, 2024
d3e91dd
New feature: new club approval form fixed (#6)
MaheshPulivarthi18 Feb 18, 2024
d77d812
fixed: removed conflicts (#7)
MaheshPulivarthi18 Feb 18, 2024
f1738ab
Merge branch 'Anurag607:main' into main
RishabhSharma96 Feb 18, 2024
2e3e423
date foreign key issue resolved
RishabhSharma96 Feb 18, 2024
3dc2451
Merge pull request #8 from RishabhSharma96/main
RishabhSharma96 Feb 18, 2024
23982f8
Merge branch 'Anurag607:main' into main
hardiksharma11 Feb 18, 2024
902f607
Merge pull request #9 from ast008/main
shokushwaha Feb 18, 2024
110e2e8
fixed: new club joinee request approval and rejection
shokushwaha Feb 18, 2024
6026782
Merge pull request #10 from shokushwaha/main
shokushwaha Feb 18, 2024
d019145
fix: multiple votes issue resolved
rohitsinghh01 Feb 18, 2024
31aa2e9
Merge pull request #11 from rohitsinghh01/main
RishabhSharma96 Feb 18, 2024
d0df8f6
corrected: club budget sent to dean
shokushwaha Feb 18, 2024
4340c77
corrected: club budget sent to dean
shokushwaha Feb 18, 2024
96ccd17
Delete requirements1.txt
shokushwaha Feb 18, 2024
b2804fb
fix: packages file edited
rohitsinghh01 Feb 18, 2024
8f009bc
Merge pull request #13 from shokushwaha/main
shokushwaha Feb 18, 2024
5c236ff
Merge pull request #12 from rohitsinghh01/main
shokushwaha Feb 18, 2024
ae3a3b7
view club budget added
shokushwaha Feb 20, 2024
e6403cc
Merge pull request #14 from shokushwaha/main
shokushwaha Feb 20, 2024
8dab59d
updated migrations error
RishabhSharma96 Feb 20, 2024
af1fd3a
Merge pull request #15 from RishabhSharma96/main
RishabhSharma96 Feb 20, 2024
0c34cff
segregated use cases based on actors
RohanParmar2002 Feb 20, 2024
2064e3a
Merge pull request #17 from RohanParmar2002/main
RishabhSharma96 Feb 20, 2024
22e2fef
fixed gymkhana sidebar buttons according to roles
RishabhSharma96 Feb 20, 2024
1897411
Merge pull request #18 from RishabhSharma96/main
RishabhSharma96 Feb 20, 2024
af5c4a2
fixed: type in designations
shokushwaha Feb 20, 2024
ddea219
Merge pull request #19 from shokushwaha/main
shokushwaha Feb 20, 2024
47af12c
GAD -5 Dashboard Changes (#1325)
BlackHAWK2001 Mar 11, 2024
ed642ee
dashboard and usercard updated (#1329)
Arpittak Mar 12, 2024
a165374
fic navigation added
shokushwaha Mar 16, 2024
71ccd36
Merge branch 'main' of https://github.com/shokushwaha/Fusion
shokushwaha Mar 16, 2024
a3ceaa3
Merge pull request #20 from shokushwaha/main
shokushwaha Mar 16, 2024
0efdbff
removed migrations
shokushwaha Mar 16, 2024
64a53f6
Merge branch 'Anurag607:main' into main
shokushwaha Mar 16, 2024
d47e105
Merge pull request #21 from shokushwaha/main
shokushwaha Mar 16, 2024
d9bc51d
local migrations removed
shokushwaha Mar 17, 2024
586003b
Merge branch 'main' of https://github.com/shokushwaha/Fusion
shokushwaha Mar 17, 2024
97426f1
Merge pull request #22 from shokushwaha/main
shokushwaha Mar 17, 2024
d40e94d
Fixing ui bugs (#1335)
SukulSarve Mar 17, 2024
a7eaf45
all migration files removed
shokushwaha Mar 18, 2024
9be658c
Merge pull request #23 from shokushwaha/main
shokushwaha Mar 18, 2024
4afec24
chore: merged with main
Anurag607 Mar 19, 2024
1fd0462
chore: merged with main
Anurag607 Mar 19, 2024
113e790
Merge branch 'gad-5' of https://github.com/FusionIIIT/Fusion into sa-3
Anurag607 Mar 19, 2024
58494be
chore: added migrations to gitignore
Anurag607 Mar 19, 2024
206d27b
Sa 3 (#24)
MaheshPulivarthi18 Apr 10, 2024
b0ddf24
chore: removed migrations from .gitignore
Anurag607 Apr 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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,4 @@ node_modules/

FusionIIIT/static/
package-lock.json
# **/**/migrations/*
5 changes: 5 additions & 0 deletions FusionIIIT/Fusion/context_processors.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
def global_vars(request):
return {
'global_var': request.session.get('currentDesignationSelected', 'default_value'),
'global_var2': request.session.get('allDesignations', 'default_value2'),
}
48 changes: 48 additions & 0 deletions FusionIIIT/Fusion/middleware/custom_middleware.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
# custom_middleware.py
from django.contrib.auth.signals import user_logged_in
from django.dispatch import receiver
from applications.globals.models import (ExtraInfo, Feedback, HoldsDesignation,
Issue, IssueImage, DepartmentInfo)
from django.shortcuts import get_object_or_404, redirect, render

def user_logged_in_middleware(get_response):
@receiver(user_logged_in)
def user_logged_in_handler(sender, user, request, **kwargs):
if 'function_executed' not in request.session:
# Run the function only if the flag is not set
# Assuming user is a model with the desired data field, retrieve the data
# For example, if your User model has a field named 'custom_field', you can access it like:
if user.is_authenticated:
desig = list(HoldsDesignation.objects.select_related('user','working','designation').all().filter(working = request.user).values_list('designation'))
print(desig)
b = [i for sub in desig for i in sub]
design = HoldsDesignation.objects.select_related('user','designation').filter(working=request.user)

designation=[]

designation.append(str(user.extrainfo.user_type))
for i in design:
if str(i.designation) != str(user.extrainfo.user_type):
print('-------')
print(i.designation)
print(user.extrainfo.user_type)
print('')
designation.append(str(i.designation))

for i in designation:
print(i)

request.session['currentDesignationSelected'] = designation[0]
request.session['allDesignations'] = designation
print("logged iN")

# Set the flag in the session to indicate that the function has bee+n executed
request.session['function_executed'] = True

def middleware(request):
if request.user.is_authenticated:
user_logged_in_handler(request.user, request.user, request)
response = get_response(request)
return response

return middleware
2 changes: 2 additions & 0 deletions FusionIIIT/Fusion/settings/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
'Fusion.middleware.custom_middleware.user_logged_in_middleware',
]

ROOT_URLCONF = 'Fusion.urls'
Expand All @@ -178,6 +179,7 @@
'django.template.context_processors.request',
'django.contrib.auth.context_processors.auth',
'django.contrib.messages.context_processors.messages',
'Fusion.context_processors.global_vars',
],
},
},
Expand Down
39 changes: 17 additions & 22 deletions FusionIIIT/Fusion/settings/development.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,45 +2,40 @@

DEBUG = True

SECRET_KEY = '=&w9due426k@l^ju1=s1)fj1rnpf0ok8xvjwx+62_nc-f12-8('
SECRET_KEY = "=&w9due426k@l^ju1=s1)fj1rnpf0ok8xvjwx+62_nc-f12-8("

ALLOWED_HOSTS = ['*']
ALLOWED_HOSTS = ["*"]

DATABASES = {
'default': {
'ENGINE': 'django.db.backends.postgresql_psycopg2',
'NAME': 'fusionlab',
'HOST': os.environ.get("DB_HOST", default='localhost'),
'USER': 'fusion_admin',
'PASSWORD': 'hello123',
"default": {
"ENGINE": "django.db.backends.postgresql_psycopg2",
"NAME": "fusionlab",
"HOST": os.environ.get("DB_HOST", default="localhost"),
"USER": "fusion_admin",
"PASSWORD": "hello123",
}
}

REST_FRAMEWORK = {
'DEFAULT_AUTHENTICATION_CLASSES': (
'rest_framework.authentication.TokenAuthentication',
"DEFAULT_AUTHENTICATION_CLASSES": (
"rest_framework.authentication.TokenAuthentication",
),
'DEFAULT_PERMISSION_CLASSES': (
'rest_framework.permissions.IsAuthenticated',
)
"DEFAULT_PERMISSION_CLASSES": ("rest_framework.permissions.IsAuthenticated",),
}

if DEBUG:
MIDDLEWARE += (
'debug_toolbar.middleware.DebugToolbarMiddleware',
)
MIDDLEWARE += ("debug_toolbar.middleware.DebugToolbarMiddleware",)

INSTALLED_APPS += (
'debug_toolbar',
'django_extensions',
)

"debug_toolbar",
"django_extensions",
)

###############################
# DJANGO_EXTENSIONS SETTINGS: #
###############################
INTERNAL_IPS = [
'127.0.0.1',
"127.0.0.1",
]

###############################
Expand All @@ -51,5 +46,5 @@
SHELL_PLUS_PRINT_SQL = True

DEBUG_TOOLBAR_CONFIG = {
'INTERCEPT_REDIRECTS': False,
"INTERCEPT_REDIRECTS": False,
}
70 changes: 34 additions & 36 deletions FusionIIIT/Fusion/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,40 +24,38 @@


urlpatterns = [
url(r'^', include('applications.globals.urls')),
url(r'^feeds/', include('applications.feeds.urls')),
url(r'^admin/', admin.site.urls),
url(r'^academic-procedures/', include('applications.academic_procedures.urls')),
url(r'^aims/', include('applications.academic_information.urls')),
url(r'^notifications/', include('applications.notifications_extension.urls')),
url(r'^estate/', include('applications.estate_module.urls')),
url(r'^dep/', include('applications.department.urls')),
url(r'^programme_curriculum/',include('applications.programme_curriculum.urls')),
url(r'^iwdModuleV2/', include('applications.iwdModuleV2.urls')),
url(r'^__debug__/', include(debug_toolbar.urls)),
url(r'^research_procedures/', include('applications.research_procedures.urls')),
url(r'^accounts/', include('allauth.urls')),


url(r'^eis/', include('applications.eis.urls')),
url(r'^mess/', include('applications.central_mess.urls')),
url(r'^complaint/', include('applications.complaint_system.urls')),
url(r'^healthcenter/', include('applications.health_center.urls')),
url(r'^leave/', include('applications.leave.urls')),
url(r'^placement/', include('applications.placement_cell.urls')),
url(r'^filetracking/', include('applications.filetracking.urls')),
url(r'^spacs/', include('applications.scholarships.urls')),
url(r'^visitorhostel/', include('applications.visitor_hostel.urls')),
url(r'^office/', include('applications.office_module.urls')),
url(r'^finance/', include('applications.finance_accounts.urls')),
url(r'^purchase-and-store/', include('applications.ps1.urls')),
url(r'^gymkhana/', include('applications.gymkhana.urls')),
url(r'^library/', include('applications.library.urls')),
url(r'^establishment/', include('applications.establishment.urls')),
url(r'^ocms/', include('applications.online_cms.urls')),
url(r'^counselling/', include('applications.counselling_cell.urls')),
url(r'^hostelmanagement/', include('applications.hostel_management.urls')),
url(r'^income-expenditure/', include('applications.income_expenditure.urls')),
url(r'^hr2/', include('applications.hr2.urls')),
url(r'^recruitment/', include('applications.recruitment.urls')),
url(r"^", include("applications.globals.urls")),
url(r"^feeds/", include("applications.feeds.urls")),
url(r"^admin/", admin.site.urls),
url(r"^academic-procedures/", include("applications.academic_procedures.urls")),
url(r"^aims/", include("applications.academic_information.urls")),
url(r"^notifications/", include("applications.notifications_extension.urls")),
url(r"^estate/", include("applications.estate_module.urls")),
url(r"^dep/", include("applications.department.urls")),
url(r"^programme_curriculum/", include("applications.programme_curriculum.urls")),
url(r"^iwdModuleV2/", include("applications.iwdModuleV2.urls")),
url(r"^__debug__/", include(debug_toolbar.urls)),
url(r"^research_procedures/", include("applications.research_procedures.urls")),
url(r"^accounts/", include("allauth.urls")),
url(r"^eis/", include("applications.eis.urls")),
url(r"^mess/", include("applications.central_mess.urls")),
url(r"^complaint/", include("applications.complaint_system.urls")),
url(r"^healthcenter/", include("applications.health_center.urls")),
url(r"^leave/", include("applications.leave.urls")),
url(r"^placement/", include("applications.placement_cell.urls")),
url(r"^filetracking/", include("applications.filetracking.urls")),
url(r"^spacs/", include("applications.scholarships.urls")),
url(r"^visitorhostel/", include("applications.visitor_hostel.urls")),
url(r"^office/", include("applications.office_module.urls")),
url(r"^finance/", include("applications.finance_accounts.urls")),
url(r"^purchase-and-store/", include("applications.ps1.urls")),
url(r"^gymkhana/", include("applications.gymkhana.urls")),
url(r"^library/", include("applications.library.urls")),
url(r"^establishment/", include("applications.establishment.urls")),
url(r"^ocms/", include("applications.online_cms.urls")),
url(r"^counselling/", include("applications.counselling_cell.urls")),
url(r"^hostelmanagement/", include("applications.hostel_management.urls")),
url(r"^income-expenditure/", include("applications.income_expenditure.urls")),
url(r"^hr2/", include("applications.hr2.urls")),
url(r"^recruitment/", include("applications.recruitment.urls")),
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
Loading