Skip to content

Commit

Permalink
AC-1: Fts Added (#1458)
Browse files Browse the repository at this point in the history
* 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 <[email protected]>

* gad-3: Week7 : fixed the notification and re-assign worker button issues (#1137)

Co-authored-by: Aksh Bansal <[email protected]>

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

* 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 <[email protected]>
Co-authored-by: aish0749 <[email protected]>

* 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 <[email protected]>
Co-authored-by: Aksh Bansal <[email protected]>

* GAD -5 Dashboard Changes (#1325)

* dashboard and usercard updated (#1329)

---------

Co-authored-by: Yathartha Goenka <[email protected]>
Co-authored-by: akshatnema <[email protected]>
Co-authored-by: Harshvardhan Singh <[email protected]>
Co-authored-by: A Anunaya <[email protected]>
Co-authored-by: Aksh Bansal <[email protected]>
Co-authored-by: BlackHAWK2001 <[email protected]>
Co-authored-by: Arpit Tak <[email protected]>

* Os 2 (#1346)

* GAD-5: Fix responsiveness (#1125)

Co-authored-by: A Anunaya <[email protected]>
Co-authored-by: Aksh Bansal <[email protected]>

* 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 <[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: Hardik Sharma <[email protected]>
Co-authored-by: Raman Chaudhary <[email protected]>
Co-authored-by: BlackHAWK2001 <[email protected]>
Co-authored-by: Arpit Tak <[email protected]>
Co-authored-by: Anudeep Sanapala <[email protected]>
Co-authored-by: SukulSarve <[email protected]>

* Revert "Os 2" (#1352)

This reverts commit 1db64d7da40d190218f6e8b0991bc71cd9da7c88.

* Os 2 (#1353)

* GAD-5: Fix responsiveness (#1125)

Co-authored-by: A Anunaya <[email protected]>
Co-authored-by: Aksh Bansal <[email protected]>

* 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 <[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: Hardik Sharma <[email protected]>
Co-authored-by: Raman Chaudhary <[email protected]>
Co-authored-by: BlackHAWK2001 <[email protected]>
Co-authored-by: Arpit Tak <[email protected]>
Co-authored-by: Anudeep Sanapala <[email protected]>
Co-authored-by: SukulSarve <[email protected]>

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

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

* visitor hostel

* os-1 vh complete

* os-1 vh module

* GAD-5: Fix responsiveness (#1125)

Co-authored-by: A Anunaya <[email protected]>
Co-authored-by: Aksh Bansal <[email protected]>

* 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 <[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]>

---------

Co-authored-by: VedantJain1103 <[email protected]>
Co-authored-by: Yathartha Goenka <[email protected]>
Co-authored-by: akshatnema <[email protected]>
Co-authored-by: harsh-k-singh <[email protected]>
Co-authored-by: A Anunaya <[email protected]>
Co-authored-by: Akshat Nema <[email protected]>
Co-authored-by: davneesh <[email protected]>
Co-authored-by: Avneesh <[email protected]>
Co-authored-by: Raman Chaudhary <[email protected]>
Co-authored-by: varunraj03 <[email protected]>
Co-authored-by: Harshvardhan Singh <[email protected]>
Co-authored-by: Aksh Bansal <[email protected]>
Co-authored-by: BlackHAWK2001 <[email protected]>
Co-authored-by: Arpit Tak <[email protected]>
Co-authored-by: SukulSarve <[email protected]>

* GAD-4 Updated according to Dashboard changes (#1361)

* GAD-5: Fix responsiveness (#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 (#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 <[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]>

* Sa 2 (#1362)

* sa-2 : till week-4 : #1009 , #1044 and #1097 fix (#1010)

Co-authored-by: theparasgami <[email protected]>

* 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 <[email protected]>
Co-authored-by: akshatnema <[email protected]>

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

* Some UI changes (#35)

Co-authored-by: Harshul Choudhary <[email protected]>

* 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 <[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: Hritik Yadav <[email protected]>
Co-authored-by: Harshul <[email protected]>

* Sa 2 - updated dashboard (#1342)

* GAD-5: Fix responsiveness (#1125)

Co-authored-by: A Anunaya <[email protected]>
Co-authored-by: Aksh Bansal <[email protected]>

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

* Some UI changes (#35)

Co-authored-by: Harshul Choudhary <[email protected]>

* 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 <[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: 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]>

* Sa 2 (#1351)

* GAD-5: Fix responsiveness (#1125)

Co-authored-by: A Anunaya <[email protected]>
Co-authored-by: Aksh Bansal <[email protected]>

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

* Some UI changes (#35)

Co-authored-by: Harshul Choudhary <[email protected]>

* 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 <[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: 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]>

---------

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: 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: Harshul Choudhary <[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: Hritik Yadav <[email protected]>
Co-authored-by: Harshul <[email protected]>
Co-authored-by: Harshvardhan Singh <[email protected]>
Co-authored-by: Aksh Bansal <[email protected]>
Co-authored-by: BlackHAWK2001 <[email protected]>
Co-authored-by: Arpit Tak <[email protected]>
Co-authored-by: SukulSarve <[email protected]>

* 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 <[email protected]>
Co-authored-by: aish0749 <[email protected]>

* GAD-4 Updated according to Dashboard changes (#1361)

* GAD-5: Fix responsiveness (#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 (#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 <[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]>

---------

Co-authored-by: Yathartha Goenka <[email protected]>
Co-authored-by: prakhar-da-gama <[email protected]>
Co-authored-by: akshatnema <[email protected]>
Co-authored-by: manavdesai27 <[email protected]>
Co-authored-by: Divyansh Tripathi <[email protected]>
Co-authored-by: Aragorn-64 <[email protected]>
Co-authored-by: aish0749 <[email protected]>
Co-authored-by: Advay Sagarkar <[email protected]>
Co-authored-by: Harshvardhan Singh <[email protected]>
Co-authored-by: A Anunaya <[email protected]>
Co-authored-by: Aksh Bansal <[email protected]>
Co-authored-by: BlackHAWK2001 <[email protected]>
Co-authored-by: Arpit Tak <[email protected]>
Co-authored-by: SukulSarve <[email protected]>

* 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 <[email protected]>
Co-authored-by: Aksh Bansal <[email protected]>

* GAD -5 Dashboard Changes (#1325)

* dashboard and usercard updated (#1329)

* Fixing ui bugs (#1335)

* Ac1 Updated Dashboard

---------

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]>

* 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 <[email protected]>
Co-authored-by: Aksh Bansal <[email protected]>

* 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 <[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]>

---------

Co-authored-by: EyeOfHorus158 <[email protected]>
Co-authored-by: Yathartha Goenka <[email protected]>
Co-authored-by: akshatnema <[email protected]>
Co-authored-by: Ravichendraa <[email protected]>
Co-authored-by: Harshvardhan Singh <[email protected]>
Co-authored-by: A Anunaya <[email protected]>
Co-authored-by: Aksh Bansal <[email protected]>
Co-authored-by: BlackHAWK2001 <[email protected]>
Co-authored-by: Arpit Tak <[email protected]>
Co-authored-by: SukulSarve <[email protected]>
Co-authored-by: Hardik Sharma <[email protected]>
Co-authored-by: Raman Chaudhary <[email protected]>
Co-authored-by: Anudeep Sanapala <[email protected]>

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

* 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 <[email protected]>
Co-authored-by: Aksh Bansal <[email protected]>

* 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 <[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: Nitya Tiwari <[email protected]>
Co-authored-by: BlackHAWK2001 <[email protected]>
Co-authored-by: Arpit Tak <[email protected]>

---------

Co-authored-by: gaur-abhi524 <[email protected]>
Co-authored-by: akshatnema <[email protected]>
Co-authored-by: Yathartha Goenka <[email protected]>
Co-authored-by: Sudheer dagar <[email protected]>
Co-authored-by: Harshvardhan Singh <[email protected]>
Co-authored-by: A Anunaya <[email protected]>
Co-authored-by: Aksh Bansal <[email protected]>
Co-authored-by: Nitya Tiwari <[email protected]>
Co-authored-by: BlackHAWK2001 <[email protected]>
Co-authored-by: Arpit Tak <[email protected]>

* 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 <[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 (#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 <[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]>

* 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 <[email protected]>
Co-authored-by: Aksh Bansal <[email protected]>

* 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 <[email protected]>
Co-authored-by: Harshvardhan Singh <[email protected]>
Co-authored-by: A Anunaya <[email protected]>
Co-authored-by: Aksh Bansal <[email protected]>
Co-authored-by: Hardik Sharma <[email protected]>
Co-authored-by: Raman Chaudhary <[email protected]>
Co-authored-by: Divyanshu Sharma <[email protected]>
Co-authored-by: BlackHAWK2001 <[email protected]>
Co-authored-by: Arpit Tak <[email protected]>
Co-authored-by: Anudeep Sanapala <[email protected]>
Co-authored-by: TilteD24 <[email protected]>
Co-authored-by: Divyanshu Srivastava <[email protected]>
Co-authored-by: SukulSarve <[email protected]>

---------

Co-authored-by: A Anunaya <[email protected]>
Co-authored-by: akshatnema <[email protected]>
Co-authored-by: Divyanshu Sharma <[email protected]>
Co-authored-by: Raman Chaudhary <[email protected]>
Co-authored-by: Divyanshu Sharma <[email protected]>
Co-authored-by: Harshvardhan Singh <[email protected]>
Co-authored-by: Aksh Bansal <[email protected]>
Co-authored-by: Hardik Sharma <[email protected]>
Co-authored-by: BlackHAWK2001 <[email protected]>
Co-authored-by: Arpit Tak <[email protected]>
Co-authored-by: Anudeep Sanapala <[email protected]>
Co-authored-by: TilteD24 <[email protected]>
Co-authored-by: Divyanshu Srivastava <[email protected]>
Co-authored-by: SukulSarve <[email protected]>

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

* 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 <[email protected]>
Co-authored-by: Aksh Bansal <[email protected]>

* GAD -5 Dashboard Changes (#1325)

* dashboard and usercard updated (#1329)

---------

Co-authored-by: Yathartha Goenka <[email protected]>
Co-authored-by: akshatnema <[email protected]>
Co-authored-by: Harshvardhan Singh <[email protected]>
Co-authored-by: A Anunaya <[email protected]>
Co-authored-by: Aksh Bansal <[email protected]>
Co-authored-by: BlackHAWK2001 <[email protected]>
Co-authored-by: Arpit Tak <[email protected]>

* Os 2 (#1346)

* GAD-5: Fix responsiveness (#1125)

Co-authored-by: A Anunaya <[email protected]>
Co-authored-by: Aksh Bansal <[email protected]>

* 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 <[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: Hardik Sharma <[email protected]>
Co-authored-by: Raman Chaudhary <[email protected]>
Co-authored-by: BlackHAWK2001 <[email protected]>
Co-authored-by: Arpit Tak <[email protected]>
Co-authored-by: Anudeep Sanapala <[email protected]>
Co-authored-by: SukulSarve <[email protected]>

* Revert "Os 2" (#1352)

This reverts commit 1db64d7da40d190218f6e8b0991bc71cd9da7c88.

* Os 2 (#1353)

* GAD-5: Fix responsiveness (#1125)

Co-authored-by: A Anunaya <[email protected]>
Co-authored-by: Aksh Bansal <[email protected]>

* 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 <[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: Hardik Sharma <[email protected]>
Co-authored-by: Raman Chaudhary <[email protected]>
Co-authored-by: BlackHAWK2001 <[email protected]>
Co-authored-by: Arpit Tak <[email protected]>
Co-authored-by: Anudeep Sanapala <[email protected]>
Co-authored-by: SukulSarve <[email protected]>

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

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

* visitor hostel

* os-1 vh complete

* os-1 vh module

* GAD-5: Fix responsiveness (#1125)

Co-authored-by: A Anunaya <[email protected]>
Co-authored-by: Aksh Bansal <[email protected]>

* 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 <[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]>

---------

Co-authored-by: VedantJain1103 <[email protected]>
Co-authored-by: Yathartha Goenka <[email protected]>
Co-authored-by: akshatnema <[email protected]>
Co-authored-by: harsh-k-singh <[email protected]>
Co-authored-by: A Anunaya <[email protected]>
Co-authored-by: Akshat Nema <[email protected]>
Co-authored-by: davneesh <[email protected]>
Co-authored-by: Avneesh <[email protected]>
Co-authored-by: Raman Chaudhary <[email protected]>
Co-authored-by: varunraj03 <[email protected]>
Co-authored-by: Harshvardhan Singh <[email protected]>
Co-authored-by: Aksh Bansal <[email protected]>
Co-authored-by: BlackHAWK2001 <[email protected]>
Co-authored-by: Arpit Tak <[email protected]>
Co-authored-by: SukulSarve <[email protected]>

* AC-1 Updated according to dashboard (#1355)

* GAD-5: Fix responsiveness (#1125)

Co-authored-by: A Anunaya <[email protected]>
Co-authored-by: Aksh Bansal <[email protected]>

* GAD -5 Dashboard Changes (#1325)

* dashboard and usercard updated (#1329)

* Fixing ui bugs (#1335)

* Ac1 Updated Dashboard

---------

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]>

* Sa 2 (#1362)

* sa-2 : till week-4 : #1009 , #1044 and #1097 fix (#1010)

Co-authored-by: theparasgami <[email protected]>

* 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 <[email protected]>
Co-authored-by: akshatnema <[email protected]>

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

* Some UI changes (#35)

Co-authored-by: Harshul Choudhary <[email protected]>

* 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 <[email protected]>
Co-authored-by: Harshul <[email protected]>
Co-authored-by: hemantsinghhere <[email protected]>
…
  • Loading branch information
Show file tree
Hide file tree
Showing 213 changed files with 19,619 additions and 7,398 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,5 @@ node_modules/

FusionIIIT/static/
package-lock.json


11 changes: 6 additions & 5 deletions FusionIIIT/Fusion/settings/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
'django.contrib.staticfiles',
'django.contrib.sites',
'django.contrib.humanize',

'django_crontab',
'corsheaders',

'applications.eis',
Expand Down Expand Up @@ -171,7 +171,7 @@
TEMPLATES = [
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'DIRS': [os.path.join(BASE_DIR, '..', 'templates/'),],
'DIRS': [os.path.join(BASE_DIR, '..', 'templates'),],
'APP_DIRS': True,
'OPTIONS': {
'context_processors': [
Expand Down Expand Up @@ -256,9 +256,9 @@

# os.path.join(BASE_DIR, 'static/')
STATIC_URL = '/static/'
STATIC_ROOT = os.path.join(BASE_DIR, '..', 'static/')
STATIC_ROOT = os.path.join(BASE_DIR, '..', 'static')
STATICFILES_STORAGE = 'whitenoise.storage.CompressedManifestStaticFilesStorage'
MEDIA_ROOT = os.path.join(BASE_DIR, '..', 'media/')
MEDIA_ROOT = os.path.join(BASE_DIR, '..', 'media')
MEDIA_URL = '/media/'

ACCOUNT_USERNAME_REQUIRED = False
Expand All @@ -279,5 +279,6 @@
YOUTUBE_DATA_API_KEY = 'api_key'



CORS_ORIGIN_ALLOW_ALL = True
ALLOW_PASS_RESET = True
ALLOW_PASS_RESET = True
12 changes: 11 additions & 1 deletion FusionIIIT/Fusion/settings/development.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from Fusion.settings.common import *

DEBUG = True

TEMPLATE_DEBUG = True
SECRET_KEY = '=&w9due426k@l^ju1=s1)fj1rnpf0ok8xvjwx+62_nc-f12-8('

ALLOWED_HOSTS = ['*']
Expand All @@ -16,9 +16,11 @@
}
}


REST_FRAMEWORK = {
'DEFAULT_AUTHENTICATION_CLASSES': (
'rest_framework.authentication.TokenAuthentication',
'rest_framework.authentication.SessionAuthentication',
),
'DEFAULT_PERMISSION_CLASSES': (
'rest_framework.permissions.IsAuthenticated',
Expand Down Expand Up @@ -53,3 +55,11 @@
DEBUG_TOOLBAR_CONFIG = {
'INTERCEPT_REDIRECTS': False,
}

CRONJOBS = [
# the below job will update the bill at every minute can be used for testing
# ('* * * * *', 'applications.central_mess.tasks.generate_bill'),

#the below job which we need to add in production server, to update the mess bill of student everyday at 10 pm in night
('0 22 * * *', 'applications.central_mess.tasks.generate_bill'),
]
4 changes: 2 additions & 2 deletions FusionIIIT/applications/academic_information/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ class Student(models.Model):
batch_id = models.ForeignKey(Batch, null=True, blank=True, on_delete=models.CASCADE)
cpi = models.FloatField(default=0)
category = models.CharField(max_length=10, choices=Constants.CATEGORY, null=False)
father_name = models.CharField(max_length=40, default='')
mother_name = models.CharField(max_length=40, default='')
father_name = models.CharField(max_length=40, default='',null=True)
mother_name = models.CharField(max_length=40, default='',null=True)
hall_no = models.IntegerField(default=0)
room_no = models.CharField(max_length=10, blank=True, null=True)
specialization = models.CharField(max_length=40,choices=Constants.MTechSpecialization, null=True, default='')
Expand Down
73 changes: 44 additions & 29 deletions FusionIIIT/applications/central_mess/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

from .models import (Feedback, Menu, Menu_change_request, Mess_meeting,
Mess_minutes, Mess_reg, Messinfo, Monthly_bill,
Nonveg_data, Nonveg_menu, Payments, Rebate,
Special_request, Vacation_food,MessBillBase)
Payments, Rebate,
Special_request, Vacation_food,MessBillBase, Registration_Request, Reg_records, Reg_main)

# Register your models here.

Expand Down Expand Up @@ -45,7 +45,7 @@ class Mess_regAdmin(admin.ModelAdmin):
('start_reg', {'fields': ['start_reg']}),
('end_reg', {'fields': ['end_reg']}),
]
list_display = ('start_reg', 'end_reg')
list_display = ('sem','start_reg', 'end_reg')



Expand All @@ -56,26 +56,24 @@ class Monthly_billAdmin(admin.ModelAdmin):
('month', {'fields': ['month']}),
('year', {'fields': ['year']}),
('amount', {'fields': ['amount']}),
('nonveg_total_bill', {'fields': ['nonveg_total_bill']}),
# ('nonveg_total_bill', {'fields': ['nonveg_total_bill']}),
('rebate_count', {'fields': ['rebate_count']}),
('rebate_amount', {'fields': ['rebate_amount']}),
('total_bill', {'fields': ['total_bill']}),

]
list_display = ('student_id', 'month', 'year', 'amount',
'nonveg_total_bill', 'rebate_count', 'rebate_amount', 'total_bill')
'rebate_count', 'rebate_amount', 'total_bill')



class PaymentsAdmin(admin.ModelAdmin):
model = Payments
fieldsets = [
('student_id', {'fields': ['student_id']}),
('sem', {'fields': ['sem']}),
('year', {'fields': ['year']}),
('amount_paid', {'fields': ['amount_paid']}),
]
list_display = ('student_id', 'sem', 'year', 'amount_paid')
list_display = ('student_id', 'amount_paid')


class RebateAdmin(admin.ModelAdmin):
Expand Down Expand Up @@ -106,26 +104,26 @@ class Vacation_foodAdmin(admin.ModelAdmin):



class Nonveg_menuAdmin(admin.ModelAdmin):
model = Nonveg_menu
fieldsets = [
('dish', {'fields': ['dish']}),
('price', {'fields': ['price']}),
('order_interval', {'fields': ['order_interval']}),
]
list_display = ('dish', 'price', 'order_interval')
# class Nonveg_menuAdmin(admin.ModelAdmin):
# model = Nonveg_menu
# fieldsets = [
# ('dish', {'fields': ['dish']}),
# ('price', {'fields': ['price']}),
# ('order_interval', {'fields': ['order_interval']}),
# ]
# list_display = ('dish', 'price', 'order_interval')



class Nonveg_dataAdmin(admin.ModelAdmin):
model = Nonveg_data
fieldsets = [
('student_id', {'fields': ['student_id']}),
('order_date', {'fields': ['order_date']}),
('dish', {'fields': ['dish']}),
('order_interval', {'fields': ['order_interval']}),
]
list_display = ('student_id', 'order_date', 'dish', 'order_interval')
# class Nonveg_dataAdmin(admin.ModelAdmin):
# model = Nonveg_data
# fieldsets = [
# ('student_id', {'fields': ['student_id']}),
# ('order_date', {'fields': ['order_date']}),
# ('dish', {'fields': ['dish']}),
# ('order_interval', {'fields': ['order_interval']}),
# ]
# list_display = ('student_id', 'order_date', 'dish', 'order_interval')



Expand Down Expand Up @@ -172,9 +170,10 @@ class FeedbackAdmin(admin.ModelAdmin):
('student_id', {'fields': ['student_id']}),
('fdate', {'fields': ['fdate']}),
('description', {'fields': ['description']}),
('feedback_type', {'fields': ['feedback_type']})
('feedback_type', {'fields': ['feedback_type']}),
('feedback_remark', {'fields':['feedback_remark']})
]
list_display = ('student_id', 'fdate', 'description', 'feedback_type')
list_display = ('student_id', 'fdate', 'description', 'feedback_type', 'feedback_remark')


class MessBillBaseAdmin(admin.ModelAdmin):
Expand All @@ -184,6 +183,19 @@ class MessBillBaseAdmin(admin.ModelAdmin):
]
list_display = ('bill_amount', 'timestamp')

class Reg_mainAdmin(admin.ModelAdmin):
model = Reg_main
list_display = ('student_id','program','current_mess_status','balance','mess_option')

class Reg_recordsAdmin(admin.ModelAdmin):
model=Reg_records
list_display = ('student_id','start_date','end_date')


class Registration_RequestAdmin(admin.ModelAdmin):
model=Registration_Request
list_display = ('student_id','Txn_no','img','amount','status','registration_remark')


admin.site.register(Mess_minutes, Mess_minutesAdmin),
admin.site.register(Messinfo, MessinfoAdmin),
Expand All @@ -194,9 +206,12 @@ class MessBillBaseAdmin(admin.ModelAdmin):
admin.site.register(Rebate, RebateAdmin),
admin.site.register(Vacation_food, Vacation_foodAdmin),
admin.site.register(Special_request, Special_requestAdmin),
admin.site.register(Nonveg_menu, Nonveg_menuAdmin),
admin.site.register(Nonveg_data, Nonveg_dataAdmin),
# admin.site.register(Nonveg_menu, Nonveg_menuAdmin),
# admin.site.register(Nonveg_data, Nonveg_dataAdmin),
admin.site.register(Mess_meeting, Mess_meetingAdmin),
admin.site.register(Feedback, FeedbackAdmin),
admin.site.register(MessBillBase,MessBillBaseAdmin),
admin.site.register(Menu_change_request, Menu_change_requestAdmin)
admin.site.register(Reg_main,Reg_mainAdmin)
admin.site.register(Reg_records,Reg_recordsAdmin)
admin.site.register(Registration_Request,Registration_RequestAdmin)
91 changes: 91 additions & 0 deletions FusionIIIT/applications/central_mess/api/serializers.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
from rest_framework import serializers
from applications.central_mess.models import *

class MessinfoSerializer(serializers.ModelSerializer):

class Meta:
model=Messinfo
fields=('__all__')

class Mess_regSerializer(serializers.ModelSerializer):
class Meta:
model = Mess_reg
fields=('__all__')

class MessBillBaseSerializer(serializers.ModelSerializer):
class Meta:
model = MessBillBase
fields=('__all__')

class Monthly_billSerializer(serializers.ModelSerializer):
class Meta:
model=Monthly_bill
fields=('__all__')

class PaymentsSerializer(serializers.ModelSerializer):
class Meta:
model=Payments
fields=('__all__')

class MenuSerializer(serializers.ModelSerializer):
class Meta:
model=Menu
fields=('__all__')

class RebateSerializer(serializers.ModelSerializer):

class Meta:
model=Rebate
fields=('__all__')

class Vacation_foodSerializer(serializers.ModelSerializer):
class Meta:
model = Vacation_food
fields=('__all__')

# class Nonveg_menuSerializer(serializers.ModelSerializer):
# class Meta:
# model = Nonveg_menu
# fields=('__all__')

# class Nonveg_dataSerializer(serializers.ModelSerializer):
# class Meta:
# model=Nonveg_data
# fields=('__all__')

class Special_requestSerializer(serializers.ModelSerializer):
class Meta:
model=Special_request
fields=('__all__')

class Mess_meetingSerializer(serializers.ModelSerializer):
class Meta:
model=Mess_meeting
fields=('__all__')

class Mess_minutesSerializer(serializers.ModelSerializer):
class Meta:
model = Mess_minutes
fields=('__all__')

class Menu_change_requestSerializer(serializers.ModelSerializer):
class Meta:
model = Menu_change_request
fields=('__all__')

class FeedbackSerializer(serializers.ModelSerializer):
class Meta:
model=Feedback
fields=('__all__')

class GetFilteredSerialzer(serializers.ModelSerializer):
first_name = serializers.CharField(source='student_id.id.user.first_name')
last_name = serializers.CharField(source='student_id.id.user.last_name')
class Meta:
model=Reg_main
fields=('__all__')

class reg_recordSerialzer(serializers.ModelSerializer):
class Meta:
model = Reg_records
fields=('__all__')
27 changes: 27 additions & 0 deletions FusionIIIT/applications/central_mess/api/urls.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
from django.conf.urls import url
from . import views
from .views import *

urlpatterns = [
url("feedbackApi", views.FeedbackApi.as_view(), name="feedbackApi"),
url("menuChangeRequestApi", views.Menu_change_requestApi.as_view(), name="menuChangeRequestApi"),
url("messMinutesApi", views.Mess_minutesApi.as_view(), name="messMinutesApi"),
# url("nonvegDataApi", views.Nonveg_dataApi.as_view(), name="nonvegDataApi"),
url("specialRequestApi", views.Special_requestApi.as_view(), name="specialRequestApi"),
url("messMeetingApi", views.Mess_meetingApi.as_view(), name="messMeetingApi"),
# url("nonvegMenuApi", views.Nonveg_menuApi.as_view(), name="nonvegMenuApi"),
url("vacationFoodApi", views.Vacation_foodApi.as_view(), name="vacationFoodApi"),
url("messInfoApi", views.MessinfoApi.as_view(), name="messInfoApi"),
url("rebateApi", views.RebateApi.as_view(), name="rebateApi"),
url("menuApi", views.MenuApi.as_view(), name="menuApi"),
url("paymentsApi", views.PaymentsApi.as_view(), name="paymentsApi"),
url("monthlyBillApi", views.Monthly_billApi.as_view(), name="monthlyBillApi"),
url("messBillBaseApi", views.MessBillBaseApi.as_view(), name="messBillBaseApi"),
url("messRegApi", views.Mess_regApi.as_view(), name="messRegApi"),
url("get_mess_students", views.Get_Filtered_Students.as_view(), name="get_mess_students"),
url("get_reg_records",views.Get_Reg_Records.as_view(),name="reg_record_API"),
# url("billDashboard", views.Bill_dashboard.as_view(), name="billDashboard"),
url("get_student_bill",views.Get_Student_bill.as_view(),name="student_bill_API"),
url("get_student_payment",views.Get_Student_Payments.as_view(),name="student_payment_API"),
url("get_student_all_details",views.Get_Student_Details.as_view(),name="get_student_details_API")
]
Loading

0 comments on commit 55f5a9b

Please sign in to comment.