Latest staging #1511

Anurag607 · 2024-04-21T16:47:58Z

Issue that this pull request solves

Closes: # (issue number)

Proposed changes

Brief description of what is fixed or changed

Types of changes

Put an x in the boxes that apply

Bugfix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to not work as expected)
Other (please describe):

Checklist

Put an x in the boxes that apply

My code follows the style guidelines of this project
I have performed a self-review of my own code
I have created new branch for this pull request
I have commented my code, particularly in hard-to-understand areas
I have made corresponding changes to the documentation
My changes generate no new warnings
My changes does not break the current system and it passes all the current test cases.

Screenshots

Please attach the screenshots of the changes made in case of change in user interface

Other information

Any other information that is important to this pull request

* Add functionality to add and update courses * Course version added * Delete FusionIIIT/Fusion/settings/development.py * Delete FusionIIIT/applications/academic_procedures/migrations/0002_auto_20240218_1206.py * Delete FusionIIIT/applications/eis/migrations/0002_auto_20240218_1206.py * Delete FusionIIIT/applications/globals/migrations/0002_auto_20240218_1206.py * Delete FusionIIIT/applications/globals/migrations/0003_auto_20240218_1235.py * Delete FusionIIIT/applications/globals/migrations/0004_auto_20240218_1242.py * Delete FusionIIIT/applications/globals/migrations/0005_auto_20240218_1325.py * Delete FusionIIIT/applications/globals/migrations/0006_auto_20240218_1336.py * Delete FusionIIIT/applications/globals/migrations/0007_auto_20240218_1601.py * Delete FusionIIIT/applications/globals/migrations/0008_auto_20240218_1942.py * Delete FusionIIIT/applications/globals/migrations/0009_auto_20240219_2217.py * Delete FusionIIIT/applications/globals/migrations/0010_auto_20240219_2232.py * Delete FusionIIIT/applications/scholarships/migrations/0002_auto_20240218_1206.py * Delete requirements.txt * Delete FusionIIIT/applications/programme_curriculum/migrations/0002_auto_20240312_1929.py * Delete FusionIIIT/applications/programme_curriculum/migrations/0003_auto_20240312_1944.py * Delete FusionIIIT/applications/programme_curriculum/migrations/0004_course_latest_version.py * Delete FusionIIIT/applications/programme_curriculum/migrations/0005_auto_20240313_0128.py

commit the merge

