Skip to content

Commit

Permalink
Faculty Profile errors resolved (#1388)
Browse files Browse the repository at this point in the history
* 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 c1359b7.

* 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 8e48ec5.

* Revert "module completed"

This reverts commit 2544877.

* Revert "module completed"

This reverts commit 2544877.

* Revert "integrated dashboard"

This reverts commit 8e48ec5.

* 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 1db64d7.

* 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 c1359b7.

* 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 8e48ec5.

* Revert "module completed"

This reverts commit 2544877.

* Revert "module completed"

This reverts commit 2544877.

* Revert "integrated dashboard"

This reverts commit 8e48ec5.

* 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 83e2e73.

* revert to old

* some changes in frontend

* some updates in frontend files

* added the api for mobiles and updated urls and views of web

* some updates in backend

* Added frontend for new apis

Created frontend for registered students and update menu features

* updated admin and ui

* resolved errors

* Menu UI changes

* Updated Menu_card

* some fixes

* migrations fixed

* added mess registration request model

* minor changes

* added model and view for registeration

* url fixed

* fixed rebate

* added new form for registration request

* fixed gitignore

resolved conflicts

* context

* Registration UI Changes

* registration UI changes

* restored migration file

* completed registration

* made some ui changes

* migration fix

* done things about payments

* changed some views

* Added Registration Remark and Dropdown

* Changed id in reg

* rectified error with rebate response frontend

* fixed datetime in reg

* worked on manage reg

* deregistration request functionality added

* rectified the backend issues for generate bills

* added registration list

* completed dereg

* student bill functionality addded

* rectified error of previous commit

* added view reg records

* added filter in view mess students

* worked on bills caretaker side

* changed development

* Updated special food request

* 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 83e2e73.

* revert to old

* some changes in frontend

* some updates in frontend files

* added the api for mobiles and updated urls and views of web

* some updates in backend

* Added frontend for new apis

Created frontend for registered students and update menu features

* updated admin and ui

* resolved errors

* Menu UI changes

* Updated Menu_card

* some fixes

* migrations fixed

* added mess registration request model

* minor changes

* added model and view for registeration

* url fixed

* fixed rebate

* added new form for registration request

* fixed gitignore

resolved conflicts

* context

* Registration UI Changes

* registration UI changes

* restored migration file

* completed registration

* made some ui changes

* migration fix

* done things about payments

* changed some views

* Added Registration Remark and Dropdown

* Changed id in reg

* rectified error with rebate response frontend

* fixed datetime in reg

* worked on manage reg

* deregistration request functionality added

* rectified the backend issues for generate bills

* added registration list

* completed dereg

* student bill functionality addded

* rectified error of previous commit

* added view reg records

* added filter in view mess students

* worked on bills caretaker side

* changed development

* Updated special food request

* GAD -5 Dashboard Changes (#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 83e2e73.

* revert to old

* some changes in frontend

* some updates in frontend files

* added the api for mobiles and updated urls and views of web

* some updates in backend

* Added frontend for new apis

Created frontend for registered students and update menu features

* updated admin and ui

* resolved errors

* Menu UI changes

* Updated Menu_card

* some fixes

* migrations fixed

* added mess registration request model

* minor changes

* added model and view for registeration

* url fixed

* fixed rebate

* added new form for registration request

* fixed gitignore

resolved conflicts

* context

* Registration UI Changes

* registration UI changes

* restored migration file

* completed registration

* made some ui changes

* migration fix

* done things about payments

* changed some views

* Added Registration Remark and Dropdown

* Changed id in reg

* rectified error with rebate response frontend

* fixed datetime in reg

* worked on manage reg

* deregistration request functionality added

* rectified the backend issues for generate bills

* added registration list

* completed dereg

* student bill functionality addded

* rectified error of previous commit

* added view reg records

* added filter in view mess students

* worked on bills caretaker side

* changed development

* Updated special food request

* GAD -5 Dashboard Changes (#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 c1359b7.

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

* modified academic_info_models

* removed migrations

* removed migration folders

* added migrationns

* Update development.py

* Update requirements.txt

* corrected faculty profile error

* correct faculty profile error

* corrected user profile

---------

Co-authored-by: EyeOfHorus158 <[email protected]>
Co-authored-by: Yathartha Goenka <[email protected]>
Co-authored-by: akshatnema <[email protected]>
Co-authored-by: Apc010101 <[email protected]>
Co-authored-by: Akshay010203 <[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: 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: prem-charan <[email protected]>
Co-authored-by: Hardik Sharma <[email protected]>
Co-authored-by: Raman Chaudhary <[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: Akshat Nema <[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]>
  • Loading branch information
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 13 deletions.
1 change: 1 addition & 0 deletions FusionIIIT/Fusion/settings/development.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
}
}


REST_FRAMEWORK = {
'DEFAULT_AUTHENTICATION_CLASSES': (
'rest_framework.authentication.TokenAuthentication',
Expand Down
26 changes: 13 additions & 13 deletions FusionIIIT/applications/eis/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def get_absolute_url(self):

class emp_techtransfer(models.Model):
user = models.ForeignKey(User, on_delete=models.CASCADE, blank=True,null=True)
pf_no = models.IntegerField()
pf_no = models.CharField(max_length=20)
details = models.CharField(max_length=500, default=" ")
date_entry = models.DateField(null=True, blank=True, default=datetime.datetime.now)
start_date = models.DateField(null=True,blank=True)
Expand All @@ -35,7 +35,7 @@ class emp_techtransfer(models.Model):

class emp_session_chair(models.Model):
user = models.ForeignKey(User, on_delete=models.CASCADE, blank=True,null=True)
pf_no = models.IntegerField()
pf_no = models.CharField(max_length=20)
name = models.CharField(max_length=500, default=" ")
event = models.TextField(max_length=2500, default=" ")
YEAR_CHOICES = []
Expand All @@ -57,7 +57,7 @@ def __str__(self):

class emp_research_projects(models.Model):
user = models.ForeignKey(User, on_delete=models.CASCADE, blank=True,null=True)
pf_no = models.IntegerField()
pf_no = models.CharField(max_length=20)
ptype = models.CharField(max_length=100, default="Research")
pi = models.CharField(max_length=1000, default=" ")
co_pi = models.CharField(max_length=1500, default=" ")
Expand All @@ -82,7 +82,7 @@ def __str__(self):

class emp_research_papers(models.Model):
user = models.ForeignKey(User, on_delete=models.CASCADE, blank=True,null=True)
pf_no = models.IntegerField()
pf_no = models.CharField(max_length=20)
R_TYPE_CHOICES = (
('Journal', 'Journal'),
('Conference', 'Conference'),
Expand Down Expand Up @@ -133,7 +133,7 @@ def __str__(self):

class emp_published_books(models.Model):
user = models.ForeignKey(User, on_delete=models.CASCADE, blank=True,null=True)
pf_no = models.IntegerField()
pf_no = models.CharField(max_length=20)
PTYPE_TYPE_CHOICES = (
('Book', 'Book'),
('Monograph', 'Monograph'),
Expand All @@ -158,7 +158,7 @@ def __str__(self):

class emp_patents(models.Model):
user = models.ForeignKey(User, on_delete=models.CASCADE, blank=True,null=True)
pf_no = models.IntegerField()
pf_no = models.CharField(max_length=20)
p_no = models.CharField(max_length=150)
title = models.CharField(max_length=1500)
earnings = models.IntegerField(default=0)
Expand Down Expand Up @@ -186,7 +186,7 @@ def __str__(self):

class emp_mtechphd_thesis(models.Model):
user = models.ForeignKey(User, on_delete=models.CASCADE, blank=True,null=True)
pf_no = models.IntegerField()
pf_no = models.CharField(max_length=20)
degree_type = models.IntegerField(default=1)
title = models.CharField(max_length=250)
supervisors = models.CharField(max_length=250)
Expand Down Expand Up @@ -219,7 +219,7 @@ def __str__(self):

class emp_keynote_address(models.Model):
user = models.ForeignKey(User, on_delete=models.CASCADE, blank=True,null=True)
pf_no = models.IntegerField()
pf_no = models.CharField(max_length=20)
KEYNOTE_TYPE_CHOICES = (
('Keynote', 'Keynote'),
('Plenary Address', 'Plenary Address'),
Expand Down Expand Up @@ -248,7 +248,7 @@ def __str__(self):

class emp_expert_lectures(models.Model):
user = models.ForeignKey(User, on_delete=models.CASCADE, blank=True,null=True)
pf_no = models.IntegerField()
pf_no = models.CharField(max_length=20)
LECTURE_TYPE_CHOICES = (
('Expert Lecture', 'Expert Lecture'),
('Invited Talk', 'Invited Talk'),
Expand All @@ -273,7 +273,7 @@ def __str__(self):

class emp_event_organized(models.Model):
user = models.ForeignKey(User, on_delete=models.CASCADE, blank=True,null=True)
pf_no = models.IntegerField()
pf_no = models.CharField(max_length=20)
TYPE_CHOICES = (
('Training Program', 'Training Program'),
('Seminar', 'Seminar'),
Expand Down Expand Up @@ -301,7 +301,7 @@ def __str__(self):

class emp_consultancy_projects(models.Model):
user = models.ForeignKey(User, on_delete=models.CASCADE, blank=True,null=True)
pf_no = models.IntegerField()
pf_no = models.CharField(max_length=20)
consultants = models.CharField(max_length=150)
title = models.CharField(max_length=1000)
client = models.CharField(max_length=1000)
Expand All @@ -323,7 +323,7 @@ def __str__(self):

class emp_confrence_organised(models.Model):
user = models.ForeignKey(User, on_delete=models.CASCADE, blank=True,null=True)
pf_no = models.IntegerField()
pf_no = models.CharField(max_length=20)
name = models.CharField(max_length=500)
venue = models.CharField(max_length=500)
YEAR_CHOICES = []
Expand Down Expand Up @@ -353,7 +353,7 @@ def __str__(self):

class emp_achievement(models.Model):
user = models.ForeignKey(User, on_delete=models.CASCADE, blank=True,null=True)
pf_no = models.IntegerField()
pf_no = models.CharField(max_length=20)
A_TYPE_CHOICES = (
('Award', 'Award'),
('Honour', 'Honour'),
Expand Down

0 comments on commit 824a15c

Please sign in to comment.