Updated Ac2 merged with staging#1435
Merged
ChaudharyRaman merged 89 commits intoFusionIIIT:crfrom Apr 12, 2024
Merged
Conversation
…1113) fix: icons that were disabled or not working.
…taker (FusionIIIT#1132) Co-authored-by: Akshat Nema <76521428+akshatnema@users.noreply.github.com>
…ues (FusionIIIT#1137) Co-authored-by: Aksh Bansal <63552235+Aksh-Bansal-dev@users.noreply.github.com>
…oking an appointment (FusionIIIT#1084) * Date validation added * Date Validation for booking ambulance --------- Co-authored-by: Akshay010203 <92329718+Akshay010203@users.noreply.github.com>
…IIT#1173) * before adding functionality for secincharge * Delete 0002_auto_20230321_0041.py
* 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
This reverts commit c1359b7.
* gad-3 : week-2 : changed api functions (FusionIIIT#1069) * gad-3 : workers would be assigned by Section Incharge instead of Caretaker (FusionIIIT#1132) Co-authored-by: Akshat Nema <76521428+akshatnema@users.noreply.github.com> * gad-3: Week7 : fixed the notification and re-assign worker button issues (FusionIIIT#1137) Co-authored-by: Aksh Bansal <63552235+Aksh-Bansal-dev@users.noreply.github.com> * auto-restart docker (FusionIIIT#1147) * gad-3 : week-8 : db migrations after adding Section Incharge (FusionIIIT#1173) * before adding functionality for secincharge * Delete 0002_auto_20230321_0041.py * gad-3 : week8 : remove wrong dependency to globals. (FusionIIIT#1178) * Gad 3 (FusionIIIT#1383) * GAD-5: Fix responsiveness (FusionIIIT#1125) Co-authored-by: A Anunaya <76819712+Anunaya07@users.noreply.github.com> Co-authored-by: Aksh Bansal <63552235+Aksh-Bansal-dev@users.noreply.github.com> * Minor changes * Implementation of FTS and completion of the redirect functionality * Change in model of supervisor * Complition of redirect functionality and pagination * Fixation of a error * Completion of module * GAD -5 Dashboard Changes (FusionIIIT#1325) * dashboard and usercard updated (FusionIIIT#1329) * Fixing ui bugs (FusionIIIT#1335) * Integrated dashborad * creating new branch * disallowing migrations * removing migration files --------- Co-authored-by: Harshvardhan Singh <73544247+Lawful2002@users.noreply.github.com> Co-authored-by: A Anunaya <76819712+Anunaya07@users.noreply.github.com> Co-authored-by: Aksh Bansal <63552235+Aksh-Bansal-dev@users.noreply.github.com> Co-authored-by: akshatnema <20bcs022@iiitdmj.ac.in> Co-authored-by: BlackHAWK2001 <150950834+BlackHAWK2001@users.noreply.github.com> Co-authored-by: Arpit Tak <140220904+Ishu-ji@users.noreply.github.com> Co-authored-by: SukulSarve <143542658+SukulSarve@users.noreply.github.com> * Gad-3 : fixed minor issues (FusionIIIT#1389) * GAD-5: Fix responsiveness (FusionIIIT#1125) Co-authored-by: A Anunaya <76819712+Anunaya07@users.noreply.github.com> Co-authored-by: Aksh Bansal <63552235+Aksh-Bansal-dev@users.noreply.github.com> * Minor changes * Implementation of FTS and completion of the redirect functionality * Change in model of supervisor * Complition of redirect functionality and pagination * Fixation of a error * Completion of module * GAD -5 Dashboard Changes (FusionIIIT#1325) * dashboard and usercard updated (FusionIIIT#1329) * Fixing ui bugs (FusionIIIT#1335) * Integrated dashborad * creating new branch * disallowing migrations * removing migration files * resolved errors --------- Co-authored-by: Harshvardhan Singh <73544247+Lawful2002@users.noreply.github.com> Co-authored-by: A Anunaya <76819712+Anunaya07@users.noreply.github.com> Co-authored-by: Aksh Bansal <63552235+Aksh-Bansal-dev@users.noreply.github.com> Co-authored-by: akshatnema <20bcs022@iiitdmj.ac.in> Co-authored-by: BlackHAWK2001 <150950834+BlackHAWK2001@users.noreply.github.com> Co-authored-by: Arpit Tak <140220904+Ishu-ji@users.noreply.github.com> Co-authored-by: SukulSarve <143542658+SukulSarve@users.noreply.github.com> * Gad 3 complaint (FusionIIIT#1390) * GAD-5: Fix responsiveness (FusionIIIT#1125) Co-authored-by: A Anunaya <76819712+Anunaya07@users.noreply.github.com> Co-authored-by: Aksh Bansal <63552235+Aksh-Bansal-dev@users.noreply.github.com> * Minor changes * Implementation of FTS and completion of the redirect functionality * Change in model of supervisor * Complition of redirect functionality and pagination * Fixation of a error * Completion of module * GAD -5 Dashboard Changes (FusionIIIT#1325) * dashboard and usercard updated (FusionIIIT#1329) * Fixing ui bugs (FusionIIIT#1335) * Integrated dashborad * creating new branch * disallowing migrations * removing migration files * resolved errors --------- Co-authored-by: Harshvardhan Singh <73544247+Lawful2002@users.noreply.github.com> Co-authored-by: A Anunaya <76819712+Anunaya07@users.noreply.github.com> Co-authored-by: Aksh Bansal <63552235+Aksh-Bansal-dev@users.noreply.github.com> Co-authored-by: akshatnema <20bcs022@iiitdmj.ac.in> Co-authored-by: BlackHAWK2001 <150950834+BlackHAWK2001@users.noreply.github.com> Co-authored-by: Arpit Tak <140220904+Ishu-ji@users.noreply.github.com> Co-authored-by: SukulSarve <143542658+SukulSarve@users.noreply.github.com> * Gad 3 complaint (FusionIIIT#1391) * GAD-5: Fix responsiveness (FusionIIIT#1125) Co-authored-by: A Anunaya <76819712+Anunaya07@users.noreply.github.com> Co-authored-by: Aksh Bansal <63552235+Aksh-Bansal-dev@users.noreply.github.com> * Minor changes * Implementation of FTS and completion of the redirect functionality * Change in model of supervisor * Complition of redirect functionality and pagination * Fixation of a error * Completion of module * GAD -5 Dashboard Changes (FusionIIIT#1325) * dashboard and usercard updated (FusionIIIT#1329) * Fixing ui bugs (FusionIIIT#1335) * Integrated dashborad * creating new branch * disallowing migrations * removing migration files * resolved errors * resolved error --------- Co-authored-by: Harshvardhan Singh <73544247+Lawful2002@users.noreply.github.com> Co-authored-by: A Anunaya <76819712+Anunaya07@users.noreply.github.com> Co-authored-by: Aksh Bansal <63552235+Aksh-Bansal-dev@users.noreply.github.com> Co-authored-by: akshatnema <20bcs022@iiitdmj.ac.in> Co-authored-by: BlackHAWK2001 <150950834+BlackHAWK2001@users.noreply.github.com> Co-authored-by: Arpit Tak <140220904+Ishu-ji@users.noreply.github.com> Co-authored-by: SukulSarve <143542658+SukulSarve@users.noreply.github.com> * merged staging into gad-3 --------- Co-authored-by: ujjawallele13 <111732396+ujjawallele13@users.noreply.github.com> Co-authored-by: akshatnema <20bcs022@iiitdmj.ac.in> Co-authored-by: Akshat Nema <76521428+akshatnema@users.noreply.github.com> Co-authored-by: Aksh Bansal <63552235+Aksh-Bansal-dev@users.noreply.github.com> Co-authored-by: nidhibarapatre <116302859+nidhibarapatre@users.noreply.github.com> Co-authored-by: Harshvardhan Singh <73544247+Lawful2002@users.noreply.github.com> Co-authored-by: A Anunaya <76819712+Anunaya07@users.noreply.github.com> Co-authored-by: BlackHAWK2001 <150950834+BlackHAWK2001@users.noreply.github.com> Co-authored-by: Arpit Tak <140220904+Ishu-ji@users.noreply.github.com> Co-authored-by: SukulSarve <143542658+SukulSarve@users.noreply.github.com>
Ac-1 Gad-4 Ac-5 Gad-3 Os-1 Os-3 Sa-2 Os-2 Gad-5
* sa-4 : 4 : all-changes-till-now (FusionIIIT#1115) Co-authored-by: Smeet Chavan <smeet.br.chavan7@gmail.com> * PlacementModuleWeb (FusionIIIT#1322) * urls * added apply for jobs and upload documents * added options for TPO and Chairman * PLacement Schedule method * Added PLacement Statistics * Features added resume,update placement data ,notiication , add schedule * fixed ui issue placement.html * send invitation, check invitaion status ,resolved other minor bugs * Placement cell updated dashboard (FusionIIIT#1402) * urls * added apply for jobs and upload documents * added options for TPO and Chairman * PLacement Schedule method * Added PLacement Statistics * Features added resume,update placement data ,notiication , add schedule * fixed ui issue placement.html * send invitation, check invitaion status ,resolved other minor bugs * 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. * pull * update * invitation status * invitation status --------- Co-authored-by: Hardik Sharma <104981324+hardiksharma11@users.noreply.github.com> Co-authored-by: Raman Chaudhary <97114586+ChaudharyRaman@users.noreply.github.com> * Placementcell (FusionIIIT#1411) * urls * added apply for jobs and upload documents * added options for TPO and Chairman * PLacement Schedule method * Added PLacement Statistics * Features added resume,update placement data ,notiication , add schedule * fixed ui issue placement.html * send invitation, check invitaion status ,resolved other minor bugs * 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. * pull * update * invitation status * invitation status * placement cell --------- Co-authored-by: Hardik Sharma <104981324+hardiksharma11@users.noreply.github.com> Co-authored-by: Raman Chaudhary <97114586+ChaudharyRaman@users.noreply.github.com> * resolved dashboard profile view --------- Co-authored-by: Smeetiiitdmj <121860497+Smeetiiitdmj@users.noreply.github.com> Co-authored-by: Smeet Chavan <smeet.br.chavan7@gmail.com> Co-authored-by: akshatnema <20bcs022@iiitdmj.ac.in> Co-authored-by: Kush Batla <97120358+kushbatla@users.noreply.github.com> Co-authored-by: Hardik Sharma <104981324+hardiksharma11@users.noreply.github.com> Co-authored-by: Raman Chaudhary <97114586+ChaudharyRaman@users.noreply.github.com>
* sa-4 : 4 : all-changes-till-now (FusionIIIT#1115) Co-authored-by: Smeet Chavan <smeet.br.chavan7@gmail.com> * PlacementModuleWeb (FusionIIIT#1322) * urls * added apply for jobs and upload documents * added options for TPO and Chairman * PLacement Schedule method * Added PLacement Statistics * Features added resume,update placement data ,notiication , add schedule * fixed ui issue placement.html * send invitation, check invitaion status ,resolved other minor bugs * Placement cell updated dashboard (FusionIIIT#1402) * urls * added apply for jobs and upload documents * added options for TPO and Chairman * PLacement Schedule method * Added PLacement Statistics * Features added resume,update placement data ,notiication , add schedule * fixed ui issue placement.html * send invitation, check invitaion status ,resolved other minor bugs * 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. * pull * update * invitation status * invitation status --------- Co-authored-by: Hardik Sharma <104981324+hardiksharma11@users.noreply.github.com> Co-authored-by: Raman Chaudhary <97114586+ChaudharyRaman@users.noreply.github.com> * Placementcell (FusionIIIT#1411) * urls * added apply for jobs and upload documents * added options for TPO and Chairman * PLacement Schedule method * Added PLacement Statistics * Features added resume,update placement data ,notiication , add schedule * fixed ui issue placement.html * send invitation, check invitaion status ,resolved other minor bugs * 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. * pull * update * invitation status * invitation status * placement cell --------- Co-authored-by: Hardik Sharma <104981324+hardiksharma11@users.noreply.github.com> Co-authored-by: Raman Chaudhary <97114586+ChaudharyRaman@users.noreply.github.com> * resolved dashboard profile view * reverted requirements.txt changes --------- Co-authored-by: Smeetiiitdmj <121860497+Smeetiiitdmj@users.noreply.github.com> Co-authored-by: Smeet Chavan <smeet.br.chavan7@gmail.com> Co-authored-by: akshatnema <20bcs022@iiitdmj.ac.in> Co-authored-by: Kush Batla <97120358+kushbatla@users.noreply.github.com> Co-authored-by: Hardik Sharma <104981324+hardiksharma11@users.noreply.github.com> Co-authored-by: Raman Chaudhary <97114586+ChaudharyRaman@users.noreply.github.com>
* sa-2 : till week-4 : FusionIIIT#1009 , FusionIIIT#1044 and FusionIIIT#1097 fix (FusionIIIT#1010) * Added start date display in pre registration (FusionIIIT#1063) * GAD-5: Fix responsiveness (FusionIIIT#1125) * SA-2 :Query Optimization (FusionIIIT#1134) * Query Optimization * Removed Unnecessary print Statements * Used .exists() method * Sa-2: Week 8: Created Api's (FusionIIIT#1172) * 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 (FusionIIIT#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 (FusionIIIT#32) * Some UI changes (FusionIIIT#35) * 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 * merging mess and staging * conflict resolve --------- Co-authored-by: Harshul Choudhary <113760758+Harshul-25@users.noreply.github.com> Co-authored-by: Samay Sagar <73112080+samay-rgb@users.noreply.github.com> Co-authored-by: theparasgami <20BCS151@iiitdmj.ac.in> Co-authored-by: akshatnema <20bcs022@iiitdmj.ac.in> Co-authored-by: A Anunaya <76819712+Anunaya07@users.noreply.github.com> Co-authored-by: Harshvardhan Singh <73544247+Lawful2002@users.noreply.github.com> Co-authored-by: Aksh Bansal <63552235+Aksh-Bansal-dev@users.noreply.github.com> Co-authored-by: PARAS GAMI <86421345+theparasgami@users.noreply.github.com> Co-authored-by: Yathartha Goenka <75240973+yatharthagoenka@users.noreply.github.com> Co-authored-by: Mayankingale123 <122631799+Mayankingale123@users.noreply.github.com> Co-authored-by: Mayankingale123 <chetanmayank123@gamil.com> Co-authored-by: Harshit0009 <tiwariharshit909@email.com> Co-authored-by: Harshul <harshul@pop-os.localdomain> Co-authored-by: hemantsinghhere <115834099+hemantsinghhere@users.noreply.github.com> Co-authored-by: Hritik Yadav <hritikyadav.mail@gmail.com> Co-authored-by: Harshit0009 <tiwariharshit909@gmail.com> Co-authored-by: Harshit Tiwari <96289939+Harshit0009@users.noreply.github.com> Co-authored-by: hemantsinghhere <honey25303@gmail.com> Co-authored-by: BlackHAWK2001 <150950834+BlackHAWK2001@users.noreply.github.com> Co-authored-by: Arpit Tak <140220904+Ishu-ji@users.noreply.github.com> Co-authored-by: Hritik Yadav <97102768+HritikYadav7@users.noreply.github.com> Co-authored-by: Harshul <nawaniharshul2@gmail.com> Co-authored-by: SukulSarve <143542658+SukulSarve@users.noreply.github.com>
Removed readonly tag from html only
Author
|
@ChaudharyRaman @prajjwalkapoor Please merge this pr. |
|
@Divyanshusir Have you rebased/merged this PR with the latest_staging branch on your local? |
|
Also please include what changes have been made in this PR providing the description about which module have been effected, so it is easy to review. Thanks! |
Author
|
@theoden42 I have specifically done changes in ac-2 (academic-procedures) folder and corrected gitignore file , then i fetched latest_staging and merged it, so any changes done in latest_staging are also present. |
|
In that case, LGTM |
theoden42
approved these changes
Apr 12, 2024
theoden42
left a comment
theoden42
left a comment
There was a problem hiding this comment.
Only changes specific to this module are in .gitignore which is checked. All other module changes have been picked from latest_staging branch.
Contributor
|
@ChaudharyRaman @prajjwalkapoor LGTM , you can proceed |
Contributor
|
okay LGTM, Merging. |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
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.
Solving the issues in gitignores , migrations
#merged with latest staging