Gad-3 and AC-2 merged by prabhatsuman · Pull Request #1403 · FusionIIIT/Fusion

prabhatsuman · 2024-04-08T11:08:42Z

Issue that this pull request solves

Closes: # (issue number)

Proposed changes

Brief description of what is fixed or changed

Types of changes

Put an x in the boxes that apply

Bugfix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to not work as expected)
Other (please describe):

Checklist

Put an x in the boxes that apply

My code follows the style guidelines of this project
I have performed a self-review of my own code
I have created new branch for this pull request
I have commented my code, particularly in hard-to-understand areas
I have made corresponding changes to the documentation
My changes generate no new warnings
My changes does not break the current system and it passes all the current test cases.

Screenshots

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

…1113) fix: icons that were disabled or not working.

…ssary files (FusionIIIT#1109)

…taker (FusionIIIT#1132) Co-authored-by: Akshat Nema <76521428+akshatnema@users.noreply.github.com>

…ues (FusionIIIT#1137) Co-authored-by: Aksh Bansal <63552235+Aksh-Bansal-dev@users.noreply.github.com>

…oking an appointment (FusionIIIT#1084) * Date validation added * Date Validation for booking ambulance --------- Co-authored-by: Akshay010203 <92329718+Akshay010203@users.noreply.github.com>

…IIT#1173) * before adding functionality for secincharge * Delete 0002_auto_20230321_0041.py

* GAD-5: Fix responsiveness (FusionIIIT#1125) Co-authored-by: A Anunaya <76819712+Anunaya07@users.noreply.github.com> Co-authored-by: Aksh Bansal <63552235+Aksh-Bansal-dev@users.noreply.github.com> * Minor changes * Implementation of FTS and completion of the redirect functionality * Change in model of supervisor * Complition of redirect functionality and pagination * Fixation of a error * Completion of module * GAD -5 Dashboard Changes (FusionIIIT#1325) * dashboard and usercard updated (FusionIIIT#1329) * Fixing ui bugs (FusionIIIT#1335) * Integrated dashborad * creating new branch * disallowing migrations * removing migration files --------- Co-authored-by: Harshvardhan Singh <73544247+Lawful2002@users.noreply.github.com> Co-authored-by: A Anunaya <76819712+Anunaya07@users.noreply.github.com> Co-authored-by: Aksh Bansal <63552235+Aksh-Bansal-dev@users.noreply.github.com> Co-authored-by: akshatnema <20bcs022@iiitdmj.ac.in> Co-authored-by: BlackHAWK2001 <150950834+BlackHAWK2001@users.noreply.github.com> Co-authored-by: Arpit Tak <140220904+Ishu-ji@users.noreply.github.com> Co-authored-by: SukulSarve <143542658+SukulSarve@users.noreply.github.com>

* ac-2: added sample excel sheet to add new students and deleted unnecessary files (FusionIIIT#1109) * AC-2: Replaced .xlsx file with .xls file (FusionIIIT#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 (FusionIIIT#1357) * 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> * Added pylint (FusionIIIT#1302) * Create bandit_security_test.yml Added Bandit security test for python * Update bandit_security_test.yml * Update bandit_security_test.yml * Create pylint.yml * Update pylint.yml * Update pylint.yml * Revert "Added pylint (FusionIIIT#1302)" (FusionIIIT#1324) This reverts commit c1359b7. * Added JSON APIs for get_next_sem_courses , add_course_to_slot , remove_course_from_slot * GAD -5 Dashboard Changes (FusionIIIT#1325) * dashboard and usercard updated (FusionIIIT#1329) * changes in programme_cuuriculam,adding version to models (FusionIIIT#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 (FusionIIIT#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>

* GAD-5: Fix responsiveness (FusionIIIT#1125) Co-authored-by: A Anunaya <76819712+Anunaya07@users.noreply.github.com> Co-authored-by: Aksh Bansal <63552235+Aksh-Bansal-dev@users.noreply.github.com> * Minor changes * Implementation of FTS and completion of the redirect functionality * Change in model of supervisor * Complition of redirect functionality and pagination * Fixation of a error * Completion of module * GAD -5 Dashboard Changes (FusionIIIT#1325) * dashboard and usercard updated (FusionIIIT#1329) * Fixing ui bugs (FusionIIIT#1335) * Integrated dashborad * creating new branch * disallowing migrations * removing migration files * resolved errors --------- Co-authored-by: Harshvardhan Singh <73544247+Lawful2002@users.noreply.github.com> Co-authored-by: A Anunaya <76819712+Anunaya07@users.noreply.github.com> Co-authored-by: Aksh Bansal <63552235+Aksh-Bansal-dev@users.noreply.github.com> Co-authored-by: akshatnema <20bcs022@iiitdmj.ac.in> Co-authored-by: BlackHAWK2001 <150950834+BlackHAWK2001@users.noreply.github.com> Co-authored-by: Arpit Tak <140220904+Ishu-ji@users.noreply.github.com> Co-authored-by: SukulSarve <143542658+SukulSarve@users.noreply.github.com>

* GAD-5: Fix responsiveness (FusionIIIT#1125) Co-authored-by: A Anunaya <76819712+Anunaya07@users.noreply.github.com> Co-authored-by: Aksh Bansal <63552235+Aksh-Bansal-dev@users.noreply.github.com> * Minor changes * Implementation of FTS and completion of the redirect functionality * Change in model of supervisor * Complition of redirect functionality and pagination * Fixation of a error * Completion of module * GAD -5 Dashboard Changes (FusionIIIT#1325) * dashboard and usercard updated (FusionIIIT#1329) * Fixing ui bugs (FusionIIIT#1335) * Integrated dashborad * creating new branch * disallowing migrations * removing migration files * resolved errors * resolved error --------- Co-authored-by: Harshvardhan Singh <73544247+Lawful2002@users.noreply.github.com> Co-authored-by: A Anunaya <76819712+Anunaya07@users.noreply.github.com> Co-authored-by: Aksh Bansal <63552235+Aksh-Bansal-dev@users.noreply.github.com> Co-authored-by: akshatnema <20bcs022@iiitdmj.ac.in> Co-authored-by: BlackHAWK2001 <150950834+BlackHAWK2001@users.noreply.github.com> Co-authored-by: Arpit Tak <140220904+Ishu-ji@users.noreply.github.com> Co-authored-by: SukulSarve <143542658+SukulSarve@users.noreply.github.com>

* gad-3 : week-2 : changed api functions (FusionIIIT#1069) * gad-3 : workers would be assigned by Section Incharge instead of Caretaker (FusionIIIT#1132) Co-authored-by: Akshat Nema <76521428+akshatnema@users.noreply.github.com> * gad-3: Week7 : fixed the notification and re-assign worker button issues (FusionIIIT#1137) Co-authored-by: Aksh Bansal <63552235+Aksh-Bansal-dev@users.noreply.github.com> * auto-restart docker (FusionIIIT#1147) * gad-3 : week-8 : db migrations after adding Section Incharge (FusionIIIT#1173) * before adding functionality for secincharge * Delete 0002_auto_20230321_0041.py * gad-3 : week8 : remove wrong dependency to globals. (FusionIIIT#1178) * Gad 3 (FusionIIIT#1383) * GAD-5: Fix responsiveness (FusionIIIT#1125) Co-authored-by: A Anunaya <76819712+Anunaya07@users.noreply.github.com> Co-authored-by: Aksh Bansal <63552235+Aksh-Bansal-dev@users.noreply.github.com> * Minor changes * Implementation of FTS and completion of the redirect functionality * Change in model of supervisor * Complition of redirect functionality and pagination * Fixation of a error * Completion of module * GAD -5 Dashboard Changes (FusionIIIT#1325) * dashboard and usercard updated (FusionIIIT#1329) * Fixing ui bugs (FusionIIIT#1335) * Integrated dashborad * creating new branch * disallowing migrations * removing migration files --------- Co-authored-by: Harshvardhan Singh <73544247+Lawful2002@users.noreply.github.com> Co-authored-by: A Anunaya <76819712+Anunaya07@users.noreply.github.com> Co-authored-by: Aksh Bansal <63552235+Aksh-Bansal-dev@users.noreply.github.com> Co-authored-by: akshatnema <20bcs022@iiitdmj.ac.in> Co-authored-by: BlackHAWK2001 <150950834+BlackHAWK2001@users.noreply.github.com> Co-authored-by: Arpit Tak <140220904+Ishu-ji@users.noreply.github.com> Co-authored-by: SukulSarve <143542658+SukulSarve@users.noreply.github.com> * Gad-3 : fixed minor issues (FusionIIIT#1389) * GAD-5: Fix responsiveness (FusionIIIT#1125) Co-authored-by: A Anunaya <76819712+Anunaya07@users.noreply.github.com> Co-authored-by: Aksh Bansal <63552235+Aksh-Bansal-dev@users.noreply.github.com> * Minor changes * Implementation of FTS and completion of the redirect functionality * Change in model of supervisor * Complition of redirect functionality and pagination * Fixation of a error * Completion of module * GAD -5 Dashboard Changes (FusionIIIT#1325) * dashboard and usercard updated (FusionIIIT#1329) * Fixing ui bugs (FusionIIIT#1335) * Integrated dashborad * creating new branch * disallowing migrations * removing migration files * resolved errors --------- Co-authored-by: Harshvardhan Singh <73544247+Lawful2002@users.noreply.github.com> Co-authored-by: A Anunaya <76819712+Anunaya07@users.noreply.github.com> Co-authored-by: Aksh Bansal <63552235+Aksh-Bansal-dev@users.noreply.github.com> Co-authored-by: akshatnema <20bcs022@iiitdmj.ac.in> Co-authored-by: BlackHAWK2001 <150950834+BlackHAWK2001@users.noreply.github.com> Co-authored-by: Arpit Tak <140220904+Ishu-ji@users.noreply.github.com> Co-authored-by: SukulSarve <143542658+SukulSarve@users.noreply.github.com> * Gad 3 complaint (FusionIIIT#1390) * GAD-5: Fix responsiveness (FusionIIIT#1125) Co-authored-by: A Anunaya <76819712+Anunaya07@users.noreply.github.com> Co-authored-by: Aksh Bansal <63552235+Aksh-Bansal-dev@users.noreply.github.com> * Minor changes * Implementation of FTS and completion of the redirect functionality * Change in model of supervisor * Complition of redirect functionality and pagination * Fixation of a error * Completion of module * GAD -5 Dashboard Changes (FusionIIIT#1325) * dashboard and usercard updated (FusionIIIT#1329) * Fixing ui bugs (FusionIIIT#1335) * Integrated dashborad * creating new branch * disallowing migrations * removing migration files * resolved errors --------- Co-authored-by: Harshvardhan Singh <73544247+Lawful2002@users.noreply.github.com> Co-authored-by: A Anunaya <76819712+Anunaya07@users.noreply.github.com> Co-authored-by: Aksh Bansal <63552235+Aksh-Bansal-dev@users.noreply.github.com> Co-authored-by: akshatnema <20bcs022@iiitdmj.ac.in> Co-authored-by: BlackHAWK2001 <150950834+BlackHAWK2001@users.noreply.github.com> Co-authored-by: Arpit Tak <140220904+Ishu-ji@users.noreply.github.com> Co-authored-by: SukulSarve <143542658+SukulSarve@users.noreply.github.com> * Gad 3 complaint (FusionIIIT#1391) * GAD-5: Fix responsiveness (FusionIIIT#1125) Co-authored-by: A Anunaya <76819712+Anunaya07@users.noreply.github.com> Co-authored-by: Aksh Bansal <63552235+Aksh-Bansal-dev@users.noreply.github.com> * Minor changes * Implementation of FTS and completion of the redirect functionality * Change in model of supervisor * Complition of redirect functionality and pagination * Fixation of a error * Completion of module * GAD -5 Dashboard Changes (FusionIIIT#1325) * dashboard and usercard updated (FusionIIIT#1329) * Fixing ui bugs (FusionIIIT#1335) * Integrated dashborad * creating new branch * disallowing migrations * removing migration files * resolved errors * resolved error --------- Co-authored-by: Harshvardhan Singh <73544247+Lawful2002@users.noreply.github.com> Co-authored-by: A Anunaya <76819712+Anunaya07@users.noreply.github.com> Co-authored-by: Aksh Bansal <63552235+Aksh-Bansal-dev@users.noreply.github.com> Co-authored-by: akshatnema <20bcs022@iiitdmj.ac.in> Co-authored-by: BlackHAWK2001 <150950834+BlackHAWK2001@users.noreply.github.com> Co-authored-by: Arpit Tak <140220904+Ishu-ji@users.noreply.github.com> Co-authored-by: SukulSarve <143542658+SukulSarve@users.noreply.github.com> * merged staging into gad-3 --------- Co-authored-by: ujjawallele13 <111732396+ujjawallele13@users.noreply.github.com> Co-authored-by: akshatnema <20bcs022@iiitdmj.ac.in> Co-authored-by: Akshat Nema <76521428+akshatnema@users.noreply.github.com> Co-authored-by: Aksh Bansal <63552235+Aksh-Bansal-dev@users.noreply.github.com> Co-authored-by: nidhibarapatre <116302859+nidhibarapatre@users.noreply.github.com> Co-authored-by: Harshvardhan Singh <73544247+Lawful2002@users.noreply.github.com> Co-authored-by: A Anunaya <76819712+Anunaya07@users.noreply.github.com> Co-authored-by: BlackHAWK2001 <150950834+BlackHAWK2001@users.noreply.github.com> Co-authored-by: Arpit Tak <140220904+Ishu-ji@users.noreply.github.com> Co-authored-by: SukulSarve <143542658+SukulSarve@users.noreply.github.com>

…ing6

prabhatsuman · 2024-04-08T12:18:36Z

@prajjwalkapoor

ujjawallele13 and others added 30 commits February 16, 2023 11:35

gad-3 : week-2 : changed api functions (FusionIIIT#1069)

817f981

Checked the sidebar after acad-admin login and fixed the (FusionIIIT#…

1e34c96

…1113) fix: icons that were disabled or not working.

ac-2: added sample excel sheet to add new students and deleted unnece…

0e4f281

…ssary files (FusionIIIT#1109)

Enabled all modules for access (FusionIIIT#1120)

e99bc53

Merge remote-tracking branch 'origin/test-temp' into ac-2

821c814

Merge branch 'main' into ac-2

bf8a101

Merge branch 'main' into test-temp

ba91cf0

Merge branch 'test-temp' into gad-3

15e59b1

Merge branch 'test-temp' into ac-1

faf49c6

Merge branch 'main' into gad-3

7597de4

gad-3 : workers would be assigned by Section Incharge instead of Care…

c326956

…taker (FusionIIIT#1132) Co-authored-by: Akshat Nema <76521428+akshatnema@users.noreply.github.com>

gad-3: Week7 : fixed the notification and re-assign worker button iss…

4d7e4bb

…ues (FusionIIIT#1137) Co-authored-by: Aksh Bansal <63552235+Aksh-Bansal-dev@users.noreply.github.com>

auto-restart docker (FusionIIIT#1147)

4abf495

Merge branch 'main' into gad-3

0cc61d2

Merge branch 'main' into ac-1

e856260

Merge branch 'main' into ac-2

0df8bfe

Merge branch 'main' into ac-1

d747e3f

Merge branch 'main' into ac-2

2a037b8

Merge branch 'main' into gad-3

6db87c4

Merge branch 'main' into ac-1

1a78289

Merge branch 'main' into ac-2

4c842d5

Merge branch 'main' into gad-3

c91ec0c

Merge branch 'main' into ac-1

5ab8fa2

Merge branch 'main' into ac-2

bfca3e9

Merge branch 'main' into gad-3

4821144

Merge branch 'test-temp' into os-2

c2e2e8e

OS -2 : Week 4 : Addition of important personal information during bo…

54bf66d

…oking an appointment (FusionIIIT#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 (FusionI…

1b6f34b

…IIT#1173) * before adding functionality for secincharge * Delete 0002_auto_20230321_0041.py

Merge branch 'main' into ac-1

71a5cd0

Merge branch 'main' into ac-2

115d684

prabhatsuman and others added 27 commits March 21, 2024 09:59

removed migrations

b75a84d

removed migration folders

870e597

Merge branch 'staging2' of github.com:prabhatsuman/Fusion into staging5

f22f6e2

added migrationns

05290c0

Update development.py

37e0ad6

Update requirements.txt

07c1047

Merge branch 'staging' into ac-2

6d49351

Merge branch 'FusionIIIT:main' into staging6

125aed6

corrected faculty profile error

b395f7b

Merge branch 'staging6' of github.com:prabhatsuman/Fusion into staging6

036fce8

correct faculty profile error

b2028f9

corrected user profile

05c2afd

merged staging into gad-3

994a569

Merge branch 'staging' into gad-3

3c5af53

migrations removed

ad5386b

Merge branch 'staging7' into staging6

1990420

Merge branch 'staging6-2' of github.com:prabhatsuman/Fusion into stag…

e3eea54

…ing6

added phc corrections

918ccbf

prescribe issue resolved in PHC

643a4fa

Merge branch 'Ac-2' into staging6

596d8a4

Merge branch 'Gad-3' into staging6

eee4c2c

Administrative Profile error resolved

99bf837

ChaudharyRaman merged commit 061d7d8 into FusionIIIT:staging-2 Apr 9, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Comments

Gad-3 and AC-2 merged#1403

Gad-3 and AC-2 merged#1403
ChaudharyRaman merged 98 commits intoFusionIIIT:staging-2from
prabhatsuman:staging6

prabhatsuman commented Apr 8, 2024

Uh oh!

prabhatsuman commented Apr 8, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

19 participants

Comments

Conversation

prabhatsuman commented Apr 8, 2024

Issue that this pull request solves

Proposed changes

Brief description of what is fixed or changed

Types of changes

Checklist

Screenshots

Other information

Uh oh!

prabhatsuman commented Apr 8, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

19 participants