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

Sa 1 #1631

Closed
wants to merge 509 commits into from
Closed

Sa 1 #1631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
509 commits
Select commit Hold shift + click to select a range
0a8bbb0
Merge remote-tracking branch 'remoteK/main' into notificationsPull
Iamankit45 Mar 15, 2024
85f74aa
Merge pull request #23 from anujpatel03/hmweb-main
anujpatel03 Mar 15, 2024
a765e45
Merge branch 'anujpatel03:main' into hmweb-leave
aniruddha2002das Mar 15, 2024
a9853ca
added remark field in leave
aniruddha2002das Mar 15, 2024
3ee3c58
Merge remote-tracking branch 'origin/hmweb-leave' into hmweb-leave
aniruddha2002das Mar 15, 2024
62fb346
fix:hostelTransaction
aniruddha2002das Mar 15, 2024
a2633e7
fix
aniruddha2002das Mar 15, 2024
5d8f810
fix:In leave request remark option is added
aniruddha2002das Mar 15, 2024
31c07be
Merge pull request #24 from aniruddha2002das/hmweb-leave
anujpatel03 Mar 15, 2024
1c9a221
added notification functionality
Iamankit45 Mar 16, 2024
2925a9e
Merge branch 'hmweb-main' into dashboardMerge
anujpatel03 Mar 16, 2024
5516b6f
Merge pull request #25 from Iamankit45/dashboardMerge
anujpatel03 Mar 16, 2024
52dbcfb
added remark column in leave request
anujpatel03 Mar 16, 2024
2b5ce50
Merge remote-tracking branch 'origin/hmweb-main' into notification
anujpatel03 Mar 16, 2024
b64e663
migrations files
anujpatel03 Mar 16, 2024
5678579
Merge pull request #26 from anujpatel03/hmweb-main
anujpatel03 Mar 16, 2024
0c2392c
AC-1 : Add functionality to add and update courses (#1300)
Ravichendraa Mar 17, 2024
d40e94d
Fixing ui bugs (#1335)
SukulSarve Mar 17, 2024
58a32b0
Merge branch 'FusionIIIT:main' into main
kishankoushal Mar 17, 2024
bd60014
Merge branch 'main' of https://github.com/kishankoushal/Fusion
kishankoushal Mar 17, 2024
1afa0de
Merge remote-tracking branch 'fusion/gad-5' into dashboardMerge
Iamankit45 Mar 18, 2024
b1a62ed
Merge remote-tracking branch 'upstream/gad-5' into gad-5_2021
kishankoushal Mar 18, 2024
f27a5a4
updated dashboard
kishankoushal Mar 18, 2024
01bf0c9
Gad 5 (#1341)
abhi87374 Mar 18, 2024
c29708d
Merge pull request #1 from kishankoushal/gad-5_2021
kishankoushal Mar 18, 2024
69d3357
Synced with new Dashboard
Iamankit45 Mar 18, 2024
4c14426
Merge remote-tracking branch 'origin/dashboardMerge' into dashboardMerge
Iamankit45 Mar 18, 2024
1c72a73
.DS_Store
anujpatel03 Mar 18, 2024
a5eeacd
Merge pull request #27 from Iamankit45/dashboardMerge
anujpatel03 Mar 18, 2024
09cd7f5
Merge remote-tracking branch 'origin/hmweb-main' into notification
anujpatel03 Mar 18, 2024
d5288a3
Merge pull request #28 from anujpatel03/hmweb-main
anujpatel03 Mar 18, 2024
1f5fa00
Merge branch 'FusionIIIT:main' into main
anujpatel03 Mar 18, 2024
55af051
file tracking updated
SharanKumar06 Mar 18, 2024
236d404
commented inventory
anujpatel03 Mar 18, 2024
39d1e0a
Merge pull request #29 from anujpatel03/notification
anujpatel03 Mar 18, 2024
b932431
integration of updated dashboard
SharanKumar06 Mar 18, 2024
145ec51
dashboard modified
SharanKumar06 Mar 18, 2024
cf297f0
dashboard and fts integrated
SharanKumar06 Mar 18, 2024
c1d43df
updated dashboard
kishankoushal Mar 19, 2024
a3dbf4b
updated dashboard
kishankoushal Mar 19, 2024
7fe918e
Merge remote-tracking branch 'upstream/os-3'
kishankoushal Mar 19, 2024
1db64d7
Os 2 (#1346)
prem-charan Mar 19, 2024
48bf988
Revert "Os 2" (#1352)
prajjwalkapoor Mar 19, 2024
8fee0c6
Os 2 (#1353)
prem-charan Mar 19, 2024
6625f30
OS-1 | VH Module (#1334)
prajjwalkapoor Mar 19, 2024
338b463
Changes made
Srivatsa19 Mar 19, 2024
97e0419
dashboard integrated
Srivatsa19 Mar 19, 2024
841ca11
dashboard integrated1
Srivatsa19 Mar 19, 2024
ef28e8c
Merge pull request #1360 from abhi87374/os-2
Shivkant-Chauhan Mar 19, 2024
d6caf93
AC-1 Updated according to dashboard (#1355)
Ravichendraa Mar 20, 2024
b829689
GAD-4 Updated according to Dashboard changes (#1361)
Aragorn-64 Mar 20, 2024
eddb6b0
Sa 2 (#1362)
abhi87374 Mar 20, 2024
d2f731e
Merge branch 'staging' into gad-4
prajjwalkapoor Mar 20, 2024
56e4770
Gad 4 - FTS
prajjwalkapoor Mar 20, 2024
8b0b349
Added pylint (#1302)
hardiksharma11 Mar 11, 2024
f11d2be
Revert "Added pylint (#1302)" (#1324)
ChaudharyRaman Mar 11, 2024
c6dc7f4
changes in programme_cuuriculam,adding version to models (#1330)
anudeeps0306 Mar 12, 2024
c9ca4a0
Merge branch 'ac-1' into staging
prajjwalkapoor Mar 20, 2024
a70b856
updated gitignore
anujpatel03 Mar 20, 2024
8c8ffc3
updated gitignore
anujpatel03 Mar 20, 2024
0530655
Merge remote-tracking branch 'fusion/sa-1' into hmweb-final
anujpatel03 Mar 20, 2024
e8f3eda
Merge branch 'hmweb-final'
anujpatel03 Mar 20, 2024
3c3aff4
removed migrations
anujpatel03 Mar 20, 2024
d4547f4
Ac-1 updated model.py (#1372) (#1378)
abhi87374 Mar 20, 2024
9cdae29
merging Ac 5 into staging (#1379)
abhi87374 Mar 20, 2024
5824465
modified academic_info_models
prabhatsuman Mar 20, 2024
b75a84d
removed migrations
prabhatsuman Mar 21, 2024
870e597
removed migration folders
prabhatsuman Mar 21, 2024
f22f6e2
Merge branch 'staging2' of github.com:prabhatsuman/Fusion into staging5
prabhatsuman Mar 21, 2024
05290c0
added migrationns
prabhatsuman Mar 21, 2024
37e0ad6
Update development.py
prabhatsuman Mar 21, 2024
07c1047
Update requirements.txt
prabhatsuman Mar 21, 2024
1b4c7d3
Gad 3 (#1383)
nidhibarapatre Mar 21, 2024
195f71a
Ac 2 merging to staging (#1384)
abhi87374 Mar 21, 2024
125aed6
Merge branch 'FusionIIIT:main' into staging6
prabhatsuman Mar 21, 2024
4bf1be8
Staging6 (#1385)
prabhatsuman Mar 21, 2024
b395f7b
corrected faculty profile error
prabhatsuman Mar 21, 2024
036fce8
Merge branch 'staging6' of github.com:prabhatsuman/Fusion into staging6
prabhatsuman Mar 21, 2024
b2028f9
correct faculty profile error
prabhatsuman Mar 21, 2024
05c2afd
corrected user profile
prabhatsuman Mar 21, 2024
824a15c
Faculty Profile errors resolved (#1388)
prabhatsuman Mar 21, 2024
920dcce
Gad-3 : fixed minor issues (#1389)
nidhibarapatre Mar 26, 2024
fc063bc
Gad 3 complaint (#1390)
nidhibarapatre Apr 2, 2024
aae2c18
Gad 3 complaint (#1391)
nidhibarapatre Apr 2, 2024
994a569
merged staging into gad-3
abhi87374 Apr 2, 2024
3c5af53
Merge branch 'staging' into gad-3
abhi87374 Apr 2, 2024
0b4ad88
merge Gad 3 into staging (#1392)
abhi87374 Apr 2, 2024
ad5386b
migrations removed
prabhatsuman Apr 4, 2024
1990420
Merge branch 'staging7' into staging6
prabhatsuman Apr 4, 2024
e3eea54
Merge branch 'staging6-2' of github.com:prabhatsuman/Fusion into stag…
prabhatsuman Apr 4, 2024
da94e3f
Updated api for App dashboard (#1397)
TusharGupta03 Apr 7, 2024
918ccbf
added phc corrections
prabhatsuman Apr 7, 2024
643a4fa
prescribe issue resolved in PHC
prabhatsuman Apr 8, 2024
a4c7769
change in migrations
Iamankit45 Apr 9, 2024
a9e7e69
Merge remote-tracking branch 'upstream/hmweb-main' into testcase1
Iamankit45 Apr 9, 2024
2a93fce
resolve bugs in guestroom functionality
Iamankit45 Apr 9, 2024
6088734
phc issue resolved
prabhatsuman Apr 10, 2024
ec66276
Merge branch 'Gad-3' into staging-new
prabhatsuman Apr 10, 2024
b93e92d
complaint management issue solved
prabhatsuman Apr 10, 2024
51183a2
Merge pull request #1407 from prabhatsuman/staging-new
Ykumar1415 Apr 10, 2024
3258caf
functionlity changed in student details view
Iamankit45 Apr 10, 2024
ede22a4
Merge pull request #30 from Iamankit45/testcase1
anujpatel03 Apr 10, 2024
cc4a3c3
Merge remote-tracking branch 'origin/hmweb-main' into hmweb-test
anujpatel03 Apr 10, 2024
9a9cd12
removed .DS_Store
anujpatel03 Apr 10, 2024
0462ef5
Rspc 2025 1 "updated dashboard" (#1350)
SharanKumar06 Apr 10, 2024
309b0f3
removed migrations
anujpatel03 Apr 10, 2024
ca7a793
added pay link
anujpatel03 Apr 10, 2024
c834069
Changes made 10/04
SharanKumar06 Apr 10, 2024
0ccb411
Changes made 10/04/24
SharanKumar06 Apr 10, 2024
ee342e0
merging with old
SharanKumar06 Apr 10, 2024
49b9ed6
changes after merge
SharanKumar06 Apr 10, 2024
6cb3a30
changes after merge 1
SharanKumar06 Apr 10, 2024
3d8676b
feat:Fine edit
aniruddha2002das Apr 10, 2024
7810c77
chore:design added in fine edit
aniruddha2002das Apr 10, 2024
84ff3df
Rspc 2025 1_ updated pr (#1413)
SharanKumar06 Apr 10, 2024
baf68dd
fix:Hostel fine list's button
aniruddha2002das Apr 10, 2024
0a8c0dd
SA 1: Hostel Management (#1348)
anujpatel03 Apr 10, 2024
5253873
merging sa-4(Pcell) into latest_staging (#1417)
abhi87374 Apr 10, 2024
c8a001b
student details,room allottment functionality change
Iamankit45 Apr 10, 2024
11ff20b
fixed: few checks
anujpatel03 Apr 10, 2024
6ece1ba
dashboard edit
SharanKumar06 Apr 10, 2024
8046d05
Merge remote-tracking branch 'upstream/rspc' into rspc_2025_1
SharanKumar06 Apr 10, 2024
1ca9dd4
Rspc 2025 1 (#1419)
SharanKumar06 Apr 10, 2024
5908d60
added worker report
anujpatel03 Apr 10, 2024
9eacf9d
Merge pull request #31 from aniruddha2002das/anni-fine-edit
anujpatel03 Apr 10, 2024
0606bb6
Merge branch 'hmweb-test' into hmweb-main
anujpatel03 Apr 10, 2024
af7f160
Merge pull request #32 from anujpatel03/hmweb-main
anujpatel03 Apr 10, 2024
161efc9
Merge branch 'hmweb-main' into testcase1
Iamankit45 Apr 10, 2024
48d0584
Merge pull request #33 from Iamankit45/testcase1
anujpatel03 Apr 10, 2024
39bb548
Merge pull request #34 from anujpatel03/hmweb-main
anujpatel03 Apr 10, 2024
59b0a08
fixed:phone number in student details
anujpatel03 Apr 10, 2024
f138fcc
removed migrations files
anujpatel03 Apr 10, 2024
8f0f43c
Resolved merge-conflicts
anujpatel03 Apr 10, 2024
c128c16
Pcell (#1423)
abhi87374 Apr 11, 2024
2df23d6
corrected requirement txt version
abhi87374 Apr 11, 2024
79cf97b
mess update merge (#1421) (#1427)
abhi87374 Apr 11, 2024
578e9b2
Update booking-request-action-modal.html
abhi87374 Apr 11, 2024
97fa75b
added migrations file
anujpatel03 Apr 11, 2024
ef5fbde
SA-1 : Hostel Management (Fixed Bugs) (#1422)
anujpatel03 Apr 11, 2024
a823ed5
Gad 2 2025 dashboard integrated (#1356)
Srivatsa19 Apr 11, 2024
9c38b48
GAD-4: Fix edit draft functionality and usertype Access (#1410)
Aragorn-64 Apr 11, 2024
faedc55
Upadted modules.html (#1432)
TusharGupta03 Apr 11, 2024
b3fbfbc
merged sa-3 into new branch gk (#1433)
abhi87374 Apr 11, 2024
d229068
Revert " merged sa-3 into new branch gk (#1433)" (#1434)
abhi87374 Apr 11, 2024
485eefe
All changes done
SharanKumar06 Apr 11, 2024
cfbb884
Merge remote-tracking branch 'upstream/gad-4' into gad-4
theoden42 Apr 11, 2024
0942cc4
Merge branch 'latest_staging' into gad-4
theoden42 Apr 11, 2024
1d1a7da
fix gad-4 merge conflicts
theoden42 Apr 11, 2024
53c5858
fix merging errors from latest_staging
theoden42 Apr 11, 2024
3755d36
All changes done 2
SharanKumar06 Apr 11, 2024
2975250
Merging done
SharanKumar06 Apr 11, 2024
2d86242
GAD-2 IWD completed
Srivatsa19 Apr 11, 2024
e1a7856
GAD-2
Srivatsa19 Apr 11, 2024
99816bf
PR raise
SharanKumar06 Apr 11, 2024
049b4fa
GAD-2 New Commit
Srivatsa19 Apr 11, 2024
7020d5e
GAD-2 New
Srivatsa19 Apr 11, 2024
914b0de
create space for notification panel in filetracking view
theoden42 Apr 11, 2024
c4d68ad
Ps-1 Changes with Migrations (#1430)
ThisisMS11 Apr 11, 2024
793ae0f
error, login handling done
SharanKumar06 Apr 12, 2024
b1acd67
Merge pull request #1438 from theoden42/latest_staging
Priyansh61 Apr 12, 2024
33780ef
functions created for better code understanding
SharanKumar06 Apr 12, 2024
c0ff4dc
fixed bugs as asked
SharanKumar06 Apr 12, 2024
1536fbb
all changes done
SharanKumar06 Apr 12, 2024
385b815
edited for better understanding
SharanKumar06 Apr 12, 2024
277c5da
edited for better understanding 3
SharanKumar06 Apr 12, 2024
e8e38dd
file tracking usage comments added
SharanKumar06 Apr 12, 2024
33000f3
Added migrations files
Srivatsa19 Apr 12, 2024
1b26122
added sorted functionality for warden in hall student list
anujpatel03 Apr 12, 2024
7938a9f
Added migrations file in all modules
anujpatel03 Apr 12, 2024
d146da9
Added migrations file in all modules
anujpatel03 Apr 12, 2024
6239448
Merge branch 'FusionIIIT:main' into os_3_2021
kishankoushal Apr 12, 2024
b46cd00
Merge branch 'latest_staging_test' into os_3_2021
kishankoushal Apr 12, 2024
0335cb7
Merge pull request #2 from kishankoushal/os_3_2021
anudeeps0306 Apr 12, 2024
e29f344
Added Functionality where logged in users can only access the module
Srivatsa19 Apr 12, 2024
a9653a8
Rspc 2025 1 (#1439)
SharanKumar06 Apr 13, 2024
5850b07
updated PHC
prabhatsuman Apr 13, 2024
e38e719
Merge branch 'latest_staging' into rspc
ChaudharyRaman Apr 13, 2024
05d5818
Co-authored-by: KPR111 <[email protected]>
SharanKumar06 Apr 13, 2024
9b2d1ae
working on PHC medical Relief
prabhatsuman Apr 13, 2024
e645a87
medical relief part incomplete
prabhatsuman Apr 13, 2024
66d37b0
corrected medical relief page
prabhatsuman Apr 13, 2024
da6180f
corrected the medical relief issue for student
prabhatsuman Apr 13, 2024
0c67de0
Gad 2 New Commits (#1440)
Srivatsa19 Apr 14, 2024
b889b02
implemented compounder medical relief view
prabhatsuman Apr 14, 2024
61d3c96
Removed changes made in globals/api/views.py
Srivatsa19 Apr 14, 2024
8c5c9be
Merge remote-tracking branch 'upstream/gad-2' into gad-2-latest
Srivatsa19 Apr 14, 2024
bf0e797
Removed changes in globals/api/views.py
Srivatsa19 Apr 14, 2024
cec64f9
added .github and .idea
SharanKumar06 Apr 14, 2024
764704a
PS-1 Changes with Revived Migrations
ThisisMS11 Apr 14, 2024
cced151
remove faculty and staff and update api for app
SukulSarve Apr 14, 2024
c671aa2
[RSPC] Add .github and .idea files
SharanKumar06 Apr 14, 2024
5237e02
implemented file tracking
prabhatsuman Apr 14, 2024
fad7365
implemented file tracking
prabhatsuman Apr 14, 2024
5bb11b9
final changes added
SharanKumar06 Apr 14, 2024
2e6f006
Merge pull request #1446 from anujpatel03/sa-1-main
Priyansh61 Apr 14, 2024
8e1fb18
updated with latest migrations
prabhatsuman Apr 14, 2024
9a46103
Merge branch 'latest_staging' into Gad-5-latest
TusharGupta03 Apr 14, 2024
4e75db6
file tracking implementation done
prabhatsuman Apr 14, 2024
f65ca17
added PHC notificatons
prabhatsuman Apr 15, 2024
194a36d
Merge pull request #1449 from Srivatsa19/gad-2-2025-latest
Priyansh61 Apr 15, 2024
385427a
Merge pull request #1456 from TusharGupta03/Gad-5-latest
Priyansh61 Apr 15, 2024
8a1639f
minor bugs fixed and notfication panel inserted
SharanKumar06 Apr 15, 2024
a1b8564
Merge remote-tracking branch 'upstream/rspc' into rspc_2025_1
SharanKumar06 Apr 15, 2024
f10028b
necessary corrections in PHC
prabhatsuman Apr 15, 2024
462756a
Merge branch 'latest_staging' into OS-2
prabhatsuman Apr 15, 2024
0c40ac5
hardcoded lines removed
SharanKumar06 Apr 15, 2024
8fa8821
Merge pull request #1461 from SharanKumar06/rspc_2025_1
ChaudharyRaman Apr 15, 2024
1c24f23
Merge pull request #1448 from FusionIIIT/rspc
ChaudharyRaman Apr 15, 2024
36fc71a
merge conflicts with latest_staging resolved
Srivatsa19 Apr 15, 2024
2b35fb0
Merge branch 'latest_staging' into gad-2
Srivatsa19 Apr 15, 2024
b85f45c
Resolved merge conflicts and merged with latest_staging
Srivatsa19 Apr 15, 2024
c4cc0a4
Update dashboard.html
anudeeps0306 Apr 15, 2024
a3eb1f6
Merge branch 'latest_staging' into latest_staging_test
anudeeps0306 Apr 15, 2024
946ab05
Merge pull request #1447 from anudeeps0306/latest_staging_test
prabhatsuman Apr 15, 2024
7943900
temp pause
prabhatsuman Apr 15, 2024
1425db2
Removed auto files and .sql files
Srivatsa19 Apr 15, 2024
adb0849
Delete fusionlab.sql
prabhatsuman Apr 15, 2024
090d80a
Purchase-and-store PR with minor changes 1.0
ThisisMS11 Apr 15, 2024
6ea89a2
Revert "[RSPC] Final Staging"
prabhatsuman Apr 15, 2024
a5b6b6c
Fixed an error in views.py
Srivatsa19 Apr 15, 2024
1f2a0fa
Set the min values to zero for the quantity, cost and budget
Srivatsa19 Apr 15, 2024
9588e45
minor bug fixing
prabhatsuman Apr 15, 2024
7ce2872
notification sidepannel commented out
prabhatsuman Apr 15, 2024
c569661
Merge pull request #1464 from FusionIIIT/revert-1448-rspc
prabhatsuman Apr 15, 2024
13d3fc6
Merge branch 'latest_staging' into OS-2
prabhatsuman Apr 15, 2024
9324b00
minor bug fix
prabhatsuman Apr 15, 2024
6de94ac
latest migrations added
prabhatsuman Apr 15, 2024
688830b
Merge pull request #1466 from prabhatsuman/OS-2
ChaudharyRaman Apr 15, 2024
2a31c28
Merge branch 'latest_staging' of https://github.com/FusionIIIT/Fusion…
ChaudharyRaman Apr 15, 2024
f2156de
Merge pull request #1468 from FusionIIIT/os-2
ChaudharyRaman Apr 15, 2024
416f522
removed auto migrations
ChaudharyRaman Apr 15, 2024
443720c
Merge pull request #1469 from FusionIIIT/ps-1
ChaudharyRaman Apr 15, 2024
0c92fc9
Removed unwanted files
Srivatsa19 Apr 16, 2024
d8033fe
Merge branch 'latest_staging' of https://github.com/FusionIIIT/Fusion…
Srivatsa19 Apr 16, 2024
123472d
fixed indentation
prajjwalkapoor Apr 16, 2024
d3b81da
fixed indentation
prajjwalkapoor Apr 16, 2024
58ecf34
Enable deployed module (#1471)
SukulSarve Apr 16, 2024
a5cc5e4
Merge branch 'latest_staging' of https://github.com/FusionIIIT/Fusion…
Srivatsa19 Apr 16, 2024
df6c7eb
Made changes so that employee also can create a new request
Srivatsa19 Apr 16, 2024
7d53b01
Merge pull request #1463 from Srivatsa19/gad-2-2025-latest
Priyansh61 Apr 16, 2024
c638c57
Merge pull request #1460 from FusionIIIT/gad-2
Priyansh61 Apr 16, 2024
04cc11a
Added extra designations in the iwd dashboard file
Srivatsa19 Apr 16, 2024
3d7a221
Added extra designation in the ied dashboard file
Srivatsa19 Apr 16, 2024
30df282
Merge pull request #1474 from Srivatsa19/gad-2-2025-latest
prajjwalkapoor Apr 16, 2024
eb90711
Merge pull request #1475 from FusionIIIT/gad-2
prajjwalkapoor Apr 16, 2024
c8bbe19
removed initials of url http://0.0.0.0:8000 while fetching in assign-…
anujpatel03 Apr 16, 2024
43900a5
previous batch by default value 0
anujpatel03 Apr 16, 2024
47b12de
Merge pull request #1478 from anujpatel03/sa-1-main
Priyansh61 Apr 17, 2024
32ba344
resolve conflict
anujpatel03 Apr 17, 2024
438f0a5
Merge pull request #1481 from anujpatel03/latest-sa-1
Priyansh61 Apr 17, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,7 @@ node_modules/

FusionIIIT/static/
package-lock.json


.DS_Store

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'),
}
50 changes: 50 additions & 0 deletions FusionIIIT/Fusion/middleware/custom_middleware.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
# 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=[]
if str(user.extrainfo.user_type) == "student":
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
13 changes: 8 additions & 5 deletions FusionIIIT/Fusion/settings/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
'django.contrib.staticfiles',
'django.contrib.sites',
'django.contrib.humanize',

'django_crontab',
'corsheaders',

'applications.eis',
Expand Down Expand Up @@ -163,21 +163,23 @@
'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'

TEMPLATES = [
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'DIRS': [os.path.join(BASE_DIR, '..', 'templates/'),],
'DIRS': [os.path.join(BASE_DIR, '..', 'templates'),],
'APP_DIRS': True,
'OPTIONS': {
'context_processors': [
'django.template.context_processors.debug',
'django.template.context_processors.request',
'django.contrib.auth.context_processors.auth',
'django.contrib.messages.context_processors.messages',
'Fusion.context_processors.global_vars',
],
},
},
Expand Down Expand Up @@ -254,9 +256,9 @@

# os.path.join(BASE_DIR, 'static/')
STATIC_URL = '/static/'
STATIC_ROOT = os.path.join(BASE_DIR, '..', 'static/')
STATIC_ROOT = os.path.join(BASE_DIR, '..', 'static')
STATICFILES_STORAGE = 'whitenoise.storage.CompressedManifestStaticFilesStorage'
MEDIA_ROOT = os.path.join(BASE_DIR, '..', 'media/')
MEDIA_ROOT = os.path.join(BASE_DIR, '..', 'media')
MEDIA_URL = '/media/'

ACCOUNT_USERNAME_REQUIRED = False
Expand All @@ -277,5 +279,6 @@
YOUTUBE_DATA_API_KEY = 'api_key'



CORS_ORIGIN_ALLOW_ALL = True
ALLOW_PASS_RESET = True
ALLOW_PASS_RESET = True
12 changes: 11 additions & 1 deletion FusionIIIT/Fusion/settings/development.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from Fusion.settings.common import *

DEBUG = True

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

ALLOWED_HOSTS = ['*']
Expand All @@ -16,9 +16,11 @@
}
}


REST_FRAMEWORK = {
'DEFAULT_AUTHENTICATION_CLASSES': (
'rest_framework.authentication.TokenAuthentication',
'rest_framework.authentication.SessionAuthentication',
),
'DEFAULT_PERMISSION_CLASSES': (
'rest_framework.permissions.IsAuthenticated',
Expand Down Expand Up @@ -53,3 +55,11 @@
DEBUG_TOOLBAR_CONFIG = {
'INTERCEPT_REDIRECTS': False,
}

CRONJOBS = [
# the below job will update the bill at every minute can be used for testing
# ('* * * * *', 'applications.central_mess.tasks.generate_bill'),

#the below job which we need to add in production server, to update the mess bill of student everyday at 10 pm in night
('0 22 * * *', 'applications.central_mess.tasks.generate_bill'),
]
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by Django 3.1.5 on 2023-03-15 18:53
# Generated by Django 3.1.5 on 2024-04-15 23:58

from django.db import migrations, models
import django.db.models.deletion
Expand All @@ -9,8 +9,8 @@ class Migration(migrations.Migration):
initial = True

dependencies = [
('programme_curriculum', '0001_initial'),
('globals', '0001_initial'),
('programme_curriculum', '0001_initial'),
]

operations = [
Expand Down Expand Up @@ -117,8 +117,8 @@ class Migration(migrations.Migration):
('batch', models.IntegerField(default=2016)),
('cpi', models.FloatField(default=0)),
('category', models.CharField(choices=[('GEN', 'General'), ('SC', 'Scheduled Castes'), ('ST', 'Scheduled Tribes'), ('OBC', 'Other Backward Classes')], max_length=10)),
('father_name', models.CharField(default='', max_length=40)),
('mother_name', models.CharField(default='', max_length=40)),
('father_name', models.CharField(default='', max_length=40, null=True)),
('mother_name', models.CharField(default='', max_length=40, null=True)),
('hall_no', models.IntegerField(default=0)),
('room_no', models.CharField(blank=True, max_length=10, null=True)),
('specialization', models.CharField(choices=[('Power and Control', 'Power and Control'), ('Microwave and Communication Engineering', 'Microwave and Communication Engineering'), ('Micro-nano Electronics', 'Micro-nano Electronics'), ('CAD/CAM', 'CAD/CAM'), ('Design', 'Design'), ('Manufacturing', 'Manufacturing'), ('CSE', 'CSE'), ('Mechatronics', 'Mechatronics'), ('MDes', 'MDes'), ('None', 'None')], default='', max_length=40, null=True)),
Expand Down
4 changes: 2 additions & 2 deletions FusionIIIT/applications/academic_information/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ class Student(models.Model):
batch_id = models.ForeignKey(Batch, null=True, blank=True, on_delete=models.CASCADE)
cpi = models.FloatField(default=0)
category = models.CharField(max_length=10, choices=Constants.CATEGORY, null=False)
father_name = models.CharField(max_length=40, default='')
mother_name = models.CharField(max_length=40, default='')
father_name = models.CharField(max_length=40, default='',null=True)
mother_name = models.CharField(max_length=40, default='',null=True)
hall_no = models.IntegerField(default=0)
room_no = models.CharField(max_length=10, blank=True, null=True)
specialization = models.CharField(max_length=40,choices=Constants.MTechSpecialization, null=True, default='')
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by Django 3.1.5 on 2023-03-15 18:53
# Generated by Django 3.1.5 on 2024-04-15 23:58

import datetime
from django.db import migrations, models
Expand All @@ -11,9 +11,9 @@ class Migration(migrations.Migration):
initial = True

dependencies = [
('globals', '0001_initial'),
('academic_information', '0001_initial'),
('programme_curriculum', '0001_initial'),
('globals', '0001_initial'),
]

operations = [
Expand Down Expand Up @@ -188,7 +188,7 @@ class Migration(migrations.Migration):
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('month', models.CharField(choices=[('Jan', 'January'), ('Feb', 'Febuary'), ('Mar', 'March'), ('Apr', 'April'), ('May', 'May'), ('Jun', 'June'), ('Jul', 'July'), ('Aug', 'August'), ('Sep', 'September'), ('Oct', 'October'), ('Nov', 'November'), ('Dec', 'December')], max_length=10)),
('year', models.IntegerField(choices=[(2023, 2023), (2022, 2022)])),
('year', models.IntegerField(choices=[(2024, 2024), (2023, 2023)])),
('description', models.CharField(choices=[('Stu_paid', 'Paid'), ('Stu_due', 'Due')], max_length=15)),
('amount', models.IntegerField()),
('remaining_amount', models.IntegerField()),
Expand Down Expand Up @@ -243,7 +243,7 @@ class Migration(migrations.Migration):
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('semester', models.IntegerField()),
('batch', models.IntegerField(default=2023)),
('batch', models.IntegerField(default=2024)),
('verified', models.BooleanField(default=False)),
('curr_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.curriculum')),
('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')),
Expand Down Expand Up @@ -334,7 +334,7 @@ class Migration(migrations.Migration):
name='course_registration',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('working_year', models.IntegerField(blank=True, choices=[(2023, 2023), (2022, 2022)], null=True)),
('working_year', models.IntegerField(blank=True, choices=[(2024, 2024), (2023, 2023)], null=True)),
('course_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.course')),
('course_slot_id', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='programme_curriculum.courseslot')),
('semester_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.semester')),
Expand Down Expand Up @@ -374,7 +374,7 @@ class Migration(migrations.Migration):
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('date', models.DateTimeField(auto_now_add=True)),
('month', models.CharField(choices=[('Jan', 'January'), ('Feb', 'Febuary'), ('Mar', 'March'), ('Apr', 'April'), ('May', 'May'), ('Jun', 'June'), ('Jul', 'July'), ('Aug', 'August'), ('Sep', 'September'), ('Oct', 'October'), ('Nov', 'November'), ('Dec', 'December')], max_length=10)),
('year', models.IntegerField(choices=[(2023, 2023), (2022, 2022)])),
('year', models.IntegerField(choices=[(2024, 2024), (2023, 2023)])),
('bank_account', models.CharField(max_length=11)),
('applicability', models.CharField(choices=[('GATE', 'GATE'), ('NET', 'NET'), ('CEED', 'CEED')], max_length=5)),
('ta_supervisor_remark', models.BooleanField(default=False)),
Expand All @@ -392,7 +392,7 @@ class Migration(migrations.Migration):
name='Register',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('year', models.IntegerField(default=2023)),
('year', models.IntegerField(default=2024)),
('semester', models.IntegerField()),
('curr_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.curriculum')),
('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')),
Expand All @@ -402,4 +402,4 @@ class Migration(migrations.Migration):
'unique_together': {('curr_id', 'student_id')},
},
),
]
]
Loading
Loading