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

Modified Hostel allocation ,Room allocation ,Added Room Swaps ,Room change #1617

Open
wants to merge 543 commits into
base: sa-1
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
543 commits
Select commit Hold shift + click to select a range
dbdd3bc
added required apis for ac-2 module
Bhavik-ag Apr 20, 2024
55d42ae
Merge branch 'ac-3' of github.com:FusionIIIT/Fusion into ac3-final
prabhatsuman Apr 20, 2024
1f12194
Merge branch 'latest_staging' into ac-5
itsspriyansh Apr 20, 2024
9f076ca
fixed designation dependency and minor redirect issues
pratham534 Apr 21, 2024
52b5244
Merge pull request #7 from pratham534/os-2
pratham534 Apr 21, 2024
1836dc5
added medical profile
prem-charan Apr 21, 2024
10c74ea
Merge pull request #8 from prem-charan/phc
prabhatsuman Apr 21, 2024
ceee427
removed medical profile
prabhatsuman Apr 21, 2024
9cfb0df
All required changes done 1
SharanKumar06 Apr 21, 2024
044206d
Final changes of rspc
SharanKumar06 Apr 21, 2024
fef9a29
Merge branch 'rspc-2025-gad7' into rspc--latest_staging
SharanKumar06 Apr 21, 2024
7c6b6e7
added version field in urls and fixed course fetching errors
Daksh119 Apr 21, 2024
da3d306
Deleted migrations file
anudeeps0306 Apr 21, 2024
403cff6
Merge pull request #1505 from FusionIIIT/ac-5
itsspriyansh Apr 21, 2024
348f350
Merge pull request #1509 from Daksh119/ac-3-final
prabhatsuman Apr 21, 2024
22ae8c0
acad procedure error corrected
prabhatsuman Apr 21, 2024
e71308f
Merge pull request #1512 from FusionIIIT/ac-3-final
prabhatsuman Apr 21, 2024
6f6c539
Merge pull request #1507 from FusionIIIT/ps-1
VarunGitGood Apr 21, 2024
caa100f
Delete FusionIIIT/applications/otheracademic/migrations/0002_auto_202…
prabhatsuman Apr 21, 2024
eec13f3
Delete FusionIIIT/applications/otheracademic/migrations/0003_auto_202…
prabhatsuman Apr 21, 2024
e2d651a
Merge pull request #1504 from Bhavik-ag/ac2-apis
prabhatsuman Apr 21, 2024
3fa5f68
views for api
Arpan243 Apr 21, 2024
d5c54cc
serializers for api
Arpan243 Apr 21, 2024
a8d0f1a
api
Arpan243 Apr 21, 2024
4a13d60
Merge pull request #1516 from Arpan243/ac-final
prabhatsuman Apr 21, 2024
758d4d0
updated apis for ac-2 module
Bhavik-ag Apr 21, 2024
84c039c
Merge branch 'FusionIIIT:ac-7' into ac-7
Harshan-Nayak Apr 22, 2024
f97eb7b
Merge pull request #1489 from FusionIIIT/ac-final
prabhatsuman Apr 22, 2024
1735c45
removed migration files
xenouno Apr 22, 2024
3f15cb3
Merge pull request #1500 from SharanKumar06/rspc--latest_staging
ChaudharyRaman Apr 22, 2024
70fae4e
Merge pull request #1494 from xenouno/otheracademic-2024
ChaudharyRaman Apr 22, 2024
60c6f3d
Merge branch 'latest_staging' of github.com:SharanKumar06/Fusion into…
SharanKumar06 Apr 22, 2024
28c4c1c
Merge pull request #1508 from anudeeps0306/gad-1
prajjwalkapoor Apr 22, 2024
c78f1ed
Merge pull request #1506 from FusionIIIT/gad-1
prajjwalkapoor Apr 22, 2024
fc90e77
feat: confirm before unloading page and make the fields not required
theoden42 Apr 22, 2024
181b94e
working_year column insertions
Divyanshu-iiitdmj Apr 22, 2024
18a8e6d
All changes done
SharanKumar06 Apr 22, 2024
6b4aa7d
Merge branch 'latest_staging' of github.com:SharanKumar06/Fusion into…
SharanKumar06 Apr 22, 2024
23cd097
Merge branch 'latest_staging' into rspc--latest_staging
SharanKumar06 Apr 22, 2024
470b498
Merge branch 'rspc-2025-gad7' into rspc--latest_staging
SharanKumar06 Apr 22, 2024
56bc6fb
Merge pull request #1521 from Divyanshusir/cr2
ChaudharyRaman Apr 22, 2024
9bbf2cf
Final_changes done
SharanKumar06 Apr 22, 2024
8b54426
Globals api error corrected
prabhatsuman Apr 22, 2024
101b798
deleted .sql
prabhatsuman Apr 22, 2024
308f901
Merge pull request #1524 from prabhatsuman/latest_staging
prabhatsuman Apr 22, 2024
a79424c
app changes
21BCS035 Apr 22, 2024
475573b
fix acadadmin error
Daksh119 Apr 22, 2024
b29516b
Merge pull request #1526 from FusionIIIT/ac-final
ChaudharyRaman Apr 22, 2024
8ca1273
Merge pull request #1528 from FusionIIIT/ac-final
prabhatsuman Apr 22, 2024
5a5f8dc
Merge pull request #1527 from Daksh119/ac-f
prabhatsuman Apr 22, 2024
d87066a
Merge pull request #1529 from FusionIIIT/ac-3-final
prabhatsuman Apr 22, 2024
cd503a4
changes related to apis
pratham534 Apr 22, 2024
a93272c
Merge branch 'FusionIIIT:ac-7' into ac-7
Harshan-Nayak Apr 22, 2024
09bc002
changes
Harshan-Nayak Apr 22, 2024
ae6599d
changes
Harshan-Nayak Apr 22, 2024
5208b02
corrected designation for acad_admin
Divyanshu-iiitdmj Apr 22, 2024
95da0a8
Merge pull request #1530 from Divyanshusir/cr2
prabhatsuman Apr 22, 2024
c3559ef
Merge pull request #1531 from FusionIIIT/cr
prabhatsuman Apr 22, 2024
25d9784
Changes
Harshan-Nayak Apr 22, 2024
a1f5df1
Changes
Harshan-Nayak Apr 22, 2024
9b93a16
Update modules.html
prabhatsuman Apr 22, 2024
8a740b4
Update 0001_initial.py
prabhatsuman Apr 22, 2024
4e89fee
Merge pull request #1534 from Harshan-Nayak/ac-7
prabhatsuman Apr 22, 2024
a893436
Update views.py
prabhatsuman Apr 22, 2024
97f9d6e
add active tab highlight to sidebar
Aragorn-64 Apr 22, 2024
73fb5f0
fix extra html
Aragorn-64 Apr 22, 2024
0d3bbf5
Merge branch 'mohit_fusion_1' of https://github.com/ThisisMS11/Fusion…
ThisisMS11 Apr 19, 2024
a9cce44
Merge branch 'temp' into mohit_fusion_1
ThisisMS11 Apr 22, 2024
01651ef
add File download as zip feature
Aragorn-64 Apr 23, 2024
10c8142
Merge pull request #11 from pratham534/os-2
prabhatsuman Apr 23, 2024
070a535
Merge pull request #1536 from FusionIIIT/latest_staging
ChaudharyRaman Apr 23, 2024
cca9e17
Update modules.html
prabhatsuman Apr 23, 2024
82c7f7c
Merge pull request #1535 from FusionIIIT/ac-7
prabhatsuman Apr 23, 2024
aa3d07b
minor changes
SharanKumar06 Apr 23, 2024
5e814eb
Merge remote-tracking branch 'upstream/rspc-final' into rspc--latest_…
SharanKumar06 Apr 23, 2024
85463ba
Merge pull request #1522 from SharanKumar06/rspc--latest_staging
ChaudharyRaman Apr 23, 2024
f8bd67e
corrected annoucemnet logic
prabhatsuman Apr 23, 2024
7c72ec8
Update 0001_initial.py
prabhatsuman Apr 23, 2024
a7f8944
Update 0001_initial.py
prabhatsuman Apr 23, 2024
7d23333
Merge pull request #1496 from FusionIIIT/rspc-final
ChaudharyRaman Apr 23, 2024
d490736
announcement issue resolved
prabhatsuman Apr 23, 2024
fee6f1c
Merge branch 'latest_staging' of github.com:prabhatsuman/Fusion into …
prabhatsuman Apr 23, 2024
87f9c7c
synced latest staging
prabhatsuman Apr 23, 2024
1679897
removed extra manage.py
prabhatsuman Apr 23, 2024
e026046
authorization
21BCS035 Apr 23, 2024
c98d1b2
Merge pull request #1539 from prabhatsuman/OS-2
prabhatsuman Apr 23, 2024
596e932
Merge pull request #1540 from FusionIIIT/os-2
prabhatsuman Apr 23, 2024
d858a51
Merge pull request #1541 from FusionIIIT/ac-final
prabhatsuman Apr 23, 2024
e6ad7ed
Merge remote-tracking branch 'dev/gad-4-final' into gad-4-final
theoden42 Apr 23, 2024
246218f
fix: small formatting errors
theoden42 Apr 23, 2024
ed56e07
added migration files
xenouno Apr 23, 2024
b127169
fix: inbox, drafts and archives are now ordered by time of creating a…
theoden42 Apr 23, 2024
1039d8b
Merge pull request #1542 from xenouno/otheracademic-2024
ChaudharyRaman Apr 23, 2024
f8cb495
Merge branch 'latest_staging' of github.com:prabhatsuman/Fusion into …
prabhatsuman Apr 23, 2024
ac54de2
merging sa-2 into latest_staging
Harshul-25 Apr 23, 2024
554287e
Update .gitignore
prabhatsuman Apr 23, 2024
7777e06
added manage.py path to dev setting
Harshul-25 Apr 23, 2024
c3144fc
Merge branch 'latest_staging' of github.com:Harshul-25/Fusion into la…
Harshul-25 Apr 23, 2024
510a5e0
fix: forward file to error correctly and improve template
theoden42 Apr 23, 2024
820afd7
Merge pull request #1544 from Harshul-25/latest_staging
prabhatsuman Apr 23, 2024
f95d509
fix: on draft saving without destination redirect is correctly placed
theoden42 Apr 23, 2024
67c2b7a
added notification side panel mess
Harshul-25 Apr 23, 2024
8408908
Merge pull request #1547 from Harshul-25/latest_staging
prabhatsuman Apr 23, 2024
fc86e2a
fix: attachments added on sending from drafts
theoden42 Apr 23, 2024
545a935
Merge pull request #1543 from prabhatsuman/ac-4
prabhatsuman Apr 23, 2024
b3f0ccf
Merge branch 'latest_staging' of github.com:prabhatsuman/Fusion into …
prabhatsuman Apr 23, 2024
d6b6040
Merge pull request #1550 from prabhatsuman/ac-4
prabhatsuman Apr 23, 2024
70212ae
changed files permissions
prabhatsuman Apr 23, 2024
b7d602e
Changed file persmissions
prabhatsuman Apr 23, 2024
ce9a32e
another file changed
prabhatsuman Apr 23, 2024
9ce8a40
FTS mig change restored
prabhatsuman Apr 23, 2024
3d53e52
Introduces Subtype option and implemented generate report
ThisisMS11 Apr 23, 2024
18944dd
Added notifications and tracking for each file
Srivatsa19 Apr 23, 2024
b15716d
Merge pull request #1551 from prabhatsuman/ac-4
prabhatsuman Apr 23, 2024
2b28b61
Removed unwanted files
Srivatsa19 Apr 23, 2024
8855721
Merge pull request #1537 from FusionIIIT/ac-4
prabhatsuman Apr 23, 2024
d7b00f8
Merge pull request #1546 from theoden42/gad-4-final
prajjwalkapoor Apr 24, 2024
7143741
Revert "Merging AC-4 to Latest-Staging"
prabhatsuman Apr 24, 2024
e632e56
Merge pull request #1558 from FusionIIIT/revert-1537-ac-4
prabhatsuman Apr 24, 2024
bb1fc5f
Merge branch 'latest_staging' into gad-4-final
VarunGitGood Apr 24, 2024
fb8c35b
Merge pull request #1557 from FusionIIIT/gad-4-final
Priyansh61 Apr 24, 2024
781861f
corrected acadadmin login issues
Divyanshu-iiitdmj Apr 24, 2024
258b955
Merge pull request #1559 from Divyanshusir/latest_staging
prabhatsuman Apr 24, 2024
312b20c
Merge pull request #1560 from FusionIIIT/ac-2
prabhatsuman Apr 24, 2024
d59b421
added verify course api endpoint
Bhavik-ag Apr 24, 2024
ad15bae
chore: added updated files for gymkhana in applications and templates
Anurag607 Apr 24, 2024
f81871d
Merge pull request #1562 from Anurag607/latest_staging_new
prabhatsuman Apr 24, 2024
a40440c
fts user validation fixed and side panel notifications
Ravichendraa Apr 24, 2024
39177ff
Merge branch 'ac-1_final' of https://github.com/FusionIIIT/Fusion int…
Ravichendraa Apr 24, 2024
04e4ecc
Sidepanel Added
Ravichendraa Apr 24, 2024
f0cd7b3
Delete FusionIIIT/applications/globals/migrations/0015_auto_20240425_…
prabhatsuman Apr 24, 2024
723946e
Delete FusionIIIT/applications/research_procedures/migrations/0004_au…
prabhatsuman Apr 24, 2024
550dade
Delete FusionIIIT/applications/globals/migrations/0014_auto_20240425_…
prabhatsuman Apr 24, 2024
5f2eb17
corrected ac-4 module
xenouno Apr 24, 2024
23e9af8
Merge pull request #1567 from xenouno/latest_staging
prabhatsuman Apr 24, 2024
d7dc61f
Merge pull request #1565 from itsspriyansh/sa-3
prabhatsuman Apr 24, 2024
bf0d813
Merge pull request #1568 from FusionIIIT/ac-4
prabhatsuman Apr 24, 2024
93cfeb8
refactor: api
itsspriyansh Apr 25, 2024
2d5cfac
Delete FusionIIIT/applications/central_mess/migrations/0010_auto_2024…
prabhatsuman Apr 24, 2024
bf4d386
Introduces Subtype option and implemented generate report
ThisisMS11 Apr 23, 2024
fc8fdf5
removed conflicts
ThisisMS11 Apr 25, 2024
0ecbdc8
removed conflicts
ThisisMS11 Apr 25, 2024
0c41891
Merge branch 'mohit_fusion_1' of https://github.com/ThisisMS11/Fusion…
ThisisMS11 Apr 25, 2024
40dd12e
Merge pull request #1553 from Srivatsa19/gad-2-inven
Priyansh61 Apr 25, 2024
e54482f
corrected PHC notifications
prabhatsuman Apr 25, 2024
ed35166
Merge pull request #1569 from prabhatsuman/OSS-2
prabhatsuman Apr 25, 2024
6e66b1c
Merge pull request #1570 from FusionIIIT/os-2
prabhatsuman Apr 25, 2024
5ff2879
multi copis
SharanKumar06 Apr 25, 2024
d645a42
Merge pull request #1520 from Bhavik-ag/ac2-apis
ChaudharyRaman Apr 25, 2024
1f9fb72
Merge pull request #1573 from FusionIIIT/ac-2
ChaudharyRaman Apr 25, 2024
703b5ac
fix acadadmin error
Daksh119 Apr 25, 2024
b438fa4
refactor: urls and views
itsspriyansh Apr 25, 2024
bf0d1e3
Merge pull request #1574 from Daksh119/ac-final
prabhatsuman Apr 25, 2024
88e664d
Merge pull request #1576 from FusionIIIT/ac-3-final
prabhatsuman Apr 25, 2024
97baf89
Merge pull request #1566 from ThisisMS11/mohit_fusion_1
prajjwalkapoor Apr 25, 2024
ab2cd9a
fixed issues of testing
Divyanshu-iiitdmj Apr 26, 2024
41e1058
Merge pull request #1525 from 21BCS035/gad-new
prajjwalkapoor Apr 26, 2024
447de08
Merge pull request #1579 from Divyanshusir/latest_staging
prabhatsuman Apr 26, 2024
e33a503
Merge pull request #1581 from FusionIIIT/gad-2
itsspriyansh Apr 26, 2024
9bba0d6
Resolve minor issues
ThisisMS11 Apr 26, 2024
1f54705
Merge pull request #1582 from ThisisMS11/mohit_fusion_1
prabhatsuman Apr 26, 2024
a2615b5
notification error in gad-2 resolved
prabhatsuman Apr 27, 2024
69b987d
Merge pull request #1584 from prabhatsuman/latest_staging
prabhatsuman Apr 27, 2024
35408d2
Merge pull request #1580 from FusionIIIT/ac-2
prabhatsuman Apr 27, 2024
4d57dfb
updated migrations for all modules
prabhatsuman Apr 27, 2024
71f4d2e
Merge pull request #1585 from prabhatsuman/latest_staging
prabhatsuman Apr 27, 2024
c914f68
add_projects updated
SharanKumar06 May 3, 2024
6312078
dropdown added
SharanKumar06 May 3, 2024
8a579cc
Merge branch 'latest_staging' of github.com:SharanKumar06/Fusion into…
SharanKumar06 May 3, 2024
e250fef
Merge branch 'ps-1' into mig
prabhatsuman May 3, 2024
4b51036
added ps-1
prabhatsuman May 3, 2024
a904ba6
Merge pull request #1583 from FusionIIIT/ps-1
prabhatsuman May 3, 2024
db86040
bug fix in ac-7
prabhatsuman May 3, 2024
3f7771f
Merge pull request #1575 from FusionIIIT/ac-5
itsspriyansh May 3, 2024
89775df
Merge branch 'FusionIIIT:latest_staging' into latest_staging
prabhatsuman May 3, 2024
aa89a49
Enable,checks on module and navigate in navbar
TusharGupta03 May 3, 2024
f2a067e
Merge pull request #1587 from TusharGupta03/FinalChanges
prabhatsuman May 3, 2024
b9ae288
Merge branch 'latest_staging' into mig
prabhatsuman May 3, 2024
c9deb49
Merge pull request #1589 from prabhatsuman/latest_staging
prabhatsuman May 3, 2024
4a9b752
Merge pull request #1588 from FusionIIIT/gad-5
prabhatsuman May 4, 2024
7a0fc39
Swayam, course code and minor fixes
Daksh119 May 4, 2024
4dc7f39
Merge pull request #1590 from Daksh119/ac-3-final
prabhatsuman May 4, 2024
7939417
Merge pull request #1591 from FusionIIIT/ac-3-final
prabhatsuman May 4, 2024
1b37a4d
changes done final
SharanKumar06 May 4, 2024
d0143b2
Merge branch 'latest_staging' into rspc-2025-gad7
SharanKumar06 May 4, 2024
726abd8
merge confilcts resolved
SharanKumar06 May 4, 2024
d85114b
Merge branch 'new9ac1' of https://github.com/Ravichendraa/Fusion; bra…
Ravichendraa May 4, 2024
087fadf
dep final push
prajjwalkapoor May 4, 2024
3f60f80
Merge pull request #1594 from FusionIIIT/ac-6-final
prajjwalkapoor May 4, 2024
56a0fd0
delete migrations
prajjwalkapoor May 4, 2024
b944341
Update requirements.txt
prajjwalkapoor May 4, 2024
89f0220
Update requirements.txt
prajjwalkapoor May 4, 2024
dfe2c57
Merge pull request #1592 from SharanKumar06/rspc-2025-gad7
prajjwalkapoor May 4, 2024
3e186aa
Modify viewHIstory API
aish0749 May 4, 2024
c79cca6
Update 0001_initial.py
prabhatsuman May 4, 2024
3c49d8a
apis added
SharanKumar06 May 4, 2024
827c71d
Merge branch 'rspc-2025-gad7' of github.com:SharanKumar06/Fusion into…
SharanKumar06 May 4, 2024
7f3765c
Merge pull request #1593 from Ravichendraa/new9ac1
prabhatsuman May 4, 2024
00c64b6
Merge pull request #1597 from FusionIIIT/ac-1
prabhatsuman May 4, 2024
8352e67
Merge pull request #1598 from SharanKumar06/rspc-2025-gad7
prabhatsuman May 4, 2024
6529198
Merge pull request #1595 from FusionIIIT/rspc
prabhatsuman May 4, 2024
0473fbf
Merge pull request #1596 from aish0749/latest_staging
prajjwalkapoor May 4, 2024
bf921e1
revert to db sync
prabhatsuman May 4, 2024
100c4dc
Merge pull request #20 from prabhatsuman/latest_staging
prabhatsuman May 4, 2024
6098339
added ac-6, rspc
prabhatsuman May 4, 2024
a7567d0
added apis for app
Daksh119 May 5, 2024
ab5fcb4
Merge pull request #1600 from Daksh119/ac-3-final
prabhatsuman May 5, 2024
fdb38ae
Merge pull request #1602 from FusionIIIT/ac-3-final
prabhatsuman May 5, 2024
6167924
Merge pull request #1604 from FusionIIIT/gad-1
itsspriyansh May 5, 2024
8912494
fixed bugs api chages
Harshul-25 May 5, 2024
14550e5
Merge pull request #1605 from Harshul-25/latest_staging
prabhatsuman May 5, 2024
e07930f
rebate fix
Harshul-25 May 5, 2024
a2cc468
Update filetracking.html
prabhatsuman May 5, 2024
db960a9
Merge pull request #1608 from Harshul-25/latest_staging
prabhatsuman May 5, 2024
9ab977d
minor issues in the Dashboard
TusharGupta03 Jun 19, 2024
cc80f40
this commit, adds a new search functionality, a new pagination featur…
theoden42 Jun 22, 2024
513c081
Merge pull request #1612 from theoden42/latest_staging
prajjwalkapoor Jul 1, 2024
bebd568
Merge remote-tracking branch 'upstream/latest-sa-1' into latestHM
Iamankit45 Jul 3, 2024
be31168
Merge remote-tracking branch 'origin/latest-sa-1' into hmweb-main2.0
Jul 3, 2024
935f348
add new hostel,view hostel details added
Iamankit45 Jul 4, 2024
3dc9ca9
added hostelallotment
Iamankit45 Jul 4, 2024
ed7ebc2
room allotment added
Iamankit45 Jul 4, 2024
d1ef2e7
added functionality for removing hostelAllotmnent
Iamankit45 Jul 4, 2024
2af25b4
room swaps and new room change functionality added
Iamankit45 Jul 5, 2024
9f6c7ea
modified view hostel
Iamankit45 Jul 5, 2024
8bfea87
sort student list by rollnum
Iamankit45 Jul 5, 2024
7885b7b
modified student details ,checks for fixed value
Iamankit45 Jul 5, 2024
e2cc2d7
added alert for removing task
Iamankit45 Jul 5, 2024
f9df066
Merge pull request #35 from Iamankit45/Final
anujpatel03 Jul 5, 2024
afb6aaa
migration files
Jul 5, 2024
4125d61
Merging Ankit's changes
anujpatel03 Jul 5, 2024
7aefb14
modified add_new_hallForm
anujpatel03 Jul 5, 2024
024a578
deleted migration files and few modification in add_new_hallForm
anujpatel03 Jul 5, 2024
92cc502
Merge pull request #1611 from TusharGupta03/lates_sta
ChaudharyRaman Jul 14, 2024
088335f
updated mig
prabhatsuman Jul 16, 2024
4445c2f
Merge branch 'mig' into latest_staging
prabhatsuman Jul 16, 2024
8aa30b5
corrected globals mig
prabhatsuman Jul 16, 2024
693e189
Merge pull request #1614 from prabhatsuman/latest_staging
prabhatsuman Jul 16, 2024
58b64c6
changed allot courses function to update pre registration data using …
hrithik-09 Jul 26, 2024
d5fffde
updated user card to show roll no
hrithik-09 Jul 26, 2024
2769761
Merge pull request #1616 from hrithik-09/latest_staging
ChaudharyRaman Jul 26, 2024
ebad56d
increase options for less fee payment
hrithik-09 Jul 26, 2024
d133ee9
Merge pull request #1618 from hrithik-09/latest_staging
prabhatsuman Jul 26, 2024
0037d7a
Merge remote-tracking branch 'upstream/latest_staging' into hmweb-lat…
anujpatel03 Jul 30, 2024
3a2ad19
Update admin.py
SukulSarve Jul 31, 2024
2eaa8fb
Merge pull request #1619 from SukulSarve/lt
prabhatsuman Jul 31, 2024
81b99ca
new feat. marks submission, improved attendance and grading scheme
Daksh119 Jul 31, 2024
7a6261d
Merge pull request #1620 from Daksh119/latest-ac3
prabhatsuman Jul 31, 2024
573db4a
Merge remote-tracking branch 'upstream/latest_staging' into hmweb-lat…
anujpatel03 Jul 31, 2024
008b252
pulled latest_staging and style changes
anujpatel03 Aug 1, 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
  •  
  •  
  •  
