Skip to content

Commit

Permalink
Gad-3 and AC-2 merged (#1403)
Browse files Browse the repository at this point in the history
* gad-3 : week-2 : changed api functions (#1069)

* Checked the sidebar after acad-admin login and fixed the (#1113)

fix: icons that were disabled or not working.

* ac-2: added sample excel sheet to add new students and deleted unnecessary files (#1109)

* Enabled all modules for access (#1120)

* 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)

* 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

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

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

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

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

* corrected faculty profile error

* correct faculty profile error

* corrected user profile

* Gad-3 : fixed minor issues (#1389)

* 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

* 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 (#1390)

* 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

* 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 (#1391)

* 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

* 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

* merge Gad 3 into staging  (#1392)

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

* 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)

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

* Gad-3 : fixed minor issues (#1389)

* 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

* 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 (#1390)

* 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

* 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 (#1391)

* 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

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

* migrations removed

* added phc corrections

* prescribe issue resolved in PHC

* Administrative Profile error resolved

---------

Co-authored-by: ujjawallele13 <[email protected]>
Co-authored-by: EyeOfHorus158 <[email protected]>
Co-authored-by: A Anunaya <[email protected]>
Co-authored-by: Yathartha Goenka <[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: Apc010101 <[email protected]>
Co-authored-by: Akshay010203 <[email protected]>
Co-authored-by: Divyanshu Sharma <[email protected]>
Co-authored-by: Raman Chaudhary <[email protected]>
Co-authored-by: Ravichendraa <[email protected]>
Co-authored-by: Abhikumar Gupta <[email protected]>
Co-authored-by: Harshvardhan Singh <[email protected]>
Co-authored-by: BlackHAWK2001 <[email protected]>
Co-authored-by: Arpit Tak <[email protected]>
Co-authored-by: prem-charan <[email protected]>
Co-authored-by: Hardik Sharma <[email protected]>
Co-authored-by: Anudeep Sanapala <[email protected]>
Co-authored-by: SukulSarve <[email protected]>
Co-authored-by: Prajjwal kapoor <[email protected]>
Co-authored-by: VedantJain1103 <[email protected]>
Co-authored-by: harsh-k-singh <[email protected]>
Co-authored-by: davneesh <[email protected]>
Co-authored-by: Avneesh <[email protected]>
Co-authored-by: varunraj03 <[email protected]>
Co-authored-by: Shivkant Chauhan <[email protected]>
Co-authored-by: Samay Sagar <[email protected]>
Co-authored-by: theparasgami <[email protected]>
Co-authored-by: PARAS GAMI <[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: Yathartha Goenka <[email protected]>
Co-authored-by: prakhar-da-gama <[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: Prajjwal Kapoor <[email protected]>
Co-authored-by: gaur-abhi524 <[email protected]>
Co-authored-by: Sudheer dagar <[email protected]>
Co-authored-by: Nitya Tiwari <[email protected]>
Co-authored-by: Divyanshu Sharma <[email protected]>
Co-authored-by: TilteD24 <[email protected]>
Co-authored-by: Divyanshu Srivastava <[email protected]>
Co-authored-by: nidhibarapatre <[email protected]>
Co-authored-by: Abhikumar Gupta <[email protected]>
  • Loading branch information
Show file tree
Hide file tree
Showing 248 changed files with 7,485 additions and 4,674 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -74,3 +74,4 @@ FusionIIIT/static/
package-lock.json



8 changes: 4 additions & 4 deletions FusionIIIT/Fusion/settings/development.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.postgresql_psycopg2',
'NAME': 'fusiondb',
'HOST': os.environ.get("DB_HOST"),
'USER': 'fusionuser',
'PASSWORD': 'password',
'NAME': 'fusionlab',
'HOST': os.environ.get("DB_HOST", default='localhost'),
'USER': 'fusion_admin',
'PASSWORD': 'hello123',
}
}

Expand Down
1 change: 0 additions & 1 deletion FusionIIIT/applications/academic_information/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,3 @@ class Curriculum_InstructorAdmin(admin.ModelAdmin):
admin.site.register(Holiday)
admin.site.register(Curriculum,CurriculumAdmin)

#Hello!
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ class Meta:

class CurriculumSerializer(serializers.ModelSerializer):
course_id = CourseSerializer()

class Meta:
model = Curriculum
fields = ('curriculum_id','course_code','course_id','credits','course_type',
Expand Down
2 changes: 1 addition & 1 deletion FusionIIIT/applications/academic_information/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ class Student(models.Model):
'''
Current Purpose : To store information pertinent to a user who is also a student
ATTRIBUTES :
Expand Down
57 changes: 37 additions & 20 deletions FusionIIIT/applications/academic_information/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@



from applications.academic_procedures.views import acad_proced_global_context
from applications.academic_procedures.views import acad_proced_global_context , get_sem_courses
from applications.programme_curriculum.models import Batch


Expand Down Expand Up @@ -107,7 +107,6 @@ def get_context(request):
# course_type = Constants.COURSE_TYPE
# timetable = Timetable.objects.all()
# exam_t = Exam_timetable.objects.all()

procedures_context = acad_proced_global_context()

try:
Expand Down Expand Up @@ -842,12 +841,16 @@ def generatexlsheet(request):
"""
if user_check(request):
return HttpResponseRedirect('/academic-procedures/')

# print(request.POST)
try:
batch = request.POST['batch']
course = Courses.objects.get(id = request.POST['course'])
batch = request.POST['batch']#batch hai year wala (2020 , 21)
course_id = int(request.POST['course']) # id of course in integer
course = course = Courses.objects.get(id=course_id)

# print(course.name)
obj = course_registration.objects.all().filter(course_id = course)
except Exception as e:
print(str(e))
batch=""
course=""
curr_key=""
Expand Down Expand Up @@ -1029,9 +1032,14 @@ def generate_preregistration_report(request):
max_width = max(max_width,len(choices_of_current_student))

for choice in range(1,len(choices_of_current_student)+1):
current_choice = InitialRegistration.objects.get(student_id=student, semester_id__semester_no=sem,course_slot_id = slot,priority = choice)
# #print("current choice is ",current_choice)
z.append(str(current_choice.course_id.code)+"-"+str(current_choice.course_id.name))
try:
current_choice = InitialRegistration.objects.get(student_id=student, semester_id__semester_no=sem, course_slot_id=slot, priority=choice)
z.append(str(current_choice.course_id.code) + "-" + str(current_choice.course_id.name))
except :
z.append("No registration found")
# current_choice = InitialRegistration.objects.get(student_id=student, semester_id__semester_no=sem,course_slot_id = slot,priority = choice)
# # #print("current choice is ",current_choice)
# z.append(str(current_choice.course_id.code)+"-"+str(current_choice.course_id.name))

data.append(z)
m+=1
Expand Down Expand Up @@ -1169,9 +1177,9 @@ def add_new_profile (request):
}
if request.method == 'POST' and request.FILES:
profiles=request.FILES['profiles']
excel = xlrd.open_workbook(file_contents=profiles.read())
excel = xlrd.open_workbook(profiles.name,file_contents=profiles.read())
sheet=excel.sheet_by_index(0)
for i in range(sheet.nrows):
for i in range(1,sheet.nrows):
roll_no=sheet.cell(i,0).value
first_name=str(sheet.cell(i,1).value)
last_name=str(sheet.cell(i,2).value)
Expand All @@ -1191,7 +1199,7 @@ def add_new_profile (request):
category=""
phone_no=0
address=""
dept=str(sheet.cell(i,12).value)
dept=str(sheet.cell(i,11).value)
specialization=str(sheet.cell(i,12).value)
hall_no=None

Expand All @@ -1209,14 +1217,14 @@ def add_new_profile (request):
batch_year=request.POST['Batch']

batch = Batch.objects.all().filter(name = programme_name, discipline__acronym = dept, year = batch_year).first()

user = User.objects.create_user(
username=roll_no,
password='hello123',
first_name=first_name,
last_name=last_name,
email=email,
)


einfo = ExtraInfo.objects.create(
id=roll_no,
Expand Down Expand Up @@ -1253,6 +1261,11 @@ def add_new_profile (request):
working=user,
designation=desig,
)

user.save()
einfo.save()
stud_data.save()
hold_des.save()

sem_id = Semester.objects.get(curriculum = batch.curriculum, semester_no = sem)
course_slots = CourseSlot.objects.all().filter(semester = sem_id)
Expand Down Expand Up @@ -2063,14 +2076,15 @@ def view_all_student_data(request):
"specailization": student.specialization,
"gender" : student.id.sex,
"category": student.category,
"pwd_status": student.pwd_status,
# "pwd_status": student.pwd_status,
"pwd_status": False,
"Mobile": student.id.phone_no,
"dob" : student.id.date_of_birth,
"emailid" : student.id.user.email,
"father_name": student.father_name,
"father_mobile_no": student.father_mobile_no,
# "father_mobile_no": student.father_mobile_no,
"mother_name": student.mother_name,
"mother_mobile_no": student.mother_mobile_no,
# "mother_mobile_no": student.mother_mobile_no,
"address": student.id.address
}
data.append(obj)
Expand Down Expand Up @@ -2140,9 +2154,9 @@ def generatestudentxlsheet(request):
data = None
else:
if(request_rollno != ""):
students = Student.objects.select_related('batch_id', 'id__user', 'batch_id__discipline', 'id').filter(id = request_rollno).only('batch', 'id__id', 'id__user', 'programme','pwd_status', 'father_mobile_no', 'mother_mobile_no', 'batch_id__discipline__acronym', 'specialization', 'id__sex', 'category', 'id__phone_no', 'id__date_of_birth', 'id__user__first_name', 'id__user__last_name', 'id__user__email', 'father_name', 'mother_name', 'id__address')
students = Student.objects.select_related('batch_id', 'id__user', 'batch_id__discipline', 'id').filter(id = request_rollno).only('batch', 'id__id', 'id__user', 'programme', 'batch_id__discipline__acronym', 'specialization', 'id__sex', 'category', 'id__phone_no', 'id__date_of_birth', 'id__user__first_name', 'id__user__last_name', 'id__user__email', 'father_name', 'mother_name', 'id__address')
else:
students = Student.objects.select_related('batch_id', 'id__user', 'batch_id__discipline', 'id').filter(**filter_names).order_by('id').all().only('batch', 'id__id', 'id__user', 'programme','pwd_status', 'father_mobile_no', 'mother_mobile_no', 'batch_id__discipline__acronym', 'specialization', 'id__sex', 'category', 'id__phone_no', 'id__date_of_birth', 'id__user__first_name', 'id__user__last_name', 'id__user__email', 'father_name', 'mother_name', 'id__address')
students = Student.objects.select_related('batch_id', 'id__user', 'batch_id__discipline', 'id').filter(**filter_names).order_by('id').all().only('batch', 'id__id', 'id__user', 'programme', 'batch_id__discipline__acronym', 'specialization', 'id__sex', 'category', 'id__phone_no', 'id__date_of_birth', 'id__user__first_name', 'id__user__last_name', 'id__user__email', 'father_name', 'mother_name', 'id__address')
for i in students:
obj = []
obj.append(i.batch)
Expand All @@ -2153,14 +2167,17 @@ def generatestudentxlsheet(request):
obj.append(i.specialization)
obj.append(i.id.sex)
obj.append(i.category)
obj.append(i.pwd_status)
#obj.append(i.pwd_status)
obj.append(None)
obj.append(i.id.phone_no)
obj.append(i.id.date_of_birth)
obj.append(i.id.user.email)
obj.append(i.father_name)
obj.append(i.father_mobile_no)
#obj.append(i.father_mobile_no)
obj.append(None)
obj.append(i.mother_name)
obj.append(i.mother_mobile_no)
# obj.append(i.mother_mobile_no)
obj.append(None)
obj.append(i.id.address)
data.append(obj)
data.sort()
Expand Down
44 changes: 39 additions & 5 deletions FusionIIIT/applications/academic_procedures/api/serializers.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
from rest_framework.authtoken.models import Token
from rest_framework import serializers

from applications.academic_procedures.models import (ThesisTopicProcess, InitialRegistrations,
FinalRegistrations, SemesterMarks,
BranchChange)
from applications.academic_procedures.models import (ThesisTopicProcess, InitialRegistrations,InitialRegistration,
FinalRegistration, FinalRegistrations, SemesterMarks,
BranchChange , StudentRegistrationChecks, Semester, backlog_course , CourseSlot , FeePayments , course_registration)

from applications.academic_information.api.serializers import (CurriculumInstructorSerializer,
CurriculumSerializer)
from applications.globals.api.serializers import (UserSerializer, HoldsDesignationSerializer)
CurriculumSerializer , CourseSerializer , StudentSerializers )
from applications.globals.api.serializers import (UserSerializer, HoldsDesignationSerializer , ExtraInfoSerializer)

class ThesisTopicProcessSerializer(serializers.ModelSerializer):

Expand All @@ -27,6 +27,24 @@ class Meta:
model = FinalRegistrations
fields = ('__all__')

class InitialRegistrationSerializer(serializers.ModelSerializer):

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

class FinalRegistrationSerializer(serializers.ModelSerializer):

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

class StudentRegistrationChecksSerializer(serializers.ModelSerializer):
class Meta:
model = StudentRegistrationChecks
fields = '__all__'


class SemesterMarksSerializer(serializers.ModelSerializer):

class Meta:
Expand All @@ -38,3 +56,19 @@ class BranchChangeSerializer(serializers.ModelSerializer):
class Meta:
model = BranchChange
fields = ('__all__')

class SemesterSerializer(serializers.ModelSerializer):

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

class CourseRegistrationSerializer(serializers.ModelSerializer):
class Meta:
model = course_registration
fields = ('__all__')

class CourseSlotSerializer(serializers.ModelSerializer):
class Meta:
model = CourseSlot
fields = ('__all__')
41 changes: 35 additions & 6 deletions FusionIIIT/applications/academic_procedures/api/urls.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,41 @@
from django.conf.urls import url

from . import views


urlpatterns = [
url(r'^stu/details', views.academic_procedures_student, name='student_procedures'),
url(r'^stu/pre_registration' , views.student_pre_registration , name = 'pre_registration'),
url(r'^stu/final_registration' , views.student_final_registration , name = 'final_registration'),
url(r'^stu/view_registration' , views.student_view_registration , name = 'view_registration'),
url(r'^stu/view_offered_courses' , views.view_offered_courses , name = 'student_view_offered_courses'),
url(r'^stu/backlog_courses', views.student_backlog_courses , name = 'student_backlog_courses'),
url(r'^stu/add_course' , views.add_course , name ='add_course') ,
url(r'^stu/drop_course' , views.drop_course , name = 'drop_course'),
# url(r'^stu/replaceCourse' , views.replaceCourse , name = 'replaceCourse')



url(r'^acad/view_registrations' , views.acad_view_reigstrations , name='acad_view_registrations'),
url(r'^acad/get_course_list' , views.get_course_list , name = 'get_course_list' ),
url(r'^acad/configure_pre_registration' , views.configure_pre_registration_date , name = 'configure_pre_registration'),
url(r'^acad/configure_final_registration' , views.configure_final_registration_date , name = 'configure_final_registration'),
url(r'^acad/add_course_to_slot' , views.add_course_to_slot , name = 'add_course_to_slot'),
url(r'^acad/remove_course_from_slot' , views.remove_course_from_slot , name = 'remove_course_from_slot'),
url(r'^get_next_sem_courses' , views.get_next_sem_courses , name= 'get_next_sem_courses'),


url(r'^fac/view_assigned_courses' , views.faculty_assigned_courses , name = 'faculty_assigned_courses'),
# url(r'^fac/get_roll_list' , views.fetch_roll_list , name = 'fetch_roll_list'),



url(r'^get_user_info' , views.get_user_info , name = 'get_user_info'),

# these urls were designed previously and are not working any more

url(r'^fac/', views.academic_procedures_faculty, name='faculty_procedures'),
url(r'^stu/', views.academic_procedures_student, name='student_procedures'),
url(r'^addThesis/', views.add_thesis, name='add_thesis'),
url(r'^approve_thesis/(?P<id>[0-9]+)/', views.approve_thesis, name='approve_thesis'),
# url(r'^fac/', views.academic_procedures_faculty, name='faculty_procedures'),
# url(r'^stu', views.academic_procedures_student, name='student_procedures'),
# url(r'^addThesis/', views.add_thesis, name='add_thesis'),
# url(r'^approve_thesis/(?P<id>[0-9]+)/', views.approve_thesis, name='approve_thesis')

]
]
Loading

0 comments on commit 061d7d8

Please sign in to comment.