Skip to content

Patent management system #1797

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
Merged
Captain-T2004 merged 59 commits into from
Apr 21, 2025
Merged

Patent management system #1797

Captain-T2004 merged 59 commits into from
Apr 21, 2025

Conversation

@Jasmine5220
Copy link

@Jasmine5220 Jasmine5220 commented Apr 21, 2025

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

Jasmine5220 and others added 30 commits January 21, 2025 16:57
@Jasmine5220
Added patent_system folder
e0e1bb0
@Jasmine5220
Add files via upload
7d6e8bc
@ashish789bhoi
Added the new branch patent-management-system
f2b3e6c
@ashish789bhoi
Resolved the merge conflicts
ea9dd2a
@shreyashkatkar07
resolved migration issue and done basic backend structure setup
fd79fd1
@Jasmine5220
Merge pull request #2 from shreyashkatkar07/patent-management-system
79bb16a 
Resolved migration issue and done basic backend structure setup
@ashish789bhoi
Initial Merging
df5f4d7
@Jasmine5220
Update models.py
2eae24a
@ashish789bhoi
Added the submit application functionality in backend
36f41af
@Jasmine5220
Merge branch 'patent-management-system' into patent-management-system
1569794
@Jasmine5220
Merge pull request #3 from ashish789bhoi/patent-management-system
ac720f2 
Added the submit application functionality in the backend
@ashish789bhoi
Added the submit application functionality in backend
5af1951
@ashish789bhoi
Merge branch 'Jasmine5220:patent-management-system' into patent-manag…
dc69afa 
…ement-system
@Jasmine5220
Merge pull request #5 from ashish789bhoi/patent-management-system
ae2a78d 
Solved the backend error
@shreyashkatkar07
implemented api to fetch all applications of an applicant
499a033
@shreyashkatkar07
defined urls for pcc admin apis
47bdc03
@Jasmine5220
Merge pull request #6 from shreyashkatkar07/patent-management-system
67fa7ed 
Implemented backend functionality to view all applications and fetch application details by ID
@ashish789bhoi
Implemented the new_applicaiton api for the pcc_Admin
4432803
@shreyashkatkar07
Merge pull request #7 from ashish789bhoi/patent-management-system
e627870 
Implemented the new_applicaiton api for the pcc_Admin
@shreyashkatkar07
implemented status of all applications api for pccAdmin interface
5ebc74d
@shreyashkatkar07
implemented view application details api for pccAdmin interface
b0e546c
@shreyashkatkar07
Merge pull request #8 from shreyashkatkar07/patent-management-system
855adcc 
Implemented API to view application statuses and detailed application data in the PCC Admin interface
@ashish789bhoi
Useless
d9e5ee7
@ashish789bhoi
Implemented API to review, forward and reject application for the PCC…
34b2587 
… Admin interface
@ashish789bhoi
Merge pull request #9 from ashish789bhoi/patent-management-system
87851ad 
Implemented API to review, forward and reject application for  the PCC Admin interface
@Jasmine5220
feat: Added Manage Attorney features
2eb4d6f
@Jasmine5220
feat: Added Patents fetch and post documents functionality
fb8ca97
@shreyashkatkar07
Implemented apis for new, ongoing and past applications for PCC Admin…
d301b03 
… interface
@shreyashkatkar07
Merge pull request #10 from shreyashkatkar07/patent-management-system
252671f 
Implemented apis for new, ongoing and past applications for PCC Admin Interface
@ashish789bhoi
Implemented API's to review,accept, forward and reject application fo…
a4e2507 
…r the Director interface
ashish789bhoi and others added 29 commits April 15, 2025 20:19
@ashish789bhoi
Merge pull request #11 from ashish789bhoi/patent-management-system
c5301e5 
Implemented API's to review,accept, forward and reject application fo…
@shreyashkatkar07
implemented apis to review, forward, request modification, change status
3d30087
@ashish789bhoi
Implemented view application API for the Director interface
dbc9524
@ashish789bhoi
Merge pull request #12 from ashish789bhoi/patent-management-system
5398b2f 
Implemented view application API for the Director interface
@shreyashkatkar07
fixed errors in pcc admin views
914ac27
@shreyashkatkar07
Merge branch 'patent-management-system' of https://github.com/shreyas…
e0dc714 
…hkatkar07/Fusion into patent-management-system
@ashish789bhoi
Handle the submit application API for the Applicant interface
e8de051
@ashish789bhoi
Merge pull request #13 from ashish789bhoi/patent-management-system
e533b45 
Handle the submit application API for the Applicant interface
@ashish789bhoi
Handle the email and mobile number updation for submit application AP…
0926c04 
…I for the Applicant interface
@ashish789bhoi
Merge branch 'patent-management-system' of https://github.com/ashish7…
31017e6 
…89bhoi/Fusion into patent-management-system
@ashish789bhoi
Merge pull request #14 from ashish789bhoi/patent-management-system
d5f73ba 
Patent management system
@Jasmine5220
feat: Resolved issues in applicant interface
380cfbc
@ashish789bhoi
Resolved error in submit application
339eb89
@ashish789bhoi
Merge branch 'patent-management-system' of https://github.com/ashish7…
ad3c59d 
…89bhoi/Fusion into patent-management-system
@ashish789bhoi
Resolved the token generation after submit application
ebde3bf
@ashish789bhoi
Updated the submit applicaiton error for applicant
7bb2521
@shreyashkatkar07
removed unused field
b8f1c38
@shreyashkatkar07
Merge branch 'patent-management-system' of https://github.com/shreyas…
c712f24 
…hkatkar07/Fusion into patent-management-system
@ashish789bhoi
Added the token generation functionality after Director's Approval
dce9606
@Jasmine5220
feat: Approved bug fix
173a23c
@ashish789bhoi
Merge branch 'patent-management-system' of https://github.com/ashish7…
cfc1237 
…89bhoi/Fusion into patent-management-system
@Jasmine5220
feat: folder structure modified
2b7eee0
@Jasmine5220
Merge remote-tracking branch 'origin/dashboard_client' into patent-ma…
2f4d109 
…nagement-system
@Jasmine5220
Reset files to match dashboard_client state
519b049
@Jasmine5220
Clean slate before reset to dashboard_client
abac7f4
@Jasmine5220
Reset all files to match dashboard_client
af965b5
@Jasmine5220
Add files via upload
4632315
@Jasmine5220
Update common.py
5dbb795
@Jasmine5220
Update urls.py
aa34d0e
@Captain-T2004 Captain-T2004 merged commit acdf42a into FusionIIIT:dashboard_client Apr 21, 2025
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@Jasmine5220 @Captain-T2004 @ashish789bhoi @shreyashkatkar07