Ac-4 (forked) to AC-4 (fusion) #1543
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
* 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> * fix requirements and docker-compose * fix docker compose and dependencies * add sdk and api folder structure * add sdk methods and fix some urls * update models for API * add urls for api * add methods for viewing file, inbox, outbox, getting designation with serializers and minor bug fixes * fix serializers and fix file attachment functionality in forward_file * sync with upstream * add views and fix urls * create file * create file change * fix create_file, without upload_file feature * fix sdk forward_file : accept remarks * add view_history in sdk * add blueprint for draft and archive methods to sdk * fix FileHeaderSerializer to include id * fix empty file upload error * fix inbox outbox methods to return unique ids * fix complete_flag to is_read * fix inbox outbox methods to not show archived * add view_archived method to sdk * add archive_file method to sdk * fix inbox and outbox output and add support for attachments * add draft methods to sdk * fix default values of named params * fix css for filetracking.html * fix fts serializer.py * add dept adding method to sdk * add helper methods to sdk * fix inbox based on SDK * remove track from TabMenu * fix outbox using SDK * fix archive view for SDK * fix Drafts based on SDK * fix the view file functionality in the web app * fix frontend * fix .gitignore to untrack migrations * database integration error resolved * 50% usecases implemented * Added new suggested usecases * few changes made * hellooo * GAD -5 Dashboard Changes (FusionIIIT#1325) * dashboard and usercard updated (FusionIIIT#1329) * Fixing ui bugs (FusionIIIT#1335) * dashboard modified * dashboard and fts integrated * Changes made 10/04 * Changes made 10/04/24 * changes after merge * changes after merge 1 * dashboard edit * All changes done * All changes done 2 * PR raise * error, login handling done * functions created for better code understanding * fixed bugs as asked * all changes done * edited for better understanding * edited for better understanding 3 * file tracking usage comments added * added .github and .idea --------- 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: Aragorn-64 <advaysagarkar@gmail.com> Co-authored-by: Divyansh Tripathi <55395696+theoden42@users.noreply.github.com> Co-authored-by: KULADEEP1 <basettykuladeep@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: SukulSarve <143542658+SukulSarve@users.noreply.github.com>
* gad-3 : week-2 : changed api functions (#1069) * Checked the sidebar after acad-admin login and fixed the (#1113) fix: icons that were disabled or not working. * gad-3 : workers would be assigned by Section Incharge instead of Caretaker (#1132) Co-authored-by: Akshat Nema <76521428+akshatnema@users.noreply.github.com> * gad-3: Week7 : fixed the notification and re-assign worker button issues (#1137) Co-authored-by: Aksh Bansal <63552235+Aksh-Bansal-dev@users.noreply.github.com> * auto-restart docker (#1147) * OS -2 : Week 4 : Addition of important personal information during booking an appointment (#1084) * Date validation added * Date Validation for booking ambulance --------- Co-authored-by: Akshay010203 <92329718+Akshay010203@users.noreply.github.com> * gad-3 : week-8 : db migrations after adding Section Incharge (#1173) * before adding functionality for secincharge * Delete 0002_auto_20230321_0041.py * gad-3 : week8 : remove wrong dependency to globals. (#1178) * Added pylint (#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 (#1302)" (#1324) This reverts commit c1359b7ce8a1945e41e90330fe39bc634d9ca6f3. * changes in programme_cuuriculam,adding version to models (#1330) * AC-1 : Add functionality to add and update courses (#1300) * Add functionality to add and update courses * Course version added * Delete FusionIIIT/Fusion/settings/development.py * Delete FusionIIIT/applications/academic_procedures/migrations/0002_auto_20240218_1206.py * Delete FusionIIIT/applications/eis/migrations/0002_auto_20240218_1206.py * Delete FusionIIIT/applications/globals/migrations/0002_auto_20240218_1206.py * Delete FusionIIIT/applications/globals/migrations/0003_auto_20240218_1235.py * Delete FusionIIIT/applications/globals/migrations/0004_auto_20240218_1242.py * Delete FusionIIIT/applications/globals/migrations/0005_auto_20240218_1325.py * Delete FusionIIIT/applications/globals/migrations/0006_auto_20240218_1336.py * Delete FusionIIIT/applications/globals/migrations/0007_auto_20240218_1601.py * Delete FusionIIIT/applications/globals/migrations/0008_auto_20240218_1942.py * Delete FusionIIIT/applications/globals/migrations/0009_auto_20240219_2217.py * Delete FusionIIIT/applications/globals/migrations/0010_auto_20240219_2232.py * Delete FusionIIIT/applications/scholarships/migrations/0002_auto_20240218_1206.py * Delete requirements.txt * Delete FusionIIIT/applications/programme_curriculum/migrations/0002_auto_20240312_1929.py * Delete FusionIIIT/applications/programme_curriculum/migrations/0003_auto_20240312_1944.py * Delete FusionIIIT/applications/programme_curriculum/migrations/0004_course_latest_version.py * Delete FusionIIIT/applications/programme_curriculum/migrations/0005_auto_20240313_0128.py * Gad 5 (#1341) * Enabled all modules for access (#1120) * GAD-5: Fix responsiveness (#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> * GAD -5 Dashboard Changes (#1325) * dashboard and usercard updated (#1329) --------- Co-authored-by: Yathartha Goenka <75240973+yatharthagoenka@users.noreply.github.com> Co-authored-by: akshatnema <20bcs022@iiitdmj.ac.in> 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: BlackHAWK2001 <150950834+BlackHAWK2001@users.noreply.github.com> Co-authored-by: Arpit Tak <140220904+Ishu-ji@users.noreply.github.com> * Os 2 (#1346) * GAD-5: Fix responsiveness (#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> * added announcements and pathologist schedule * Added pylint (#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 (#1302)" (#1324) This reverts commit c1359b7ce8a1945e41e90330fe39bc634d9ca6f3. * GAD -5 Dashboard Changes (#1325) * dashboard and usercard updated (#1329) * changes in programme_cuuriculam,adding version to models (#1330) * Fixing ui bugs (#1335) * module completed * integrated dashboard * Revert "integrated dashboard" This reverts commit 8e48ec598072104d1678bfede3daab6fb8d20a2f. * Revert "module completed" This reverts commit 254487731b88e097e42743fabc97e77d84388694. * Revert "module completed" This reverts commit 254487731b88e097e42743fabc97e77d84388694. * Revert "integrated dashboard" This reverts commit 8e48ec598072104d1678bfede3daab6fb8d20a2f. * errors corrected * errors resolved * added dashboard and corrected errors * removed Migrations * removed migrations * removed migrations --------- 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: Hardik Sharma <104981324+hardiksharma11@users.noreply.github.com> Co-authored-by: Raman Chaudhary <97114586+ChaudharyRaman@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: Anudeep Sanapala <71971574+anudeeps0306@users.noreply.github.com> Co-authored-by: SukulSarve <143542658+SukulSarve@users.noreply.github.com> * Revert "Os 2" (#1352) This reverts commit 1db64d7da40d190218f6e8b0991bc71cd9da7c88. * Os 2 (#1353) * GAD-5: Fix responsiveness (#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> * added announcements and pathologist schedule * Added pylint (#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 (#1302)" (#1324) This reverts commit c1359b7ce8a1945e41e90330fe39bc634d9ca6f3. * GAD -5 Dashboard Changes (#1325) * dashboard and usercard updated (#1329) * changes in programme_cuuriculam,adding version to models (#1330) * Fixing ui bugs (#1335) * module completed * integrated dashboard * Revert "integrated dashboard" This reverts commit 8e48ec598072104d1678bfede3daab6fb8d20a2f. * Revert "module completed" This reverts commit 254487731b88e097e42743fabc97e77d84388694. * Revert "module completed" This reverts commit 254487731b88e097e42743fabc97e77d84388694. * Revert "integrated dashboard" This reverts commit 8e48ec598072104d1678bfede3daab6fb8d20a2f. * errors corrected * errors resolved * added dashboard and corrected errors * removed Migrations * removed migrations * removed migrations * corrected 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: Hardik Sharma <104981324+hardiksharma11@users.noreply.github.com> Co-authored-by: Raman Chaudhary <97114586+ChaudharyRaman@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: Anudeep Sanapala <71971574+anudeeps0306@users.noreply.github.com> Co-authored-by: SukulSarve <143542658+SukulSarve@users.noreply.github.com> * OS-1 | VH Module (#1334) * OS1 issue 1024 resolved : Booking form integrated with Front End (#1025) * Enabled all modules for access (#1120) * OS-1 : Week 5 : All changes till week 5 (#1116) * Added start date display in pre registration (#1063) * Major changes in Visitor's Hostel --------- Co-authored-by: A Anunaya <76819712+Anunaya07@users.noreply.github.com> * OS-1 Minor issues resolved (#1202) * Booking form integrated with Front End * OS-1 week 7 issue resolve * Bill structured properly, updated room availability, meal record fixed, url fixed * Indentaion problems fixed * database changed * More indentations issues resolved * More indentations issues resolved * Next button issue resolved * Database Changed, inventory functionality added * Database conflict resolved * Minor issues resolved * Final changes made --------- Co-authored-by: Akshat Nema <76521428+akshatnema@users.noreply.github.com> * visitor hostel * os-1 vh complete * os-1 vh module * GAD-5: Fix responsiveness (#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> * refactored and corrected booking issues * GAD -5 Dashboard Changes (#1325) * dashboard and usercard updated (#1329) * added form * Fixing ui bugs (#1335) --------- 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> --------- Co-authored-by: VedantJain1103 <105827483+VedantJain1103@users.noreply.github.com> Co-authored-by: Yathartha Goenka <75240973+yatharthagoenka@users.noreply.github.com> Co-authored-by: akshatnema <20bcs022@iiitdmj.ac.in> Co-authored-by: harsh-k-singh <105146460+harsh-k-singh@users.noreply.github.com> Co-authored-by: A Anunaya <76819712+Anunaya07@users.noreply.github.com> Co-authored-by: Akshat Nema <76521428+akshatnema@users.noreply.github.com> Co-authored-by: davneesh <avneeshd09@gmail.com> Co-authored-by: Avneesh <97170838+davneesh@users.noreply.github.com> Co-authored-by: Raman Chaudhary <97114586+ChaudharyRaman@users.noreply.github.com> Co-authored-by: varunraj03 <113377182+varunraj03@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: 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 Updated according to dashboard (#1355) * GAD-5: Fix responsiveness (#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> * GAD -5 Dashboard Changes (#1325) * dashboard and usercard updated (#1329) * Fixing ui bugs (#1335) * Ac1 Updated Dashboard --------- 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> * Sa 2 (#1362) * sa-2 : till week-4 : #1009 , #1044 and #1097 fix (#1010) Co-authored-by: theparasgami <20BCS151@iiitdmj.ac.in> * Added start date display in pre registration (#1063) * SA-2 :Query Optimization (#1134) * Query Optimization * Removed Unnecessary print Statements * Used .exists() method * Sa-2: Week 8: Created Api's (#1172) Co-authored-by: Mayankingale123 <chetanmayank123@gamil.com> Co-authored-by: akshatnema <20bcs022@iiitdmj.ac.in> * Sa 2 (#1332) * updated models * Revert "updated models" This reverts commit 83e2e73d895fc7f6a7ba2fa117624bbcb2ede278. * 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 * Updated Special food Functionality * 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 <113760758+Harshul-25@users.noreply.github.com> * Some UI changes (#35) Co-authored-by: Harshul Choudhary <113760758+Harshul-25@users.noreply.github.com> * merge fixes * added remove * some ui fixes * fixed cronjobs * semdate fixes * removed migrations * 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: 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: Hritik Yadav <97102768+HritikYadav7@users.noreply.github.com> Co-authored-by: Harshul <nawaniharshul2@gmail.com> * Sa 2 - updated dashboard (#1342) * GAD-5: Fix responsiveness (#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> * updated models * Revert "updated models" This reverts commit 83e2e73d895fc7f6a7ba2fa117624bbcb2ede278. * 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 (#1325) * Updated Special food Functionality * dashboard and usercard updated (#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 <113760758+Harshul-25@users.noreply.github.com> * Some UI changes (#35) Co-authored-by: Harshul Choudhary <113760758+Harshul-25@users.noreply.github.com> * merge fixes * added remove * some ui fixes * fixed cronjobs * semdate fixes * removed migrations * Fixing ui bugs (#1335) * 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 <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: 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> * Sa 2 (#1351) * GAD-5: Fix responsiveness (#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> * updated models * Revert "updated models" This reverts commit 83e2e73d895fc7f6a7ba2fa117624bbcb2ede278. * 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 (#1325) * Updated Special food Functionality * dashboard and usercard updated (#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 <113760758+Harshul-25@users.noreply.github.com> * Some UI changes (#35) Co-authored-by: Harshul Choudhary <113760758+Harshul-25@users.noreply.github.com> * merge fixes * added remove * some ui fixes * fixed cronjobs * semdate fixes * removed migrations * Fixing ui bugs (#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 <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: 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> --------- 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: 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: Harshul Choudhary <113760758+Harshul-25@users.noreply.github.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: Hritik Yadav <97102768+HritikYadav7@users.noreply.github.com> Co-authored-by: Harshul <nawaniharshul2@gmail.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: 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 4 - FTS * deployment ports config * gad-4: Created fileTrackingNotAllowed.html (#1082) * gad-4: new views.py to remove students from file tracking (#1104) * fix: reverting deployment changes * GAD-4: FTS SDK * fix requirements and docker-compose * fix docker compose and dependencies * add sdk and api folder structure * add sdk methods and fix some urls * update models for API * add urls for api * add methods for viewing file, inbox, outbox, getting designation with serializers and minor bug fixes * fix serializers and fix file attachment functionality in forward_file * sync with upstream * add views and fix urls * create file * create file change * fix create_file, without upload_file feature * fix sdk forward_file : accept remarks * add view_history in sdk * add blueprint for draft and archive methods to sdk * fix FileHeaderSerializer to include id * fix empty file upload error * fix inbox outbox methods to return unique ids * fix complete_flag to is_read * fix inbox outbox methods to not show archived * add view_archived method to sdk * add archive_file method to sdk * fix inbox and outbox output and add support for attachments * add draft methods to sdk * fix default values of named params * fix css for filetracking.html * fix fts serializer.py * add dept adding method to sdk * add helper methods to sdk * fix inbox based on SDK * remove track from TabMenu * fix outbox using SDK * fix archive view for SDK * fix Drafts based on SDK * fix the view file functionality in the web app * fix frontend * fix .gitignore to untrack migrations * fix 1. order of files in inbox and outbox 2. order of files is mantained in uniqueList function * fix login required on viewing file * fix create_file method so that subject and description are also accepted * add rest api for create file and view file * add rest api for create, view and delete file * add rest api for inbox, outbox, history view * add rest api for draft view, forward file * prevent student access of the filetracking module * add dropdown filtering based on reciever username and update notallowed template * add option to unarchive files * fix template for filetrackingnotallowed page * fix attachments view in the history of the file * make the fields in draft view editable * update the views --------- Co-authored-by: Aragorn-64 <advaysagarkar@gmail.com> Co-authored-by: aish0749 <aishwaryasaxena57@gmail.com> * GAD-4 Updated according to Dashboard changes (#1361) * GAD-5: Fix responsiveness (#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> * fix requirements and docker-compose * fix docker compose and dependencies * add sdk and api folder structure * add sdk methods and fix some urls * update models for API * add urls for api * add methods for viewing file, inbox, outbox, getting designation with serializers and minor bug fixes * fix serializers and fix file attachment functionality in forward_file * sync with upstream * add views and fix urls * create file * create file change * fix create_file, without upload_file feature * fix sdk forward_file : accept remarks * add view_history in sdk * add blueprint for draft and archive methods to sdk * fix FileHeaderSerializer to include id * fix empty file upload error * fix inbox outbox methods to return unique ids * fix complete_flag to is_read * fix inbox outbox methods to not show archived * add view_archived method to sdk * add archive_file method to sdk * fix inbox and outbox output and add support for attachments * add draft methods to sdk * fix default values of named params * fix css for filetracking.html * fix fts serializer.py * add dept adding method to sdk * add helper methods to sdk * fix inbox based on SDK * remove track from TabMenu * fix outbox using SDK * fix archive view for SDK * fix Drafts based on SDK * fix the view file functionality in the web app * fix frontend * fix .gitignore to untrack migrations * fix 1. order of files in inbox and outbox 2. order of files is mantained in uniqueList function * fix login required on viewing file * fix create_file method so that subject and description are also accepted * add rest api for create file and view file * add rest api for create, view and delete file * add rest api for inbox, outbox, history view * add rest api for draft view, forward file * prevent student access of the filetracking module * add dropdown filtering based on reciever username and update notallowed template * add option to unarchive files * fix template for filetrackingnotallowed page * fix attachments view in the history of the file * make the fields in draft view editable * update the views * GAD -5 Dashboard Changes (#1325) * dashboard and usercard updated (#1329) * Fixing ui bugs (#1335) * fix file sending and forwarding template to include designation automatically * fix forward file view to include designations automatically * add redirect to dropdown designation to views * add redirect on designation change --------- 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: Divyansh Tripathi <55395696+theoden42@users.noreply.github.com> Co-authored-by: aish0749 <aishwaryasaxena57@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: SukulSarve <143542658+SukulSarve@users.noreply.github.com> --------- Co-authored-by: Yathartha Goenka <goenkayathartha2002@gmail.com> Co-authored-by: prakhar-da-gama <95561933+prakhar-da-gama@users.noreply.github.com> Co-authored-by: akshatnema <20bcs022@iiitdmj.ac.in> Co-authored-by: manavdesai27 <manav27202@gmail.com> Co-authored-by: Divyansh Tripathi <55395696+theoden42@users.noreply.github.com> Co-authored-by: Aragorn-64 <advaysagarkar@gmail.com> Co-authored-by: aish0749 <aishwaryasaxena57@gmail.com> Co-authored-by: Advay Sagarkar <72992475+Aragorn-64@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: Aksh Bansal <63552235+Aksh-Bansal-dev@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> * Added pylint (#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 (#1302)" (#1324) This reverts commit c1359b7ce8a1945e41e90330fe39bc634d9ca6f3. * changes in programme_cuuriculam,adding version to models (#1330) * Ac 1 Request to merge in staging again. (#1373) * Checked the sidebar after acad-admin login and fixed the (#1113) fix: icons that were disabled or not working. * Enabled all modules for access (#1120) * AC-1 : Add functionality to add and update courses (#1300) * Add functionality to add and update courses * Course version added * Delete FusionIIIT/Fusion/settings/development.py * Delete FusionIIIT/applications/academic_procedures/migrations/0002_auto_20240218_1206.py * Delete FusionIIIT/applications/eis/migrations/0002_auto_20240218_1206.py * Delete FusionIIIT/applications/globals/migrations/0002_auto_20240218_1206.py * Delete FusionIIIT/applications/globals/migrations/0003_auto_20240218_1235.py * Delete FusionIIIT/applications/globals/migrations/0004_auto_20240218_1242.py * Delete FusionIIIT/applications/globals/migrations/0005_auto_20240218_1325.py * Delete FusionIIIT/applications/globals/migrations/0006_auto_20240218_1336.py * Delete FusionIIIT/applications/globals/migrations/0007_auto_20240218_1601.py * Delete FusionIIIT/applications/globals/migrations/0008_auto_20240218_1942.py * Delete FusionIIIT/applications/globals/migrations/0009_auto_20240219_2217.py * Delete FusionIIIT/applications/globals/migrations/0010_auto_20240219_2232.py * Delete FusionIIIT/applications/scholarships/migrations/0002_auto_20240218_1206.py * Delete requirements.txt * Delete FusionIIIT/applications/programme_curriculum/migrations/0002_auto_20240312_1929.py * Delete FusionIIIT/applications/programme_curriculum/migrations/0003_auto_20240312_1944.py * Delete FusionIIIT/applications/programme_curriculum/migrations/0004_course_latest_version.py * Delete FusionIIIT/applications/programme_curriculum/migrations/0005_auto_20240313_0128.py * AC-1 Updated according to dashboard (#1355) * GAD-5: Fix responsiveness (#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> * GAD -5 Dashboard Changes (#1325) * dashboard and usercard updated (#1329) * Fixing ui bugs (#1335) * Ac1 Updated Dashboard --------- 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> * Added pylint (#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 (#1302)" (#1324) This reverts commit c1359b7ce8a1945e41e90330fe39bc634d9ca6f3. * changes in programme_cuuriculam,adding version to models (#1330) * Ac-1 updated model.py (#1372) * GAD-5: Fix responsiveness (#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> * GAD -5 Dashboard Changes (#1325) * dashboard and usercard updated (#1329) * Fixing ui bugs (#1335) * Ac1 Updated Dashboard * changes * Changes in model.py * Changes in model.py --------- 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> --------- Co-authored-by: EyeOfHorus158 <75492668+EyeOfHorus158@users.noreply.github.com> Co-authored-by: Yathartha Goenka <75240973+yatharthagoenka@users.noreply.github.com> Co-authored-by: akshatnema <20bcs022@iiitdmj.ac.in> Co-authored-by: Ravichendraa <112809862+Ravichendraa@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: Aksh Bansal <63552235+Aksh-Bansal-dev@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> 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> * Revert "Ac 1 Request to merge in staging again. (#1373)" (#1376) This reverts commit 16523a7a1568d165a8212794bc646b8557bd0569. * Ac-1 updated model.py (#1372) (#1378) * GAD-5: Fix responsiveness (#1125) * GAD -5 Dashboard Changes (#1325) * dashboard and usercard updated (#1329) * Fixing ui bugs (#1335) * Ac1 Updated Dashboard * changes * Changes in model.py * Changes in model.py --------- Co-authored-by: Ravichendraa <112809862+Ravichendraa@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: 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> * merging Ac 5 into staging (#1379) * Fix problem regarding fetching batch for students enrolled in batch 2… (#1030) * Fix form render for students of 2020 batch and later (#1103) * AC-5 (spacs) : dashboard integration and invitations and application update issues (#1345) * GAD-5: Fix responsiveness (#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> * debugging and refactoring * resolved invitation notifications error * added apply convocation functionality * fixed profile redirection issue * fixed profile redirection issues * refactoring and other changes * GAD -5 Dashboard Changes (#1325) * dashboard and usercard updated (#1329) * resolved routing error * removed delete button --------- 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: Nitya Tiwari <nityasdl002@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: gaur-abhi524 <82049206+gaur-abhi524@users.noreply.github.com> Co-authored-by: akshatnema <20bcs022@iiitdmj.ac.in> Co-authored-by: Yathartha Goenka <75240973+yatharthagoenka@users.noreply.github.com> Co-authored-by: Sudheer dagar <60738162+sudheerdagar@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: Aksh Bansal <63552235+Aksh-Bansal-dev@users.noreply.github.com> Co-authored-by: Nitya Tiwari <nityasdl002@gmail.com> Co-authored-by: BlackHAWK2001 <150950834+BlackHAWK2001@users.noreply.github.com> Co-authored-by: Arpit Tak <140220904+Ishu-ji@users.noreply.github.com> * modified academic_info_models * removed migrations * removed migration folders * added migrationns * Update development.py * Update requirements.txt * Gad 3 (#1383) * GAD-5: Fix responsiveness (#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 (#1325) * dashboard and usercard updated (#1329) * Fixing ui bugs (#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> * Ac 2 merging to staging (#1384) * ac-2: added sample excel sheet to add new students and deleted unnecessary files (#1109) * AC-2: Replaced .xlsx file with .xls file (#1124) * created apis for AC2 module * created apis for AC2 module * created apis for AC2 module * added apis for AC2 module and created backlog model * created functionalities for pre registration configuration , also created html templates and apis for the same * removing postgres data files and migrations file * Remove ignored files from repository * removing postgres data files and migrations file * removing postgres data files * functionality for faculty to view assigned course and generate roll list * Wrong details displayed : course name in place of course code * Removed migrations file * Changed the gitignore file * Updated PR AC2-Course registration after the changes and integration with new Dashboard (#1357) * GAD-5: Fix responsiveness (#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> * Added pylint (#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 (#1302)" (#1324) This reverts commit c1359b7ce8a1945e41e90330fe39bc634d9ca6f3. * Added JSON APIs for get_next_sem_courses , add_course_to_slot , remove_course_from_slot * GAD -5 Dashboard Changes (#1325) * dashboard and usercard updated (#1329) * changes in programme_cuuriculam,adding version to models (#1330) * initial commit * new features for making pre registration automated * Revert "Replace course functionality added" * useless commit * changes in code - for verification of student by admin after final registration * replace functionality added * check for if seats available during replace course and pre reg, solved issues when returning student personal details * Fixing ui bugs (#1335) * added swayam functionality and resolved some other issues * fixed dropcourse option issue in acad admin view * ais/profile conflict * old modules.html * check modules.html conflict * check modules.html conflict 2 * resolving conflict --------- Co-authored-by: akshatnema <20bcs022@iiitdmj.ac.in> 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: Hardik Sharma <104981324+hardiksharma11@users.noreply.github.com> Co-authored-by: Raman Chaudhary <97114586+ChaudharyRaman@users.noreply.github.com> Co-authored-by: Divyanshu Sharma <21bcs079@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: Anudeep Sanapala <71971574+anudeeps0306@users.noreply.github.com> Co-authored-by: TilteD24 <21bcs080@iiitdmj.ac.in> Co-authored-by: Divyanshu Srivastava <97041656+TilteD24@users.noreply.github.com> Co-authored-by: SukulSarve <143542658+SukulSarve@users.noreply.github.com> --------- Co-authored-by: A Anunaya <76819712+Anunaya07@users.noreply.github.com> Co-authored-by: akshatnema <20bcs022@iiitdmj.ac.in> Co-authored-by: Divyanshu Sharma <21bcs079@iiitdmj.ac.in> Co-authored-by: Raman Chaudhary <97114586+ChaudharyRaman@users.noreply.github.com> Co-authored-by: Divyanshu Sharma <114430068+Divyanshusir@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: Hardik Sharma <104981324+hardiksharma11@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: Anudeep Sanapala <71971574+anudeeps0306@users.noreply.github.com> Co-authored-by: TilteD24 <21bcs080@iiitdmj.ac.in> Co-authored-by: Divyanshu Srivastava <97041656+TilteD24@users.noreply.github.com> Co-authored-by: SukulSarve <143542658+SukulSarve@users.noreply.github.com> * Staging6 (#1385) * Checked the sidebar after acad-admin login and fixed the (#1113) fix: icons that were disabled or not working. * Enabled all modules for access (#1120) * OS -2 : Week 4 : Addition of important personal information during booking an appointment (#1084) * Date validation added * Date Validation for booking ambulance --------- Co-authored-by: Akshay010203 <92329718+Akshay010203@users.noreply.github.com> * AC-1 : Add functionality to add and update courses (#1300) * Add functionality to add and update courses * Course version added * Delete FusionIIIT/Fusion/settings/development.py * Delete FusionIIIT/applications/academic_procedures/migrations/0002_auto_20240218_1206.py * Delete FusionIIIT/applications/eis/migrations/0002_auto_20240218_1206.py * Delete FusionIIIT/applications/globals/migrations/0002_auto_20240218_1206.py * Delete FusionIIIT/applications/globals/migrations/0003_auto_20240218_1235.py * Delete FusionIIIT/applications/globals/migrations/0004_auto_20240218_1242.py * Delete FusionIIIT/applications/globals/migrations/0005_auto_20240218_1325.py * Delete FusionIIIT/applications/globals/migrations/0006_auto_20240218_1336.py * Delete FusionIIIT/applications/globals/migrations/0007_auto_20240218_1601.py * Delete FusionIIIT/applications/globals/migrations/0008_auto_20240218_1942.py * Delete FusionIIIT/applications/globals/migrations/0009_auto_20240219_2217.py * Delete FusionIIIT/applications/globals/migrations/0010_auto_20240219_2232.py * Delete FusionIIIT/applications/scholarships/migrations/0002_auto_20240218_1206.py * Delete requirements.txt * Delete FusionIIIT/applications/programme_curriculum/migrations/0002_auto_20240312_1929.py * Delete FusionIIIT/applications/programme_curriculum/migrations/0003_auto_20240312_1944.py * Delete FusionIIIT/applications/programme_curriculum/migrations/0004_course_latest_version.py * Delete FusionIIIT/applications/programme_curriculum/migrations/0005_auto_20240313_0128.py * Gad 5 (#1341) * Enabled all modules for access (#1120) * GAD-5: Fix responsiveness (#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> * GAD -5 Dashboard Changes (#1325) * dashboard and usercard updated (#1329) --------- Co-authored-by: Yathartha Goenka <75240973+yatharthagoenka@users.noreply.github.com> Co-authored-by: akshatnema <20bcs022@iiitdmj.ac.in> 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: BlackHAWK2001 <150950834+BlackHAWK2001@users.noreply.github.com> Co-authored-by: Arpit Tak <140220904+Ishu-ji@users.noreply.github.com> * Os 2 (#1346) * GAD-5: Fix responsiveness (#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> * added announcements and pathologist schedule * Added pylint (#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 (#1302)" (#1324) This reverts commit c1359b7ce8a1945e41e90330fe39bc634d9ca6f3. * GAD -5 Dashboard Changes (#1325) * dashboard and usercard updated (#1329) * changes in programme_cuuriculam,adding version to models (#1330) * Fixing ui bugs (#1335) * module completed * integrated dashboard * Revert "integrated dashboard" This reverts commit 8e48ec598072104d1678bfede3daab6fb8d20a2f. * Revert "module completed" This reverts commit 254487731b88e097e42743fabc97e77d84388694. * Revert "module completed" This reverts commit 254487731b88e097e42743fabc97e77d84388694. * Revert "integrated dashboard" This reverts commit 8e48ec598072104d1678bfede3daab6fb8d20a2f. * errors corrected * errors resolved * added dashboard and corrected errors * removed Migrations * removed migrations * removed migrations --------- 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: Hardik Sharma <104981324+hardiksharma11@users.noreply.github.com> Co-authored-by: Raman Chaudhary <97114586+ChaudharyRaman@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: Anudeep Sanapala <71971574+anudeeps0306@users.noreply.github.com> Co-authored-by: SukulSarve <143542658+SukulSarve@users.noreply.github.com> * Revert "Os 2" (#1352) This reverts commit 1db64d7da40d190218f6e8b0991bc71cd9da7c88. * Os 2 (#1353) * GAD-5: Fix responsiveness (#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> * added announcements and pathologist schedule * Added pylint (#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 (#1302)" (#1324) This reverts commit c1359b7ce8a1945e41e90330fe39bc634d9ca6f3. * GAD -5 Dashboard Changes (#1325) * dashboard and usercard updated (#1329) * changes in programme_cuuriculam,adding version to models (#1330) * Fixing ui bugs (#1335) * module completed * integrated dashboard * Revert "integrated dashboard" This reverts commit 8e48ec598072104d1678bfede3daab6fb8d20a2f. * Revert "module completed" This reverts commit 254487731b88e097e42743fabc97e77d84388694. * Revert "module completed" This reverts commit 254487731b88e097e42743fabc97e77d84388694. * Revert "integrated dashboard" This reverts commit 8e48ec598072104d1678bfede3daab6fb8d20a2f. * errors corrected * errors resolved * added dashboard and corrected errors * removed Migrations * removed migrations * removed migrations * corrected 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: Hardik Sharma <104981324+hardiksharma11@users.noreply.github.com> Co-authored-by: Raman Chaudhary <97114586+ChaudharyRaman@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: Anudeep Sanapala <71971574+anudeeps0306@users.noreply.github.com> Co-authored-by: SukulSarve <143542658+SukulSarve@users.noreply.github.com> * OS-1 | VH Module (#1334) * OS1 issue 1024 resolved : Booking form integrated with Front End (#1025) * Enabled all modules for access (#1120) * OS-1 : Week 5 : All changes till week 5 (#1116) * Added start date display in pre registration (#1063) * Major changes in Visitor's Hostel --------- Co-authored-by: A Anunaya <76819712+Anunaya07@users.noreply.github.com> * OS-1 Minor issues resolved (#1202) * Booking form integrated with Front End * OS-1 week 7 issue resolve * Bill structured properly, updated room availability, meal record fixed, url fixed * Indentaion problems fixed * database changed * More indentations issues resolved * More indentations issues resolved * Next button issue resolved * Database Changed, inventory functionality added * Database conflict resolved * Minor issues resolved * Final changes made --------- Co-authored-by: Akshat Nema <76521428+akshatnema@users.noreply.github.com> * visitor hostel * os-1 vh complete * os-1 vh module * GAD-5: Fix responsiveness (#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> * refactored and corrected booking issues * GAD -5 Dashboard Changes (#1325) * dashboard and usercard updated (#1329) * added form * Fixing ui bugs (#1335) --------- 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> --------- Co-authored-by: VedantJain1103 <105827483+VedantJain1103@users.noreply.github.com> Co-authored-by: Yathartha Goenka <75240973+yatharthagoenka@users.noreply.github.com> Co-authored-by: akshatnema <20bcs022@iiitdmj.ac.in> Co-authored-by: harsh-k-singh <105146460+harsh-k-singh@users.noreply.github.com> Co-authored-by: A Anunaya <76819712+Anunaya07@users.noreply.github.com> Co-authored-by: Akshat Nema <76521428+akshatnema@users.noreply.github.com> Co-authored-by: davneesh <avneeshd09@gmail.com> Co-authored-by: Avneesh <97170838+davneesh@users.noreply.github.com> Co-authored-by: Raman Chaudhary <97114586+ChaudharyRaman@users.noreply.github.com> Co-authored-by: varunraj03 <113377182+varunraj03@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: 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 Updated according to dashboard (#1355) * GAD-5: Fix responsiveness (#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> * GAD -5 Dashboard Changes (#1325) * dashboard and usercard updated (#1329) * Fixing ui bugs (#1335) * Ac1 Updated Dashboard --------- 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> * Sa 2 (#1362) * sa-2 : till week-4 : #1009 , #1044 and #1097 fix (#1010) Co-authored-by: theparasgami <20BCS151@iiitdmj.ac.in> * Added start date display in pre registration (#1063) * SA-2 :Query Optimization (#1134) * Query Optimization * Removed Unnecessary print Statements * Used .exists() method * Sa-2: Week 8: Created Api's (#1172) Co-authored-by: Mayankingale123 <chetanmayank123@gamil.com> Co-authored-by: akshatnema <20bcs022@iiitdmj.ac.in> * Sa 2 (#1332) * updated models * Revert "updated models" This reverts commit 83e2e73d895fc7f6a7ba2fa117624bbcb2ede278. * 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 * Updated Special food Functionality * 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 <113760758+Harshul-25@users.noreply.github.com> * Some UI changes (#35) Co-authored-by: Harshul Choudhary <113760758+Harshul-25@users.noreply.github.com> * merge fixes * added remove * some ui fixes * fixed cronjobs * semdate fixes * removed migrations * 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: 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: Hritik Yadav <97102768+HritikYadav7@users.noreply.github.com> Co-authored-by: Harshul <nawaniharshul2@gmail.com> * Sa 2 - updated dashboard (#1342) * GAD-5: Fix responsiveness (#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> * updated models * Revert "updated models" This reverts commit 83e2e73d895fc7f6a7ba2fa117624bbcb2ede278. * 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 (#1325) * Updated Special food Functionality * dashboard and usercard updated (#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 <113760758+Harshul-25@users.noreply.github.com> * Some UI changes (#35) Co-authored-by: Harshul Choudhary <113760758+Harshul-25@u…
SA-1 Hostel Management
* deployment ports config * gad-3 : week-2 : changed api functions (#1069) * gad-4: Created fileTrackingNotAllowed.html (#1082) * gad-4: new views.py to remove students from file tracking (#1104) * fix: reverting deployment changes * gad-3 : workers would be assigned by Section Incharge instead of Caretaker (#1132) Co-authored-by: Akshat Nema <76521428+akshatnema@users.noreply.github.com> * gad-3: Week7 : fixed the notification and re-assign worker button issues (#1137) Co-authored-by: Aksh Bansal <63552235+Aksh-Bansal-dev@users.noreply.github.com> * auto-restart docker (#1147) * OS -2 : Week 4 : Addition of important personal information during booking an appointment (#1084) * Date validation added * Date Validation for booking ambulance --------- Co-authored-by: Akshay010203 <92329718+Akshay010203@users.noreply.github.com> * gad-3 : week-8 : db migrations after adding Section Incharge (#1173) * before adding functionality for secincharge * Delete 0002_auto_20230321_0041.py * gad-3 : week8 : remove wrong dependency to globals. (#1178) * GAD-4: FTS SDK * fix requirements and docker-compose * fix docker compose and dependencies * add sdk and api folder structure * add sdk methods and fix some urls * update models for API * add urls for api * add methods for viewing file, inbox, outbox, getting designation with serializers and minor bug fixes * fix serializers and fix file attachment functionality in forward_file * sync with upstream * add views and fix urls * create file * create file change * fix create_file, without upload_file feature * fix sdk forward_file : accept remarks * add view_history in sdk * add blueprint for draft and archive methods to sdk * fix FileHeaderSerializer to include id * fix empty file upload error * fix inbox outbox methods to return unique ids * fix complete_flag to is_read * fix inbox outbox methods to not show archived * add view_archived method to sdk * add archive_file method to sdk * fix inbox and outbox output and add support for attachments * add draft methods to sdk * fix default values of named params * fix css for filetracking.html * fix fts serializer.py * add dept adding method to sdk * add helper methods to sdk * fix inbox based on SDK * remove track from TabMenu * fix outbox using SDK * fix archive view for SDK * fix Drafts based on SDK * fix the view file functionality in the web app * fix frontend * fix .gitignore to untrack migrations * fix 1. order of files in inbox and outbox 2. order of files is mantained in uniqueList function * fix login required on viewing file * fix create_file method so that subject and description are also accepted * add rest api for create file and view file * add rest api for create, view and delete file * add rest api for inbox, outbox, history view * add rest api for draft view, forward file * prevent student access of the filetracking module * add dropdown filtering based on reciever username and update notallowed template * add option to unarchive files * fix template for filetrackingnotallowed page * fix attachments view in the history of the file * make the fields in draft view editable * update the views --------- Co-authored-by: Aragorn-64 <advaysagarkar@gmail.com> Co-authored-by: aish0749 <aishwaryasaxena57@gmail.com> * Added pylint (#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 (#1302)" (#1324) This reverts commit c1359b7ce8a1945e41e90330fe39bc634d9ca6f3. * changes in programme_cuuriculam,adding version to models (#1330) * Gad 5 (#1341) * Enabled all modules for access (#1120) * GAD-5: Fix responsiveness (#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> * GAD -5 Dashboard Changes (#1325) * dashboard and usercard updated (#1329) --------- Co-authored-by: Yathartha Goenka <75240973+yatharthagoenka@users.noreply.github.com> Co-authored-by: akshatnema <20bcs022@iiitdmj.ac.in> 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: BlackHAWK2001 <150950834+BlackHAWK2001@users.noreply.github.com> Co-authored-by: Arpit Tak <140220904+Ishu-ji@users.noreply.github.com> * Os 2 (#1346) * GAD-5: Fix responsiveness (#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> * added announcements and pathologist schedule * Added pylint (#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 (#1302)" (#1324) This reverts commit c1359b7ce8a1945e41e90330fe39bc634d9ca6f3. * GAD -5 Dashboard Changes (#1325) * dashboard and usercard updated (#1329) * changes in programme_cuuriculam,adding version to models (#1330) * Fixing ui bugs (#1335) * module completed * integrated dashboard * Revert "integrated dashboard" This reverts commit 8e48ec598072104d1678bfede3daab6fb8d20a2f. * Revert "module completed" This reverts commit 254487731b88e097e42743fabc97e77d84388694. * Revert "module completed" This reverts commit 254487731b88e097e42743fabc97e77d84388694. * Revert "integrated dashboard" This reverts commit 8e48ec598072104d1678bfede3daab6fb8d20a2f. * errors corrected * errors resolved * added dashboard and corrected errors * removed Migrations * removed migrations * removed migrations --------- 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: Hardik Sharma <104981324+hardiksharma11@users.noreply.github.com> Co-authored-by: Raman Chaudhary <97114586+ChaudharyRaman@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: Anudeep Sanapala <71971574+anudeeps0306@users.noreply.github.com> Co-authored-by: SukulSarve <143542658+SukulSarve@users.noreply.github.com> * Revert "Os 2" (#1352) This reverts commit 1db64d7da40d190218f6e8b0991bc71cd9da7c88. * Os 2 (#1353) * GAD-5: Fix responsiveness (#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> * added announcements and pathologist schedule * Added pylint (#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 (#1302)" (#1324) This reverts commit c1359b7ce8a1945e41e90330fe39bc634d9ca6f3. * GAD -5 Dashboard Changes (#1325) * dashboard and usercard updated (#1329) * changes in programme_cuuriculam,adding version to models (#1330) * Fixing ui bugs (#1335) * module completed * integrated dashboard * Revert "integrated dashboard" This reverts commit 8e48ec598072104d1678bfede3daab6fb8d20a2f. * Revert "module completed" This reverts commit 254487731b88e097e42743fabc97e77d84388694. * Revert "module completed" This reverts commit 254487731b88e097e42743fabc97e77d84388694. * Revert "integrated dashboard" This reverts commit 8e48ec598072104d1678bfede3daab6fb8d20a2f. * errors corrected * errors resolved * added dashboard and corrected errors * removed Migrations * removed migrations * removed migrations * corrected 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: Hardik Sharma <104981324+hardiksharma11@users.noreply.github.com> Co-authored-by: Raman Chaudhary <97114586+ChaudharyRaman@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: Anudeep Sanapala <71971574+anudeeps0306@users.noreply.github.com> Co-authored-by: SukulSarve <143542658+SukulSarve@users.noreply.github.com> * OS-1 | VH Module (#1334) * OS1 issue 1024 resolved : Booking form integrated with Front End (#1025) * Enabled all modules for access (#1120) * OS-1 : Week 5 : All changes till week 5 (#1116) * Added start date display in pre registration (#1063) * Major changes in Visitor's Hostel --------- Co-authored-by: A Anunaya <76819712+Anunaya07@users.noreply.github.com> * OS-1 Minor issues resolved (#1202) * Booking form integrated with Front End * OS-1 week 7 issue resolve * Bill structured properly, updated room availability, meal record fixed, url fixed * Indentaion problems fixed * database changed * More indentations issues resolved * More indentations issues resolved * Next button issue resolved * Database Changed, inventory functionality added * Database conflict resolved * Minor issues resolved * Final changes made --------- Co-authored-by: Akshat Nema <76521428+akshatnema@users.noreply.github.com> * visitor hostel * os-1 vh complete * os-1 vh module * GAD-5: Fix responsiveness (#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> * refactored and corrected booking issues * GAD -5 Dashboard Changes (#1325) * dashboard and usercard updated (#1329) * added form * Fixing ui bugs (#1335) --------- 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> --------- Co-authored-by: VedantJain1103 <105827483+VedantJain1103@users.noreply.github.com> Co-authored-by: Yathartha Goenka <75240973+yatharthagoenka@users.noreply.github.com> Co-authored-by: akshatnema <20bcs022@iiitdmj.ac.in> Co-authored-by: harsh-k-singh <105146460+harsh-k-singh@users.noreply.github.com> Co-authored-by: A Anunaya <76819712+Anunaya07@users.noreply.github.com> Co-authored-by: Akshat Nema <76521428+akshatnema@users.noreply.github.com> Co-authored-by: davneesh <avneeshd09@gmail.com> Co-authored-by: Avneesh <97170838+davneesh@users.noreply.github.com> Co-authored-by: Raman Chaudhary <97114586+ChaudharyRaman@users.noreply.github.com> Co-authored-by: varunraj03 <113377182+varunraj03@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: 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-4 Updated according to Dashboard changes (#1361) * GAD-5: Fix responsiveness (#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> * fix requirements and docker-compose * fix docker compose and dependencies * add sdk and api folder structure * add sdk methods and fix some urls * update models for API * add urls for api * add methods for viewing file, inbox, outbox, getting designation with serializers and minor bug fixes * fix serializers and fix file attachment functionality in forward_file * sync with upstream * add views and fix urls * create file * create file change * fix create_file, without upload_file feature * fix sdk forward_file : accept remarks * add view_history in sdk * add blueprint for draft and archive methods to sdk * fix FileHeaderSerializer to include id * fix empty file upload error * fix inbox outbox methods to return unique ids * fix complete_flag to is_read * fix inbox outbox methods to not show archived * add view_archived method to sdk * add archive_file method to sdk * fix inbox and outbox output and add support for attachments * add draft methods to sdk * fix default values of named params * fix css for filetracking.html * fix fts serializer.py * add dept adding method to sdk * add helper methods to sdk * fix inbox based on SDK * remove track from TabMenu * fix outbox using SDK * fix archive view for SDK * fix Drafts based on SDK * fix the view file functionality in the web app * fix frontend * fix .gitignore to untrack migrations * fix 1. order of files in inbox and outbox 2. order of files is mantained in uniqueList function * fix login required on viewing file * fix create_file method so that subject and description are also accepted * add rest api for create file and view file * add rest api for create, view and delete file * add rest api for inbox, outbox, history view * add rest api for draft view, forward file * prevent student access of the filetracking module * add dropdown filtering based on reciever username and update notallowed template * add option to unarchive files * fix template for filetrackingnotallowed page * fix attachments view in the history of the file * make the fields in draft view editable * update the views * GAD -5 Dashboard Changes (#1325) * dashboard and usercard updated (#1329) * Fixing ui bugs (#1335) * fix file sending and forwarding template to include designation automatically * fix forward file view to include designations automatically * add redirect to dropdown designation to views * add redirect on designation change --------- 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: Divyansh Tripathi <55395696+theoden42@users.noreply.github.com> Co-authored-by: aish0749 <aishwaryasaxena57@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: SukulSarve <143542658+SukulSarve@users.noreply.github.com> * Sa 2 (#1362) * sa-2 : till week-4 : #1009 , #1044 and #1097 fix (#1010) Co-authored-by: theparasgami <20BCS151@iiitdmj.ac.in> * Added start date display in pre registration (#1063) * SA-2 :Query Optimization (#1134) * Query Optimization * Removed Unnecessary print Statements * Used .exists() method * Sa-2: Week 8: Created Api's (#1172) Co-authored-by: Mayankingale123 <chetanmayank123@gamil.com> Co-authored-by: akshatnema <20bcs022@iiitdmj.ac.in> * Sa 2 (#1332) * updated models * Revert "updated models" This reverts commit 83e2e73d895fc7f6a7ba2fa117624bbcb2ede278. * 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 * Updated Special food Functionality * 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 <113760758+Harshul-25@users.noreply.github.com> * Some UI changes (#35) Co-authored-by: Harshul Choudhary <113760758+Harshul-25@users.noreply.github.com> * merge fixes * added remove * some ui fixes * fixed cronjobs * semdate fixes * removed migrations * 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: 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: Hritik Yadav <97102768+HritikYadav7@users.noreply.github.com> Co-authored-by: Harshul <nawaniharshul2@gmail.com> * Sa 2 - updated dashboard (#1342) * GAD-5: Fix responsiveness (#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> * updated models * Revert "updated models" This reverts commit 83e2e73d895fc7f6a7ba2fa117624bbcb2ede278. * 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 (#1325) * Updated Special food Functionality * dashboard and usercard updated (#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 <113760758+Harshul-25@users.noreply.github.com> * Some UI changes (#35) Co-authored-by: Harshul Choudhary <113760758+Harshul-25@users.noreply.github.com> * merge fixes * added remove * some ui fixes * fixed cronjobs * semdate fixes * removed migrations * Fixing ui bugs (#1335) * 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 <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: 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> * Sa 2 (#1351) * GAD-5: Fix responsiveness (#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> * updated models * Revert "updated models" This reverts commit 83e2e73d895fc7f6a7ba2fa117624bbcb2ede278. * 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 (#1325) * Updated Special food Functionality * dashboard and usercard updated (#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 <113760758+Harshul-25@users.noreply.github.com> * Some UI changes (#35) Co-authored-by: Harshul Choudhary <113760758+Harshul-25@users.noreply.github.com> * merge fixes * added remove * some ui fixes * fixed cronjobs * semdate fixes * removed migrations * Fixing ui bugs (#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 <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: 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> --------- 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: 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: Harshul Choudhary <113760758+Harshul-25@users.noreply.github.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: Hritik Yadav <97102768+HritikYadav7@users.noreply.github.com> Co-authored-by: Harshul <nawaniharshul2@gmail.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: 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 4 - FTS * deployment ports config * gad-4: Created fileTrackingNotAllowed.html (#1082) * gad-4: new views.py to remove students from file tracking (#1104) * fix: reverting deployment changes * GAD-4: FTS SDK * fix requirements and docker-compose * fix docker compose and dependencies * add sdk and api folder structure * add sdk methods and fix some urls * update models for API * add urls for api * add methods for viewing file, inbox, outbox, getting designation with serializers and minor bug fixes * fix serializers and fix file attachment functionality in forward_file * sync with upstream * add views and fix urls * create file * create file change * fix create_file, without upload_file feature * fix sdk forward_file : accept remarks * add view_history in sdk * add blueprint for draft and archive methods to sdk * fix FileHeaderSerializer to include id * fix empty file upload error * fix inbox outbox methods to return unique ids * fix complete_flag to is_read * fix inbox outbox methods to not show archived * add view_archived method to sdk * add archive_file method to sdk * fix inbox and outbox output and add support for attachments * add draft methods to sdk * fix default values of named params * fix css for filetracking.html * fix fts serializer.py * add dept adding method to sdk * add helper methods to sdk * fix inbox based on SDK * remove track from TabMenu * fix outbox using SDK * fix archive view for SDK * fix Drafts based on SDK * fix the view file functionality in the web app * fix frontend * fix .gitignore to untrack migrations * fix 1. order of files in inbox and outbox 2. order of files is mantained in uniqueList function * fix login required on viewing file * fix create_file method so that subject and description are also accepted * add rest api for create file and view file * add rest api for create, view and delete file * add rest api for inbox, outbox, history view * add rest api for draft view, forward file * prevent student access of the filetracking module * add dropdown filtering based on reciever username and update notallowed template * add option to unarchive files * fix template for filetrackingnotallowed page * fix attachments view in the history of the file * make the fields in draft view editable * update the views --------- Co-authored-by: Aragorn-64 <advaysagarkar@gmail.com> Co-authored-by: aish0749 <aishwaryasaxena57@gmail.com> * GAD-4 Updated according to Dashboard changes (#1361) * GAD-5: Fix responsiveness (#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> * fix requirements and docker-compose * fix docker compose and dependencies * add sdk and api folder structure * add sdk methods and fix some urls * update models for API * add urls for api * add methods for viewing file, inbox, outbox, getting designation with serializers and minor bug fixes * fix serializers and fix file attachment functionality in forward_file * sync with upstream * add views and fix urls * create file * create file change * fix create_file, without upload_file feature * fix sdk forward_file : accept remarks * add view_history in sdk * add blueprint for draft and archive methods to sdk * fix FileHeaderSerializer to include id * fix empty file upload error * fix inbox outbox methods to return unique ids * fix complete_flag to is_read * fix inbox outbox methods to not show archived * add view_archived method to sdk * add archive_file method to sdk * fix inbox and outbox output and add support for attachments * add draft methods to sdk * fix default values of named params * fix css for filetracking.html * fix fts serializer.py * add dept adding method to sdk * add helper methods to sdk * fix inbox based on SDK * remove track from TabMenu * fix outbox using SDK * fix archive view for SDK * fix Drafts based on SDK * fix the view file functionality in the web app * fix frontend * fix .gitignore to untrack migrations * fix 1. order of files in inbox and outbox 2. order of files is mantained in uniqueList function * fix login required on viewing file * fix create_file method so that subject and description are also accepted * add rest api for create file and view file * add rest api for create, view and delete file * add rest api for inbox, outbox, history view * add rest api for draft view, forward file * prevent student access of the filetracking module * add dropdown filtering based on reciever username and update notallowed template * add option to unarchive files * fix template for filetrackingnotallowed page * fix attachments view in the history of the file * make the fields in draft view editable * update the views * GAD -5 Dashboard Changes (#1325) * dashboard and usercard updated (#1329) * Fixing ui bugs (#1335) * fix file sending and forwarding template to include designation automatically * fix forward file view to include designations automatically * add redirect to dropdown designation to views * add redirect on designation change --------- 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: Divyansh Tripathi <55395696+theoden42@users.noreply.github.com> Co-authored-by: aish0749 <aishwaryasaxena57@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: SukulSarve <143542658+SukulSarve@users.noreply.github.com> --------- Co-authored-by: Yathartha Goenka <goenkayathartha2002@gmail.com> Co-authored-by: prakhar-da-gama <95561933+prakhar-da-gama@users.noreply.github.com> Co-authored-by: akshatnema <20bcs022@iiitdmj.ac.in> Co-authored-by: manavdesai27 <manav27202@gmail.com> Co-authored-by: Divyansh Tripathi <55395696+theoden42@users.noreply.github.com> Co-authored-by: Aragorn-64 <advaysagarkar@gmail.com> Co-authored-by: aish0749 <aishwaryasaxena57@gmail.com> Co-authored-by: Advay Sagarkar <72992475+Aragorn-64@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: Aksh Bansal <63552235+Aksh-Bansal-dev@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 Request to merge in staging again. (#1373) * Checked the sidebar after acad-admin login and fixed the (#1113) fix: icons that were disabled or not working. * Enabled all modules for access (#1120) * AC-1 : Add functionality to add and update courses (#1300) * Add functionality to add and update courses * Course version added * Delete FusionIIIT/Fusion/settings/development.py * Delete FusionIIIT/applications/academic_procedures/migrations/0002_auto_20240218_1206.py * Delete FusionIIIT/applications/eis/migrations/0002_auto_20240218_1206.py * Delete FusionIIIT/applications/globals/migrations/0002_auto_20240218_1206.py * Delete FusionIIIT/applications/globals/migrations/0003_auto_20240218_1235.py * Delete FusionIIIT/applications/globals/migrations/0004_auto_20240218_1242.py * Delete FusionIIIT/applications/globals/migrations/0005_auto_20240218_1325.py * Delete FusionIIIT/applications/globals/migrations/0006_auto_20240218_1336.py * Delete FusionIIIT/applications/globals/migrations/0007_auto_20240218_1601.py * Delete FusionIIIT/applications/globals/migrations/0008_auto_20240218_1942.py * Delete FusionIIIT/applications/globals/migrations/0009_auto_20240219_2217.py * Delete FusionIIIT/applications/globals/migrations/0010_auto_20240219_2232.py * Delete FusionIIIT/applications/scholarships/migrations/0002_auto_20240218_1206.py * Delete requirements.txt * Delete FusionIIIT/applications/programme_curriculum/migrations/0002_auto_20240312_1929.py * Delete FusionIIIT/applications/programme_curriculum/migrations/0003_auto_20240312_1944.py * Delete FusionIIIT/applications/programme_curriculum/migrations/0004_course_latest_version.py * Delete FusionIIIT/applications/programme_curriculum/migrations/0005_auto_20240313_0128.py * AC-1 Updated according to dashboard (#1355) * GAD-5: Fix responsiveness (#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> * GAD -5 Dashboard Changes (#1325) * dashboard and usercard updated (#1329) * Fixing ui bugs (#1335) * Ac1 Updated Dashboard --------- 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> * Added pylint (#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 (#1302)" (#1324) This reverts commit c1359b7ce8a1945e41e90330fe39bc634d9ca6f3. * changes in programme_cuuriculam,adding version to models (#1330) * Ac-1 updated model.py (#1372) * GAD-5: Fix responsiveness (#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> * GAD -5 Dashboard Changes (#1325) * dashboard and usercard updated (#1329) * Fixing ui bugs (#1335) * Ac1 Updated Dashboard * changes * Changes in model.py * Changes in model.py --------- 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> --------- Co-authored-by: EyeOfHorus158 <75492668+EyeOfHorus158@users.noreply.github.com> Co-authored-by: Yathartha Goenka <75240973+yatharthagoenka@users.noreply.github.com> Co-authored-by: akshatnema <20bcs022@iiitdmj.ac.in> Co-authored-by: Ravichendraa <112809862+Ravichendraa@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: Aksh Bansal <63552235+Aksh-Bansal-dev@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> 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> * Revert "Ac 1 Request to merge in staging again. (#1373)" (#1376) This reverts commit 16523a7a1568d165a8212794bc646b8557bd0569. * Ac-1 updated model.py (#1372) (#1378) * GAD-5: Fix responsiveness (#1125) * GAD -5 Dashboard Changes (#1325) * dashboard and usercard updated (#1329) * Fixing ui bugs (#1335) * Ac1 Updated Dashboard * changes * Changes in model.py * Changes in model.py --------- Co-authored-by: Ravichendraa <112809862+Ravichendraa@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: 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> * merging Ac 5 into staging (#1379) * Fix problem regarding fetching batch for students enrolled in batch 2… (#1030) * Fix form render for students of 2020 batch and later (#1103) * AC-5 (spacs) : dashboard integration and invitations and application update issues (#1345) * GAD-5: Fix responsiveness (#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> * debugging and refactoring * resolved invitation notifications error * added apply convocation functionality * fixed profile redirection issue * fixed profile redirection issues * refactoring and other changes * GAD -5 Dashboard Changes (#1325) * dashboard and usercard updated (#1329) * resolved routing error * removed delete button --------- 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: Nitya Tiwari <nityasdl002@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: gaur-abhi524 <82049206+gaur-abhi524@users.noreply.github.com> Co-authored-by: akshatnema <20bcs022@iiitdmj.ac.in> Co-authored-by: Yathartha Goenka <75240973+yatharthagoenka@users.noreply.github.com> Co-authored-by: Sudheer dagar <60738162+sudheerdagar@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: Aksh Bansal <63552235+Aksh-Bansal-dev@users.noreply.github.com> Co-authored-by: Nitya Tiwari <nityasdl002@gmail.com> Co-authored-by: BlackHAWK2001 <150950834+BlackHAWK2001@users.noreply.github.com> Co-authored-by: Arpit Tak <140220904+Ishu-ji@users.noreply.github.com> * modified academic_info_models * removed migrations * removed migration folders * added migrationns * Update development.py * Update requirements.txt * Gad 3 (#1383) * GAD-5: Fix responsiveness (#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 (#1325) * dashboard and usercard updated (#1329) * Fixing ui bugs (#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> * Ac 2 merging to staging (#1384) * ac-2: added sample excel sheet to add new students and deleted unnecessary files (#1109) * AC-2: Replaced .xlsx file with .xls file (#1124) * created apis for AC2 module * created apis for AC2 module * created apis for AC2 module * added apis for AC2 module and created backlog model * created functionalities for pre registration configuration , also created html templates and apis for the same * removing postgres data files and migrations file * Remove ignored files from repository * removing postgres data files and migrations file * removing postgres data files * functionality for faculty to view assigned course and generate roll list * Wrong details displayed : course name in place of course code * Removed migrations file * Changed the gitignore file * Updated PR AC2-Course registration after the changes and integration with new Dashboard (#1357) * GAD-5: Fix responsiveness (#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> * Added pylint (#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 (#1302)" (#1324) This reverts commit c1359b7ce8a1945e41e90330fe39bc634d9ca6f3. * Added JSON APIs for get_next_sem_courses , add_course_to_slot , remove_course_from_slot * GAD -5 Dashboard Changes (#1325) * dashboard and usercard updated (#1329) * changes in programme_cuuriculam,adding version to models (#1330) * initial commit * new features for making pre registration automated * Revert "Replace course functionality added" * useless commit * changes in code - for verification of student by admin after final registration * replace functionality added * check for if seats available during replace course and pre reg, solved issues when returning student personal details * Fixing ui bugs (#1335) * added swayam functionality and resolved some other issues * fixed dropcourse option issue in acad admin view * ais/profile conflict * old modules.html * check modules.html conflict * check modules.html conflict 2 * resolving conflict --------- Co-authored-by: akshatnema <20bcs022@iiitdmj.ac.in> 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: Hardik Sharma <104981324+hardiksharma11@users.noreply.github.com> Co-authored-by: Raman Chaudhary <97114586+ChaudharyRaman@users.noreply.github.com> Co-authored-by: Divyanshu Sharma <21bcs079@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: Anudeep Sanapala <71971574+anudeeps0306@users.noreply.github.com> Co-authored-by: TilteD24 <21bcs080@iiitdmj.ac.in> Co-authored-by: Divyanshu Srivastava <97041656+TilteD24@users.noreply.github.com> Co-authored-by: SukulSarve <143542658+SukulSarve@users.noreply.github.com> --------- Co-authored-by: A Anunaya <76819712+Anunaya07@users.noreply.github.com> Co-authored-by: akshatnema <20bcs022@iiitdmj.ac.in> Co-authored-by: Divyanshu Sharma <21bcs079@iiitdmj.ac.in> Co-authored-by: Raman Chaudhary <97114586+ChaudharyRaman@users.noreply.github.com> Co-authored-by: Divyanshu Sharma <114430068+Divyanshusir@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: Hardik Sharma <104981324+hardiksharma11@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: Anudeep Sanapala <71971574+anudeeps0306@users.noreply.github.com> Co-authored-by: TilteD24 <21bcs080@iiitdmj.ac.in> Co-authored-by: Divyanshu Srivastava <97041656+TilteD24@users.noreply.github.com> Co-authored-by: SukulSarve <143542658+SukulSarve@users.noreply.github.com> * Staging6 (#1385) * Checked the sidebar after acad-admin login and fixed the (#1113) fix: icons that were disabled or not working. * Enabled all modules for access (#1120) * OS -2 : Week 4 : Addition of important personal information during booking an appointment (#1084) * Date validation added * Date Validation for booking ambulance --------- Co-authored-by: Akshay010203 <92329718+Akshay010203@users.noreply.github.com> * AC-1 : Add functionality to add and update courses (#1300) * Add functionality to add and update courses * Course version added * Delete FusionIIIT/Fusion/settings/development.py * Delete FusionIIIT/applications/academic_procedures/migrations/0002_auto_20240218_1206.py * Delete FusionIIIT/applications/eis/migrations/0002_auto_20240218_1206.py * Delete FusionIIIT/applications/globals/migrations/0002_auto_20240218_1206.py * Delete FusionIIIT/applications/globals/migrations/0003_auto_20240218_1235.py * Delete FusionIIIT/applications/globals/migrations/0004_auto_20240218_1242.py * Delete FusionIIIT/applications/globals/migrations/0005_auto_20240218_1325.py * Delete FusionIIIT/applications/globals/migrations/0006_auto_20240218_1336.py * Delete FusionIIIT/applications/globals/migrations/0007_auto_20240218_1601.py * Delete FusionIIIT/applications/globals/migrations/0008_auto_20240218_1942.py * Delete FusionIIIT/applications/globals/migrations/0009_auto_20240219_2217.py * Delete FusionIIIT/applications/globals/migrations/0010_auto_20240219_2232.py * Delete FusionIIIT/applications/scholarships/migrations/0002_auto_20240218_1206.py * Delete requirements.txt * Delete FusionIIIT/applications/programme_curriculum/migrations/0002_auto_20240312_1929.py * Delete FusionIIIT/applications/programme_curriculum/migrations/0003_auto_20240312_1944.py * Delete FusionIIIT/applications/programme_curriculum/migrations/0004_course_latest_version.py * Delete FusionIIIT/applications/programme_curriculum/migrations/0005_auto_20240313_0128.py * Gad 5 (#1341) * Enabled all modules for access (#1120) * GAD-5: Fix responsiveness (#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> * GAD -5 Dashboard Changes (#1325) * dashboard and usercard updated (#1329) --------- Co-authored-by: Yathartha Goenka <75240973+yatharthagoenka@users.noreply.github.com> Co-authored-by: akshatnema <20bcs022@iiitdmj.ac.in> 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: BlackHAWK2001 <150950834+BlackHAWK2001@users.noreply.github.com> Co-authored-by: Arpit Tak <140220904+Ishu-ji@users.noreply.github.com> * Os 2 (#1346) * GAD-5: Fix responsiveness (#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> * added announcements and pathologist schedule * Added pylint (#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 (#1302)" (#1324) This reverts commit c1359b7ce8a1945e41e90330fe39bc634d9ca6f3. * GAD -5 Dashboard Changes (#1325) * dashboard and usercard updated (#1329) * changes in programme_cuuriculam,adding version to models (#1330) * Fixing ui bugs (#1335) * module completed * integrated dashboard * Revert "integrated dashboard" This reverts commit 8e48ec598072104d1678bfede3daab6fb8d20a2f. * Revert "module completed" This reverts commit 254487731b88e097e42743fabc97e77d84388694. * Revert "module completed" This reverts commit 254487731b88e097e42743fabc97e77d84388694. * Revert "integrated dashboard" This reverts commit 8e48ec598072104d1678bfede3daab6fb8d20a2f. * errors corrected * errors resolved * added dashboard and corrected errors * removed Migrations * removed migrations * removed migrations --------- 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: Hardik Sharma <104981324+hardiksharma11@users.noreply.github.com> Co-authored-by: Raman Chaudhary <97114586+ChaudharyRaman@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: Anudeep Sanapala <71971574+anudeeps0306@users.noreply.github.com> Co-authored-by: SukulSarve <143542658+SukulSarve@users.noreply.github.com> * Revert "Os 2" (#1352) This reverts commit 1db64d7da40d190218f6e8b0991bc71cd9da7c88. * Os 2 (#1353) * GAD-5: Fix responsiveness (#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> * added announcements and pathologist schedule * Added pylint (#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 (#1302)" (#1324) This reverts commit c1359b7ce8a1945e41e90330fe39bc634d9ca6f3. * GAD -5 Dashboard Changes (#1325) * dashboard and usercard updated (#1329) * changes in programme_cuuriculam,adding version to models (#1330) * Fixing ui bugs (#1335) * module completed * integrated dashboard * Revert "integrated dashboard" This reverts commit 8e48ec598072104d1678bfede3daab6fb8d20a2f. * Revert "module completed" This reverts commit 254487731b88e097e42743fabc97e77d84388694. * Revert "module completed" This reverts commit 254487731b88e097e42743fabc97e77d84388694. * Revert "integrated dashboard" This reverts commit 8e48ec598072104d1678bfede3daab6fb8d20a2f. * errors corrected * errors resolved * added dashboard and corrected errors * removed Migrations * removed migrations * removed migrations * corrected 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: Hardik Sharma <104981324+hardiksharma11@users.noreply.github.com> Co-authored-by: Raman Chaudhary <97114586+ChaudharyRaman@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: Anudeep Sanapala <71971574+anudeeps0306@users.noreply.github.com> Co-authored-by: SukulSarve <143542658+SukulSarve@users.noreply.github.com> * OS-1 | VH Module (#1334) * OS1 issue 1024 resolved : Booking form integrated with Front End (#1025) * Enabled all modules for access (#1120) * OS-1 : Week 5 : All changes till week 5 (#1116) * Added start date display in pre registration (#1063) * Major changes in Visitor's Hostel --------- Co-authored-by: A Anunaya <76819712+Anunaya07@users.noreply.github.com> * OS-1 Minor issues resolved (#1202) * Booking form integrated with Front End * OS-1 week 7 issue resolve * Bill structured properly, updated room availability, meal record fixed, url fixed * Indentaion problems fixed * database changed * More indentations issues resolved * More indentations issues resolved * Next button issue resolved * Database Changed, inventory functionality added * Database conflict resolved * Minor issues resolved * Final changes made --------- Co-authored-by: Akshat Nema <76521428+akshatnema@users.noreply.github.com> * visitor hostel * os-1 vh complete * os-1 vh module * GAD-5: Fix responsiveness (#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> * refactored and corrected booking issues * GAD -5 Dashboard Changes (#1325) * dashboard and usercard updated (#1329) * added form * Fixing ui bugs (#1335) --------- 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> --------- Co-authored-by: VedantJain1103 <105827483+VedantJain1103@users.noreply.github.com> Co-authored-by: Yathartha Goenka <75240973+yatharthagoenka@users.noreply.github.com> Co-authored-by: akshatnema <20bcs022@iiitdmj.ac.in> Co-authored-by: harsh-k-singh <105146460+harsh-k-singh@users.noreply.github.com> Co-authored-by: A Anunaya <76819712+Anunaya07@users.noreply.github.com> Co-authored-by: Akshat Nema <76521428+akshatnema@users.noreply.github.com> Co-authored-by: davneesh <avneeshd09@gmail.com> Co-authored-by: Avneesh <97170838+davneesh@users.noreply.github.com> Co-authored-by: Raman Chaudhary <97114586+ChaudharyRaman@users.noreply.github.com> Co-authored-by: varunraj03 <113377182+varunraj03@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: 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 Updated according to dashboard (#1355) * GAD-5: Fix responsiveness (#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> * GAD -5 Dashboard Changes (#1325) * dashboard and usercard updated (#1329) * Fixing ui bugs (#1335) * Ac1 Updated Dashboard --------- 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> * Sa 2 (#1362) * sa-2 : till week-4 : #1009 , #1044 and #1097 fix (#1010) Co-authored-by: theparasgami <20BCS151@iiitdmj.ac.in> * Added start date display in pre registration (#1063) * SA-2 :Query Optimization (#1134) * Query Optimization * Removed Unnecessary print Statements * Used .exists() method * Sa-2: Week 8: Created Api's (#1172) Co-authored-by: Mayankingale123 <chetanmayank123@gamil.com> Co-authored-by: akshatnema <20bcs022@iiitdmj.ac.in> * Sa 2 (#1332) * updated models * Revert "updated models" This reverts commit 83e2e73d895fc7f6a7ba2fa117624bbcb2ede278. * 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 * Updated Special food Functionality * 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 <113760758+Harshul-25@users.noreply.github.com> * Some UI changes (#35) Co-authored-by: Harshul Choudhary <113760758+Harshul-25@users.noreply.github.com> * merge fixes * added remove * some ui fixes * fixed cronjobs * semdate fixes * removed migrations * 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: Harshit0009 <tiwariharshit909@email.com> Co-authored-by: Harshul <harshul@pop-os.localdomain> Co-authored-by: hemantsinghhere <115834099+hemantsinghhere@users.noreply.github.com> …
Corrected designation for acad admin
Corrected code of AC-2 to AC-final
Ac 7 Latest Code with Changes
There was an extra print statement causing now commented out.
changes related to apis
Merging Latest Staging in RSPC-FINAL
Updated AC-7 to AC-final
…aging Rspc latest staging
Replaced the migration with my migration to sync database
RSPC Final to Latest-Staging..
API corrections for PHC (OS-2)
OS-2 to latest_staging
Corrected AC-7 in AC-final to latest_staging
|
@prajjwalkapoor @ChaudharyRaman Review it . LGTM |
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
xin the boxes that applyChecklist
Put an
xin 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