18 changes: 15 additions & 3 deletions FusionIIIT/Fusion/middleware/custom_middleware.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
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)
Issue, IssueImage, DepartmentInfo,ModuleAccess)
from django.shortcuts import get_object_or_404, redirect, render

def user_logged_in_middleware(get_response):
Expand Down Expand Up @@ -35,7 +35,19 @@ def user_logged_in_handler(sender, user, request, **kwargs):
print(i)

request.session['currentDesignationSelected'] = designation[0]
request.session['allDesignations'] = designation
request.session['allDesignations'] = designation
first_designation = designation[0]
module_access = ModuleAccess.objects.filter(designation=first_designation).first()

if module_access:
access_rights = {}

field_names = [field.name for field in ModuleAccess._meta.get_fields() if field.name not in ['id', 'designation']]

for field_name in field_names:
access_rights[field_name] = getattr(module_access, field_name)

request.session['moduleAccessRights'] = access_rights
print("logged iN")

# Set the flag in the session to indicate that the function has bee+n executed
Expand All @@ -47,4 +59,4 @@ def middleware(request):
response = get_response(request)
return response

return middleware
return middleware
4 changes: 3 additions & 1 deletion FusionIIIT/Fusion/settings/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@
'notification',
'notifications',
'applications.academic_procedures',
'applications.examination',
'applications.academic_information',
'applications.leave',
'applications.library',
Expand All @@ -127,6 +128,7 @@
'applications.ps1',
'applications.programme_curriculum',
'applications.placement_cell',
'applications.otheracademic',
'applications.recruitment',
'applications.scholarships',
'applications.visitor_hostel',
Expand Down Expand Up @@ -281,4 +283,4 @@


