Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rspc 2025 1 #1461

Merged
merged 88 commits into from
Apr 15, 2024
Merged

Rspc 2025 1 #1461

merged 88 commits into from
Apr 15, 2024

Conversation

SharanKumar06
Copy link

@SharanKumar06 SharanKumar06 commented Apr 15, 2024 •
edited
Loading

Issue that this pull request solves

minor bug fixes, integration of notification panel

  1. Used a global variable in the backend for fetching current user designation, as suggested by dashboard module (view.py, menucard.html)

2.Notifications panel added (sidepanel.html)

Closes: # (issue number)

Proposed changes

Brief description of what is fixed or changed

Types of changes

Put an x in the boxes that apply

  • [ x] Bugfix (non-breaking change which fixes an issue)
  • [ x] 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

  • [ x] My code follows the style guidelines of this project
  • [ x] I have performed a self-review of my own code
  • [x ] I have created new branch for this pull request
  • [ x] I have commented my code, particularly in hard-to-understand areas
  • [ x] I have made corresponding changes to the documentation
  • [ x] My changes generate no new warnings
  • [ x] 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

@prajjwalkapoor
@ChaudharyRaman
@varun7singh
@Priyansh61
Any other information that is important to this pull request

Lawful2002 and others added 30 commits February 23, 2023 14:32
@Lawful2002 @Anunaya07 @Aksh-Bansal-dev
GAD-5: Fix responsiveness (FusionIIIT#1125)
5c61a54 
Co-authored-by: A Anunaya <[email protected]>
Co-authored-by: Aksh Bansal <[email protected]>
@akshatnema
Merge branch 'main' into gad-5
9a4fc4d
@akshatnema
Merge branch 'main' into gad-5
b295d7f
@akshatnema
Merge branch 'main' into gad-5
72e34e7
@akshatnema
Merge branch 'main' into gad-5
721ee82
@akshatnema
Merge branch 'main' into gad-5
91ef4e9
@akshatnema
Merge branch 'main' into gad-5
da49572
@Aragorn-64
fix requirements and docker-compose
468b866
@theoden42
fix docker compose and dependencies
bed09cc
@theoden42
fix merge conflicts
d136718
@theoden42
add sdk and api folder structure
10a5fec
@theoden42
add sdk methods and fix some urls
b60770f
@Aragorn-64
update models for API
fe98b1d
@Aragorn-64
add urls for api
f6c5284
@Aragorn-64
merge urls in api
8ee2f6e
@Aragorn-64
Merge remote-tracking branch 'upstream/main'
d6917b8
@theoden42
add methods for viewing file, inbox, outbox, getting designation with…
726e6f1 
… serializers and minor bug fixes
@theoden42
fix serializers and fix file attachment functionality in forward_file
0bd4cb4
@Aragorn-64
sync with upstream
b36972c
@theoden42
add views and fix urls
1631e25
@Aragorn-64
create file
201185d
@Aragorn-64
Merge branch 'main' of https://github.com/theoden42/Fusion
18cdf15
@Aragorn-64
create file change
a3c1d63
@Aragorn-64
fix create_file, without upload_file feature
ef9105e
@Aragorn-64
fix sdk forward_file : accept remarks
87dc61a
@Aragorn-64
add view_history in sdk
5ad97a7
@Aragorn-64
add blueprint for draft and archive methods to sdk
07f7d04
@Aragorn-64
fix FileHeaderSerializer to include id
54845b1
@Aragorn-64
fix empty file upload error
30afd49
@Aragorn-64
fix inbox outbox methods to return unique ids
55e8a74
@SharanKumar06
integration of updated dashboard
b932431
@SharanKumar06
dashboard modified
145ec51
@SharanKumar06
dashboard and fts integrated
cf297f0
@SharanKumar06
Changes made 10/04
c834069
@SharanKumar06
Changes made 10/04/24
0ccb411
@SharanKumar06
merging with old
ee342e0
@SharanKumar06
changes after merge
49b9ed6
@SharanKumar06
changes after merge 1
6cb3a30
@SharanKumar06
dashboard edit
6ece1ba
@SharanKumar06
Merge remote-tracking branch 'upstream/rspc' into rspc_2025_1
8046d05
@SharanKumar06
All changes done
485eefe
@SharanKumar06
All changes done 2
3755d36
@SharanKumar06
Merging done
2975250
@SharanKumar06
PR raise
99816bf
@SharanKumar06
error, login handling done
793ae0f
@SharanKumar06
functions created for better code understanding
33780ef
@SharanKumar06
fixed bugs as asked
c0ff4dc
@SharanKumar06
all changes done
1536fbb
@SharanKumar06
edited for better understanding
385b815
@SharanKumar06
edited for better understanding 3
277c5da
@SharanKumar06
file tracking usage comments added
e8e38dd
@SharanKumar06
Co-authored-by: KPR111 <[email protected]>
05d5818 
Co-authored-by: KULADEEP1 <[email protected]>
Co-authored-by: Manish Chandolu <[email protected]>
Co-authored-by: bandasatwik07 <[email protected]>
Co-authored-by: bandasatwik4 <[email protected]>
@SharanKumar06
added .github and .idea
cec64f9
@SharanKumar06
final changes added
5bb11b9
@SharanKumar06
minor bugs fixed and notfication panel inserted
8a1639f
@SharanKumar06
Merge remote-tracking branch 'upstream/rspc' into rspc_2025_1
a1b8564
Priyansh61
Priyansh61 requested changes Apr 15, 2024
View reviewed changes
Copy link

@Priyansh61 Priyansh61 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@SharanKumar06 PTAL

FusionIIIT/applications/research_procedures/views.py Outdated
Comment on lines 678 to 683
if user_designation == 'Assistant':
user_designation = 'Assistant Professor'

if user_designation == 'CSE':
user_designation= 'CSE HOD'

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please avoid hardcoding designation use an enum or const for this.

FusionIIIT/applications/research_procedures/views.py Outdated
Comment on lines 717 to 722
if receiver_designation == 'Assistant':
receiver_designation = 'Assistant Professor'

if receiver_designation == 'CSE':
receiver_designation = 'CSE HOD'

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same as above

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Priyansh61
Done...

@ChaudharyRaman ChaudharyRaman merged commit 8fa8821 into FusionIIIT:rspc Apr 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Priyansh61 Priyansh61 Priyansh61 requested changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.