forked from FusionIIIT/Fusion
-
Notifications
You must be signed in to change notification settings - Fork 6
New feature: new club approval form fixed #6
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
Merged
+163
−217
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Anurag607
added a commit
that referenced
this pull request
Apr 11, 2024
* 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 --------- 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]>
Anurag607
added a commit
that referenced
this pull request
Apr 11, 2024
* 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]>
Anurag607
added a commit
that referenced
this pull request
Apr 11, 2024
* 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]>
Anurag607
added a commit
that referenced
this pull request
Apr 11, 2024
* 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 --------- 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]>
Anurag607
added a commit
that referenced
this pull request
Apr 11, 2024
* 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]>
Anurag607
added a commit
that referenced
this pull request
Apr 11, 2024
* 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]>
Anurag607
pushed a commit
that referenced
this pull request
Apr 19, 2024
added assign-warden, add hostel , delete hostel ,show room, alloted room, complaint , leave etc
Anurag607
added a commit
that referenced
this pull request
Apr 19, 2024
* 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]>
Anurag607
added a commit
that referenced
this pull request
Apr 19, 2024
* 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]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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 applyChecklist
Put an
x
in the boxes that applyScreenshots
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