CORS_ORIGIN_ALLOW_ALL = True
ALLOW_PASS_RESET = True
ALLOW_PASS_RESET = True
2 changes: 2 additions & 0 deletions FusionIIIT/Fusion/settings/development.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,3 +63,5 @@
#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'),
]

CRONTAB_DJANGO_MANAGE_PATH = '/home/owlman/Desktop/Fuse/Fusion/FusionIIIT/manage.py'
2 changes: 2 additions & 0 deletions FusionIIIT/Fusion/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,6 @@
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'^examination/', include('applications.examination.urls')),
url(r'^otheracademic/', include('applications.otheracademic.urls')),
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
1 change: 0 additions & 1 deletion FusionIIIT/applications/academic_information/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,3 @@ class Curriculum_InstructorAdmin(admin.ModelAdmin):
admin.site.register(Holiday)
admin.site.register(Curriculum,CurriculumAdmin)

#Hello!
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ class Meta:

class CurriculumSerializer(serializers.ModelSerializer):
course_id = CourseSerializer()

class Meta:
model = Curriculum
fields = ('curriculum_id','course_code','course_id','credits','course_type',
Expand Down
5 changes: 3 additions & 2 deletions FusionIIIT/applications/academic_information/api/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@

# url(r'^meeting',views.meeting_api,name='meeting-get-api'),

# url(r'^calendar',views.calendar_api,name='calendar-get-api'),
url(r'^calendar',views.ListCalendarView.as_view(),name='calendar-get-api'),
url(r'^update-calendar',views.update_calendar,name='calendar-update-api'),

# url(r'^holiday',views.holiday_api,name='holiday-get-api'),

Expand All @@ -27,4 +28,4 @@
# url(r'^grades',views.grades_api,name='grades-get-api'),

# url(r'^spi',views.spi_api,name='spi-get-api')
]
]
Loading
Loading