[AC-2] Cource registration merging to CR #1445
Merged
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
…1113) fix: icons that were disabled or not working.
…taker (FusionIIIT#1132) Co-authored-by: Akshat Nema <[email protected]>
…ues (FusionIIIT#1137) Co-authored-by: Aksh Bansal <[email protected]>
…oking an appointment (FusionIIIT#1084) * Date validation added * Date Validation for booking ambulance --------- Co-authored-by: Akshay010203 <[email protected]>
…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-5: Fix responsiveness (FusionIIIT#1125) Co-authored-by: A Anunaya <[email protected]> Co-authored-by: Aksh Bansal <[email protected]> * 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 <[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]>
* 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 <[email protected]> * gad-3: Week7 : fixed the notification and re-assign worker button issues (FusionIIIT#1137) Co-authored-by: Aksh Bansal <[email protected]> * 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 <[email protected]> Co-authored-by: Aksh Bansal <[email protected]> * 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 <[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]> * Gad-3 : fixed minor issues (FusionIIIT#1389) * GAD-5: Fix responsiveness (FusionIIIT#1125) Co-authored-by: A Anunaya <[email protected]> Co-authored-by: Aksh Bansal <[email protected]> * 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 <[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]> * Gad 3 complaint (FusionIIIT#1390) * GAD-5: Fix responsiveness (FusionIIIT#1125) Co-authored-by: A Anunaya <[email protected]> Co-authored-by: Aksh Bansal <[email protected]> * 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 <[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]> * Gad 3 complaint (FusionIIIT#1391) * GAD-5: Fix responsiveness (FusionIIIT#1125) Co-authored-by: A Anunaya <[email protected]> Co-authored-by: Aksh Bansal <[email protected]> * 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 <[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]> * merged staging into gad-3 --------- Co-authored-by: ujjawallele13 <[email protected]> Co-authored-by: akshatnema <[email protected]> Co-authored-by: Akshat Nema <[email protected]> Co-authored-by: Aksh Bansal <[email protected]> Co-authored-by: nidhibarapatre <[email protected]> Co-authored-by: Harshvardhan Singh <[email protected]> Co-authored-by: A Anunaya <[email protected]> Co-authored-by: BlackHAWK2001 <[email protected]> Co-authored-by: Arpit Tak <[email protected]> Co-authored-by: SukulSarve <[email protected]>
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 <[email protected]> * 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 <[email protected]> Co-authored-by: Raman Chaudhary <[email protected]> * 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 <[email protected]> Co-authored-by: Raman Chaudhary <[email protected]> * resolved dashboard profile view --------- Co-authored-by: Smeetiiitdmj <[email protected]> Co-authored-by: Smeet Chavan <[email protected]> Co-authored-by: akshatnema <[email protected]> Co-authored-by: Kush Batla <[email protected]> Co-authored-by: Hardik Sharma <[email protected]> Co-authored-by: Raman Chaudhary <[email protected]>
* sa-4 : 4 : all-changes-till-now (FusionIIIT#1115) Co-authored-by: Smeet Chavan <[email protected]> * 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 <[email protected]> Co-authored-by: Raman Chaudhary <[email protected]> * 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 <[email protected]> Co-authored-by: Raman Chaudhary <[email protected]> * resolved dashboard profile view * reverted requirements.txt changes --------- Co-authored-by: Smeetiiitdmj <[email protected]> Co-authored-by: Smeet Chavan <[email protected]> Co-authored-by: akshatnema <[email protected]> Co-authored-by: Kush Batla <[email protected]> Co-authored-by: Hardik Sharma <[email protected]> Co-authored-by: Raman Chaudhary <[email protected]>
* 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 <[email protected]> Co-authored-by: Samay Sagar <[email protected]> Co-authored-by: theparasgami <[email protected]> Co-authored-by: akshatnema <[email protected]> Co-authored-by: A Anunaya <[email protected]> Co-authored-by: Harshvardhan Singh <[email protected]> Co-authored-by: Aksh Bansal <[email protected]> Co-authored-by: PARAS GAMI <[email protected]> Co-authored-by: Yathartha Goenka <[email protected]> Co-authored-by: Mayankingale123 <[email protected]> Co-authored-by: Mayankingale123 <[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]>
Removed readonly tag from html only
abhi87374
approved these changes
Apr 12, 2024
There was a problem hiding this comment.
this pr raised by me ;
LGTM, you can proceed.
@ChaudharyRaman @prajjwalkapoor
|
@ChaudharyRaman Can you raise a PR from Fusion:CR to Fusion:latest_staging instead of merging from personal fork ? And then we can work on this further ? |
ChaudharyRaman
changed the title
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
merging course registration into latest_staging
Changes made as suggested:
In sync with new dashboard
In sync with new programme_curriculum_course table with new version column.
New Pre registration logic without priority system.
New Replace course feature for optional elective courses.
New Swayam replace option for replacing optional courses with swayam courses.
Bugs and issues Fixed:
student courses and drop option from acad admin side of it was fixed,
roll number input (type = number) field issue fixed
Video :
AC2.-.course.registration.updated.pr.-.Made.with.Clipchamp.1.mp4
Please merge this PR and if any issues please let me know:
@ChaudharyRaman
@prajjwalkapoor