Pushing `sa-1` to `latest_staging` #1480

Priyansh61 · 2024-04-17T16:59:15Z

Issue that this pull request solves

Closes: # (issue number)

Proposed changes

Brief description of what is fixed or changed

Types of changes

Put an x in the boxes that apply

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

Checklist

Put an x in the boxes that apply

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

Screenshots

Please attach the screenshots of the changes made in case of change in user interface

Other information

Any other information that is important to this pull request

Functionality of Hostel Allotment Backend

Functionality assigned batch

* GAD-5: Fix responsiveness (#1125) Co-authored-by: A Anunaya <[email protected]> Co-authored-by: Aksh Bansal <[email protected]> * setup * chore:alloted_rooms and all_staff are added * doing * chor:HostelAllotment * comment in import hostelstudentattendance in views * Chore:change in staff schedule * chore:Hostelleave- caretaker and wardern can see all leave forms * chore:post request delete from StaffScheduleView class * chore:Hostelleave- student can apply for hostel leave * adding functionality of super admin * chore:all_stuff changed * functionality assigned batch * Chore:CURD API in hostel_management_hostelinventory * added functionality of assigning caretaker * chore:hostel_complaint_implemented * chore:inventory_form change * added frontend of alloted_room and linked with backend * chore: hostel_complaint and hostel_leave implemented * feat:hall_inventory form submmit,edit,delete * Merging migration of database * added assign-warden , add-hostel ,delete-hostel in frontend and backend * akshay PR merge * chore:hall id set * Final merge of akshay,ankit,anuj * uncommented functionality of hostel_complaint_list/ * fix:hall select problem fixed * fix:dropdownlist change when hall.id change in URL * Added frontend of all_leave_data,alloted_rooms_main,create_leave,complaint_form * chore: login required * chore: login required implemented * feat:authentication added * feat: authentication added in hostel leave and hostel complaint system and also added all operations that caretaker and warden can perform * Added frontend with templates of all_leave_data,alloted_rooms_main,create_leave,complaint_form * book guestroom * chore: run python manage.py copy_data to merge table to get all student details at one place * chore: Added functionality - caretaker and warden can get all details of student of their hall -----used StudentDetails table * guest room part done * added templates for hostel_complaint,inventory_form,my_leaves * added full student details table * Added api endpoints for notifications * fix:input fields of complaint and leave form * added funtionality of hostel super admin , guest room * feat:caretaker manage fine impose * migration files of DB * resolved error in sending notification for announcements * chore:student fine show * fix:student details * updated html files with template * updated alerts.html and alert1.html for implementing delete notification * chore:fine frontend design * fix:List name change * updated frontend using templates * fixed few bugs and few glitches. * 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) * minor changes * removed HostelAllotment class * chore:Student fine show * chore:date disable feature added * fix:notification message for room booking request is changed * added dropdown in sidebar * changes in programme_cuuriculam,adding version to models (#1330) * added hostelTransactions * Seater type added and vacant seats added * added seater,vacant,logs * fix: calender,fine * only vacant room show in guestroom * added Hostel history functionality * fix:UI of tables * fix:UI of tables * migration * added remark field in leave * fix:hostelTransaction * fix * fix:In leave request remark option is added * added notification functionality * added remark column in leave request * migrations files * Fixing ui bugs (#1335) * Synced with new Dashboard Some changes made to dashboard module in terms of UI and context updated. * .DS_Store * commented inventory * updated gitignore * updated gitignore * 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: Aniruddha <[email protected]> Co-authored-by: Stark <[email protected]> Co-authored-by: ANKIT <[email protected]> Co-authored-by: KK <[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: Aniruddha Das <[email protected]> Co-authored-by: SukulSarve <[email protected]>

Student Fine Edit by Caretaker

Merging hmweb-main into hmweb-test (Changes of Anni)

student details,room allottment functionality change

Merging hmweb-main into hmweb-test

* GAD-5: Fix responsiveness (#1125) Co-authored-by: A Anunaya <[email protected]> Co-authored-by: Aksh Bansal <[email protected]> * setup * chore:alloted_rooms and all_staff are added * doing * chor:HostelAllotment * comment in import hostelstudentattendance in views * Chore:change in staff schedule * chore:Hostelleave- caretaker and wardern can see all leave forms * chore:post request delete from StaffScheduleView class * chore:Hostelleave- student can apply for hostel leave * adding functionality of super admin * chore:all_stuff changed * functionality assigned batch * Chore:CURD API in hostel_management_hostelinventory * added functionality of assigning caretaker * chore:hostel_complaint_implemented * chore:inventory_form change * added frontend of alloted_room and linked with backend * chore: hostel_complaint and hostel_leave implemented * feat:hall_inventory form submmit,edit,delete * Merging migration of database * added assign-warden , add-hostel ,delete-hostel in frontend and backend * akshay PR merge * chore:hall id set * Final merge of akshay,ankit,anuj * uncommented functionality of hostel_complaint_list/ * fix:hall select problem fixed * fix:dropdownlist change when hall.id change in URL * Added frontend of all_leave_data,alloted_rooms_main,create_leave,complaint_form * chore: login required * chore: login required implemented * feat:authentication added * feat: authentication added in hostel leave and hostel complaint system and also added all operations that caretaker and warden can perform * Added frontend with templates of all_leave_data,alloted_rooms_main,create_leave,complaint_form * book guestroom * chore: run python manage.py copy_data to merge table to get all student details at one place * chore: Added functionality - caretaker and warden can get all details of student of their hall -----used StudentDetails table * guest room part done * added templates for hostel_complaint,inventory_form,my_leaves * added full student details table * Added api endpoints for notifications * fix:input fields of complaint and leave form * added funtionality of hostel super admin , guest room * feat:caretaker manage fine impose * migration files of DB * resolved error in sending notification for announcements * chore:student fine show * fix:student details * updated html files with template * updated alerts.html and alert1.html for implementing delete notification * chore:fine frontend design * fix:List name change * updated frontend using templates * fixed few bugs and few glitches. * 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) * minor changes * removed HostelAllotment class * chore:Student fine show * chore:date disable feature added * fix:notification message for room booking request is changed * added dropdown in sidebar * changes in programme_cuuriculam,adding version to models (#1330) * added hostelTransactions * Seater type added and vacant seats added * added seater,vacant,logs * fix: calender,fine * only vacant room show in guestroom * added Hostel history functionality * fix:UI of tables * fix:UI of tables * migration * added remark field in leave * fix:hostelTransaction * fix * fix:In leave request remark option is added * added notification functionality * added remark column in leave request * migrations files * Fixing ui bugs (#1335) * Synced with new Dashboard Some changes made to dashboard module in terms of UI and context updated. * .DS_Store * commented inventory * updated gitignore * updated gitignore * removed migrations * change in migrations * resolve bugs in guestroom functionality * functionlity changed in student details view * removed .DS_Store * removed migrations * added pay link * feat:Fine edit * chore:design added in fine edit * fix:Hostel fine list's button * student details,room allottment functionality change * fixed: few checks * added worker report * fixed:phone number in student details * added migrations file --------- 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: Aniruddha <[email protected]> Co-authored-by: Stark <[email protected]> Co-authored-by: ANKIT <[email protected]> Co-authored-by: KK <[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: Aniruddha Das <[email protected]> Co-authored-by: SukulSarve <[email protected]> Co-authored-by: Ankit kumar <[email protected]>

SA-1 Hostel Management

…batch,assign-caretaker,assign-warden

SA-1 Hostel Management (Fixed bug)

Priyansh61 · 2024-04-17T16:59:59Z

@anudeeps0306 @anujpatel03 PTAL!! And can you raise a PR to tackle the merge conflicts.

SA-1 Hostel Management

akshatnema and others added 30 commits March 15, 2023 13:12

Merge branch 'main' into sa-1

8e62975

Merge branch 'main' into sa-1

b5605d8

Merge branch 'main' into sa-1

c87641e

Merge branch 'main' into sa-1

c12e6d6

Merge branch 'main' into sa-1

ce32c1f

Merge branch 'main' into sa-1

bb8cb09

setup

c161ba4

chore:alloted_rooms and all_staff are added

c861c2c

doing

34cefa3

chor:HostelAllotment

706176b

comment in import hostelstudentattendance in views

928e9ff

Chore:change in staff schedule

8c48a4f

chore:Hostelleave- caretaker and wardern can see all leave forms

a175e81

Merge pull request #2 from aniruddha2002das/hmweb-anni

30de362

Functionality of Hostel Allotment Backend

chore:post request delete from StaffScheduleView class

4d191c9

chore:Hostelleave- student can apply for hostel leave

f7f2608

adding functionality of super admin

3c8cd67

chore:all_stuff changed

68eb614

functionality assigned batch

dbb0389

Chore:CURD API in hostel_management_hostelinventory

8f55472

added functionality of assigning caretaker

9a32c21

chore:hostel_complaint_implemented

2a3802d

chore:inventory_form change

d2f6f6b

added frontend of alloted_room and linked with backend

c97c383

Merge branch 'hmweb-main' into hmweb3

8dcf6ad

Merge pull request #3 from Iamankit45/hmweb3

4a5695e

Functionality assigned batch

Merge remote-tracking branch 'origin/hmweb-main' into hmweb-main

fcf2912

chore: hostel_complaint and hostel_leave implemented

035e559

feat:hall_inventory form submmit,edit,delete

bc3dbe0

Merging migration of database

89111f8

anujpatel03 and others added 26 commits April 10, 2024 19:35

added pay link

ca7a793

feat:Fine edit

3d8676b

chore:design added in fine edit

7810c77

fix:Hostel fine list's button

baf68dd

student details,room allottment functionality change

c8a001b

fixed: few checks

11ff20b

added worker report

5908d60

Merge pull request #31 from aniruddha2002das/anni-fine-edit

9eacf9d

Student Fine Edit by Caretaker

Merge branch 'hmweb-test' into hmweb-main

0606bb6

Merge pull request #32 from anujpatel03/hmweb-main

af7f160

Merging hmweb-main into hmweb-test (Changes of Anni)

Merge branch 'hmweb-main' into testcase1

161efc9

Merge pull request #33 from Iamankit45/testcase1

48d0584

student details,room allottment functionality change

Merge pull request #34 from anujpatel03/hmweb-main

39bb548

Merging hmweb-main into hmweb-test

fixed:phone number in student details

59b0a08

removed migrations files

f138fcc

Resolved merge-conflicts

8f0f43c

added migrations file

97fa75b

added sorted functionality for warden in hall student list

1b26122

Added migrations file in all modules

7938a9f

Added migrations file in all modules

d146da9

Merge pull request #1446 from anujpatel03/sa-1-main

2e6f006

SA-1 Hostel Management

removed initials of url http://0.0.0.0:8000 while fetching in assign-…

c8bbe19

…batch,assign-caretaker,assign-warden

previous batch by default value 0

43900a5

Merge pull request #1478 from anujpatel03/sa-1-main

47b12de

SA-1 Hostel Management (Fixed bug)

anujpatel03 and others added 2 commits April 17, 2024 23:05

resolve conflict

32ba344

Merge pull request #1481 from anujpatel03/latest-sa-1

438f0a5

SA-1 Hostel Management

Priyansh61 merged commit bbab300 into latest_staging Apr 17, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Pushing `sa-1` to `latest_staging` #1480

Pushing `sa-1` to `latest_staging` #1480

Priyansh61 commented Apr 17, 2024

Priyansh61 commented Apr 17, 2024

Pushing sa-1 to latest_staging #1480

Pushing sa-1 to latest_staging #1480

Conversation

Priyansh61 commented Apr 17, 2024

Issue that this pull request solves

Proposed changes

Brief description of what is fixed or changed

Types of changes

Checklist

Screenshots

Other information

Priyansh61 commented Apr 17, 2024

Pushing `sa-1` to `latest_staging` #1480

Pushing `sa-1` to `latest_staging` #1480