AC-1: Fts Added #1458

Ravichendraa · 2024-04-14T20:35:54Z

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

…#1104)

…taker (FusionIIIT#1132) Co-authored-by: Akshat Nema <[email protected]>

…ues (FusionIIIT#1137) Co-authored-by: Aksh Bansal <[email protected]>

…oking an appointment (FusionIIIT#1084) * Date validation added * Date Validation for booking ambulance --------- Co-authored-by: Akshay010203 <[email protected]>

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

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

…ing6

Ac-1 Gad-4 Ac-5 Gad-3 Os-1 Os-3 Sa-2 Os-2 Gad-5

* sa-4 : 4 : all-changes-till-now (FusionIIIT#1115) Co-authored-by: Smeet Chavan <[email protected]> * PlacementModuleWeb (FusionIIIT#1322) * urls * added apply for jobs and upload documents * added options for TPO and Chairman * PLacement Schedule method * Added PLacement Statistics * Features added resume,update placement data ,notiication , add schedule * fixed ui issue placement.html * send invitation, check invitaion status ,resolved other minor bugs * Placement cell updated dashboard (FusionIIIT#1402) * urls * added apply for jobs and upload documents * added options for TPO and Chairman * PLacement Schedule method * Added PLacement Statistics * Features added resume,update placement data ,notiication , add schedule * fixed ui issue placement.html * send invitation, check invitaion status ,resolved other minor bugs * Added pylint (FusionIIIT#1302) * Create bandit_security_test.yml Added Bandit security test for python * Update bandit_security_test.yml * Update bandit_security_test.yml * Create pylint.yml * Update pylint.yml * Update pylint.yml * Revert "Added pylint (FusionIIIT#1302)" (FusionIIIT#1324) This reverts commit c1359b7. * pull * update * invitation status * invitation status --------- Co-authored-by: Hardik Sharma <[email protected]> Co-authored-by: Raman Chaudhary <[email protected]> * Placementcell (FusionIIIT#1411) * urls * added apply for jobs and upload documents * added options for TPO and Chairman * PLacement Schedule method * Added PLacement Statistics * Features added resume,update placement data ,notiication , add schedule * fixed ui issue placement.html * send invitation, check invitaion status ,resolved other minor bugs * Added pylint (FusionIIIT#1302) * Create bandit_security_test.yml Added Bandit security test for python * Update bandit_security_test.yml * Update bandit_security_test.yml * Create pylint.yml * Update pylint.yml * Update pylint.yml * Revert "Added pylint (FusionIIIT#1302)" (FusionIIIT#1324) This reverts commit c1359b7. * pull * update * invitation status * invitation status * placement cell --------- Co-authored-by: Hardik Sharma <[email protected]> Co-authored-by: Raman Chaudhary <[email protected]> * resolved dashboard profile view --------- Co-authored-by: Smeetiiitdmj <[email protected]> Co-authored-by: Smeet Chavan <[email protected]> Co-authored-by: akshatnema <[email protected]> Co-authored-by: Kush Batla <[email protected]> Co-authored-by: Hardik Sharma <[email protected]> Co-authored-by: Raman Chaudhary <[email protected]>

* sa-4 : 4 : all-changes-till-now (FusionIIIT#1115) Co-authored-by: Smeet Chavan <[email protected]> * PlacementModuleWeb (FusionIIIT#1322) * urls * added apply for jobs and upload documents * added options for TPO and Chairman * PLacement Schedule method * Added PLacement Statistics * Features added resume,update placement data ,notiication , add schedule * fixed ui issue placement.html * send invitation, check invitaion status ,resolved other minor bugs * Placement cell updated dashboard (FusionIIIT#1402) * urls * added apply for jobs and upload documents * added options for TPO and Chairman * PLacement Schedule method * Added PLacement Statistics * Features added resume,update placement data ,notiication , add schedule * fixed ui issue placement.html * send invitation, check invitaion status ,resolved other minor bugs * Added pylint (FusionIIIT#1302) * Create bandit_security_test.yml Added Bandit security test for python * Update bandit_security_test.yml * Update bandit_security_test.yml * Create pylint.yml * Update pylint.yml * Update pylint.yml * Revert "Added pylint (FusionIIIT#1302)" (FusionIIIT#1324) This reverts commit c1359b7. * pull * update * invitation status * invitation status --------- Co-authored-by: Hardik Sharma <[email protected]> Co-authored-by: Raman Chaudhary <[email protected]> * Placementcell (FusionIIIT#1411) * urls * added apply for jobs and upload documents * added options for TPO and Chairman * PLacement Schedule method * Added PLacement Statistics * Features added resume,update placement data ,notiication , add schedule * fixed ui issue placement.html * send invitation, check invitaion status ,resolved other minor bugs * Added pylint (FusionIIIT#1302) * Create bandit_security_test.yml Added Bandit security test for python * Update bandit_security_test.yml * Update bandit_security_test.yml * Create pylint.yml * Update pylint.yml * Update pylint.yml * Revert "Added pylint (FusionIIIT#1302)" (FusionIIIT#1324) This reverts commit c1359b7. * pull * update * invitation status * invitation status * placement cell --------- Co-authored-by: Hardik Sharma <[email protected]> Co-authored-by: Raman Chaudhary <[email protected]> * resolved dashboard profile view * reverted requirements.txt changes --------- Co-authored-by: Smeetiiitdmj <[email protected]> Co-authored-by: Smeet Chavan <[email protected]> Co-authored-by: akshatnema <[email protected]> Co-authored-by: Kush Batla <[email protected]> Co-authored-by: Hardik Sharma <[email protected]> Co-authored-by: Raman Chaudhary <[email protected]>

* sa-2 : till week-4 : FusionIIIT#1009 , FusionIIIT#1044 and FusionIIIT#1097 fix (FusionIIIT#1010) * Added start date display in pre registration (FusionIIIT#1063) * GAD-5: Fix responsiveness (FusionIIIT#1125) * SA-2 :Query Optimization (FusionIIIT#1134) * Query Optimization * Removed Unnecessary print Statements * Used .exists() method * Sa-2: Week 8: Created Api's (FusionIIIT#1172) * updated models * Revert "updated models" This reverts commit 83e2e73. * revert to old * some changes in frontend * some updates in frontend files * added the api for mobiles and updated urls and views of web * some updates in backend * Added frontend for new apis Created frontend for registered students and update menu features * updated admin and ui * resolved errors * Menu UI changes * Updated Menu_card * some fixes * migrations fixed * added mess registration request model * minor changes * added model and view for registeration * url fixed * fixed rebate * added new form for registration request * fixed gitignore resolved conflicts * context * Registration UI Changes * registration UI changes * restored migration file * completed registration * made some ui changes * migration fix * done things about payments * changed some views * Added Registration Remark and Dropdown * Changed id in reg * rectified error with rebate response frontend * fixed datetime in reg * worked on manage reg * deregistration request functionality added * rectified the backend issues for generate bills * added registration list * completed dereg * student bill functionality addded * rectified error of previous commit * added view reg records * added filter in view mess students * worked on bills caretaker side * changed development * Updated special food request * GAD -5 Dashboard Changes (FusionIIIT#1325) * Updated Special food Functionality * dashboard and usercard updated (FusionIIIT#1329) * minor ui fixes * added search * updated manage registration * added view bills and payments of students for mess caretaker * added notification functionality in right rail * Added Sem start and end date form (FusionIIIT#26) * added start date to registration form * made some ui changes * added modal for details of a student * made some ui improvements * tested crontab * added excel upload for bill and reg * added add student to mess * fixes * update bill added and dates added (FusionIIIT#32) * Some UI changes (FusionIIIT#35) * merge fixes * added remove * some ui fixes * fixed cronjobs * semdate fixes * removed migrations * Fixing ui bugs (FusionIIIT#1335) * added django crontab to requirements.txt * automation of bills no new msg resolved some merge conflicts * useless commit for pulling no msg * completed automation of mess bill generation and payment history feature for student * resolved a merge error * bug fixes * bug fixes * merging mess and staging * conflict resolve --------- Co-authored-by: Harshul Choudhary <[email protected]> Co-authored-by: Samay Sagar <[email protected]> Co-authored-by: theparasgami <[email protected]> Co-authored-by: akshatnema <[email protected]> Co-authored-by: A Anunaya <[email protected]> Co-authored-by: Harshvardhan Singh <[email protected]> Co-authored-by: Aksh Bansal <[email protected]> Co-authored-by: PARAS GAMI <[email protected]> Co-authored-by: Yathartha Goenka <[email protected]> Co-authored-by: Mayankingale123 <[email protected]> Co-authored-by: Mayankingale123 <[email protected]> Co-authored-by: Harshit0009 <[email protected]> Co-authored-by: Harshul <[email protected]> Co-authored-by: hemantsinghhere <[email protected]> Co-authored-by: Hritik Yadav <[email protected]> Co-authored-by: Harshit0009 <[email protected]> Co-authored-by: Harshit Tiwari <[email protected]> Co-authored-by: hemantsinghhere <[email protected]> Co-authored-by: BlackHAWK2001 <[email protected]> Co-authored-by: Arpit Tak <[email protected]> Co-authored-by: Hritik Yadav <[email protected]> Co-authored-by: Harshul <[email protected]> Co-authored-by: SukulSarve <[email protected]>

Removed readonly tag from html only

) * GAD-5: Fix responsiveness (FusionIIIT#1125) Co-authored-by: A Anunaya <[email protected]> Co-authored-by: Aksh Bansal <[email protected]> * 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 (FusionIIIT#1325) * dashboard and usercard updated (FusionIIIT#1329) * Fixing ui bugs (FusionIIIT#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 * fix: forward file does not autodetect designation * fix merge conflicts again * add notification display and fix non department file * add decorator to handle staff or faculty * add options to admin.py for FTS * fix remark saved to draft --------- Co-authored-by: Harshvardhan Singh <[email protected]> Co-authored-by: A Anunaya <[email protected]> Co-authored-by: Aksh Bansal <[email protected]> Co-authored-by: akshatnema <[email protected]> Co-authored-by: Divyansh Tripathi <[email protected]> Co-authored-by: aish0749 <[email protected]> Co-authored-by: BlackHAWK2001 <[email protected]> Co-authored-by: Arpit Tak <[email protected]> Co-authored-by: SukulSarve <[email protected]>

…T#1434) This reverts commit b3fbfbc.

GAD 4 FTS : Merge Into latest_staging

yatharthagoenka and others added 30 commits February 13, 2023 13:25

deployment ports config

b6a35ad

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

817f981

gad-4: Created fileTrackingNotAllowed.html (FusionIIIT#1082)

f62c502

gad-4: new views.py to remove students from file tracking (FusionIIIT…

e52a590

…#1104)

Merge branch 'main' into gad-4

8debd86

Merge remote-tracking branch 'origin/test-temp' into gad-4

a2e68c3

Merge branch 'main' into gad-4

eee3d46

Merge branch 'test-temp' into gad-4

079fbaa

Merge branch 'test-temp' into gad-3

15e59b1

fix: reverting deployment changes

69e97fb

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 <[email protected]>

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

4d7e4bb

…ues (FusionIIIT#1137) Co-authored-by: Aksh Bansal <[email protected]>

auto-restart docker (FusionIIIT#1147)

4abf495

Merge branch 'main' into gad-3

0cc61d2

Merge branch 'main' into gad-4

4ca90b3

Merge branch 'main' into gad-3

6db87c4

Merge branch 'main' into gad-4

33b55f6

Merge branch 'main' into gad-3

c91ec0c

Merge branch 'main' into gad-4

304f45b

Merge branch 'main' into gad-3

4821144

Merge branch 'main' into gad-4

2f9017d

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 <[email protected]>

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 gad-3

ecc0619

Merge branch 'main' into gad-4

b1482e1

Merge branch 'main' into os-2

7f0341a

gad-3 : week8 : remove wrong dependency to globals. (FusionIIIT#1178)

439399b

Merge branch 'main' into gad-3

2b007db

abhi87374 and others added 29 commits April 2, 2024 17:47

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

phc issue resolved

6088734

Merge branch 'Gad-3' into staging-new

ec66276

complaint management issue solved

b93e92d

Merge pull request FusionIIIT#1407 from prabhatsuman/staging-new

51183a2

Ac-1 Gad-4 Ac-5 Gad-3 Os-1 Os-3 Sa-2 Os-2 Gad-5

corrected requirement txt version

2df23d6

Update booking-request-action-modal.html

578e9b2

Removed readonly tag from html only

Upadted modules.html (FusionIIIT#1432)

faedc55

merged sa-3 into new branch gk (FusionIIIT#1433)

b3fbfbc

Revert " merged sa-3 into new branch gk (FusionIIIT#1433)" (FusionIII…

d229068

…T#1434) This reverts commit b3fbfbc.

Merge remote-tracking branch 'upstream/gad-4' into gad-4

cfbb884

Merge branch 'latest_staging' into gad-4

0942cc4

fix gad-4 merge conflicts

1d1a7da

fix merging errors from latest_staging

53c5858

create space for notification panel in filetracking view

914b0de

Merge pull request FusionIIIT#1438 from theoden42/latest_staging

b1acd67

GAD 4 FTS : Merge Into latest_staging

new functionality added

b754b56

changes

2f982d4

VarunGitGood merged commit 55f5a9b into FusionIIIT:ac-1 Apr 14, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

AC-1: Fts Added #1458

AC-1: Fts Added #1458

Uh oh!

Ravichendraa commented Apr 14, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

24 participants

AC-1: Fts Added #1458

AC-1: Fts Added #1458

Uh oh!

Conversation

Ravichendraa commented Apr 14, 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!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

24 participants