Skip to content

Comments

Gad 2 old#1724

Merged
dcoder13 merged 238 commits intoFusionIIIT:gad-2from
dcoder13:gad-2-old
Mar 18, 2025
Merged

Gad 2 old#1724
dcoder13 merged 238 commits intoFusionIIIT:gad-2from
dcoder13:gad-2-old

Conversation

@dcoder13
Copy link

@dcoder13 dcoder13 commented Mar 18, 2025

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

Lawful2002 and others added 30 commits March 4, 2023 13:01
@Lawful2002
(ac-4): week 4: fixed HOD leave module and some bugs in the student l…
fd53b1e 
…eave module. (FusionIIIT#1100)
@akshatnema
Merge branch 'main' into ac-4
d869bf2
@akshatnema
Merge branch 'main' into ac-4
e790ca5
@akshatnema
Merge branch 'main' into ac-4
0706857
@akshatnema
Merge branch 'main' into ac-4
9542057
@akshatnema
Merge branch 'main' into ac-4
79c162d
@akshatnema
Merge branch 'main' into ac-4
7effb97
@xenouno
I added my module otheracademic from scratch all functionality is imp…
e0425df 
…lemented just need to set designation
@xenouno
I added my module otheracademic from scratch all functionality is imp…
b8c6c38 
…lemented just need to set designation
@xenouno
I added my module otheracademic from scratch all functionality is imp…
0eb1310 
…lemented just need to set designation
@SharanKumar06
added new usecases
18de59c
@SharanKumar06
Merge remote-tracking branch 'upstream/main' into rspc-2025-gad7
b51d16c
@xenouno
removed migrations files
b99cb2a
@xenouno
Merge branch 'FusionIIIT:main' into otheracademic-2024
7e2196d
@xenouno @hardiksharma11 @ChaudharyRaman
Otheracademic 2024 (FusionIIIT#1316)
dd35ab6 
* I added my module otheracademic from scratch all functionality is implemented just need to set designation

* I added my module otheracademic from scratch all functionality is implemented just need to set designation

* I added my module otheracademic from scratch all functionality is implemented just need to set designation

* 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.

* removed migrations files

---------

Co-authored-by: Hardik Sharma <104981324+hardiksharma11@users.noreply.github.com>
Co-authored-by: Raman Chaudhary <97114586+ChaudharyRaman@users.noreply.github.com>
@xenouno
bug fixes
7d1612a
@xenouno
Merge branch 'otheracademic-2024' of github.com:xenouno/Fusion into o…
6b77879 
…theracademic-2024
@xenouno
Merge branch 'FusionIIIT:main' into otheracademic-2024
bafc380
@xenouno
Merge branch 'ac-4' into otheracademic-2024
4eed9df
@xenouno @hardiksharma11
@ChaudharyRaman @anudeeps0306
otheracademic update
eec488d 
* I added my module otheracademic from scratch all functionality is implemented just need to set designation

* I added my module otheracademic from scratch all functionality is implemented just need to set designation

* I added my module otheracademic from scratch all functionality is implemented just need to set designation

* 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.

* removed migrations files

* changes in programme_cuuriculam,adding version to models (FusionIIIT#1330)

* bug fixes

---------

Co-authored-by: Hardik Sharma <104981324+hardiksharma11@users.noreply.github.com>
Co-authored-by: Raman Chaudhary <97114586+ChaudharyRaman@users.noreply.github.com>
Co-authored-by: Anudeep Sanapala <71971574+anudeeps0306@users.noreply.github.com>
@xenouno
Merge branch 'gad-5' into otheracademic-2024
28cc9ca
@xenouno
Merge branch 'otheracademic-2024' of github.com:xenouno/Fusion into o…
bb32b02 
…theracademic-2024
@xenouno
Updated Dashboard
b83cf20
@xenouno
Merge branch 'otheracademic-2024' of github.com:xenouno/Fusion into o…
fdf14ca 
…theracademic-2024
@xenouno
implemented leave,assistantship,nodues
734c08e
@xenouno
Merge branch 'ac-4' into otheracademic-2024
85d2ed3
@xenouno
bug fixes
7b42e45
@xenouno
Merge branch 'otheracademic-2024' of github.com:xenouno/Fusion into o…
868125a 
…theracademic-2024
@xenouno
bug fixes assistantship
a2afb18
@xenouno
bug fixes no dues
4fe1215
dcoder13 and others added 29 commits November 18, 2024 18:09
@dcoder13
fixed apis
de7a5b6
@dcoder13
fix: serializer overriding requestCreatedBdBy value
de96808
@dcoder13
fix: serializer overriding requestCreatedBdBy value
447308d
@dcoder13
fix api
0930800
@dcoder13
Merge branch 'dashboard_client' into gad-2(latest)
2edb791
@dcoder13
chore: made handlers consistent
bfe1e25
@pred695
fix: some minor fixes
789f3d9
@dcoder13
major fixes
5c0ac8b
@pred695
minor fixes
91d964a
@pred695
add: updated urls.py and file upload
85ab3fa
@dcoder13
fix: handle dean process request file attachment upload
e2e2256
@dcoder13
fix : forward file
375d0b8
@aarav0012 @Akashsah2003
Test os 3 (FusionIIIT#1700)
5c99c5a 
* Setup Email Notifications and architected new announcement system

* Added module to announcement schema and lazy loading to specific_users

* Added create announcement and get announcement apis and added redis as dependency

* Sorted GET Announcement result order

* department info api (#1)

Co-authored-by: aarav0012 <aaravjainjn@email.com>

* rspc notification api added

---------

Co-authored-by: Akash Kumar Sah <akashsah2003@gmail.com>
Co-authored-by: aarav0012 <aaravjainjn@email.com>
@shramanpaul @AtOM18
@ompandey0703 @Vishal-Github-21 @Pheonix7113 @Arun7113
Dashboard client (FusionIIIT#1697)
13e33f2 
* Get Booking data api added (#1)

* bug: fix conditional rendering of booking req

* Dashboard client (#3)

* Get Booking data api added

* active booking api

* add: forwardBooking confirmBooking

* Dashboard client (#4)

* Get Booking data api added

* active booking api

* Added cancelled, active, completed booking view functionality

* cancellation_request done

* reject option works

* Add items backend functionality (#5)

* add: rooms availibility

* fix: urls

* add: Account statement backend (#6)

* "add: account statements"

* resolved MC

* Updated visitor_hostel URLs and views:added partial booking API (#7)

Co-authored-by: Arun7113 <arunhyd2003@gmail.com>

* fix: partial booking feature

* fix: completed bookings

* fix: account statement

* fix: correct income display on account statement

---------

Co-authored-by: Hardik Vardaan <37293677+AtOM18@users.noreply.github.com>
Co-authored-by: ompandey0703 <142932201+ompandey0703@users.noreply.github.com>
Co-authored-by: Vishal-Github-21 <116187488+Vishal-Github-21@users.noreply.github.com>
Co-authored-by: JATOTHU ARUN <167317035+Pheonix7113@users.noreply.github.com>
Co-authored-by: Arun7113 <arunhyd2003@gmail.com>
@Charan2437
All changes of Complaint Management (FusionIIIT#1704)
5008abd
@RameshBabuAsh
eis module version 1 (FusionIIIT#1706)
c613977
@pred695
fix: multiple file uploads, and ajax dropdown cbv
1f645aa
@pred695
add: added multiple drafts upload
4e8c013
@pred695
fix: uncommented mess migrations
31706f0
@Pratik2026
Merge pull request FusionIIIT#1710 from pred695/gad-4
9c1f0ee 
File tracking Backend Push
@Vithesh2215
Department module Version 1 (FusionIIIT#1709)
fdec7d3
@Pratik2026
[Dashboard] Modified Profile views to fetch relevant data only (Fusio…
79b18a6 
…nIIIT#1711)
@Adi8712 @S-tej
@karthikpadarthi @PrinceBujethia
SA-2 [New-UI] - updated APIs for use with fusion-client (FusionIIIT#1717
80b3507 
)

* chore: added linting

* changes in feedbackAPI

* feat: added update bill excel (#4)

* fix: migrations

* Fix: Fixed an api endpoint allowed method (#5)

* Added New API for Student Records, Implement Checks in RebateAPI. (#6)

* Change in feedbackAPI

* New API and filter in RebateApi

* Fix merge

* fix: api cleanup

---------

Co-authored-by: S-tej <132924903+S-tej@users.noreply.github.com>
Co-authored-by: Padarthi Karthik <133255355+karthikpadarthi@users.noreply.github.com>
Co-authored-by: Green Mansion <90859709+PrinceBujethia@users.noreply.github.com>
@Adi8712 @S-tej
@karthikpadarthi @PrinceBujethia
SA-2 new UI updates (FusionIIIT#1718)
db37756 
* chore: added linting

* changes in feedbackAPI

* feat: added update bill excel (#4)

* fix: migrations

* Fix: Fixed an api endpoint allowed method (#5)

* Added New API for Student Records, Implement Checks in RebateAPI. (#6)

* Change in feedbackAPI

* New API and filter in RebateApi

* Fix merge

* fix: api cleanup

* deployment fixes

---------

Co-authored-by: S-tej <132924903+S-tej@users.noreply.github.com>
Co-authored-by: Padarthi Karthik <133255355+karthikpadarthi@users.noreply.github.com>
Co-authored-by: Green Mansion <90859709+PrinceBujethia@users.noreply.github.com>
@dcoder13 @Bhargavzz
@abhiJeetP10 @dotniiko @Somgester
Old version(gad 2) (FusionIIIT#1721)
e528b98 
* Added API folder in iwdModuleV2

* Added endpoints in API folder in iwdModuleV2

* Added additional endpoints in API folder in iwdModuleV2

* fix[api] : fetchdesignation, requestview

* fix : view file endpoint

* minor updates while updating the issue-work-order table (#4)

* minor changes (#5)

* minor changes

* minor changes

* approve/reject  and view file

* fix: work order

* Minor changes in addBudget and editBudget endpoints (#6)

* fix : serializer

* modified views related to audit document view (#7)

* Added API folder in iwdModuleV2

* modified views related to audit document view

* fixed apis

* fix: serializer overriding requestCreatedBdBy value

* fix: serializer overriding requestCreatedBdBy value

* fix api

* chore: made handlers consistent

* major fixes

* fix: handle dean process request file attachment upload

* fix : forward file

---------

Co-authored-by: Bhargavzz <vishnubhargavsitra@gmail.com>
Co-authored-by: Abhijeet <pabhijeet349@gmail.com>
Co-authored-by: dotniiko <115548274+dotniiko@users.noreply.github.com>
Co-authored-by: Dhruv Ratmele <129955117+Somgester@users.noreply.github.com>
Co-authored-by: Abhijeet Patil <133658873+abhiJeetP10@users.noreply.github.com>
Co-authored-by: Bhargavzz <133690080+Bhargavzz@users.noreply.github.com>
@dcoder13
Revert "Old version(gad 2) (FusionIIIT#1721)" (FusionIIIT#1723)
783daca 
This reverts commit e528b98.
@dcoder13
fix:migrations
0d250b5
@dcoder13
fix: merge
7acc894
@dcoder13
Merge branch 'dashboard_client' into gad-2-old
76222d8
@dcoder13 dcoder13 merged commit dcdc36c into FusionIIIT:gad-2 Mar 18, 2025
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.