Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
86 commits
Select commit Hold shift + click to select a range
b6a35ad
deployment ports config
yatharthagoenka Feb 13, 2023
f62c502
gad-4: Created fileTrackingNotAllowed.html (#1082)
prakhar-da-gama Feb 16, 2023
e52a590
gad-4: new views.py to remove students from file tracking (#1104)
prakhar-da-gama Feb 16, 2023
8debd86
Merge branch 'main' into gad-4
akshatnema Feb 17, 2023
a2e68c3
Merge remote-tracking branch 'origin/test-temp' into gad-4
akshatnema Feb 17, 2023
eee3d46
Merge branch 'main' into gad-4
akshatnema Feb 18, 2023
079fbaa
Merge branch 'test-temp' into gad-4
akshatnema Feb 18, 2023
69e97fb
fix: reverting deployment changes
manavdesai27 Feb 22, 2023
5c61a54
GAD-5: Fix responsiveness (#1125)
Lawful2002 Feb 23, 2023
4ca90b3
Merge branch 'main' into gad-4
akshatnema Mar 15, 2023
9a4fc4d
Merge branch 'main' into gad-5
akshatnema Mar 15, 2023
33b55f6
Merge branch 'main' into gad-4
akshatnema Mar 15, 2023
b295d7f
Merge branch 'main' into gad-5
akshatnema Mar 15, 2023
304f45b
Merge branch 'main' into gad-4
akshatnema Mar 18, 2023
72e34e7
Merge branch 'main' into gad-5
akshatnema Mar 18, 2023
2f9017d
Merge branch 'main' into gad-4
akshatnema Mar 19, 2023
721ee82
Merge branch 'main' into gad-5
akshatnema Mar 19, 2023
b1482e1
Merge branch 'main' into gad-4
akshatnema Mar 23, 2023
91ef4e9
Merge branch 'main' into gad-5
akshatnema Mar 23, 2023
ee8f6be
Merge branch 'main' into gad-4
akshatnema Mar 26, 2023
da49572
Merge branch 'main' into gad-5
akshatnema Mar 26, 2023
468b866
fix requirements and docker-compose
Aragorn-64 Jan 22, 2024
bed09cc
fix docker compose and dependencies
theoden42 Jan 23, 2024
d136718
fix merge conflicts
theoden42 Jan 23, 2024
10a5fec
add sdk and api folder structure
theoden42 Jan 23, 2024
b60770f
add sdk methods and fix some urls
theoden42 Jan 23, 2024
fe98b1d
update models for API
Aragorn-64 Jan 23, 2024
f6c5284
add urls for api
Aragorn-64 Jan 23, 2024
8ee2f6e
merge urls in api
Aragorn-64 Jan 23, 2024
d6917b8
Merge remote-tracking branch 'upstream/main'
Aragorn-64 Jan 23, 2024
726e6f1
add methods for viewing file, inbox, outbox, getting designation with…
theoden42 Jan 27, 2024
0bd4cb4
fix serializers and fix file attachment functionality in forward_file
theoden42 Jan 28, 2024
b36972c
sync with upstream
Aragorn-64 Jan 30, 2024
1631e25
add views and fix urls
theoden42 Jan 30, 2024
201185d
create file
Aragorn-64 Jan 30, 2024
18cdf15
Merge branch 'main' of https://github.com/theoden42/Fusion
Aragorn-64 Jan 30, 2024
a3c1d63
create file change
Aragorn-64 Jan 30, 2024
ef9105e
fix create_file, without upload_file feature
Aragorn-64 Jan 30, 2024
87dc61a
fix sdk forward_file : accept remarks
Aragorn-64 Jan 30, 2024
5ad97a7
add view_history in sdk
Aragorn-64 Jan 30, 2024
07f7d04
add blueprint for draft and archive methods to sdk
Aragorn-64 Feb 6, 2024
54845b1
fix FileHeaderSerializer to include id
Aragorn-64 Feb 6, 2024
30afd49
fix empty file upload error
Aragorn-64 Feb 6, 2024
55e8a74
fix inbox outbox methods to return unique ids
Aragorn-64 Feb 6, 2024
6ead47d
fix complete_flag to is_read
Aragorn-64 Feb 6, 2024
40815fd
fix inbox outbox methods to not show archived
Aragorn-64 Feb 6, 2024
d4bf291
add view_archived method to sdk
Aragorn-64 Feb 6, 2024
aea33d8
add archive_file method to sdk
Aragorn-64 Feb 6, 2024
66706c7
fix inbox and outbox output and add support for attachments
theoden42 Feb 12, 2024
ab0489d
add draft methods to sdk
Aragorn-64 Feb 12, 2024
423a2f9
fix default values of named params
Aragorn-64 Feb 12, 2024
cf2bbd5
fix merge conflicts
theoden42 Feb 12, 2024
c60098f
fix css for filetracking.html
Aragorn-64 Feb 15, 2024
1d27054
fix fts serializer.py
Aragorn-64 Feb 15, 2024
eff3142
add dept adding method to sdk
Aragorn-64 Feb 15, 2024
6eb1284
add helper methods to sdk
Aragorn-64 Feb 17, 2024
25f7174
fix inbox based on SDK
Aragorn-64 Feb 17, 2024
49f4a41
remove track from TabMenu
Aragorn-64 Feb 17, 2024
6d908b2
fix outbox using SDK
Aragorn-64 Feb 17, 2024
736ea3b
fix archive view for SDK
Aragorn-64 Feb 17, 2024
21c32d3
fix Drafts based on SDK
Aragorn-64 Feb 17, 2024
c4a66ba
fix the view file functionality in the web app
theoden42 Feb 18, 2024
086cb3c
fix frontend
Aragorn-64 Feb 18, 2024
ce5b4f3
fix .gitignore to untrack migrations
Aragorn-64 Feb 18, 2024
3d19ee8
database integration error resolved
SharanKumar06 Mar 3, 2024
a117a6e
merge conflicts resolved-1
SharanKumar06 Mar 3, 2024
90763ce
50% usecases implemented
SharanKumar06 Mar 3, 2024
f8447a3
Added new suggested usecases
KULADEEP1 Mar 10, 2024
4962f02
GAD-4: FTS SDK
theoden42 Mar 11, 2024
fb2fb00
few changes made
KULADEEP1 Mar 11, 2024
f0c8308
hellooo
KULADEEP1 Mar 11, 2024
cf27da3
filetracking integraion-1
KULADEEP1 Mar 11, 2024
47af12c
GAD -5 Dashboard Changes (#1325)
BlackHAWK2001 Mar 11, 2024
ed642ee
dashboard and usercard updated (#1329)
Arpittak Mar 12, 2024
d40e94d
Fixing ui bugs (#1335)
SukulSarve Mar 17, 2024
55af051
file tracking updated
SharanKumar06 Mar 18, 2024
b932431
integration of updated dashboard
SharanKumar06 Mar 18, 2024
145ec51
dashboard modified
SharanKumar06 Mar 18, 2024
cf297f0
dashboard and fts integrated
SharanKumar06 Mar 18, 2024
c834069
Changes made 10/04
SharanKumar06 Apr 10, 2024
0ccb411
Changes made 10/04/24
SharanKumar06 Apr 10, 2024
ee342e0
merging with old
SharanKumar06 Apr 10, 2024
49b9ed6
changes after merge
SharanKumar06 Apr 10, 2024
6cb3a30
changes after merge 1
SharanKumar06 Apr 10, 2024
6ece1ba
dashboard edit
SharanKumar06 Apr 10, 2024
8046d05
Merge remote-tracking branch 'upstream/rspc' into rspc_2025_1
SharanKumar06 Apr 10, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions FusionIIIT/applications/research_procedures/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
path('inbox',views.inbox, name="inbox"),
path('view_request_inbox',views.view_request_inbox, name="view_request_inbox"),
path('forward_request',views.forward_request, name="forward_request"),
# path('serve-pdf/<str:filename>/', serve_pdf, name='serve_pdf'),


url(r'^test/$',tests.testfun,name = 'test'),
Expand Down
2 changes: 2 additions & 0 deletions FusionIIIT/templates/dashboard/modules.html
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,7 @@
</a>
</div>
{% endif %}
{% if global_var == "faculty" or global_var == "dean_rspc" or global_var == "director" or global_var == "HOD" or global_var == "rspc_admin" or global_var == "Professor" or global_var == "Assistant Professor" %}
<div style="width: calc(50% - 10px);
margin: 5px;
box-sizing: border-box;">
Expand All @@ -236,6 +237,7 @@
</div>
</a>
</div>
{% endif %}

{% comment %}A single modules row ends here!{% endcomment %}

Expand Down
1 change: 1 addition & 0 deletions FusionIIIT/templates/rs/display_inbox.html
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
<td>{{data.tracking_extra_JSON.message}}</td>
{% comment %} <td><button></button></td> {% endcomment %}
<td><button class="ui small blue equal-size-button button" onclick="openFile(event,{{forloop.counter}})" >{{data.id}}</button> </td>

<td><button class="ui small blue equal-size-button button" onclick="window.location='/research_procedures/forward_request/{{data.id}}/{{request.user.username}}'">Forward</td>

{% comment %} <td><a href="{{ files }}" >{{ data.id }}</a></td> {% endcomment %}
Expand Down