* Enabled all modules for access (FusionIIIT#1120) * GAD-5: Fix responsiveness (FusionIIIT#1125) Co-authored-by: A Anunaya <[email protected]> Co-authored-by: Aksh Bansal <[email protected]> * GAD -5 Dashboard Changes (FusionIIIT#1325) * dashboard and usercard updated (FusionIIIT#1329) --------- Co-authored-by: Yathartha Goenka <[email protected]> Co-authored-by: akshatnema <[email protected]> Co-authored-by: Harshvardhan Singh <[email protected]> Co-authored-by: A Anunaya <[email protected]> Co-authored-by: Aksh Bansal <[email protected]> Co-authored-by: BlackHAWK2001 <[email protected]> Co-authored-by: Arpit Tak <[email protected]>

Gad 5 2021

Some changes made to dashboard module in terms of UI and context updated.

Resolved some merge confilt

Synced with Dashboard

added dashboard

commented inventory,complaint

* GAD-5: Fix responsiveness (FusionIIIT#1125) Co-authored-by: A Anunaya <[email protected]> Co-authored-by: Aksh Bansal <[email protected]> * added announcements and pathologist schedule * Added pylint (FusionIIIT#1302) * Create bandit_security_test.yml Added Bandit security test for python * Update bandit_security_test.yml * Update bandit_security_test.yml * Create pylint.yml * Update pylint.yml * Update pylint.yml * Revert "Added pylint (FusionIIIT#1302)" (FusionIIIT#1324) This reverts commit c1359b7. * GAD -5 Dashboard Changes (FusionIIIT#1325) * dashboard and usercard updated (FusionIIIT#1329) * changes in programme_cuuriculam,adding version to models (FusionIIIT#1330) * Fixing ui bugs (FusionIIIT#1335) * module completed * integrated dashboard * Revert "integrated dashboard" This reverts commit 8e48ec5. * Revert "module completed" This reverts commit 2544877. * Revert "module completed" This reverts commit 2544877. * Revert "integrated dashboard" This reverts commit 8e48ec5. * errors corrected * errors resolved * added dashboard and corrected errors * removed Migrations * removed migrations * removed migrations --------- Co-authored-by: Harshvardhan Singh <[email protected]> Co-authored-by: A Anunaya <[email protected]> Co-authored-by: Aksh Bansal <[email protected]> Co-authored-by: akshatnema <[email protected]> Co-authored-by: Hardik Sharma <[email protected]> Co-authored-by: Raman Chaudhary <[email protected]> Co-authored-by: BlackHAWK2001 <[email protected]> Co-authored-by: Arpit Tak <[email protected]> Co-authored-by: Anudeep Sanapala <[email protected]> Co-authored-by: SukulSarve <[email protected]>

This reverts commit 1db64d7.

* GAD-5: Fix responsiveness (FusionIIIT#1125) Co-authored-by: A Anunaya <[email protected]> Co-authored-by: Aksh Bansal <[email protected]> * added announcements and pathologist schedule * Added pylint (FusionIIIT#1302) * Create bandit_security_test.yml Added Bandit security test for python * Update bandit_security_test.yml * Update bandit_security_test.yml * Create pylint.yml * Update pylint.yml * Update pylint.yml * Revert "Added pylint (FusionIIIT#1302)" (FusionIIIT#1324) This reverts commit c1359b7. * GAD -5 Dashboard Changes (FusionIIIT#1325) * dashboard and usercard updated (FusionIIIT#1329) * changes in programme_cuuriculam,adding version to models (FusionIIIT#1330) * Fixing ui bugs (FusionIIIT#1335) * module completed * integrated dashboard * Revert "integrated dashboard" This reverts commit 8e48ec5. * Revert "module completed" This reverts commit 2544877. * Revert "module completed" This reverts commit 2544877. * Revert "integrated dashboard" This reverts commit 8e48ec5. * errors corrected * errors resolved * added dashboard and corrected errors * removed Migrations * removed migrations * removed migrations * corrected errors --------- Co-authored-by: Harshvardhan Singh <[email protected]> Co-authored-by: A Anunaya <[email protected]> Co-authored-by: Aksh Bansal <[email protected]> Co-authored-by: akshatnema <[email protected]> Co-authored-by: Hardik Sharma <[email protected]> Co-authored-by: Raman Chaudhary <[email protected]> Co-authored-by: BlackHAWK2001 <[email protected]> Co-authored-by: Arpit Tak <[email protected]> Co-authored-by: Anudeep Sanapala <[email protected]> Co-authored-by: SukulSarve <[email protected]>

* OS1 issue 1024 resolved : Booking form integrated with Front End (FusionIIIT#1025) * Enabled all modules for access (FusionIIIT#1120) * OS-1 : Week 5 : All changes till week 5 (FusionIIIT#1116) * Added start date display in pre registration (FusionIIIT#1063) * Major changes in Visitor's Hostel --------- Co-authored-by: A Anunaya <[email protected]> * OS-1 Minor issues resolved (FusionIIIT#1202) * Booking form integrated with Front End * OS-1 week 7 issue resolve * Bill structured properly, updated room availability, meal record fixed, url fixed * Indentaion problems fixed * database changed * More indentations issues resolved * More indentations issues resolved * Next button issue resolved * Database Changed, inventory functionality added * Database conflict resolved * Minor issues resolved * Final changes made --------- Co-authored-by: Akshat Nema <[email protected]> * visitor hostel * os-1 vh complete * os-1 vh module * GAD-5: Fix responsiveness (FusionIIIT#1125) Co-authored-by: A Anunaya <[email protected]> Co-authored-by: Aksh Bansal <[email protected]> * refactored and corrected booking issues * GAD -5 Dashboard Changes (FusionIIIT#1325) * dashboard and usercard updated (FusionIIIT#1329) * added form * Fixing ui bugs (FusionIIIT#1335) --------- Co-authored-by: Harshvardhan Singh <[email protected]> Co-authored-by: A Anunaya <[email protected]> Co-authored-by: Aksh Bansal <[email protected]> Co-authored-by: akshatnema <[email protected]> Co-authored-by: BlackHAWK2001 <[email protected]> Co-authored-by: Arpit Tak <[email protected]> Co-authored-by: SukulSarve <[email protected]> --------- Co-authored-by: VedantJain1103 <[email protected]> Co-authored-by: Yathartha Goenka <[email protected]> Co-authored-by: akshatnema <[email protected]> Co-authored-by: harsh-k-singh <[email protected]> Co-authored-by: A Anunaya <[email protected]> Co-authored-by: Akshat Nema <[email protected]> Co-authored-by: davneesh <[email protected]> Co-authored-by: Avneesh <[email protected]> Co-authored-by: Raman Chaudhary <[email protected]> Co-authored-by: varunraj03 <[email protected]> Co-authored-by: Harshvardhan Singh <[email protected]> Co-authored-by: Aksh Bansal <[email protected]> Co-authored-by: BlackHAWK2001 <[email protected]> Co-authored-by: Arpit Tak <[email protected]> Co-authored-by: SukulSarve <[email protected]>

…into gad-2-2025-latest

Gad 2 2025 latest

Gad 2 : Pushing for `latest_staging`

Gad 2 2025 latest

Added extra designations in the IWD dashboard file

…batch,assign-caretaker,assign-warden

SA-1 Hostel Management (Fixed bug)

SA-1 Hostel Management

Pushing `sa-1` to `latest_staging`

* GAD-5: Fix responsiveness (FusionIIIT#1125) Co-authored-by: A Anunaya <[email protected]> Co-authored-by: Aksh Bansal <[email protected]> * feat: new use case implementation and fixes in existing APIs * refactored: new club registration form only availablt to designated peoples (#2) * removed conflicts from approve request from dean * refactored: minor changes * removed conflicts from approve request from dean (#4) * change co and coco api working * Error fix:Change co and coco api now working (#5) * removed conflicts from approve request from dean * change co and coco api working * Update serializers.py * Update views.py * Update urls.py * New feature: new club approval form fixed (#6) * use cases init * club approoval request to dean working * fixed: removed conflicts (#7) * use cases init * club approoval request to dean working * removed conflicts * date foreign key issue resolved * fixed: new club joinee request approval and rejection * fix: multiple votes issue resolved * corrected: club budget sent to dean * corrected: club budget sent to dean * Delete requirements1.txt * fix: packages file edited * view club budget added * updated migrations error * segregated use cases based on actors * fixed gymkhana sidebar buttons according to roles * fixed: type in designations * GAD -5 Dashboard Changes (FusionIIIT#1325) * dashboard and usercard updated (FusionIIIT#1329) * fic navigation added * removed migrations * local migrations removed * Fixing ui bugs (FusionIIIT#1335) * all migration files removed * chore: merged with main * chore: added migrations to gitignore * Sa 3 (#24) * club budget updates * fix: member approval, removed FTS overhead, co/coo assignment on club creation, club budget * chore: removed migrations from .gitignore * chore: added migrations --------- Co-authored-by: Harshvardhan Singh <[email protected]> Co-authored-by: A Anunaya <[email protected]> Co-authored-by: Aksh Bansal <[email protected]> Co-authored-by: akshatnema <[email protected]> Co-authored-by: Puliuvarthi.Mahesh <[email protected]> Co-authored-by: Shobhit Kushwaha <[email protected]> Co-authored-by: RishabhSharma96 <[email protected]> Co-authored-by: Anushri Thakre <[email protected]> Co-authored-by: Hardik Sharma <[email protected]> Co-authored-by: Shobhit Kushwaha <[email protected]> Co-authored-by: Rohit Raj <[email protected]> Co-authored-by: RohanParmar2002 <[email protected]> Co-authored-by: BlackHAWK2001 <[email protected]> Co-authored-by: Arpit Tak <[email protected]> Co-authored-by: SukulSarve <[email protected]>

* GAD-5: Fix responsiveness (FusionIIIT#1125) Co-authored-by: A Anunaya <[email protected]> Co-authored-by: Aksh Bansal <[email protected]> * feat: new use case implementation and fixes in existing APIs * refactored: new club registration form only availablt to designated peoples (#2) * removed conflicts from approve request from dean * refactored: minor changes * removed conflicts from approve request from dean (#4) * change co and coco api working * Error fix:Change co and coco api now working (#5) * removed conflicts from approve request from dean * change co and coco api working * Update serializers.py * Update views.py * Update urls.py * New feature: new club approval form fixed (#6) * use cases init * club approoval request to dean working * fixed: removed conflicts (#7) * use cases init * club approoval request to dean working * removed conflicts * date foreign key issue resolved * fixed: new club joinee request approval and rejection * fix: multiple votes issue resolved * corrected: club budget sent to dean * corrected: club budget sent to dean * Delete requirements1.txt * fix: packages file edited * view club budget added * updated migrations error * segregated use cases based on actors * fixed gymkhana sidebar buttons according to roles * fixed: type in designations * GAD -5 Dashboard Changes (FusionIIIT#1325) * dashboard and usercard updated (FusionIIIT#1329) * fic navigation added * removed migrations * local migrations removed * Fixing ui bugs (FusionIIIT#1335) * all migration files removed * chore: merged with main * chore: added migrations to gitignore * Sa 3 (#24) * club budget updates * fix: member approval, removed FTS overhead, co/coo assignment on club creation, club budget * chore: removed migrations from .gitignore * chore: added migrations * chore: removed .sql file --------- Co-authored-by: Harshvardhan Singh <[email protected]> Co-authored-by: A Anunaya <[email protected]> Co-authored-by: Aksh Bansal <[email protected]> Co-authored-by: akshatnema <[email protected]> Co-authored-by: Puliuvarthi.Mahesh <[email protected]> Co-authored-by: Shobhit Kushwaha <[email protected]> Co-authored-by: RishabhSharma96 <[email protected]> Co-authored-by: Anushri Thakre <[email protected]> Co-authored-by: Hardik Sharma <[email protected]> Co-authored-by: Shobhit Kushwaha <[email protected]> Co-authored-by: Rohit Raj <[email protected]> Co-authored-by: RohanParmar2002 <[email protected]> Co-authored-by: BlackHAWK2001 <[email protected]> Co-authored-by: Arpit Tak <[email protected]> Co-authored-by: SukulSarve <[email protected]>

Ravichendraa and others added 30 commits March 18, 2024 00:23

Fixing ui bugs (FusionIIIT#1335)

d40e94d

Merge branch 'FusionIIIT:main' into main

58a32b0

Merge branch 'main' of https://github.com/kishankoushal/Fusion

bd60014

Merge remote-tracking branch 'fusion/gad-5' into dashboardMerge

1afa0de

commit the merge

Merge remote-tracking branch 'upstream/gad-5' into gad-5_2021

b1a62ed

updated dashboard

f27a5a4

Merge pull request #1 from kishankoushal/gad-5_2021

c29708d

Gad 5 2021

Synced with new Dashboard

69d3357

Some changes made to dashboard module in terms of UI and context updated.

Merge remote-tracking branch 'origin/dashboardMerge' into dashboardMerge

4c14426

Resolved some merge confilt

.DS_Store

1c72a73

Merge pull request FusionIIIT#27 from Iamankit45/dashboardMerge

a5eeacd

Synced with Dashboard

Merge remote-tracking branch 'origin/hmweb-main' into notification

09cd7f5

Merge pull request FusionIIIT#28 from anujpatel03/hmweb-main

d5288a3

added dashboard

Merge branch 'FusionIIIT:main' into main

1f5fa00

file tracking updated

55af051

commented inventory

236d404

Merge pull request FusionIIIT#29 from anujpatel03/notification

39d1e0a

commented inventory,complaint

integration of updated dashboard

b932431

dashboard modified

145ec51

dashboard and fts integrated

cf297f0

updated dashboard

c1d43df

updated dashboard

a3dbf4b

Merge remote-tracking branch 'upstream/os-3'

7fe918e

Revert "Os 2" (FusionIIIT#1352)

48bf988

This reverts commit 1db64d7.

Changes made

338b463

prajjwalkapoor and others added 29 commits April 16, 2024 13:09

fixed indentation

d3b81da

Enable deployed module (FusionIIIT#1471)

58ecf34

Merge branch 'latest_staging' of https://github.com/FusionIIIT/Fusion …

a5cc5e4

…into gad-2-2025-latest

Made changes so that employee also can create a new request

df6c7eb

Merge pull request FusionIIIT#1463 from Srivatsa19/gad-2-2025-latest

7d53b01

Gad 2 2025 latest

Merge pull request FusionIIIT#1460 from FusionIIIT/gad-2

c638c57

Gad 2 : Pushing for `latest_staging`

Added extra designations in the iwd dashboard file

04cc11a

Added extra designation in the ied dashboard file

3d7a221

Merge pull request FusionIIIT#1474 from Srivatsa19/gad-2-2025-latest

30df282

Gad 2 2025 latest

Merge pull request FusionIIIT#1475 from FusionIIIT/gad-2

eb90711

Added extra designations in the IWD dashboard file

removed initials of url http://0.0.0.0:8000 while fetching in assign-…

c8bbe19

…batch,assign-caretaker,assign-warden

previous batch by default value 0

43900a5

Merge pull request FusionIIIT#1478 from anujpatel03/sa-1-main

47b12de

SA-1 Hostel Management (Fixed bug)

resolve conflict

32ba344

Merge pull request FusionIIIT#1481 from anujpatel03/latest-sa-1

438f0a5

SA-1 Hostel Management

Merge pull request FusionIIIT#1480 from FusionIIIT/sa-1

bbab300

Pushing `sa-1` to `latest_staging`

SA3: Add try except for curr_club. (FusionIIIT#1160)

466d88f

SA3: add api for new club. (FusionIIIT#1167)

99272c3

SA3: remove duplicate imports. (FusionIIIT#1168)

9cc332e

SA3: Bug fixes and formatting in templates. (FusionIIIT#1175)

44200b4

pulled from fusion/latest_staging

cf4ecb1

pulled from fusion/latest_staging

516f570

Delete fusionlab_backup_New.sql

f08abd5

pulled from fusion/latest_staging

c39524e

pulled from fusion/latest_staging

5e7d07f

chore: resolved conflicts in migrations

f28c832

chore: migrated changes as per new bug fixes and implementation

8d14833

Anurag607 closed this Apr 21, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Latest staging #1511

Latest staging #1511

Anurag607 commented Apr 21, 2024

Latest staging #1511

Latest staging #1511

Conversation

Anurag607 commented Apr 21, 2024

Issue that this pull request solves

Proposed changes

Brief description of what is fixed or changed

Types of changes

Checklist

Screenshots

Other information