Sa 2 #1532
Closed
Sa 2 #1532
Conversation
This file contains 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
…#1097 fix (FusionIIIT#1010) Co-authored-by: theparasgami <[email protected]>
* Query Optimization * Removed Unnecessary print Statements * Used .exists() method
Merge main into sa-2
Co-authored-by: Mayankingale123 <[email protected]> Co-authored-by: akshatnema <[email protected]>
This reverts commit 83e2e73.
Backend Updates
SA-2 update
Created frontend for registered students and update menu features
Added frontend for new apis
resolved errors
Menu UI changes
* GAD-5: Fix responsiveness (FusionIIIT#1125) Co-authored-by: A Anunaya <[email protected]> Co-authored-by: Aksh Bansal <[email protected]> * updated models * Revert "updated models" This reverts commit 83e2e73. * revert to old * some changes in frontend * some updates in frontend files * added the api for mobiles and updated urls and views of web * some updates in backend * Added frontend for new apis Created frontend for registered students and update menu features * updated admin and ui * resolved errors * Menu UI changes * Updated Menu_card * some fixes * migrations fixed * added mess registration request model * minor changes * added model and view for registeration * url fixed * fixed rebate * added new form for registration request * fixed gitignore resolved conflicts * context * Registration UI Changes * registration UI changes * restored migration file * completed registration * made some ui changes * migration fix * done things about payments * changed some views * Added Registration Remark and Dropdown * Changed id in reg * rectified error with rebate response frontend * fixed datetime in reg * worked on manage reg * deregistration request functionality added * rectified the backend issues for generate bills * added registration list * completed dereg * student bill functionality addded * rectified error of previous commit * added view reg records * added filter in view mess students * worked on bills caretaker side * changed development * Updated special food request * GAD -5 Dashboard Changes (FusionIIIT#1325) * Updated Special food Functionality * dashboard and usercard updated (FusionIIIT#1329) * minor ui fixes * added search * updated manage registration * added view bills and payments of students for mess caretaker * added notification functionality in right rail * Added Sem start and end date form (#26) * added start date to registration form * made some ui changes * added modal for details of a student * made some ui improvements * tested crontab * added excel upload for bill and reg * added add student to mess * fixes * update bill added and dates added (#32) Co-authored-by: Harshul Choudhary <[email protected]> * Some UI changes (#35) Co-authored-by: Harshul Choudhary <[email protected]> * merge fixes * added remove * some ui fixes * fixed cronjobs * semdate fixes * removed migrations * Fixing ui bugs (FusionIIIT#1335) * added django crontab to requirements.txt * automation of bills no new msg resolved some merge conflicts * useless commit for pulling no msg * completed automation of mess bill generation and payment history feature for student * resolved a merge error --------- 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: Harshit0009 <[email protected]> Co-authored-by: Harshul <[email protected]> Co-authored-by: hemantsinghhere <[email protected]> Co-authored-by: Hritik Yadav <[email protected]> Co-authored-by: Harshit0009 <[email protected]> Co-authored-by: Harshit Tiwari <[email protected]> Co-authored-by: hemantsinghhere <[email protected]> Co-authored-by: BlackHAWK2001 <[email protected]> Co-authored-by: Arpit Tak <[email protected]> Co-authored-by: Hritik Yadav <[email protected]> Co-authored-by: Harshul <[email protected]> Co-authored-by: SukulSarve <[email protected]>
no new msg resolved some merge conflicts
* GAD-5: Fix responsiveness (FusionIIIT#1125) Co-authored-by: A Anunaya <[email protected]> Co-authored-by: Aksh Bansal <[email protected]> * updated models * Revert "updated models" This reverts commit 83e2e73. * revert to old * some changes in frontend * some updates in frontend files * added the api for mobiles and updated urls and views of web * some updates in backend * Added frontend for new apis Created frontend for registered students and update menu features * updated admin and ui * resolved errors * Menu UI changes * Updated Menu_card * some fixes * migrations fixed * added mess registration request model * minor changes * added model and view for registeration * url fixed * fixed rebate * added new form for registration request * fixed gitignore resolved conflicts * context * Registration UI Changes * registration UI changes * restored migration file * completed registration * made some ui changes * migration fix * done things about payments * changed some views * Added Registration Remark and Dropdown * Changed id in reg * rectified error with rebate response frontend * fixed datetime in reg * worked on manage reg * deregistration request functionality added * rectified the backend issues for generate bills * added registration list * completed dereg * student bill functionality addded * rectified error of previous commit * added view reg records * added filter in view mess students * worked on bills caretaker side * changed development * Updated special food request * GAD -5 Dashboard Changes (FusionIIIT#1325) * Updated Special food Functionality * dashboard and usercard updated (FusionIIIT#1329) * minor ui fixes * added search * updated manage registration * added view bills and payments of students for mess caretaker * added notification functionality in right rail * Added Sem start and end date form (#26) * added start date to registration form * made some ui changes * added modal for details of a student * made some ui improvements * tested crontab * added excel upload for bill and reg * added add student to mess * fixes * update bill added and dates added (#32) Co-authored-by: Harshul Choudhary <[email protected]> * Some UI changes (#35) Co-authored-by: Harshul Choudhary <[email protected]> * merge fixes * added remove * some ui fixes * fixed cronjobs * semdate fixes * removed migrations * Fixing ui bugs (FusionIIIT#1335) * added django crontab to requirements.txt * automation of bills no new msg resolved some merge conflicts * useless commit for pulling no msg * completed automation of mess bill generation and payment history feature for student * resolved a merge error * bug fixes * bug fixes --------- 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: Harshit0009 <[email protected]> Co-authored-by: Harshul <[email protected]> Co-authored-by: hemantsinghhere <[email protected]> Co-authored-by: Hritik Yadav <[email protected]> Co-authored-by: Harshit0009 <[email protected]> Co-authored-by: Harshit Tiwari <[email protected]> Co-authored-by: hemantsinghhere <[email protected]> Co-authored-by: BlackHAWK2001 <[email protected]> Co-authored-by: Arpit Tak <[email protected]> Co-authored-by: Hritik Yadav <[email protected]> Co-authored-by: Harshul <[email protected]> Co-authored-by: SukulSarve <[email protected]>
* notifications changes * migrations changes * migration fix --------- Co-authored-by: Harshul Choudhary <[email protected]>
created forms for updating payment and new table created for that
* created a function in view * completed the backend logic of update payment * updated model
modified mess monthly bill API
added update payment frontend
fixed some merge conflicts
|
please check @varun7singh |
|
@anudeeps0306 can you review this PR, can this be merged or not?? |
|
This PR is already Megerd in latest_staging |
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.
Code cleanup , menu fixes and update payment feature added