- {% comment %}The left-margin segment!{% endcomment %}
-
+
{% comment %}The left-rail segment starts here!{% endcomment %}
-
+
{% comment %}The user image card starts here!{% endcomment %}
{% block usercard %}
{% include 'globals/usercard.html' %}
@@ -46,8 +78,8 @@
{% comment %}The Tab-Menu starts here!{% endcomment %}
-
+
+
{% if student_flag %}
Current Semester
diff --git a/FusionIIIT/templates/dashboard/dashboard.html b/FusionIIIT/templates/dashboard/dashboard.html
old mode 100755
new mode 100644
index 2b940cdbb..658ec2e6e
--- a/FusionIIIT/templates/dashboard/dashboard.html
+++ b/FusionIIIT/templates/dashboard/dashboard.html
@@ -1,148 +1,140 @@
{% extends 'globals/base.html' %}
{% load static %}
-
{% block title %}
-Dashboard
+ Dashboard
{% endblock %}
{% block css %}
+
+
+
{% endblock %}
-
-{% comment %}The grid starts here!{% endcomment %}
-
-
- {% comment %}The left-margin segment!{% endcomment %}
-
-
- {% comment %}
- The left-rail segment starts here!
- {% endcomment %}
-
-
- {% comment %}The user image card starts here!{% endcomment %}
- {% block usercard %}
- {% include 'globals/usercard.html' %}
- {% endblock %}
- {% comment %}The user image card ends here!{% endcomment %}
-
-
-
- {% comment %}The Tab-Menu starts here!{% endcomment %}
-
- {% comment %}The Tab-Menu ends here!{% endcomment %}
-
-
- {% if 'student' != request.user.extrainfo.user_type %}
-
- {% comment %}The Tab-Menu starts here!{% endcomment %}
-
- {% comment %}The Tab-Menu ends here!{% endcomment %}
-
- {% endif %}
-
- {% comment %}The Tab-Menu starts here!{% endcomment %}
-
-
- {% if request.user.extrainfo.user_type == 'faculty' %}
- {%for desig in designat%}
- {% if 'hradmin' == desig.designation.name %}
-
-
- {% endif %}
- {%endfor %}
- {% endif %}
- {% comment %}The Tab-Menu ends here!{% endcomment %}
-
-
-
-
-
-
-
-
-
- {% comment %}
- The left-rail segment ends here!
- {% endcomment %}
+{% block body %}
+ {% block navBar %}
+ {% include 'dashboard/navbar.html' %}
+ {% endblock %}
+ {% comment %} The grid starts here! {% endcomment %}
+
- {% comment %}
- The central-rail segment starts here!
- {% endcomment %}
+ {% comment %} The left-rail segment starts here! {% endcomment %}
+
+
+ {% comment %} The user image card starts here! {% endcomment %}
+ {% block usercard %}
+ {% include 'globals/usercard.html' %}
+ {% endblock %}
+ {% comment %}The user image card ends here!{% endcomment %}
+
+
+
+ {% comment %}The Tab-Menu starts here!{% endcomment %}
+
+ {% comment %}The Tab-Menu ends here!{% endcomment %}
-
-
-
-
+ {% comment %} The left-rail segment ends here! {% endcomment %}
+
+ {% comment %} The central-rail segment starts here! {% endcomment %}
+
+ {% comment %} The central-rail segment ends here! {% endcomment %}
- {% comment %}The right-rail segment starts here!{% endcomment %}
-
-
-{% comment %}The grid ends here!{% endcomment %}
-
-
-
+ {% comment %}The grid ends here!{% endcomment %}
{% endblock %}
{% block javascript %}
-
-
+
-
+ });
+
+ /*$(document).ready(function(){
+ $("#textLoader").toggle();
+ $("#replacement-card").toggle();
+ setTimeout(loader, 1750);
+ });
+ function loader() {
+ $("#textLoader").toggle();
+ $("#replacement-card").toggle();
+ $("#loader").removeClass("active");
+ $("#loader").addClass("disabled");
+ }*/
+
{% endblock %}
\ No newline at end of file
diff --git a/FusionIIIT/templates/dashboard/modules.html b/FusionIIIT/templates/dashboard/modules.html
old mode 100755
new mode 100644
index a8680958a..e83995749
--- a/FusionIIIT/templates/dashboard/modules.html
+++ b/FusionIIIT/templates/dashboard/modules.html
@@ -1,246 +1,217 @@
{% load static %}
+{% block css %}
+
+{% endblock %}
+
+{% comment %} The Modules start here! {% endcomment %}
{% block modules %}
-{% comment %}The Modules start here!{% endcomment %}
-
- {% comment %}The Modules:{% endcomment %}
+ {% comment %} The right-rail segment starts here! {% endcomment %}
+
- {% comment %}The right-rail segment ends here!{% endcomment %}
-
- {% comment %}The right-margin segment!{% endcomment %}
-
-
-
{% block modules %}
- {% include 'dashboard/modules.html' %}
+ {% include 'dashboard/modules.html' %}
{% endblock %}
-
+ {% comment %}The right-rail segment ends here!{% endcomment %}
-
-
-
{% endblock %}
diff --git a/FusionIIIT/templates/globals/usercard.html b/FusionIIIT/templates/globals/usercard.html
old mode 100755
new mode 100644
index ecb758bd3..8d1e54ef9
--- a/FusionIIIT/templates/globals/usercard.html
+++ b/FusionIIIT/templates/globals/usercard.html
@@ -1,14 +1,12 @@
{% load static %}
{% block usercard %}
-
{% comment %}
TODO: Something!
{% endcomment %}
- {% comment %}The Employee Image Card starts here!{% endcomment %}
-
-
-
-
-
-
- {% block data%}
-
- {% endblock %}
-
-
-
+ {% block data %} {% endblock %}
-
- Modules
-
-
-
+
-{% comment %}The Modules End here!{% endcomment %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
+{% comment %}The Modules End here!{% endcomment %}
\ No newline at end of file
diff --git a/FusionIIIT/templates/dashboard/navbar.html b/FusionIIIT/templates/dashboard/navbar.html
old mode 100755
new mode 100644
index 7d0e7e3f9..8aba787ba
--- a/FusionIIIT/templates/dashboard/navbar.html
+++ b/FusionIIIT/templates/dashboard/navbar.html
@@ -1,14 +1,59 @@
{% load static %}
+
+{% block css %}
+
+{% endblock %}
+
{% block navBar %}
{% include 'dashboard/sidenavbar.html' %}
+
+ Modules
+
+
+
+
+
-
+
+
+
+ {% endcomment %}
+
+
+
+
+ Academics Module
+
+
+
+
+
+
+
+
+
+
+
+ Programme And Curriculum Module
+
+
+
+
+
+
+
+
+
+
+
+ Central Mess
+
+
+
+
+
+
+
+
+
+
+
+ Visitor's Hostel
+
+
+
+
+
+
+
+
+
+
+
+ Healthcare Center
+
+
+
+
+
+
+
+
+
+
+
+ File Tracking
+
+
+
+
+
+
+
+
+
+
+
+ Scholarship Portal
+
+
+
+
+
+
+
+
+
+
+
+ Complaint System
+
+
+
+
+
+
+
+
+
+
+
+ Placement Cell
+
+
+
+
+
+
+
+
+
+
+
+ Estate Management
+
+
+
+
+
+
+
+
+
+
+
+ Department Portal
+
+
+
-
-
+ {% comment %}
- {% endcomment %}
-
- {% comment %}A single modules row starts here!{% endcomment %}
-
- {% comment %}A single modules row ends here!{% endcomment %}
-
- {% comment %}A single modules row starts here!{% endcomment %}
-
- {% comment %}
+
+
+
-
-
-
-
- {% comment %}A single modules row ends here!{% endcomment %}
-
- {% comment %}A single modules row starts here!{% endcomment %}
-
-
-
-
-
- {% comment %}A single modules row ends here!{% endcomment %}
-
- {% comment %}A single modules row starts here!{% endcomment %}
-
- {% comment %}A single modules row ends here!{% endcomment %}
-
- {% comment %}A single modules row starts here!{% endcomment %}
-
- {% comment %}A single modules row ends here!{% endcomment %}
-
- {% comment %}A single modules row ends here!{% endcomment %}
-
-
- {% comment %}A single modules row ends here!{% endcomment %}
-
-
-
+
+
+
+
+ Research Module
+
+
+
+
+
+
+
+
+
+
+
+ Counselling Cell
+
+
+
+
+
+
+
+
+
+
+
+ Leave Module
+
+
+
+
-
-
+
+
@@ -116,22 +163,10 @@
{% comment %}
TODO: User details! depending on type of user say: STUDENT/FACULTY/STAFF!
@@ -40,18 +87,19 @@
{{request.user.first_name}} {{request.user.last_name}}
+
{% comment %}
-
-
-
{{request.user.first_name}} {{request.user.last_name}}
+
{% comment %}
-
- Notifications
-
- 22
- TODO: Make dropdown menu
-
- {% endcomment %}
-
+
+ Notifications
+
+ 22
+ TODO: Make dropdown menu
+
+
+ {% endcomment %}
@@ -106,7 +154,6 @@
Notificati
Notificati Logout
-
+ {% comment %}The Employee Image Card starts here!{% endcomment %}
+
@@ -18,61 +16,66 @@
TODO: Add a If-Else here!
{% endcomment %}
{% if user %}
-
-
- {% comment %}The Employee Image Card ends here!{% endcomment %}
-
-
+ {% comment %} The Employee Image Card ends here! {% endcomment %}
{% endblock %}
From 468b86632917ecfc149907b5bf032e275d8200ab Mon Sep 17 00:00:00 2001
From: Aragorn-64
Date: Tue, 23 Jan 2024 04:14:16 +0530
Subject: [PATCH 02/68] fix requirements and docker-compose
---
docker-compose.yml | 4 ++--
requirements.txt | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docker-compose.yml b/docker-compose.yml
index e353d1423..18440f1a1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,9 +4,9 @@ services:
image: postgres:13-alpine
restart: always
volumes:
- - /private/var/lib/postgresql:/var/lib/postgresql/data
+ - ~/private/var/lib/postgresql:/var/lib/postgresql/data
environment:
- - PGDATA=/var/lib/postgresql/data/some_name/
+ - PGDATA=/var/lib/postgresql/data/some_name/
- POSTGRES_DB=fusionlab
- POSTGRES_USER=fusion_admin
- POSTGRES_PASSWORD=hello123
diff --git a/requirements.txt b/requirements.txt
index 4cc3a0a30..4389e0597 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
amqp==5.0.2
-arabic-reshaper==2.1.1
+arabic-reshaper>=2.1.1
asgiref==3.3.1
attrs==20.3.0
beautifulsoup4==4.9.3
From bed09cc987f136f9b67c9caf96caf5d1df8c2e81 Mon Sep 17 00:00:00 2001
From: Divyansh Tripathi <55395696+theoden42@users.noreply.github.com>
Date: Tue, 23 Jan 2024 14:33:20 +0530
Subject: [PATCH 03/68] fix docker compose and dependencies
---
docker-compose.yml | 2 +-
requirements.txt | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docker-compose.yml b/docker-compose.yml
index e353d1423..d64652516 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,7 +4,7 @@ services:
image: postgres:13-alpine
restart: always
volumes:
- - /private/var/lib/postgresql:/var/lib/postgresql/data
+ - ~/private/var/lib/postgresql:/var/lib/postgresql/data
environment:
- PGDATA=/var/lib/postgresql/data/some_name/
- POSTGRES_DB=fusionlab
diff --git a/requirements.txt b/requirements.txt
index 4cc3a0a30..673d1c3bc 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
amqp==5.0.2
-arabic-reshaper==2.1.1
+arabic-reshaper==3.0.0
asgiref==3.3.1
attrs==20.3.0
beautifulsoup4==4.9.3
@@ -71,4 +71,4 @@ whitenoise==5.2.0
xhtml2pdf==0.2.5
xlrd==2.0.1
XlsxWriter==1.3.7
-xlwt==1.3.0
\ No newline at end of file
+xlwt==1.3.0
From 10a5fec892355e66ce2ee6c5b8aa260faac6e714 Mon Sep 17 00:00:00 2001
From: Divyansh Tripathi <55395696+theoden42@users.noreply.github.com>
Date: Tue, 23 Jan 2024 15:06:50 +0530
Subject: [PATCH 04/68] add sdk and api folder structure
---
.../filetracking/api/serializers.py | 0
.../applications/filetracking/api/urls.py | 1 +
.../applications/filetracking/api/views.py | 0
.../applications/filetracking/sdk/methods.py | 28 +++++++++++++++++++
4 files changed, 29 insertions(+)
create mode 100644 FusionIIIT/applications/filetracking/api/serializers.py
create mode 100644 FusionIIIT/applications/filetracking/api/urls.py
create mode 100644 FusionIIIT/applications/filetracking/api/views.py
create mode 100644 FusionIIIT/applications/filetracking/sdk/methods.py
diff --git a/FusionIIIT/applications/filetracking/api/serializers.py b/FusionIIIT/applications/filetracking/api/serializers.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/FusionIIIT/applications/filetracking/api/urls.py b/FusionIIIT/applications/filetracking/api/urls.py
new file mode 100644
index 000000000..3162a3fe4
--- /dev/null
+++ b/FusionIIIT/applications/filetracking/api/urls.py
@@ -0,0 +1 @@
+from django.con
diff --git a/FusionIIIT/applications/filetracking/api/views.py b/FusionIIIT/applications/filetracking/api/views.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/FusionIIIT/applications/filetracking/sdk/methods.py b/FusionIIIT/applications/filetracking/sdk/methods.py
new file mode 100644
index 000000000..7c0bee6a4
--- /dev/null
+++ b/FusionIIIT/applications/filetracking/sdk/methods.py
@@ -0,0 +1,28 @@
+from django.contrib.auth import User
+from
+
+def create_file(uploader:User, uploader_designation:Designation, receiver:User,
+ receiver_designation: Designation, src_module:str,
+ src_object_id:str, file_extra_JSON:dict) -> int :
+''' this function is used to create a file object corresponding to any object of a module that needs to be tracked '''
+
+def view_file(file_id:int) -> dict:
+''' This function returns all the details of a given file'''
+
+def delete_file(file_id:int) -> None:
+''' This function is used to delete a file from being tracked, all the tracking history is deleted as well'''
+
+def view_inbox(user:User, designation:Designation) -> dict:
+''' This function is used to get all the files in the inbox of a particular user and designation'''
+
+def view_outbox(user:User, designation:Designation) -> dict:
+''' This function is used to get all the files in the outbox of a particular user and designation'''
+
+def view_history(file_id:int) -> dict:
+''' This function is used to get the history of a particular file with the given file_id '''
+
+def forward_file(file_id: int, receiver: User, receiver_designation: Designation) -> int:
+''' This function forwards the file and inserts a new tracking history into the file tracking table'''
+
+def get_designation(user: User) -> list:
+''' This function is used to return a list of all the designation of the particular user'''
From b60770f23b56bb9fd2d780085570008eb289cc9c Mon Sep 17 00:00:00 2001
From: Divyansh Tripathi <55395696+theoden42@users.noreply.github.com>
Date: Tue, 23 Jan 2024 15:41:52 +0530
Subject: [PATCH 05/68] add sdk methods and fix some urls
---
.../applications/filetracking/models.py | 2 +-
.../applications/filetracking/sdk/methods.py | 20 +++++++++++--------
FusionIIIT/applications/filetracking/urls.py | 6 +++++-
3 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/FusionIIIT/applications/filetracking/models.py b/FusionIIIT/applications/filetracking/models.py
index ee2e1fbde..ffee28d56 100644
--- a/FusionIIIT/applications/filetracking/models.py
+++ b/FusionIIIT/applications/filetracking/models.py
@@ -35,7 +35,7 @@ class Tracking(models.Model):
file_id = models.ForeignKey(File, on_delete=models.CASCADE, null=True)
current_id = models.ForeignKey(ExtraInfo, on_delete=models.CASCADE)
current_design = models.ForeignKey(HoldsDesignation, null=True, on_delete=models.CASCADE)
- # receiver_id = models.ForeignKey(ExtraInfo, on_delete=models.CASCADE, related_name='receiver_id')
+ # receiver_id = models.ForeignKey(ExtraInfo, on_delete=models.CASCADE, related_name='receiver_id')
# receive_design = models.ForeignKey(HoldsDesignation, null=True, on_delete=models.CASCADE, related_name='rec_design')
receiver_id = models.ForeignKey(User,null = True, on_delete=models.CASCADE, related_name='receiver_id')
receive_design = models.ForeignKey(Designation, null=True, on_delete=models.CASCADE, related_name='rec_design')
diff --git a/FusionIIIT/applications/filetracking/sdk/methods.py b/FusionIIIT/applications/filetracking/sdk/methods.py
index 7c0bee6a4..160d97c1a 100644
--- a/FusionIIIT/applications/filetracking/sdk/methods.py
+++ b/FusionIIIT/applications/filetracking/sdk/methods.py
@@ -1,7 +1,6 @@
from django.contrib.auth import User
-from
-def create_file(uploader:User, uploader_designation:Designation, receiver:User,
+def create_file(uploader:ExtraInfo, uploader_designation:Designation, receiver:User,
receiver_designation: Designation, src_module:str,
src_object_id:str, file_extra_JSON:dict) -> int :
''' this function is used to create a file object corresponding to any object of a module that needs to be tracked '''
@@ -9,20 +8,25 @@ def create_file(uploader:User, uploader_designation:Designation, receiver:User,
def view_file(file_id:int) -> dict:
''' This function returns all the details of a given file'''
-def delete_file(file_id:int) -> None:
-''' This function is used to delete a file from being tracked, all the tracking history is deleted as well'''
+def delete_file(file_id:int) -> bool:
+''' This function is used to delete a file from being tracked, all the tracking history is deleted as well and returns if the deletion was successful'''
-def view_inbox(user:User, designation:Designation) -> dict:
+def view_inbox(user:str, designation:str, src_module:str) -> dict:
''' This function is used to get all the files in the inbox of a particular user and designation'''
-def view_outbox(user:User, designation:Designation) -> dict:
+def view_outbox(user:str, designation:str, src_module:str) -> dict:
''' This function is used to get all the files in the outbox of a particular user and designation'''
def view_history(file_id:int) -> dict:
''' This function is used to get the history of a particular file with the given file_id '''
-def forward_file(file_id: int, receiver: User, receiver_designation: Designation) -> int:
+def forward_file(file_id: int, receiver:str, receiver_designation:str, file_extra_JSON: dict) -> int:
''' This function forwards the file and inserts a new tracking history into the file tracking table'''
-def get_designation(user: User) -> list:
+def get_designations(user: str) -> list:
''' This function is used to return a list of all the designation of the particular user'''
+
+def get_user_object_from_username(username:str) -> User:
+
+def get_designation_object_from_designation_name(designation:str) -> Designation:
+
diff --git a/FusionIIIT/applications/filetracking/urls.py b/FusionIIIT/applications/filetracking/urls.py
index cb4a7563d..b3d701f61 100644
--- a/FusionIIIT/applications/filetracking/urls.py
+++ b/FusionIIIT/applications/filetracking/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls import url
+from django.conf.urls import url, include
from . import views
@@ -28,4 +28,8 @@
url(r'^finish_fileview/(?P\d+)$', views.finish_fileview, name='finish_fileview'),
url(r'^archive_design/$', views.archive_design, name='archive_design'),
url(r'^archive_finish/(?P\d+)/$', views.archive_finish, name='archive_finish'),
+
+ ## REST api urls
+ url(r'^api/', include(applications.filetracking.api.urls))
+
]
From fe98b1d2e71274e017540ea4e362e9f601ca637b Mon Sep 17 00:00:00 2001
From: Aragorn-64
Date: Tue, 23 Jan 2024 20:02:09 +0530
Subject: [PATCH 06/68] update models for API
---
FusionIIIT/applications/filetracking/models.py | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/FusionIIIT/applications/filetracking/models.py b/FusionIIIT/applications/filetracking/models.py
index 5f9581a08..ee2e1fbde 100644
--- a/FusionIIIT/applications/filetracking/models.py
+++ b/FusionIIIT/applications/filetracking/models.py
@@ -16,6 +16,11 @@ class File(models.Model):
is_read = models.BooleanField(default = False)
+ # additions for API
+ src_module = models.CharField(max_length=100, default='filetracking')
+ src_object_id = models.CharField(max_length=100,null=True)
+ file_extra_JSON = JSONField(null=True)
+
class Meta:
db_table = 'File'
@@ -25,7 +30,7 @@ class Meta:
class Tracking(models.Model):
"""
- This is File Tracing Table which contains the status of each indivisual file created by the user
+ This is File Tracing Table which contains the status of each individual file created by the user
"""
file_id = models.ForeignKey(File, on_delete=models.CASCADE, null=True)
current_id = models.ForeignKey(ExtraInfo, on_delete=models.CASCADE)
@@ -41,5 +46,8 @@ class Tracking(models.Model):
upload_file = models.FileField(blank=True)
is_read = models.BooleanField(default = False)
+ # additions for API
+ tracking_extra_JSON = JSONField(null=True)
+
class Meta:
db_table = 'Tracking'
From f6c52848641e49e2ce05bb84403f2b492b26faae Mon Sep 17 00:00:00 2001
From: Aragorn-64
Date: Tue, 23 Jan 2024 20:42:16 +0530
Subject: [PATCH 07/68] add urls for api
---
FusionIIIT/applications/filetracking/api/urls.py | 13 +++++++++++++
FusionIIIT/applications/filetracking/api/views.py | 0
2 files changed, 13 insertions(+)
create mode 100644 FusionIIIT/applications/filetracking/api/urls.py
create mode 100644 FusionIIIT/applications/filetracking/api/views.py
diff --git a/FusionIIIT/applications/filetracking/api/urls.py b/FusionIIIT/applications/filetracking/api/urls.py
new file mode 100644
index 000000000..0e74210ae
--- /dev/null
+++ b/FusionIIIT/applications/filetracking/api/urls.py
@@ -0,0 +1,13 @@
+from django.conf.urls import url
+from . import views
+
+urlpatterns = [
+ url(r'^file/$', views.create_file, name='create_file'),
+ url(r'^file/(?P\d+)/$', views.view_file, name='view_file'),
+ url(r'^file/(?P\d+)/$', views.delete_file, name='delete_file'),
+ url(r'^inbox/$', views.view_inbox, name='view_inbox'),
+ url(r'^outbox/$', views.view_outbox, name='view_outbox'),
+ url(r'^history/(?P\d+)/$', views.view_history, name='view_history'),
+ url(r'^file/(?P\d+)/$', views.forward_file, name='forward_file'),
+ url(r'^designations/(?P\w+)/$', views.get_designations, name='get_designations'),
+]
diff --git a/FusionIIIT/applications/filetracking/api/views.py b/FusionIIIT/applications/filetracking/api/views.py
new file mode 100644
index 000000000..e69de29bb
From 726e6f18ef1167c377cd90880a340f46b0ef2d74 Mon Sep 17 00:00:00 2001
From: Divyansh Tripathi <55395696+theoden42@users.noreply.github.com>
Date: Sun, 28 Jan 2024 01:28:02 +0530
Subject: [PATCH 08/68] add methods for viewing file, inbox, outbox, getting
designation with serializers and minor bug fixes
---
.../filetracking/api/serializers.py | 45 +++++
.../applications/filetracking/models.py | 4 +-
.../applications/filetracking/sdk/methods.py | 179 +++++++++++++++---
3 files changed, 204 insertions(+), 24 deletions(-)
diff --git a/FusionIIIT/applications/filetracking/api/serializers.py b/FusionIIIT/applications/filetracking/api/serializers.py
index e69de29bb..6f66c9829 100644
--- a/FusionIIIT/applications/filetracking/api/serializers.py
+++ b/FusionIIIT/applications/filetracking/api/serializers.py
@@ -0,0 +1,45 @@
+from applications.filetracking.models import File, Tracking
+from django.core.files import File as DjangoFile
+from rest_framework import serializers
+
+
+class FileSerializer(serializers.ModelSerializer):
+ class Meta:
+ model = File
+ fields = '__all__'
+
+
+class TrackingSerializer(serializers.ModelSerializer):
+ class Meta:
+ model = Tracking
+ fields = '__all__'
+
+ def validate_upload_file(self, value):
+ print('wow')
+ if not value:
+ # handles empty file paths
+ value = None
+ else:
+ if isinstance(value, str):
+ with open(value, 'rb') as file:
+ value = DjangoFile(file)
+
+ max_file_size = 10 * 1024 * 1024 # 10 MB
+ if value.size > max_file_size:
+ raise serializers.ValidationError(
+ "File size exceeds the limit (10 MB).")
+ return value
+
+
+class FileHeaderSerializer(serializers.ModelSerializer):
+ '''
+ This serializes everything except the attachments of a file and whether it is read or not
+ '''
+ class Meta:
+ model = File
+ fields = [
+ 'uploader',
+ 'designation',
+ 'subject',
+ 'description',
+ 'upload_date']
diff --git a/FusionIIIT/applications/filetracking/models.py b/FusionIIIT/applications/filetracking/models.py
index ffee28d56..b725ea300 100644
--- a/FusionIIIT/applications/filetracking/models.py
+++ b/FusionIIIT/applications/filetracking/models.py
@@ -19,7 +19,7 @@ class File(models.Model):
# additions for API
src_module = models.CharField(max_length=100, default='filetracking')
src_object_id = models.CharField(max_length=100,null=True)
- file_extra_JSON = JSONField(null=True)
+ file_extra_JSON = models.JSONField(null=True)
class Meta:
db_table = 'File'
@@ -47,7 +47,7 @@ class Tracking(models.Model):
is_read = models.BooleanField(default = False)
# additions for API
- tracking_extra_JSON = JSONField(null=True)
+ tracking_extra_JSON = models.JSONField(null=True)
class Meta:
db_table = 'Tracking'
diff --git a/FusionIIIT/applications/filetracking/sdk/methods.py b/FusionIIIT/applications/filetracking/sdk/methods.py
index 160d97c1a..0c9b7a30a 100644
--- a/FusionIIIT/applications/filetracking/sdk/methods.py
+++ b/FusionIIIT/applications/filetracking/sdk/methods.py
@@ -1,32 +1,167 @@
-from django.contrib.auth import User
+from django.contrib.auth.models import User
+from applications.filetracking.models import Tracking, File
+from applications.globals.models import Designation, HoldsDesignation, ExtraInfo
+from applications.filetracking.api.serializers import FileSerializer, FileHeaderSerializer, TrackingSerializer
-def create_file(uploader:ExtraInfo, uploader_designation:Designation, receiver:User,
- receiver_designation: Designation, src_module:str,
- src_object_id:str, file_extra_JSON:dict) -> int :
-''' this function is used to create a file object corresponding to any object of a module that needs to be tracked '''
-def view_file(file_id:int) -> dict:
-''' This function returns all the details of a given file'''
+def create_file(
+ uploader: ExtraInfo,
+ uploader_designation: Designation,
+ receiver: User,
+ receiver_designation: Designation,
+ src_module: str,
+ src_object_id: str,
+ file_extra_JSON: dict,
+ attached_file_path) -> int:
+ '''
+ This function is used to create a file object corresponding to any object of a module that needs to be tracked
+ '''
-def delete_file(file_id:int) -> bool:
-''' This function is used to delete a file from being tracked, all the tracking history is deleted as well and returns if the deletion was successful'''
-def view_inbox(user:str, designation:str, src_module:str) -> dict:
-''' This function is used to get all the files in the inbox of a particular user and designation'''
+def view_file(file_id: int) -> dict:
+ '''
+ This function returns all the details of a given file
+ '''
+ try:
+ requested_file = File.objects.get(id=file_id)
+ serializer = FileSerializer(requested_file)
+ file_details = serializer.data
+ return file_details
+ except File.DoesNotExist:
+ raise NotFound("File Not Found with provided ID")
-def view_outbox(user:str, designation:str, src_module:str) -> dict:
-''' This function is used to get all the files in the outbox of a particular user and designation'''
-def view_history(file_id:int) -> dict:
-''' This function is used to get the history of a particular file with the given file_id '''
+def delete_file(file_id: int) -> bool:
+ '''
+ This function is used to delete a file from being tracked, all the tracking history is deleted as well and returns true if the deletion was successful
+ '''
+ try:
+ File.objects.filter(id=file_id).delete()
+ return True
+ except File.DoesNotExist:
+ return False
-def forward_file(file_id: int, receiver:str, receiver_designation:str, file_extra_JSON: dict) -> int:
-''' This function forwards the file and inserts a new tracking history into the file tracking table'''
-def get_designations(user: str) -> list:
-''' This function is used to return a list of all the designation of the particular user'''
+def view_inbox(user: str, designation: str, src_module: str) -> dict:
+ '''
+ This function is used to get all the files in the inbox of a particular user and designation
+ '''
+ # TODO: currently this does not return a value of sent by
+ user_designation = Designation.objects.get(name=designation)
+ recipient_object = get_user_object_from_username(user)
+ received_files_tracking = Tracking.objects.select_related('file_id').filter(
+ receiver_id=recipient_object,
+ receive_design=user_designation,
+ file_id__src_module=src_module)
+ received_files = [tracking.file_id for tracking in received_files_tracking]
-def get_user_object_from_username(username:str) -> User:
-
-def get_designation_object_from_designation_name(designation:str) -> Designation:
+ received_files_serialized = FileHeaderSerializer(received_files, many=True)
+ return received_files_serialized.data
+
+def view_outbox(username: str, designation: str, src_module: str) -> dict:
+ '''
+ This function is used to get all the files in the outbox of a particular user and designation
+ '''
+ user_designation = Designation.objects.get(name=designation)
+ user_object = get_user_object_from_username(username)
+
+ # holds designation is used instead of Designation due to legacy code
+ # having it and breaking changes cannot be introduced
+ user_HoldsDesignation_object = HoldsDesignation.objects.get(
+ user=user_object, designation=user_designation)
+ sender_ExtraInfo_object = get_ExtraInfo_object_from_username(username)
+ sent_files_tracking = Tracking.objects.select_related('file_id').filter(
+ current_id=sender_ExtraInfo_object,
+ current_design=user_HoldsDesignation_object,
+ file_id__src_module=src_module)
+ sent_files = [tracking.file_id for tracking in sent_files_tracking]
+
+ sent_files_serialized = FileHeaderSerializer(sent_files, many=True)
+ return sent_files_serialized.data
+
+
+def get_current_file_owner(file_id: int) -> User:
+ '''
+ This functions returns the current owner of the file.
+ The current owner is the latest recipient of the file
+ '''
+ latest_tracking = Tracking.objects.filter(
+ file_id=file_id).order_by('-receive_date').first()
+ latest_recipient = latest_tracking.receiver_id
+ return latest_recipient
+
+
+def get_current_file_owner_designation(file_id: int) -> Designation:
+ '''
+ This function returns the designation of the current owner of the file.
+ The current owner is the latest recipient of the file
+ '''
+ latest_tracking = Tracking.objects.filter(
+ file_id=file_id).order_by('-receive_date').first()
+ latest_recipient_designation = latest_tracking.receive_design
+ return latest_recipient_designation
+
+
+def forward_file(
+ file_id: int,
+ receiver: str,
+ receiver_designation: str,
+ file_extra_JSON: dict,
+ remarks: str = "",
+ attachment_path = "") -> int:
+ '''
+ This function forwards the file and inserts a new tracking history into the file tracking table
+ Note that only the current owner(with appropriate designation) of the file has the ability to forward files
+ '''
+ # HoldsDesignation and ExtraInfo object are used instead of Designation
+ # and User object because of the legacy code being shaped that way
+ # TODO: handle the file attachment logic for this code
+ current_owner = get_current_file_owner(file_id)
+ current_owner_designation = get_current_file_owner_designation(file_id)
+ current_owner_extra_info = ExtraInfo.objects.get(user=current_owner)
+ current_owner_holds_designation = HoldsDesignation.objects.get(
+ user=current_owner, designation=current_owner_designation)
+ receiver_obj = User.objects.get(username=receiver)
+ receiver_designation_obj = Designation.objects.get(name=receiver_designation)
+ tracking_data = {
+ 'file_id': file_id,
+ 'current_id': current_owner_extra_info.id,
+ 'current_design': current_owner_holds_designation.id,
+ 'receiver_id': receiver_obj.id,
+ 'receive_design': receiver_designation_obj.id,
+ 'tracking_extra_JSON': file_extra_JSON,
+ }
+ tracking_entry = TrackingSerializer(data=tracking_data)
+ if tracking_entry.is_valid():
+ tracking_entry.save()
+ else:
+ print(tracking_entry.errors)
+
+
+
+def view_history(file_id: int) -> dict:
+ '''
+ This function is used to get the history of a particular file with the given file_id
+ '''
+ pass
+
+
+def get_designations(username: str) -> list:
+ '''
+ This function is used to return a list of all the designation names of a particular user
+ '''
+ user = User.objects.get(username=username)
+ designations_held = HoldsDesignation.objects.filter(user = user)
+ designation_name = [designation.name for designation in designations_held]
+
+
+def get_user_object_from_username(username: str) -> User:
+ user = User.objects.get(username=username)
+ return user
+
+
+def get_ExtraInfo_object_from_username(username: str) -> ExtraInfo:
+ user = User.objects.get(username=username)
+ extrainfo = ExtraInfo.objects.get(user=user)
+ return extrainfo
From 0bd4cb470374bbf29c3081933a1f395a270d189d Mon Sep 17 00:00:00 2001
From: Divyansh Tripathi <55395696+theoden42@users.noreply.github.com>
Date: Mon, 29 Jan 2024 00:45:16 +0530
Subject: [PATCH 09/68] fix serializers and fix file attachment functionality
in forward_file
---
.../filetracking/api/serializers.py | 16 ----------------
.../applications/filetracking/sdk/methods.py | 19 +++++++++++++------
2 files changed, 13 insertions(+), 22 deletions(-)
diff --git a/FusionIIIT/applications/filetracking/api/serializers.py b/FusionIIIT/applications/filetracking/api/serializers.py
index 6f66c9829..5d24520d5 100644
--- a/FusionIIIT/applications/filetracking/api/serializers.py
+++ b/FusionIIIT/applications/filetracking/api/serializers.py
@@ -14,22 +14,6 @@ class Meta:
model = Tracking
fields = '__all__'
- def validate_upload_file(self, value):
- print('wow')
- if not value:
- # handles empty file paths
- value = None
- else:
- if isinstance(value, str):
- with open(value, 'rb') as file:
- value = DjangoFile(file)
-
- max_file_size = 10 * 1024 * 1024 # 10 MB
- if value.size > max_file_size:
- raise serializers.ValidationError(
- "File size exceeds the limit (10 MB).")
- return value
-
class FileHeaderSerializer(serializers.ModelSerializer):
'''
diff --git a/FusionIIIT/applications/filetracking/sdk/methods.py b/FusionIIIT/applications/filetracking/sdk/methods.py
index 0c9b7a30a..38437a691 100644
--- a/FusionIIIT/applications/filetracking/sdk/methods.py
+++ b/FusionIIIT/applications/filetracking/sdk/methods.py
@@ -2,6 +2,8 @@
from applications.filetracking.models import Tracking, File
from applications.globals.models import Designation, HoldsDesignation, ExtraInfo
from applications.filetracking.api.serializers import FileSerializer, FileHeaderSerializer, TrackingSerializer
+from django.core.exceptions import ValidationError
+from typing import Any
def create_file(
@@ -109,14 +111,14 @@ def forward_file(
receiver_designation: str,
file_extra_JSON: dict,
remarks: str = "",
- attachment_path = "") -> int:
+ file_attachment: Any = None) -> int:
'''
This function forwards the file and inserts a new tracking history into the file tracking table
Note that only the current owner(with appropriate designation) of the file has the ability to forward files
'''
- # HoldsDesignation and ExtraInfo object are used instead of Designation
- # and User object because of the legacy code being shaped that way
- # TODO: handle the file attachment logic for this code
+ # HoldsDesignation and ExtraInfo object are used instead
+ # of Designation and User object because of the legacy code being that way
+
current_owner = get_current_file_owner(file_id)
current_owner_designation = get_current_file_owner_designation(file_id)
current_owner_extra_info = ExtraInfo.objects.get(user=current_owner)
@@ -132,11 +134,16 @@ def forward_file(
'receive_design': receiver_designation_obj.id,
'tracking_extra_JSON': file_extra_JSON,
}
+ if file_attachment is not None:
+ tracking_data['upload_file'] = file_attachment
+
+
tracking_entry = TrackingSerializer(data=tracking_data)
if tracking_entry.is_valid():
tracking_entry.save()
- else:
- print(tracking_entry.errors)
+ return tracking_entry.instance.id
+ else:
+ raise ValidationError('forward data is incomplete')
From b36972cd1ffbef8aaa35f4e3d848bd24c489e33d Mon Sep 17 00:00:00 2001
From: Aragorn-64
Date: Tue, 30 Jan 2024 13:27:25 +0530
Subject: [PATCH 10/68] sync with upstream
---
.../applications/filetracking/sdk/methods.py | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/FusionIIIT/applications/filetracking/sdk/methods.py b/FusionIIIT/applications/filetracking/sdk/methods.py
index 38437a691..94b74f1e6 100644
--- a/FusionIIIT/applications/filetracking/sdk/methods.py
+++ b/FusionIIIT/applications/filetracking/sdk/methods.py
@@ -111,12 +111,12 @@ def forward_file(
receiver_designation: str,
file_extra_JSON: dict,
remarks: str = "",
- file_attachment: Any = None) -> int:
+ file_attachment: Any = None) -> int:
'''
This function forwards the file and inserts a new tracking history into the file tracking table
Note that only the current owner(with appropriate designation) of the file has the ability to forward files
'''
- # HoldsDesignation and ExtraInfo object are used instead
+ # HoldsDesignation and ExtraInfo object are used instead
# of Designation and User object because of the legacy code being that way
current_owner = get_current_file_owner(file_id)
@@ -125,7 +125,8 @@ def forward_file(
current_owner_holds_designation = HoldsDesignation.objects.get(
user=current_owner, designation=current_owner_designation)
receiver_obj = User.objects.get(username=receiver)
- receiver_designation_obj = Designation.objects.get(name=receiver_designation)
+ receiver_designation_obj = Designation.objects.get(
+ name=receiver_designation)
tracking_data = {
'file_id': file_id,
'current_id': current_owner_extra_info.id,
@@ -134,19 +135,17 @@ def forward_file(
'receive_design': receiver_designation_obj.id,
'tracking_extra_JSON': file_extra_JSON,
}
- if file_attachment is not None:
+ if file_attachment is not None:
tracking_data['upload_file'] = file_attachment
-
- tracking_entry = TrackingSerializer(data=tracking_data)
- if tracking_entry.is_valid():
+ tracking_entry = TrackingSerializer(data=tracking_data)
+ if tracking_entry.is_valid():
tracking_entry.save()
return tracking_entry.instance.id
else:
raise ValidationError('forward data is incomplete')
-
def view_history(file_id: int) -> dict:
'''
This function is used to get the history of a particular file with the given file_id
@@ -159,7 +158,7 @@ def get_designations(username: str) -> list:
This function is used to return a list of all the designation names of a particular user
'''
user = User.objects.get(username=username)
- designations_held = HoldsDesignation.objects.filter(user = user)
+ designations_held = HoldsDesignation.objects.filter(user=user)
designation_name = [designation.name for designation in designations_held]
From 1631e253d9afca76ea0e45d2cb22416143063a97 Mon Sep 17 00:00:00 2001
From: Divyansh Tripathi <55395696+theoden42@users.noreply.github.com>
Date: Tue, 30 Jan 2024 13:37:05 +0530
Subject: [PATCH 11/68] add views and fix urls
---
.../applications/filetracking/api/urls.py | 27 ++++--
.../applications/filetracking/api/views.py | 89 +++++++++++++++++++
.../applications/filetracking/sdk/methods.py | 19 ++--
FusionIIIT/applications/filetracking/urls.py | 24 +++--
4 files changed, 131 insertions(+), 28 deletions(-)
diff --git a/FusionIIIT/applications/filetracking/api/urls.py b/FusionIIIT/applications/filetracking/api/urls.py
index 0e74210ae..90f03b2ef 100644
--- a/FusionIIIT/applications/filetracking/api/urls.py
+++ b/FusionIIIT/applications/filetracking/api/urls.py
@@ -1,13 +1,22 @@
from django.conf.urls import url
-from . import views
+from .views import (
+ CreateFileView,
+ ViewFileView,
+ DeleteFileView,
+ ViewInboxView,
+ ViewOutboxView,
+ ViewHistoryView,
+ ForwardFileView,
+ GetDesignationsView,
+)
urlpatterns = [
- url(r'^file/$', views.create_file, name='create_file'),
- url(r'^file/(?P\d+)/$', views.view_file, name='view_file'),
- url(r'^file/(?P\d+)/$', views.delete_file, name='delete_file'),
- url(r'^inbox/$', views.view_inbox, name='view_inbox'),
- url(r'^outbox/$', views.view_outbox, name='view_outbox'),
- url(r'^history/(?P\d+)/$', views.view_history, name='view_history'),
- url(r'^file/(?P\d+)/$', views.forward_file, name='forward_file'),
- url(r'^designations/(?P\w+)/$', views.get_designations, name='get_designations'),
+ url(r'^file/$', CreateFileView.as_view(), name='create_file'),
+ url(r'^file/(?P\d+)/$', ViewFileView.as_view(), name='view_file'),
+ url(r'^file/(?P\d+)/$', DeleteFileView.as_view(), name='delete_file'),
+ url(r'^inbox/$', ViewInboxView.as_view(), name='view_inbox'),
+ url(r'^outbox/$', ViewOutboxView.as_view(), name='view_outbox'),
+ url(r'^history/(?P\d+)/$', ViewHistoryView.as_view(), name='view_history'),
+ url(r'^file/(?P\d+)/$', ForwardFileView.as_view(), name='forward_file'),
+ url(r'^designations/(?P\w+)/$', GetDesignationsView.as_view(), name='get_designations'),
]
diff --git a/FusionIIIT/applications/filetracking/api/views.py b/FusionIIIT/applications/filetracking/api/views.py
index e69de29bb..6694e749f 100644
--- a/FusionIIIT/applications/filetracking/api/views.py
+++ b/FusionIIIT/applications/filetracking/api/views.py
@@ -0,0 +1,89 @@
+from rest_framework.views import APIView
+from rest_framework.response import Response
+from rest_framework import status, permissions
+from rest_framework.authentication import TokenAuthentication
+from ..sdk.methods import create_file, view_file, delete_file, view_inbox, view_outbox, view_history, forward_file, get_designations
+
+
+class CreateFileView(APIView):
+ #authentication_classes = [TokenAuthentication]
+ #permission_classes = [permissions.IsAuthenticated]
+
+ def post(self, request, *args, **kwargs):
+ file_id = create_file(**request.data)
+ return Response({'file_id': file_id}, status=status.HTTP_201_CREATED)
+
+
+class ViewFileView(APIView):
+ #authentication_classes = [TokenAuthentication]
+ #permission_classes = [permissions.IsAuthenticated]
+
+ def get(self, request, file_id, *args, **kwargs):
+ file_details = view_file(int(file_id))
+ return Response(file_details)
+
+
+class DeleteFileView(APIView):
+ #authentication_classes = [TokenAuthentication]
+ #permission_classes = [permissions.IsAuthenticated]
+
+ def delete(self, request, file_id, *args, **kwargs):
+ success = delete_file(int(file_id))
+ if success:
+ return Response({'message': 'File deleted successfully'},
+ status=status.HTTP_204_NO_CONTENT)
+ else:
+ return Response({'error': 'File not found'},
+ status=status.HTTP_404_NOT_FOUND)
+
+
+class ViewInboxView(APIView):
+ #authentication_classes = [TokenAuthentication]
+ #permission_classes = [permissions.IsAuthenticated]
+
+ def get(self, request, *args, **kwargs):
+ inbox_files = view_inbox(
+ request.user.username,
+ request.query_params.get('designation'),
+ request.query_params.get('src_module'))
+ return Response(inbox_files)
+
+
+class ViewOutboxView(APIView):
+ #authentication_classes = [TokenAuthentication]
+ #permission_classes = [permissions.IsAuthenticated]
+
+ def get(self, request, *args, **kwargs):
+ outbox_files = view_outbox(
+ request.user.username,
+ request.query_params.get('designation'),
+ request.query_params.get('src_module'))
+ return Response(outbox_files)
+
+
+class ViewHistoryView(APIView):
+ #authentication_classes = [TokenAuthentication]
+ #permission_classes = [permissions.IsAuthenticated]
+
+ def get(self, request, file_id, *args, **kwargs):
+ history = view_history(int(file_id))
+ return Response(history)
+
+
+class ForwardFileView(APIView):
+ #authentication_classes = [TokenAuthentication]
+ #permission_classes = [permissions.IsAuthenticated]
+
+ def post(self, request, file_id, *args, **kwargs):
+ new_tracking_id = forward_file(int(file_id), **request.data)
+ return Response({'tracking_id': new_tracking_id},
+ status=status.HTTP_201_CREATED)
+
+
+class GetDesignationsView(APIView):
+ #authentication_classes = [TokenAuthentication]
+ #permission_classes = [permissions.IsAuthenticated]
+
+ def get(self, request, username, *args, **kwargs):
+ user_designations = get_designations(username)
+ return Response({'designations': user_designations})
diff --git a/FusionIIIT/applications/filetracking/sdk/methods.py b/FusionIIIT/applications/filetracking/sdk/methods.py
index 38437a691..26d42ca44 100644
--- a/FusionIIIT/applications/filetracking/sdk/methods.py
+++ b/FusionIIIT/applications/filetracking/sdk/methods.py
@@ -14,7 +14,7 @@ def create_file(
src_module: str,
src_object_id: str,
file_extra_JSON: dict,
- attached_file_path) -> int:
+ attached_file: Any) -> int:
'''
This function is used to create a file object corresponding to any object of a module that needs to be tracked
'''
@@ -111,12 +111,12 @@ def forward_file(
receiver_designation: str,
file_extra_JSON: dict,
remarks: str = "",
- file_attachment: Any = None) -> int:
+ file_attachment: Any = None) -> int:
'''
This function forwards the file and inserts a new tracking history into the file tracking table
Note that only the current owner(with appropriate designation) of the file has the ability to forward files
'''
- # HoldsDesignation and ExtraInfo object are used instead
+ # HoldsDesignation and ExtraInfo object are used instead
# of Designation and User object because of the legacy code being that way
current_owner = get_current_file_owner(file_id)
@@ -125,7 +125,8 @@ def forward_file(
current_owner_holds_designation = HoldsDesignation.objects.get(
user=current_owner, designation=current_owner_designation)
receiver_obj = User.objects.get(username=receiver)
- receiver_designation_obj = Designation.objects.get(name=receiver_designation)
+ receiver_designation_obj = Designation.objects.get(
+ name=receiver_designation)
tracking_data = {
'file_id': file_id,
'current_id': current_owner_extra_info.id,
@@ -134,19 +135,17 @@ def forward_file(
'receive_design': receiver_designation_obj.id,
'tracking_extra_JSON': file_extra_JSON,
}
- if file_attachment is not None:
+ if file_attachment is not None:
tracking_data['upload_file'] = file_attachment
-
- tracking_entry = TrackingSerializer(data=tracking_data)
- if tracking_entry.is_valid():
+ tracking_entry = TrackingSerializer(data=tracking_data)
+ if tracking_entry.is_valid():
tracking_entry.save()
return tracking_entry.instance.id
else:
raise ValidationError('forward data is incomplete')
-
def view_history(file_id: int) -> dict:
'''
This function is used to get the history of a particular file with the given file_id
@@ -159,7 +158,7 @@ def get_designations(username: str) -> list:
This function is used to return a list of all the designation names of a particular user
'''
user = User.objects.get(username=username)
- designations_held = HoldsDesignation.objects.filter(user = user)
+ designations_held = HoldsDesignation.objects.filter(user=user)
designation_name = [designation.name for designation in designations_held]
diff --git a/FusionIIIT/applications/filetracking/urls.py b/FusionIIIT/applications/filetracking/urls.py
index b3d701f61..c48b3ab98 100644
--- a/FusionIIIT/applications/filetracking/urls.py
+++ b/FusionIIIT/applications/filetracking/urls.py
@@ -1,6 +1,7 @@
from django.conf.urls import url, include
from . import views
+from .api import urls
app_name = 'filetracking'
@@ -13,23 +14,28 @@
url(r'^fileview2/(?P\d+)$', views.fileview2, name='fileview2'),
url(r'^outward/$', views.outward, name='outward'),
url(r'^inward/$', views.inward, name='inward'),
- url(r'^confirmdelete/(?P\d+)$', views.confirmdelete, name='confirm_delete'),
+ url(r'^confirmdelete/(?P\d+)$',
+ views.confirmdelete, name='confirm_delete'),
url(r'^archive/(?P\d+)/$', views.archive, name='archive'),
url(r'^finish/(?P\d+)/$', views.finish, name='finish'),
url(r'^forward/(?P\d+)/$', views.forward, name='forward'),
url(r'^ajax/$', views.AjaxDropdown1, name='ajax_dropdown1'),
url(r'^ajax_dropdown/$', views.AjaxDropdown, name='ajax_dropdown'),
- url(r'^test/$',views.test, name='test'),
- url(r'^delete/(?P\d+)$',views.delete, name='delete'),
- url(r'^forward_inward/(?P\d+)/$', views.forward_inward, name='forward_inward'),
+ url(r'^test/$', views.test, name='test'),
+ url(r'^delete/(?P\d+)$', views.delete, name='delete'),
+ url(r'^forward_inward/(?P\d+)/$',
+ views.forward_inward, name='forward_inward'),
- ## correction team 24
+ # correction team 24
url(r'^finish_design/$', views.finish_design, name='finish_design'),
- url(r'^finish_fileview/(?P\d+)$', views.finish_fileview, name='finish_fileview'),
+ url(r'^finish_fileview/(?P\d+)$',
+ views.finish_fileview,
+ name='finish_fileview'),
url(r'^archive_design/$', views.archive_design, name='archive_design'),
- url(r'^archive_finish/(?P\d+)/$', views.archive_finish, name='archive_finish'),
+ url(r'^archive_finish/(?P\d+)/$',
+ views.archive_finish, name='archive_finish'),
- ## REST api urls
- url(r'^api/', include(applications.filetracking.api.urls))
+ # REST api urls
+ url(r'^api/', include(urls))
]
From 201185d738efec9025d350f24d60a5d401751fbb Mon Sep 17 00:00:00 2001
From: Aragorn-64
Date: Tue, 30 Jan 2024 13:48:54 +0530
Subject: [PATCH 12/68] create file
---
.../applications/filetracking/sdk/methods.py | 21 ++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
diff --git a/FusionIIIT/applications/filetracking/sdk/methods.py b/FusionIIIT/applications/filetracking/sdk/methods.py
index 94b74f1e6..41e76e17e 100644
--- a/FusionIIIT/applications/filetracking/sdk/methods.py
+++ b/FusionIIIT/applications/filetracking/sdk/methods.py
@@ -1,3 +1,4 @@
+from hashlib import file_digest
from django.contrib.auth.models import User
from applications.filetracking.models import Tracking, File
from applications.globals.models import Designation, HoldsDesignation, ExtraInfo
@@ -14,10 +15,28 @@ def create_file(
src_module: str,
src_object_id: str,
file_extra_JSON: dict,
- attached_file_path) -> int:
+ upload_file) -> int:
'''
This function is used to create a file object corresponding to any object of a module that needs to be tracked
'''
+ new_file = File.objects.create(
+ uploader=uploader,
+ designation=uploader_designation,
+ src_module=src_module,
+ src_object_id=src_object_id,
+ file_extra_JSON=file_extra_JSON,
+ # upload_file=upload_file TESTING without file
+ )
+ # Tracking.objects.create(
+ # file_id=new_file.id,
+ # current_id=uploader,
+ # current_design=uploader_designation,
+ # receiver_id=receiver,
+ # receive_design=receiver_designation,
+ # tracking_extra_JSON=file_extra_JSON,
+ # # upload_file = upload_file TESTING without file
+ # )
+ return new_file.id
def view_file(file_id: int) -> dict:
From a3c1d6350405a56efcaffdbee5550d28551f85aa Mon Sep 17 00:00:00 2001
From: Aragorn-64
Date: Tue, 30 Jan 2024 14:22:54 +0530
Subject: [PATCH 13/68] create file change
---
.../applications/filetracking/sdk/methods.py | 47 ++++++++++++++-----
1 file changed, 35 insertions(+), 12 deletions(-)
diff --git a/FusionIIIT/applications/filetracking/sdk/methods.py b/FusionIIIT/applications/filetracking/sdk/methods.py
index f0433e9f2..bf9af49ae 100644
--- a/FusionIIIT/applications/filetracking/sdk/methods.py
+++ b/FusionIIIT/applications/filetracking/sdk/methods.py
@@ -8,10 +8,10 @@
def create_file(
- uploader: ExtraInfo,
- uploader_designation: Designation,
- receiver: User,
- receiver_designation: Designation,
+ uploader: str,
+ uploader_designation: str,
+ receiver: str,
+ receiver_designation: str,
src_module: str,
src_object_id: str,
file_extra_JSON: dict,
@@ -19,14 +19,37 @@ def create_file(
'''
This function is used to create a file object corresponding to any object of a module that needs to be tracked
'''
- new_file = File.objects.create(
- uploader=uploader,
- designation=uploader_designation,
- src_module=src_module,
- src_object_id=src_object_id,
- file_extra_JSON=file_extra_JSON,
- # upload_file=upload_file TESTING without file
- )
+ uploader_obj = get_user_object_from_username(uploader)
+ uploader_designation_obj = Designation.objects.get(name=uploader_designation)
+ receiver_obj = get_user_object_from_username(receiver)
+ receiver_designation_obj = Designation.objects.get(name=receiver_designation)
+
+ new_file_data = {
+ 'uploader': uploader_obj,
+ 'designation': uploader_designation_obj,
+ 'src_module': src_module,
+ 'src_object_id': src_object_id,
+ 'file_extra_JSON': file_extra_JSON,
+ }
+ if attached_file is not None:
+ new_file_data['upload_file'] = attached_file
+
+ new_file = FileSerializer(data=new_file_data)
+ if new_file.is_valid():
+ new_file.save()
+ return new_file.instance.id
+ else:
+ raise ValidationError('file data is incorrect')
+
+
+ # new_file = File.objects.create(
+ # uploader=uploader,
+ # designation=uploader_designation,
+ # src_module=src_module,
+ # src_object_id=src_object_id,
+ # file_extra_JSON=file_extra_JSON,
+ # # upload_file=upload_file TESTING without file
+ # )
# Tracking.objects.create(
# file_id=new_file.id,
# current_id=uploader,
From ef9105ef7a9ba6d71cd020b34b85b0f3753a6ea4 Mon Sep 17 00:00:00 2001
From: Aragorn-64
Date: Tue, 30 Jan 2024 20:43:15 +0530
Subject: [PATCH 14/68] fix create_file, without upload_file feature
---
.../migrations/0002_auto_20240130_1435.py | 38 ++++++++
.../eis/migrations/0002_auto_20240130_1435.py | 53 ++++++++++
.../migrations/0002_auto_20240130_1435.py | 33 +++++++
.../applications/filetracking/sdk/methods.py | 97 +++++++++++--------
.../migrations/0002_auto_20240130_1435.py | 23 +++++
.../migrations/0002_auto_20240130_1435.py | 18 ++++
6 files changed, 223 insertions(+), 39 deletions(-)
create mode 100644 FusionIIIT/applications/academic_procedures/migrations/0002_auto_20240130_1435.py
create mode 100644 FusionIIIT/applications/eis/migrations/0002_auto_20240130_1435.py
create mode 100644 FusionIIIT/applications/filetracking/migrations/0002_auto_20240130_1435.py
create mode 100644 FusionIIIT/applications/programme_curriculum/migrations/0002_auto_20240130_1435.py
create mode 100644 FusionIIIT/applications/scholarships/migrations/0002_auto_20240130_1435.py
diff --git a/FusionIIIT/applications/academic_procedures/migrations/0002_auto_20240130_1435.py b/FusionIIIT/applications/academic_procedures/migrations/0002_auto_20240130_1435.py
new file mode 100644
index 000000000..c094f52e2
--- /dev/null
+++ b/FusionIIIT/applications/academic_procedures/migrations/0002_auto_20240130_1435.py
@@ -0,0 +1,38 @@
+# Generated by Django 3.1.5 on 2024-01-30 14:35
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('academic_procedures', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='assistantshipclaim',
+ name='year',
+ field=models.IntegerField(choices=[(2024, 2024), (2023, 2023)]),
+ ),
+ migrations.AlterField(
+ model_name='course_registration',
+ name='working_year',
+ field=models.IntegerField(blank=True, choices=[(2024, 2024), (2023, 2023)], null=True),
+ ),
+ migrations.AlterField(
+ model_name='finalregistrations',
+ name='batch',
+ field=models.IntegerField(default=2024),
+ ),
+ migrations.AlterField(
+ model_name='messdue',
+ name='year',
+ field=models.IntegerField(choices=[(2024, 2024), (2023, 2023)]),
+ ),
+ migrations.AlterField(
+ model_name='register',
+ name='year',
+ field=models.IntegerField(default=2024),
+ ),
+ ]
diff --git a/FusionIIIT/applications/eis/migrations/0002_auto_20240130_1435.py b/FusionIIIT/applications/eis/migrations/0002_auto_20240130_1435.py
new file mode 100644
index 000000000..78ac5a411
--- /dev/null
+++ b/FusionIIIT/applications/eis/migrations/0002_auto_20240130_1435.py
@@ -0,0 +1,53 @@
+# Generated by Django 3.1.5 on 2024-01-30 14:35
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('eis', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='emp_achievement',
+ name='a_year',
+ field=models.IntegerField(blank=True, choices=[(1995, 1995), (1996, 1996), (1997, 1997), (1998, 1998), (1999, 1999), (2000, 2000), (2001, 2001), (2002, 2002), (2003, 2003), (2004, 2004), (2005, 2005), (2006, 2006), (2007, 2007), (2008, 2008), (2009, 2009), (2010, 2010), (2011, 2011), (2012, 2012), (2013, 2013), (2014, 2014), (2015, 2015), (2016, 2016), (2017, 2017), (2018, 2018), (2019, 2019), (2020, 2020), (2021, 2021), (2022, 2022), (2023, 2023), (2024, 2024)], null=True, verbose_name='year'),
+ ),
+ migrations.AlterField(
+ model_name='emp_confrence_organised',
+ name='k_year',
+ field=models.IntegerField(blank=True, choices=[(1995, 1995), (1996, 1996), (1997, 1997), (1998, 1998), (1999, 1999), (2000, 2000), (2001, 2001), (2002, 2002), (2003, 2003), (2004, 2004), (2005, 2005), (2006, 2006), (2007, 2007), (2008, 2008), (2009, 2009), (2010, 2010), (2011, 2011), (2012, 2012), (2013, 2013), (2014, 2014), (2015, 2015), (2016, 2016), (2017, 2017), (2018, 2018), (2019, 2019), (2020, 2020), (2021, 2021), (2022, 2022), (2023, 2023), (2024, 2024)], null=True, verbose_name='year'),
+ ),
+ migrations.AlterField(
+ model_name='emp_expert_lectures',
+ name='l_year',
+ field=models.IntegerField(blank=True, choices=[(1995, 1995), (1996, 1996), (1997, 1997), (1998, 1998), (1999, 1999), (2000, 2000), (2001, 2001), (2002, 2002), (2003, 2003), (2004, 2004), (2005, 2005), (2006, 2006), (2007, 2007), (2008, 2008), (2009, 2009), (2010, 2010), (2011, 2011), (2012, 2012), (2013, 2013), (2014, 2014), (2015, 2015), (2016, 2016), (2017, 2017), (2018, 2018), (2019, 2019), (2020, 2020), (2021, 2021), (2022, 2022), (2023, 2023), (2024, 2024)], null=True, verbose_name='year'),
+ ),
+ migrations.AlterField(
+ model_name='emp_keynote_address',
+ name='k_year',
+ field=models.IntegerField(blank=True, choices=[(1995, 1995), (1996, 1996), (1997, 1997), (1998, 1998), (1999, 1999), (2000, 2000), (2001, 2001), (2002, 2002), (2003, 2003), (2004, 2004), (2005, 2005), (2006, 2006), (2007, 2007), (2008, 2008), (2009, 2009), (2010, 2010), (2011, 2011), (2012, 2012), (2013, 2013), (2014, 2014), (2015, 2015), (2016, 2016), (2017, 2017), (2018, 2018), (2019, 2019), (2020, 2020), (2021, 2021), (2022, 2022), (2023, 2023), (2024, 2024)], null=True, verbose_name='year'),
+ ),
+ migrations.AlterField(
+ model_name='emp_mtechphd_thesis',
+ name='s_year',
+ field=models.IntegerField(blank=True, choices=[(1995, 1995), (1996, 1996), (1997, 1997), (1998, 1998), (1999, 1999), (2000, 2000), (2001, 2001), (2002, 2002), (2003, 2003), (2004, 2004), (2005, 2005), (2006, 2006), (2007, 2007), (2008, 2008), (2009, 2009), (2010, 2010), (2011, 2011), (2012, 2012), (2013, 2013), (2014, 2014), (2015, 2015), (2016, 2016), (2017, 2017), (2018, 2018), (2019, 2019), (2020, 2020), (2021, 2021), (2022, 2022), (2023, 2023), (2024, 2024)], null=True, verbose_name='year'),
+ ),
+ migrations.AlterField(
+ model_name='emp_patents',
+ name='p_year',
+ field=models.IntegerField(blank=True, choices=[(1995, 1995), (1996, 1996), (1997, 1997), (1998, 1998), (1999, 1999), (2000, 2000), (2001, 2001), (2002, 2002), (2003, 2003), (2004, 2004), (2005, 2005), (2006, 2006), (2007, 2007), (2008, 2008), (2009, 2009), (2010, 2010), (2011, 2011), (2012, 2012), (2013, 2013), (2014, 2014), (2015, 2015), (2016, 2016), (2017, 2017), (2018, 2018), (2019, 2019), (2020, 2020), (2021, 2021), (2022, 2022), (2023, 2023), (2024, 2024)], null=True, verbose_name='year'),
+ ),
+ migrations.AlterField(
+ model_name='emp_published_books',
+ name='pyear',
+ field=models.IntegerField(blank=True, choices=[(1995, 1995), (1996, 1996), (1997, 1997), (1998, 1998), (1999, 1999), (2000, 2000), (2001, 2001), (2002, 2002), (2003, 2003), (2004, 2004), (2005, 2005), (2006, 2006), (2007, 2007), (2008, 2008), (2009, 2009), (2010, 2010), (2011, 2011), (2012, 2012), (2013, 2013), (2014, 2014), (2015, 2015), (2016, 2016), (2017, 2017), (2018, 2018), (2019, 2019), (2020, 2020), (2021, 2021), (2022, 2022), (2023, 2023), (2024, 2024)], null=True, verbose_name='year'),
+ ),
+ migrations.AlterField(
+ model_name='emp_research_papers',
+ name='year',
+ field=models.CharField(blank=True, choices=[(1995, 1995), (1996, 1996), (1997, 1997), (1998, 1998), (1999, 1999), (2000, 2000), (2001, 2001), (2002, 2002), (2003, 2003), (2004, 2004), (2005, 2005), (2006, 2006), (2007, 2007), (2008, 2008), (2009, 2009), (2010, 2010), (2011, 2011), (2012, 2012), (2013, 2013), (2014, 2014), (2015, 2015), (2016, 2016), (2017, 2017), (2018, 2018), (2019, 2019), (2020, 2020), (2021, 2021), (2022, 2022), (2023, 2023), (2024, 2024)], max_length=10, null=True),
+ ),
+ ]
diff --git a/FusionIIIT/applications/filetracking/migrations/0002_auto_20240130_1435.py b/FusionIIIT/applications/filetracking/migrations/0002_auto_20240130_1435.py
new file mode 100644
index 000000000..5dda095fa
--- /dev/null
+++ b/FusionIIIT/applications/filetracking/migrations/0002_auto_20240130_1435.py
@@ -0,0 +1,33 @@
+# Generated by Django 3.1.5 on 2024-01-30 14:35
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('filetracking', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='file',
+ name='file_extra_JSON',
+ field=models.JSONField(null=True),
+ ),
+ migrations.AddField(
+ model_name='file',
+ name='src_module',
+ field=models.CharField(default='filetracking', max_length=100),
+ ),
+ migrations.AddField(
+ model_name='file',
+ name='src_object_id',
+ field=models.CharField(max_length=100, null=True),
+ ),
+ migrations.AddField(
+ model_name='tracking',
+ name='tracking_extra_JSON',
+ field=models.JSONField(null=True),
+ ),
+ ]
diff --git a/FusionIIIT/applications/filetracking/sdk/methods.py b/FusionIIIT/applications/filetracking/sdk/methods.py
index bf9af49ae..0ed4c94cc 100644
--- a/FusionIIIT/applications/filetracking/sdk/methods.py
+++ b/FusionIIIT/applications/filetracking/sdk/methods.py
@@ -1,4 +1,3 @@
-from hashlib import file_digest
from django.contrib.auth.models import User
from applications.filetracking.models import Tracking, File
from applications.globals.models import Designation, HoldsDesignation, ExtraInfo
@@ -19,47 +18,67 @@ def create_file(
'''
This function is used to create a file object corresponding to any object of a module that needs to be tracked
'''
- uploader_obj = get_user_object_from_username(uploader)
- uploader_designation_obj = Designation.objects.get(name=uploader_designation)
+
+ '''
+ create base file with params
+ create tracking with params
+ if both complete then return id of file
+ else raise error
+
+ also, delete file object if tracking isnt created
+ '''
+ uploader_user_obj = get_user_object_from_username(uploader)
+ uploader_extrainfo_obj = get_ExtraInfo_object_from_username(uploader)
+ uploader_designation_obj = Designation.objects.get(
+ name=uploader_designation)
receiver_obj = get_user_object_from_username(receiver)
- receiver_designation_obj = Designation.objects.get(name=receiver_designation)
-
- new_file_data = {
- 'uploader': uploader_obj,
- 'designation': uploader_designation_obj,
- 'src_module': src_module,
- 'src_object_id': src_object_id,
- 'file_extra_JSON': file_extra_JSON,
- }
- if attached_file is not None:
- new_file_data['upload_file'] = attached_file
+ receiver_designation_obj = Designation.objects.get(
+ name=receiver_designation)
- new_file = FileSerializer(data=new_file_data)
- if new_file.is_valid():
- new_file.save()
- return new_file.instance.id
+ # new_file_data = {
+ # 'uploader': uploader_obj,
+ # 'designation': uploader_designation_obj,
+ # 'src_module': src_module,
+ # 'src_object_id': src_object_id,
+ # 'file_extra_JSON': file_extra_JSON,
+ # }
+ # if attached_file is not None:
+ # new_file_data['upload_file'] = attached_file
+
+ # new_file = FileSerializer(data=new_file_data)
+ # if new_file.is_valid():
+ # new_file.save()
+ # return new_file.instance.id
+ # else:
+ # print(new_file.errors)
+ # # raise ValidationError('file data is incorrect')
+
+ new_file = File.objects.create(
+ uploader=uploader_extrainfo_obj,
+ designation=uploader_designation_obj,
+ src_module=src_module,
+ src_object_id=src_object_id,
+ file_extra_JSON=file_extra_JSON,
+ # upload_file=upload_file TESTING without file
+ )
+ uploader_holdsdesignation_obj = HoldsDesignation.objects.get(
+ user=uploader_user_obj, designation=uploader_designation_obj)
+
+ new_tracking = Tracking.objects.create(
+ file_id=new_file,
+ current_id=uploader_extrainfo_obj,
+ current_design=uploader_holdsdesignation_obj,
+ receiver_id=receiver_obj,
+ receive_design=receiver_designation_obj,
+ tracking_extra_JSON=file_extra_JSON,
+ remarks=f"File with id:{str(new_file.id)} created by {uploader} and sent to {receiver}"
+ # upload_file = None, dont add file for first tracking
+ )
+ if new_tracking is None:
+ new_file.delete()
+ raise ValidationError('Tracking model data is incorrect')
else:
- raise ValidationError('file data is incorrect')
-
-
- # new_file = File.objects.create(
- # uploader=uploader,
- # designation=uploader_designation,
- # src_module=src_module,
- # src_object_id=src_object_id,
- # file_extra_JSON=file_extra_JSON,
- # # upload_file=upload_file TESTING without file
- # )
- # Tracking.objects.create(
- # file_id=new_file.id,
- # current_id=uploader,
- # current_design=uploader_designation,
- # receiver_id=receiver,
- # receive_design=receiver_designation,
- # tracking_extra_JSON=file_extra_JSON,
- # # upload_file = upload_file TESTING without file
- # )
- return new_file.id
+ return new_file.id
def view_file(file_id: int) -> dict:
diff --git a/FusionIIIT/applications/programme_curriculum/migrations/0002_auto_20240130_1435.py b/FusionIIIT/applications/programme_curriculum/migrations/0002_auto_20240130_1435.py
new file mode 100644
index 000000000..e958734f2
--- /dev/null
+++ b/FusionIIIT/applications/programme_curriculum/migrations/0002_auto_20240130_1435.py
@@ -0,0 +1,23 @@
+# Generated by Django 3.1.5 on 2024-01-30 14:35
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('programme_curriculum', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='batch',
+ name='year',
+ field=models.PositiveIntegerField(default=2024),
+ ),
+ migrations.AlterField(
+ model_name='programme',
+ name='programme_begin_year',
+ field=models.PositiveIntegerField(default=2024),
+ ),
+ ]
diff --git a/FusionIIIT/applications/scholarships/migrations/0002_auto_20240130_1435.py b/FusionIIIT/applications/scholarships/migrations/0002_auto_20240130_1435.py
new file mode 100644
index 000000000..c7425044f
--- /dev/null
+++ b/FusionIIIT/applications/scholarships/migrations/0002_auto_20240130_1435.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.1.5 on 2024-01-30 14:35
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('scholarships', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='previous_winner',
+ name='year',
+ field=models.IntegerField(default=2024),
+ ),
+ ]
From 87dc61acb64409457ffb71ff4520c1f50660bd3f Mon Sep 17 00:00:00 2001
From: Aragorn-64
Date: Tue, 30 Jan 2024 20:58:34 +0530
Subject: [PATCH 15/68] fix sdk forward_file : accept remarks
---
FusionIIIT/applications/filetracking/sdk/methods.py | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/FusionIIIT/applications/filetracking/sdk/methods.py b/FusionIIIT/applications/filetracking/sdk/methods.py
index 0ed4c94cc..e0ffacf75 100644
--- a/FusionIIIT/applications/filetracking/sdk/methods.py
+++ b/FusionIIIT/applications/filetracking/sdk/methods.py
@@ -195,6 +195,7 @@ def forward_file(
'receiver_id': receiver_obj.id,
'receive_design': receiver_designation_obj.id,
'tracking_extra_JSON': file_extra_JSON,
+ 'remarks': remarks,
}
if file_attachment is not None:
tracking_data['upload_file'] = file_attachment
@@ -211,6 +212,7 @@ def view_history(file_id: int) -> dict:
'''
This function is used to get the history of a particular file with the given file_id
'''
+
pass
@@ -232,3 +234,6 @@ def get_ExtraInfo_object_from_username(username: str) -> ExtraInfo:
user = User.objects.get(username=username)
extrainfo = ExtraInfo.objects.get(user=user)
return extrainfo
+
+
+
From 5ad97a75aedb3a6129f1a8192dc1324e3c028c17 Mon Sep 17 00:00:00 2001
From: Aragorn-64
Date: Tue, 30 Jan 2024 21:11:48 +0530
Subject: [PATCH 16/68] add view_history in sdk
---
FusionIIIT/applications/filetracking/sdk/methods.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/FusionIIIT/applications/filetracking/sdk/methods.py b/FusionIIIT/applications/filetracking/sdk/methods.py
index e0ffacf75..425b9211c 100644
--- a/FusionIIIT/applications/filetracking/sdk/methods.py
+++ b/FusionIIIT/applications/filetracking/sdk/methods.py
@@ -212,8 +212,11 @@ def view_history(file_id: int) -> dict:
'''
This function is used to get the history of a particular file with the given file_id
'''
-
- pass
+ Tracking_history = Tracking.objects.filter(
+ file_id=file_id).order_by('-receive_date')
+ Tracking_history_serialized = TrackingSerializer(
+ Tracking_history, many=True)
+ return Tracking_history_serialized.data
def get_designations(username: str) -> list:
@@ -234,6 +237,3 @@ def get_ExtraInfo_object_from_username(username: str) -> ExtraInfo:
user = User.objects.get(username=username)
extrainfo = ExtraInfo.objects.get(user=user)
return extrainfo
-
-
-
From 07f7d043c0d7e4d9f264adb113bfba8cf87b627f Mon Sep 17 00:00:00 2001
From: Aragorn-64
Date: Tue, 6 Feb 2024 12:58:49 +0530
Subject: [PATCH 17/68] add blueprint for draft and archive methods to sdk
---
.../applications/filetracking/sdk/methods.py | 71 ++++++++++++++-----
1 file changed, 53 insertions(+), 18 deletions(-)
diff --git a/FusionIIIT/applications/filetracking/sdk/methods.py b/FusionIIIT/applications/filetracking/sdk/methods.py
index 425b9211c..aba475f35 100644
--- a/FusionIIIT/applications/filetracking/sdk/methods.py
+++ b/FusionIIIT/applications/filetracking/sdk/methods.py
@@ -20,6 +20,7 @@ def create_file(
'''
'''
+ Functioning:
create base file with params
create tracking with params
if both complete then return id of file
@@ -35,24 +36,6 @@ def create_file(
receiver_designation_obj = Designation.objects.get(
name=receiver_designation)
- # new_file_data = {
- # 'uploader': uploader_obj,
- # 'designation': uploader_designation_obj,
- # 'src_module': src_module,
- # 'src_object_id': src_object_id,
- # 'file_extra_JSON': file_extra_JSON,
- # }
- # if attached_file is not None:
- # new_file_data['upload_file'] = attached_file
-
- # new_file = FileSerializer(data=new_file_data)
- # if new_file.is_valid():
- # new_file.save()
- # return new_file.instance.id
- # else:
- # print(new_file.errors)
- # # raise ValidationError('file data is incorrect')
-
new_file = File.objects.create(
uploader=uploader_extrainfo_obj,
designation=uploader_designation_obj,
@@ -144,6 +127,58 @@ def view_outbox(username: str, designation: str, src_module: str) -> dict:
return sent_files_serialized.data
+# need: view_archived, archive_file, (can get details of archived files by view_file, etc)
+# view_drafts, create_draft, (delete_draft can be via delete_file),
+# (forward_draft can be via forward_file, but lets implement a send draft that follows our remark convention)
+
+def view_archived(user: str, designation: str, src_module: str) -> dict:
+ '''
+ This function is used to get all the files in the archive of a particular user and designation
+ Archived file mean those which the user has ever interacted with, and are now finished or archived (?)
+ '''
+ user_designation = Designation.objects.get(name=designation)
+ recipient_object = get_user_object_from_username(user)
+
+ return None
+
+
+def archive_file(file_id: int) -> bool:
+ '''
+ This function is used to archive a file and returns true if the archiving was successful
+ '''
+ return None
+
+
+def view_drafts(user: str, designation: str, src_module: str) -> dict:
+ '''
+ This function is used to get all the files in the drafts of a particular user and designation
+ '''
+ return None
+
+
+def create_draft(
+ uploader: str,
+ uploader_designation: str,
+ src_module: str,
+ src_object_id: str,
+ file_extra_JSON: dict,
+ attached_file: Any) -> int:
+ '''
+ This function is used to create a draft file object corresponding to any object of a module that needs to be tracked
+ It is similar to create_file but is not sent to anyone
+ Later this file can be sent to someone by forward_file or by send_draft by using draft file_id
+ '''
+ return None
+
+
+def send_draft(file_id: int, receiver: str, receiver_designation: str, remarks: str = "") -> int:
+ '''
+ This function is used to send a draft file and inserts a new tracking history into the file tracking table
+ Note that only the current owner(with appropriate designation) of the file has the ability to send drafts
+ '''
+ return None
+
+
def get_current_file_owner(file_id: int) -> User:
'''
This functions returns the current owner of the file.
From 54845b1a11e788bdd828d7aa166920c3608036a0 Mon Sep 17 00:00:00 2001
From: Aragorn-64
Date: Tue, 6 Feb 2024 15:25:15 +0530
Subject: [PATCH 18/68] fix FileHeaderSerializer to include id
---
FusionIIIT/applications/filetracking/api/serializers.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/FusionIIIT/applications/filetracking/api/serializers.py b/FusionIIIT/applications/filetracking/api/serializers.py
index 5d24520d5..5721b2eb2 100644
--- a/FusionIIIT/applications/filetracking/api/serializers.py
+++ b/FusionIIIT/applications/filetracking/api/serializers.py
@@ -22,6 +22,7 @@ class FileHeaderSerializer(serializers.ModelSerializer):
class Meta:
model = File
fields = [
+ 'id',
'uploader',
'designation',
'subject',
From 30afd49959c32b16e30ae5ae137790e938980696 Mon Sep 17 00:00:00 2001
From: Aragorn-64
Date: Tue, 6 Feb 2024 15:33:17 +0530
Subject: [PATCH 19/68] fix empty file upload error
---
FusionIIIT/applications/filetracking/views.py | 382 ++++++++----------
1 file changed, 179 insertions(+), 203 deletions(-)
diff --git a/FusionIIIT/applications/filetracking/views.py b/FusionIIIT/applications/filetracking/views.py
index ef5d8f347..898c824ce 100644
--- a/FusionIIIT/applications/filetracking/views.py
+++ b/FusionIIIT/applications/filetracking/views.py
@@ -9,11 +9,11 @@
from django.core import serializers
from django.contrib.auth.models import User
from timeit import default_timer as time
-from notification.views import office_module_notif,file_tracking_notif
+from notification.views import office_module_notif, file_tracking_notif
from .utils import *
-@login_required(login_url = "/accounts/login/")
+@login_required(login_url="/accounts/login/")
def filetracking(request):
"""
The function is used to create files by current user(employee).
@@ -35,18 +35,20 @@ def filetracking(request):
holdsdesignations - The HoldsDesignation object.
context - Holds data needed to make necessary changes in the template.
"""
- if request.method =="POST":
+ if request.method == "POST":
try:
if 'save' in request.POST:
uploader = request.user.extrainfo
subject = request.POST.get('title')
description = request.POST.get('desc')
design = request.POST.get('design')
- designation = Designation.objects.get(id = HoldsDesignation.objects.select_related('user','working','designation').get(id = design).designation_id)
+ designation = Designation.objects.get(id=HoldsDesignation.objects.select_related(
+ 'user', 'working', 'designation').get(id=design).designation_id)
upload_file = request.FILES.get('myfile')
- if(upload_file.size / 1000 > 10240):
- messages.error(request,"File should not be greater than 10MB")
- return redirect("/filetracking")
+ if upload_file and upload_file.size / 1000 > 10240:
+ messages.error(
+ request, "File should not be greater than 10MB")
+ return redirect("/filetracking")
File.objects.create(
uploader=uploader,
@@ -56,18 +58,20 @@ def filetracking(request):
upload_file=upload_file
)
- messages.success(request,'File Draft Saved Successfully')
+ messages.success(request, 'File Draft Saved Successfully')
if 'send' in request.POST:
uploader = request.user.extrainfo
subject = request.POST.get('title')
description = request.POST.get('desc')
design = request.POST.get('design')
- designation = Designation.objects.get(id = HoldsDesignation.objects.select_related('user','working','designation').get(id = design).designation_id)
+ designation = Designation.objects.get(id=HoldsDesignation.objects.select_related(
+ 'user', 'working', 'designation').get(id=design).designation_id)
upload_file = request.FILES.get('myfile')
- if(upload_file.size / 1000 > 10240):
- messages.error(request,"File should not be greater than 10MB")
+ if upload_file and upload_file.size / 1000 > 10240:
+ messages.error(
+ request, "File should not be greater than 10MB")
return redirect("/filetracking")
file = File.objects.create(
@@ -78,12 +82,12 @@ def filetracking(request):
upload_file=upload_file
)
-
current_id = request.user.extrainfo
remarks = request.POST.get('remarks')
sender = request.POST.get('design')
- current_design = HoldsDesignation.objects.select_related('user','working','designation').get(id=sender)
+ current_design = HoldsDesignation.objects.select_related(
+ 'user', 'working', 'designation').get(id=sender)
receiver = request.POST.get('receiver')
try:
@@ -109,19 +113,19 @@ def filetracking(request):
remarks=remarks,
upload_file=upload_file,
)
- #office_module_notif(request.user, receiver_id)
- file_tracking_notif(request.user,receiver_id,subject)
- messages.success(request,'File sent successfully')
+ # office_module_notif(request.user, receiver_id)
+ file_tracking_notif(request.user, receiver_id, subject)
+ messages.success(request, 'File sent successfully')
except IntegrityError:
message = "FileID Already Taken.!!"
return HttpResponse(message)
-
-
- file = File.objects.select_related('uploader__user','uploader__department','designation').all()
- extrainfo = ExtraInfo.objects.select_related('user','department').all()
- holdsdesignations = HoldsDesignation.objects.select_related('user','working','designation').all()
+ file = File.objects.select_related(
+ 'uploader__user', 'uploader__department', 'designation').all()
+ extrainfo = ExtraInfo.objects.select_related('user', 'department').all()
+ holdsdesignations = HoldsDesignation.objects.select_related(
+ 'user', 'working', 'designation').all()
designations = get_designation(request.user)
context = {
@@ -133,7 +137,7 @@ def filetracking(request):
return render(request, 'filetracking/composefile.html', context)
-@login_required(login_url = "/accounts/login")
+@login_required(login_url="/accounts/login")
def drafts(request):
"""
The function is used to get the designation of the user and renders it on draft template.
@@ -142,8 +146,8 @@ def drafts(request):
request - trivial.
@variables:
-
-
+
+
context - Holds data needed to make necessary changes in the template.
"""
designation = get_designation(request.user)
@@ -153,9 +157,8 @@ def drafts(request):
return render(request, 'filetracking/drafts.html', context)
-@login_required(login_url = "/accounts/login")
-def fileview(request,id):
-
+@login_required(login_url="/accounts/login")
+def fileview(request, id):
"""
This function is used to veiw all all created files by the user ordered by upload date.it collects all the created files from File object.
@@ -166,30 +169,31 @@ def fileview(request,id):
@parameters
draft - file obeject containing all the files created by user
context - holds data needed to render the template
-
-
+
+
"""
# draft = File.objects.select_related('uploader__user','uploader__department','designation').filter(uploader=request.user.extrainfo).order_by('-upload_date')
# extrainfo = ExtraInfo.objects.select_related('user','department').all()
- extrainfo = ExtraInfo.objects.select_related('user','department').all()
-
- ids = File.objects.filter(uploader=request.user.extrainfo).order_by('-upload_date').values_list('id', flat=True)
- draft_files_pk=[]
-
- for i in ids:
- file_tracking_ids = Tracking.objects.filter(file_id=i).values_list('id', flat=True)
- if(len(file_tracking_ids)==0):
- draft_files_pk.append(i)
-
- draft_file_list=[]
- for i in draft_files_pk:
- draft_file_list.append(File.objects.get(pk=i))
+ extrainfo = ExtraInfo.objects.select_related('user', 'department').all()
+
+ ids = File.objects.filter(uploader=request.user.extrainfo).order_by(
+ '-upload_date').values_list('id', flat=True)
+ draft_files_pk = []
+ for i in ids:
+ file_tracking_ids = Tracking.objects.filter(
+ file_id=i).values_list('id', flat=True)
+ if (len(file_tracking_ids) == 0):
+ draft_files_pk.append(i)
+ draft_file_list = []
+ for i in draft_files_pk:
+ draft_file_list.append(File.objects.get(pk=i))
- user_designation = HoldsDesignation.objects.select_related('user','working','designation').get(pk=id)
+ user_designation = HoldsDesignation.objects.select_related(
+ 'user', 'working', 'designation').get(pk=id)
s = str(user_designation).split(" - ")
designations = s[1]
context = {
@@ -201,10 +205,8 @@ def fileview(request,id):
return render(request, 'filetracking/fileview.html', context)
-
-@login_required(login_url = "/accounts/login")
-def fileview1(request,id):
-
+@login_required(login_url="/accounts/login")
+def fileview1(request, id):
"""
The function is used to get all the files sent by user(employee) to other employees
which are filtered from Tracking(table) objects by current user i.e. current_id.
@@ -218,13 +220,14 @@ def fileview1(request,id):
@variables:
out - The Tracking object filtered by current_id i.e, present working user.
context - Holds data needed to make necessary changes in the template.
-
+
"""
- outward_files = Tracking.objects.select_related('file_id__uploader__user','file_id__uploader__department','file_id__designation','current_id__user','current_id__department',
- 'current_design__user','current_design__working','current_design__designation','receiver_id','receive_design').filter(current_id=request.user.extrainfo).order_by('-forward_date')
+ outward_files = Tracking.objects.select_related('file_id__uploader__user', 'file_id__uploader__department', 'file_id__designation', 'current_id__user', 'current_id__department',
+ 'current_design__user', 'current_design__working', 'current_design__designation', 'receiver_id', 'receive_design').filter(current_id=request.user.extrainfo).order_by('-forward_date')
- user_designation = HoldsDesignation.objects.select_related('user','working','designation').get(pk=id)
+ user_designation = HoldsDesignation.objects.select_related(
+ 'user', 'working', 'designation').get(pk=id)
context = {
@@ -234,9 +237,8 @@ def fileview1(request,id):
return render(request, 'filetracking/fileview1.html', context)
-@login_required(login_url = "/accounts/login")
-def fileview2(request,id):
-
+@login_required(login_url="/accounts/login")
+def fileview2(request, id):
"""
The function is used to fetch the files received by the user form other employees.
These files are filtered by receiver id and ordered by receive date.
@@ -250,10 +252,11 @@ def fileview2(request,id):
context - Holds data needed to make necessary changes in the template.
"""
- inward_file = Tracking.objects.select_related('file_id__uploader__user','file_id__uploader__department','file_id__designation','current_id__user','current_id__department',
- 'current_design__user','current_design__working','current_design__designation','receiver_id','receive_design').filter(receiver_id=request.user).order_by('-receive_date')
+ inward_file = Tracking.objects.select_related('file_id__uploader__user', 'file_id__uploader__department', 'file_id__designation', 'current_id__user', 'current_id__department',
+ 'current_design__user', 'current_design__working', 'current_design__designation', 'receiver_id', 'receive_design').filter(receiver_id=request.user).order_by('-receive_date')
- user_designation = HoldsDesignation.objects.select_related('user','working','designation').get(pk=id)
+ user_designation = HoldsDesignation.objects.select_related(
+ 'user', 'working', 'designation').get(pk=id)
s = str(user_designation).split(" - ")
designations = s[1]
@@ -265,7 +268,7 @@ def fileview2(request,id):
return render(request, 'filetracking/fileview2.html', context)
-@login_required(login_url = "/accounts/login")
+@login_required(login_url="/accounts/login")
def outward(request):
"""
This function fetches the different designations of the user and renders it on outward template
@@ -274,22 +277,22 @@ def outward(request):
@variables:
context - Holds the different designation data of the user
-
+
"""
designation = get_designation(request.user)
context = {
'designation': designation,
}
- return render( request, 'filetracking/outward.html', context)
+ return render(request, 'filetracking/outward.html', context)
-@login_required(login_url = "/accounts/login")
+@login_required(login_url="/accounts/login")
def inward(request):
"""
This function fetches the different designations of the user and renders it on inward template
-
+
@param:
request - trivial.
@@ -298,15 +301,14 @@ def inward(request):
"""
designation = get_designation(request.user)
context = {
-
+
'designation': designation,
}
return render(request, 'filetracking/inward.html', context)
-@login_required(login_url = "/accounts/login")
-def confirmdelete(request,id):
-
+@login_required(login_url="/accounts/login")
+def confirmdelete(request, id):
"""
The function is used to confirm the deletion of a file.
@param:
@@ -316,16 +318,17 @@ def confirmdelete(request,id):
@variables:
context - Holds data needed to make necessary changes in the template.
"""
- file = File.objects.select_related('uploader__user','uploader__department','designation').get(pk = id)
+ file = File.objects.select_related(
+ 'uploader__user', 'uploader__department', 'designation').get(pk=id)
context = {
'j': file,
}
- return render(request, 'filetracking/confirmdelete.html',context)
+ return render(request, 'filetracking/confirmdelete.html', context)
-@login_required(login_url = "/accounts/login")
+@login_required(login_url="/accounts/login")
def forward(request, id):
"""
The function is used to forward files received by user(employee) from other
@@ -351,73 +354,73 @@ def forward(request, id):
holdsdesignations = HoldsDesignation objects.
context - Holds data needed to make necessary changes in the template.
"""
-
- file = get_object_or_404(File, id=id)
- track = Tracking.objects.select_related('file_id__uploader__user','file_id__uploader__department','file_id__designation','current_id__user','current_id__department',
- 'current_design__user','current_design__working','current_design__designation','receiver_id','receive_design').filter(file_id=file)
-
- if request.method == "POST":
- if 'finish' in request.POST:
- file.complete_flag = True
- file.save()
- if 'send' in request.POST:
- current_id = request.user.extrainfo
- remarks = request.POST.get('remarks')
- track.update(is_read=True)
-
- sender = request.POST.get('sender')
- current_design = HoldsDesignation.objects.select_related('user','working','designation').get(id=sender)
-
- receiver = request.POST.get('receiver')
- try:
- receiver_id = User.objects.get(username=receiver)
- except Exception as e:
- messages.error(request, 'Enter a valid destination')
- designations = HoldsDesignation.objects.select_related('user','working','designation').filter(user=request.user)
-
- context = {
-
- 'designations': designations,
- 'file': file,
- 'track': track,
- }
- return render(request, 'filetracking/forward.html', context)
- receive = request.POST.get('recieve')
- try:
- receive_design = Designation.objects.get(name=receive)
- except Exception as e:
- messages.error(request, 'Enter a valid Designation')
- designations = get_designation(request.user)
+ file = get_object_or_404(File, id=id)
+ track = Tracking.objects.select_related('file_id__uploader__user', 'file_id__uploader__department', 'file_id__designation', 'current_id__user', 'current_id__department',
+ 'current_design__user', 'current_design__working', 'current_design__designation', 'receiver_id', 'receive_design').filter(file_id=file)
- context = {
-
- 'designations': designations,
- 'file': file,
- 'track': track,
- }
- return render(request, 'filetracking/forward.html', context)
+ if request.method == "POST":
+ if 'finish' in request.POST:
+ file.complete_flag = True
+ file.save()
+
+ if 'send' in request.POST:
+ current_id = request.user.extrainfo
+ remarks = request.POST.get('remarks')
+ track.update(is_read=True)
+
+ sender = request.POST.get('sender')
+ current_design = HoldsDesignation.objects.select_related(
+ 'user', 'working', 'designation').get(id=sender)
+
+ receiver = request.POST.get('receiver')
+ try:
+ receiver_id = User.objects.get(username=receiver)
+ except Exception as e:
+ messages.error(request, 'Enter a valid destination')
+ designations = HoldsDesignation.objects.select_related(
+ 'user', 'working', 'designation').filter(user=request.user)
+
+ context = {
+
+ 'designations': designations,
+ 'file': file,
+ 'track': track,
+ }
+ return render(request, 'filetracking/forward.html', context)
+ receive = request.POST.get('recieve')
+ try:
+ receive_design = Designation.objects.get(name=receive)
+ except Exception as e:
+ messages.error(request, 'Enter a valid Designation')
+ designations = get_designation(request.user)
+
+ context = {
+
+ 'designations': designations,
+ 'file': file,
+ 'track': track,
+ }
+ return render(request, 'filetracking/forward.html', context)
+
+ upload_file = request.FILES.get('myfile')
+
+ Tracking.objects.create(
+ file_id=file,
+ current_id=current_id,
+ current_design=current_design,
+ receive_design=receive_design,
+ receiver_id=receiver_id,
+ remarks=remarks,
+ upload_file=upload_file,
+ )
+ messages.success(request, 'File sent successfully')
-
- upload_file = request.FILES.get('myfile')
-
- Tracking.objects.create(
- file_id=file,
- current_id=current_id,
- current_design=current_design,
- receive_design=receive_design,
- receiver_id=receiver_id,
- remarks=remarks,
- upload_file=upload_file,
- )
- messages.success(request, 'File sent successfully')
-
-
designations = get_designation(request.user)
context = {
-
- 'designations':designations,
+
+ 'designations': designations,
'file': file,
'track': track,
}
@@ -425,32 +428,31 @@ def forward(request, id):
return render(request, 'filetracking/forward.html', context)
-@login_required(login_url = "/accounts/login")
+@login_required(login_url="/accounts/login")
def archive_design(request):
- designation = HoldsDesignation.objects.select_related('user','working','designation').filter(user=request.user)
+ designation = HoldsDesignation.objects.select_related(
+ 'user', 'working', 'designation').filter(user=request.user)
context = {
'designation': designation,
}
- return render( request, 'filetracking/archive_design.html', context)
-
-
-
+ return render(request, 'filetracking/archive_design.html', context)
-@login_required(login_url = "/accounts/login")
-def archive(request , id):
+@login_required(login_url="/accounts/login")
+def archive(request, id):
- draft = File.objects.select_related('uploader__user','uploader__department','designation').filter(is_read=True).order_by('-upload_date')
+ draft = File.objects.select_related('uploader__user', 'uploader__department', 'designation').filter(
+ is_read=True).order_by('-upload_date')
-
- extrainfo = ExtraInfo.objects.select_related('user','department').all()
+ extrainfo = ExtraInfo.objects.select_related('user', 'department').all()
# designations = Designation.objects.filter(upload_designation=extrainfo.id)
- abcd = HoldsDesignation.objects.select_related('user','working','designation').get(pk=id)
+ abcd = HoldsDesignation.objects.select_related(
+ 'user', 'working', 'designation').get(pk=id)
s = str(abcd).split(" - ")
designations = s[1]
- #designations = HoldsDesignation.objects.filter(user=request.user)
+ # designations = HoldsDesignation.objects.filter(user=request.user)
# for x in designations:
# if abcd==x:
# designations=abcd
@@ -462,46 +464,38 @@ def archive(request , id):
'designations': designations,
}
+ return render(request, 'filetracking/archive.html', context)
-
- return render(request, 'filetracking/archive.html' , context)
-
-
-@login_required(login_url = "/accounts/login")
+@login_required(login_url="/accounts/login")
def archive_finish(request, id):
- file1 = get_object_or_404(File, id=id) ##file = get_object_or_404(File, ref_id=id)
+ # file = get_object_or_404(File, ref_id=id)
+ file1 = get_object_or_404(File, id=id)
track = Tracking.objects.filter(file_id=file1)
-
-
return render(request, 'filetracking/archive_finish.html', {'file': file1, 'track': track})
-
-
-@login_required(login_url = "/accounts/login")
+@login_required(login_url="/accounts/login")
def finish_design(request):
- designation = HoldsDesignation.objects.select_related('user','working','designation').filter(user=request.user)
+ designation = HoldsDesignation.objects.select_related(
+ 'user', 'working', 'designation').filter(user=request.user)
context = {
'designation': designation,
}
- return render( request, 'filetracking/finish_design.html', context)
+ return render(request, 'filetracking/finish_design.html', context)
-@login_required(login_url = "/accounts/login")
+@login_required(login_url="/accounts/login")
def finish_fileview(request, id):
- out = Tracking.objects.select_related('file_id__uploader__user','file_id__uploader__department','file_id__designation','current_id__user','current_id__department',
- 'current_design__user','current_design__working','current_design__designation','receiver_id','receive_design').filter(file_id__uploader=request.user.extrainfo, is_read=False).order_by('-forward_date')
-
-
-
-
- abcd = HoldsDesignation.objects.select_related('user','working','designation').get(pk=id)
+ out = Tracking.objects.select_related('file_id__uploader__user', 'file_id__uploader__department', 'file_id__designation', 'current_id__user', 'current_id__department',
+ 'current_design__user', 'current_design__working', 'current_design__designation', 'receiver_id', 'receive_design').filter(file_id__uploader=request.user.extrainfo, is_read=False).order_by('-forward_date')
+ abcd = HoldsDesignation.objects.select_related(
+ 'user', 'working', 'designation').get(pk=id)
context = {
@@ -511,29 +505,19 @@ def finish_fileview(request, id):
return render(request, 'filetracking/finish_fileview.html', context)
-
-
-@login_required(login_url = "/accounts/login")
+@login_required(login_url="/accounts/login")
def finish(request, id):
- file1 = get_object_or_404(File, id=id) ##file = get_object_or_404(File, ref_id=id)
+ # file = get_object_or_404(File, ref_id=id)
+ file1 = get_object_or_404(File, id=id)
track = Tracking.objects.filter(file_id=file1)
-
if request.method == "POST":
- if 'Finished' in request.POST:
- File.objects.filter(pk=id).update(is_read=True)
- track.update(is_read=True)
- messages.success(request,'File Archived')
-
-
-
-
-
-
-
- return render(request, 'filetracking/finish.html', {'file': file1, 'track': track,'fileid':id})
-
+ if 'Finished' in request.POST:
+ File.objects.filter(pk=id).update(is_read=True)
+ track.update(is_read=True)
+ messages.success(request, 'File Archived')
+ return render(request, 'filetracking/finish.html', {'file': file1, 'track': track, 'fileid': id})
def AjaxDropdown1(request):
@@ -542,7 +526,7 @@ def AjaxDropdown1(request):
@param:
request - trivial.
-
+
@variables:
context - return the httpresponce containing the matched designation of the user
@@ -553,20 +537,19 @@ def AjaxDropdown1(request):
hold = Designation.objects.filter(name__startswith=value)
holds = serializers.serialize('json', list(hold))
context = {
- 'holds' : holds
+ 'holds': holds
}
return HttpResponse(JsonResponse(context), content_type='application/json')
def AjaxDropdown(request):
-
"""
This function returns the usernames of receiver on the forward or compose file template.
@param:
request - trivial.
-
+
@variables:
context - return the httpresponce containing the matched username
@@ -586,27 +569,22 @@ def test(request):
return HttpResponse('success')
-
-@login_required(login_url = "/accounts/login")
-def delete(request,id):
-
+@login_required(login_url="/accounts/login")
+def delete(request, id):
"""
The function is used the delete of a file and it returns to the drafts page.
@param:
request - trivial.
id - id of the file that is going to be deleted
-
+
"""
- file = File.objects.get(pk = id)
+ file = File.objects.get(pk=id)
file.delete()
return redirect('/filetracking/drafts/')
-
-
-def forward_inward(request,id):
-
+def forward_inward(request, id):
""" This function is used forward the files which are available in the inbox of the user .
@param:
@@ -617,21 +595,19 @@ def forward_inward(request,id):
file - file object
track - tracking object of the file
context - necessary data to render
-
+
"""
file = get_object_or_404(File, id=id)
file.is_read = True
- track = Tracking.objects.select_related('file_id__uploader__user','file_id__uploader__department','file_id__designation','current_id__user','current_id__department',
- 'current_design__user','current_design__working','current_design__designation','receiver_id','receive_design').filter(file_id=file)
+ track = Tracking.objects.select_related('file_id__uploader__user', 'file_id__uploader__department', 'file_id__designation', 'current_id__user', 'current_id__department',
+ 'current_design__user', 'current_design__working', 'current_design__designation', 'receiver_id', 'receive_design').filter(file_id=file)
designations = get_designation(request.user)
context = {
-
- 'designations':designations,
+
+ 'designations': designations,
'file': file,
'track': track,
}
return render(request, 'filetracking/forward.html', context)
-
-
From 55e8a74443dec759293f37dc1684c3b925275f21 Mon Sep 17 00:00:00 2001
From: Aragorn-64
Date: Tue, 6 Feb 2024 22:30:57 +0530
Subject: [PATCH 20/68] fix inbox outbox methods to return unique ids
---
.../applications/filetracking/sdk/methods.py | 21 +++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)
diff --git a/FusionIIIT/applications/filetracking/sdk/methods.py b/FusionIIIT/applications/filetracking/sdk/methods.py
index aba475f35..d296067c1 100644
--- a/FusionIIIT/applications/filetracking/sdk/methods.py
+++ b/FusionIIIT/applications/filetracking/sdk/methods.py
@@ -101,7 +101,11 @@ def view_inbox(user: str, designation: str, src_module: str) -> dict:
file_id__src_module=src_module)
received_files = [tracking.file_id for tracking in received_files_tracking]
- received_files_serialized = FileHeaderSerializer(received_files, many=True)
+ # remove duplicate file ids (from sending back and forth)
+ received_files_unique = uniqueList(received_files)
+
+ received_files_serialized = FileHeaderSerializer(
+ received_files_unique, many=True)
return received_files_serialized.data
@@ -123,7 +127,10 @@ def view_outbox(username: str, designation: str, src_module: str) -> dict:
file_id__src_module=src_module)
sent_files = [tracking.file_id for tracking in sent_files_tracking]
- sent_files_serialized = FileHeaderSerializer(sent_files, many=True)
+ # remove duplicate file ids (from sending back and forth)
+ sent_files_unique = uniqueList(sent_files)
+
+ sent_files_serialized = FileHeaderSerializer(sent_files_unique, many=True)
return sent_files_serialized.data
@@ -272,3 +279,13 @@ def get_ExtraInfo_object_from_username(username: str) -> ExtraInfo:
user = User.objects.get(username=username)
extrainfo = ExtraInfo.objects.get(user=user)
return extrainfo
+
+
+def uniqueList(l: list) -> list:
+ '''
+ This function is used to return a list with unique elements
+ O(n) time and space
+ '''
+ s = set(l)
+ unique_list = (list(s))
+ return unique_list
From 6ead47de663b62fe744e007f50d0f209c2f9d6d3 Mon Sep 17 00:00:00 2001
From: Aragorn-64
Date: Tue, 6 Feb 2024 23:18:24 +0530
Subject: [PATCH 21/68] fix complete_flag to is_read
---
FusionIIIT/applications/filetracking/views.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/FusionIIIT/applications/filetracking/views.py b/FusionIIIT/applications/filetracking/views.py
index 898c824ce..d46050ebf 100644
--- a/FusionIIIT/applications/filetracking/views.py
+++ b/FusionIIIT/applications/filetracking/views.py
@@ -361,9 +361,8 @@ def forward(request, id):
if request.method == "POST":
if 'finish' in request.POST:
- file.complete_flag = True
+ file.is_read = True
file.save()
-
if 'send' in request.POST:
current_id = request.user.extrainfo
remarks = request.POST.get('remarks')
From 40815fd10ab805a1f7223909a87f80333a0a08a9 Mon Sep 17 00:00:00 2001
From: Aragorn-64
Date: Tue, 6 Feb 2024 23:19:28 +0530
Subject: [PATCH 22/68] fix inbox outbox methods to not show archived
---
FusionIIIT/applications/filetracking/sdk/methods.py | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/FusionIIIT/applications/filetracking/sdk/methods.py b/FusionIIIT/applications/filetracking/sdk/methods.py
index d296067c1..cf912fa60 100644
--- a/FusionIIIT/applications/filetracking/sdk/methods.py
+++ b/FusionIIIT/applications/filetracking/sdk/methods.py
@@ -87,18 +87,20 @@ def delete_file(file_id: int) -> bool:
except File.DoesNotExist:
return False
+# inbox and outbox could be sorted based on most recent linked tracking entry
-def view_inbox(user: str, designation: str, src_module: str) -> dict:
+def view_inbox(username: str, designation: str, src_module: str) -> dict:
'''
This function is used to get all the files in the inbox of a particular user and designation
'''
# TODO: currently this does not return a value of sent by
user_designation = Designation.objects.get(name=designation)
- recipient_object = get_user_object_from_username(user)
+ recipient_object = get_user_object_from_username(username)
received_files_tracking = Tracking.objects.select_related('file_id').filter(
receiver_id=recipient_object,
receive_design=user_designation,
- file_id__src_module=src_module)
+ file_id__src_module=src_module,
+ file_id__is_read=False)
received_files = [tracking.file_id for tracking in received_files_tracking]
# remove duplicate file ids (from sending back and forth)
@@ -124,7 +126,8 @@ def view_outbox(username: str, designation: str, src_module: str) -> dict:
sent_files_tracking = Tracking.objects.select_related('file_id').filter(
current_id=sender_ExtraInfo_object,
current_design=user_HoldsDesignation_object,
- file_id__src_module=src_module)
+ file_id__src_module=src_module,
+ file_id__is_read=False)
sent_files = [tracking.file_id for tracking in sent_files_tracking]
# remove duplicate file ids (from sending back and forth)
From d4bf291e4b146cff87679828ce25b73d93055029 Mon Sep 17 00:00:00 2001
From: Aragorn-64
Date: Tue, 6 Feb 2024 23:50:03 +0530
Subject: [PATCH 23/68] add view_archived method to sdk
---
.../applications/filetracking/sdk/methods.py | 30 ++++++++++++++++---
1 file changed, 26 insertions(+), 4 deletions(-)
diff --git a/FusionIIIT/applications/filetracking/sdk/methods.py b/FusionIIIT/applications/filetracking/sdk/methods.py
index cf912fa60..a23a8bbbc 100644
--- a/FusionIIIT/applications/filetracking/sdk/methods.py
+++ b/FusionIIIT/applications/filetracking/sdk/methods.py
@@ -141,15 +141,37 @@ def view_outbox(username: str, designation: str, src_module: str) -> dict:
# view_drafts, create_draft, (delete_draft can be via delete_file),
# (forward_draft can be via forward_file, but lets implement a send draft that follows our remark convention)
-def view_archived(user: str, designation: str, src_module: str) -> dict:
+def view_archived(username: str, designation: str, src_module: str) -> dict:
'''
This function is used to get all the files in the archive of a particular user and designation
- Archived file mean those which the user has ever interacted with, and are now finished or archived (?)
+ Archived file mean those which the user has ever interacted with, and are now finished or archived
'''
user_designation = Designation.objects.get(name=designation)
- recipient_object = get_user_object_from_username(user)
+ user_object = get_user_object_from_username(username)
+ received_archived_tracking = Tracking.objects.select_related('file_id').filter(
+ receiver_id=user_object,
+ receive_design=user_designation,
+ file_id__src_module=src_module,
+ file_id__is_read=True)
+
+ user_HoldsDesignation_object = HoldsDesignation.objects.get(
+ user=user_object, designation=user_designation)
+ sender_ExtraInfo_object = get_ExtraInfo_object_from_username(username)
+ sent_archived_tracking = Tracking.objects.select_related('file_id').filter(
+ current_id=sender_ExtraInfo_object,
+ current_design=user_HoldsDesignation_object,
+ file_id__src_module=src_module,
+ file_id__is_read=True)
+
+ archived_tracking = received_archived_tracking | sent_archived_tracking
+ archived_files = [tracking.file_id for tracking in archived_tracking]
+
+ # remove duplicate file ids (from sending back and forth)
+ archived_files_unique = uniqueList(archived_files)
+
+ archived_files_serialized = FileHeaderSerializer(archived_files_unique, many=True)
+ return archived_files_serialized.data
- return None
def archive_file(file_id: int) -> bool:
From aea33d8c95bce92d795a2e3a70fbf0ee85a8feec Mon Sep 17 00:00:00 2001
From: Aragorn-64
Date: Wed, 7 Feb 2024 00:00:23 +0530
Subject: [PATCH 24/68] add archive_file method to sdk
---
FusionIIIT/applications/filetracking/sdk/methods.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/FusionIIIT/applications/filetracking/sdk/methods.py b/FusionIIIT/applications/filetracking/sdk/methods.py
index a23a8bbbc..7eef1c58d 100644
--- a/FusionIIIT/applications/filetracking/sdk/methods.py
+++ b/FusionIIIT/applications/filetracking/sdk/methods.py
@@ -178,7 +178,11 @@ def archive_file(file_id: int) -> bool:
'''
This function is used to archive a file and returns true if the archiving was successful
'''
- return None
+ try:
+ File.objects.filter(id=file_id).update(is_read=True)
+ return True
+ except File.DoesNotExist:
+ return False
def view_drafts(user: str, designation: str, src_module: str) -> dict:
From 66706c72386211d68a52f9b004c8564b8b485d23 Mon Sep 17 00:00:00 2001
From: Divyansh Tripathi <55395696+theoden42@users.noreply.github.com>
Date: Tue, 13 Feb 2024 00:02:33 +0530
Subject: [PATCH 25/68] fix inbox and outbox output and add support for
attachments
---
.../applications/filetracking/sdk/methods.py | 91 ++++++++++++-------
1 file changed, 58 insertions(+), 33 deletions(-)
diff --git a/FusionIIIT/applications/filetracking/sdk/methods.py b/FusionIIIT/applications/filetracking/sdk/methods.py
index 7eef1c58d..e2a386ff5 100644
--- a/FusionIIIT/applications/filetracking/sdk/methods.py
+++ b/FusionIIIT/applications/filetracking/sdk/methods.py
@@ -14,7 +14,7 @@ def create_file(
src_module: str,
src_object_id: str,
file_extra_JSON: dict,
- attached_file: Any) -> int:
+ attached_file: Any = None) -> int:
'''
This function is used to create a file object corresponding to any object of a module that needs to be tracked
'''
@@ -42,8 +42,11 @@ def create_file(
src_module=src_module,
src_object_id=src_object_id,
file_extra_JSON=file_extra_JSON,
- # upload_file=upload_file TESTING without file
)
+
+ if attached_file is not None:
+ new_file.upload_file.save(attached_file.name, attached_file, save=True)
+
uploader_holdsdesignation_obj = HoldsDesignation.objects.get(
user=uploader_user_obj, designation=uploader_designation_obj)
@@ -89,11 +92,10 @@ def delete_file(file_id: int) -> bool:
# inbox and outbox could be sorted based on most recent linked tracking entry
-def view_inbox(username: str, designation: str, src_module: str) -> dict:
+def view_inbox(username: str, designation: str, src_module: str) -> list:
'''
This function is used to get all the files in the inbox of a particular user and designation
'''
- # TODO: currently this does not return a value of sent by
user_designation = Designation.objects.get(name=designation)
recipient_object = get_user_object_from_username(username)
received_files_tracking = Tracking.objects.select_related('file_id').filter(
@@ -106,12 +108,17 @@ def view_inbox(username: str, designation: str, src_module: str) -> dict:
# remove duplicate file ids (from sending back and forth)
received_files_unique = uniqueList(received_files)
- received_files_serialized = FileHeaderSerializer(
- received_files_unique, many=True)
- return received_files_serialized.data
+ received_files_serialized = list(FileHeaderSerializer(
+ received_files_unique, many=True).data)
+
+ for file in received_files_serialized:
+ file['sent_by_user'] = get_last_file_sender(file['id']).username
+ file['sent_by_designation'] = get_last_file_sender_designation(file['id']).name
+
+ return received_files_serialized
-def view_outbox(username: str, designation: str, src_module: str) -> dict:
+def view_outbox(username: str, designation: str, src_module: str) -> list:
'''
This function is used to get all the files in the outbox of a particular user and designation
'''
@@ -215,28 +222,6 @@ def send_draft(file_id: int, receiver: str, receiver_designation: str, remarks:
return None
-def get_current_file_owner(file_id: int) -> User:
- '''
- This functions returns the current owner of the file.
- The current owner is the latest recipient of the file
- '''
- latest_tracking = Tracking.objects.filter(
- file_id=file_id).order_by('-receive_date').first()
- latest_recipient = latest_tracking.receiver_id
- return latest_recipient
-
-
-def get_current_file_owner_designation(file_id: int) -> Designation:
- '''
- This function returns the designation of the current owner of the file.
- The current owner is the latest recipient of the file
- '''
- latest_tracking = Tracking.objects.filter(
- file_id=file_id).order_by('-receive_date').first()
- latest_recipient_designation = latest_tracking.receive_design
- return latest_recipient_designation
-
-
def forward_file(
file_id: int,
receiver: str,
@@ -290,6 +275,49 @@ def view_history(file_id: int) -> dict:
return Tracking_history_serialized.data
+# HELPER FUNCTIONS
+
+def get_current_file_owner(file_id: int) -> User:
+ '''
+ This functions returns the current owner of the file.
+ The current owner is the latest recipient of the file
+ '''
+ latest_tracking = Tracking.objects.filter(
+ file_id=file_id).order_by('-receive_date').first()
+ latest_recipient = latest_tracking.receiver_id
+ return latest_recipient
+
+
+def get_current_file_owner_designation(file_id: int) -> Designation:
+ '''
+ This function returns the designation of the current owner of the file.
+ The current owner is the latest recipient of the file
+ '''
+ latest_tracking = Tracking.objects.filter(
+ file_id=file_id).order_by('-receive_date').first()
+ latest_recipient_designation = latest_tracking.receive_design
+ return latest_recipient_designation
+
+def get_last_file_sender(file_id: int) -> User:
+ '''
+ This Function returns the last file sender,
+ one who has last forwarded/sent the file
+ '''
+ latest_tracking = Tracking.objects.filter(
+ file_id=file_id).order_by('-receive_date').first()
+ latest_sender_extra_info = latest_tracking.current_id
+ return latest_sender_extra_info.user
+
+def get_last_file_sender_designation(file_id: int) -> Designation:
+ '''
+ This Function returns the last file sender's Designation,
+ one who has last forwarded/sent the file
+ '''
+ latest_tracking = Tracking.objects.filter(
+ file_id=file_id).order_by('receive_date').first()
+ latest_sender_holds_designation = latest_tracking.current_design
+ return latest_sender_holds_designation.designation
+
def get_designations(username: str) -> list:
'''
This function is used to return a list of all the designation names of a particular user
@@ -298,18 +326,15 @@ def get_designations(username: str) -> list:
designations_held = HoldsDesignation.objects.filter(user=user)
designation_name = [designation.name for designation in designations_held]
-
def get_user_object_from_username(username: str) -> User:
user = User.objects.get(username=username)
return user
-
def get_ExtraInfo_object_from_username(username: str) -> ExtraInfo:
user = User.objects.get(username=username)
extrainfo = ExtraInfo.objects.get(user=user)
return extrainfo
-
def uniqueList(l: list) -> list:
'''
This function is used to return a list with unique elements
From ab0489d9d7526a5839c1bef93ecbc48a306c9d77 Mon Sep 17 00:00:00 2001
From: Aragorn-64
Date: Tue, 13 Feb 2024 04:36:07 +0530
Subject: [PATCH 26/68] add draft methods to sdk
---
.../applications/filetracking/sdk/methods.py | 37 ++++++++++++-------
1 file changed, 24 insertions(+), 13 deletions(-)
diff --git a/FusionIIIT/applications/filetracking/sdk/methods.py b/FusionIIIT/applications/filetracking/sdk/methods.py
index 7eef1c58d..c704f988a 100644
--- a/FusionIIIT/applications/filetracking/sdk/methods.py
+++ b/FusionIIIT/applications/filetracking/sdk/methods.py
@@ -42,7 +42,7 @@ def create_file(
src_module=src_module,
src_object_id=src_object_id,
file_extra_JSON=file_extra_JSON,
- # upload_file=upload_file TESTING without file
+ upload_file=attached_file
)
uploader_holdsdesignation_obj = HoldsDesignation.objects.get(
user=uploader_user_obj, designation=uploader_designation_obj)
@@ -185,12 +185,6 @@ def archive_file(file_id: int) -> bool:
return False
-def view_drafts(user: str, designation: str, src_module: str) -> dict:
- '''
- This function is used to get all the files in the drafts of a particular user and designation
- '''
- return None
-
def create_draft(
uploader: str,
@@ -202,17 +196,34 @@ def create_draft(
'''
This function is used to create a draft file object corresponding to any object of a module that needs to be tracked
It is similar to create_file but is not sent to anyone
- Later this file can be sent to someone by forward_file or by send_draft by using draft file_id
+ Later this file can be sent to someone by forward_file by using draft file_id
'''
- return None
+ uploader_extrainfo_obj = get_ExtraInfo_object_from_username(uploader)
+ uploader_designation_obj = Designation.objects.get(
+ name=uploader_designation)
+
+ new_file = File.objects.create(
+ uploader=uploader_extrainfo_obj,
+ designation=uploader_designation_obj,
+ src_module=src_module,
+ src_object_id=src_object_id,
+ file_extra_JSON=file_extra_JSON,
+ upload_file=attached_file
+ )
+ return new_file.id
-def send_draft(file_id: int, receiver: str, receiver_designation: str, remarks: str = "") -> int:
+def view_drafts(username: str, designation: str, src_module: str) -> dict:
'''
- This function is used to send a draft file and inserts a new tracking history into the file tracking table
- Note that only the current owner(with appropriate designation) of the file has the ability to send drafts
+ This function is used to get all the files in the drafts (has not been sent) of a particular user and designation
'''
- return None
+ user_designation = Designation.objects.get(name=designation)
+ user_ExtraInfo_object = get_ExtraInfo_object_from_username(username)
+ draft_files = File.objects.filter(
+ tracking__isnull=True, uploader=user_ExtraInfo_object, designation=user_designation, src_module=src_module)
+ draft_files_serialized = FileHeaderSerializer(draft_files, many=True)
+ return draft_files_serialized.data
+
def get_current_file_owner(file_id: int) -> User:
From 423a2f91a2594a6de3f77036120e49fc4bd3d0f8 Mon Sep 17 00:00:00 2001
From: Aragorn-64
Date: Tue, 13 Feb 2024 04:41:00 +0530
Subject: [PATCH 27/68] fix default values of named params
---
.../applications/filetracking/sdk/methods.py | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/FusionIIIT/applications/filetracking/sdk/methods.py b/FusionIIIT/applications/filetracking/sdk/methods.py
index c704f988a..c18e8afcb 100644
--- a/FusionIIIT/applications/filetracking/sdk/methods.py
+++ b/FusionIIIT/applications/filetracking/sdk/methods.py
@@ -11,10 +11,10 @@ def create_file(
uploader_designation: str,
receiver: str,
receiver_designation: str,
- src_module: str,
- src_object_id: str,
- file_extra_JSON: dict,
- attached_file: Any) -> int:
+ src_module: str = "filetracking",
+ src_object_id: str = "",
+ file_extra_JSON: dict = {},
+ attached_file: Any = None) -> int:
'''
This function is used to create a file object corresponding to any object of a module that needs to be tracked
'''
@@ -189,10 +189,10 @@ def archive_file(file_id: int) -> bool:
def create_draft(
uploader: str,
uploader_designation: str,
- src_module: str,
- src_object_id: str,
- file_extra_JSON: dict,
- attached_file: Any) -> int:
+ src_module: str = "filetracking",
+ src_object_id: str = "",
+ file_extra_JSON: dict = {},
+ attached_file: Any = None) -> int:
'''
This function is used to create a draft file object corresponding to any object of a module that needs to be tracked
It is similar to create_file but is not sent to anyone
From c60098fcd55073da1e76d01c20ffbc45cc70ae05 Mon Sep 17 00:00:00 2001
From: Aragorn-64
Date: Fri, 16 Feb 2024 00:59:28 +0530
Subject: [PATCH 28/68] fix css for filetracking.html
---
FusionIIIT/templates/filetracking/filetracking.html | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/FusionIIIT/templates/filetracking/filetracking.html b/FusionIIIT/templates/filetracking/filetracking.html
index 4ae903241..de65367d6 100644
--- a/FusionIIIT/templates/filetracking/filetracking.html
+++ b/FusionIIIT/templates/filetracking/filetracking.html
@@ -13,7 +13,7 @@
{% endblock %}
{% comment %}The grid starts here!{% endcomment %}
-
- {{ user.first_name}}
- {{ user.last_name}}
-
-
{% else %}
-
- {{ request.user.first_name}}
- {{ request.user.last_name}}
-
{% endif %}
- -
+
{% comment %}The left-margin segment!{% endcomment %}
@@ -96,7 +96,7 @@
{% comment %}
The central-rail segment starts here!
{% endcomment %}
-
+
{% comment %}The ... start here!{% endcomment %}
Date: Fri, 16 Feb 2024 01:23:50 +0530
Subject: [PATCH 29/68] fix fts serializer.py
---
FusionIIIT/applications/filetracking/api/serializers.py | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/FusionIIIT/applications/filetracking/api/serializers.py b/FusionIIIT/applications/filetracking/api/serializers.py
index 5721b2eb2..bdae2024e 100644
--- a/FusionIIIT/applications/filetracking/api/serializers.py
+++ b/FusionIIIT/applications/filetracking/api/serializers.py
@@ -21,10 +21,4 @@ class FileHeaderSerializer(serializers.ModelSerializer):
'''
class Meta:
model = File
- fields = [
- 'id',
- 'uploader',
- 'designation',
- 'subject',
- 'description',
- 'upload_date']
+ exclude = ['upload_file', 'is_read']
From eff3142f3f886b3dba9f557f9d797eee405c82ac Mon Sep 17 00:00:00 2001
From: Aragorn-64
Date: Fri, 16 Feb 2024 02:07:21 +0530
Subject: [PATCH 30/68] add dept adding method to sdk
---
FusionIIIT/applications/filetracking/sdk/methods.py | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/FusionIIIT/applications/filetracking/sdk/methods.py b/FusionIIIT/applications/filetracking/sdk/methods.py
index d6c389e22..cea482908 100644
--- a/FusionIIIT/applications/filetracking/sdk/methods.py
+++ b/FusionIIIT/applications/filetracking/sdk/methods.py
@@ -354,3 +354,15 @@ def uniqueList(l: list) -> list:
s = set(l)
unique_list = (list(s))
return unique_list
+
+
+def add_uploader_department_to_files_list(files: list) -> list:
+ '''
+ This function is used to add the department of the uploader to the file
+ '''
+ for file in files:
+ uploader = file['uploader']
+ uploader_Extrainfo = get_ExtraInfo_object_from_username(uploader)
+ file['uploader_department'] = (str(uploader_Extrainfo.department)).split(': ')[1]
+
+ return files
From 6eb128414cc05dffe4c7efb2621bb423b2d82a4a Mon Sep 17 00:00:00 2001
From: Aragorn-64
Date: Sun, 18 Feb 2024 01:28:31 +0530
Subject: [PATCH 31/68] add helper methods to sdk
---
.../applications/filetracking/sdk/methods.py | 44 +++++++++++++++++--
1 file changed, 40 insertions(+), 4 deletions(-)
diff --git a/FusionIIIT/applications/filetracking/sdk/methods.py b/FusionIIIT/applications/filetracking/sdk/methods.py
index cea482908..77c76f7e1 100644
--- a/FusionIIIT/applications/filetracking/sdk/methods.py
+++ b/FusionIIIT/applications/filetracking/sdk/methods.py
@@ -122,11 +122,8 @@ def view_outbox(username: str, designation: str, src_module: str) -> list:
'''
This function is used to get all the files in the outbox of a particular user and designation
'''
- user_designation = Designation.objects.get(name=designation)
+ user_designation = get_designation_obj_from_name(designation=designation)
user_object = get_user_object_from_username(username)
-
- # holds designation is used instead of Designation due to legacy code
- # having it and breaking changes cannot be introduced
user_HoldsDesignation_object = HoldsDesignation.objects.get(
user=user_object, designation=user_designation)
sender_ExtraInfo_object = get_ExtraInfo_object_from_username(username)
@@ -366,3 +363,42 @@ def add_uploader_department_to_files_list(files: list) -> list:
file['uploader_department'] = (str(uploader_Extrainfo.department)).split(': ')[1]
return files
+
+def get_designation_obj_from_name(designation: str) -> Designation:
+ des = Designation.objects.get(name = designation)
+ return des
+
+def get_HoldsDesignation_obj(username: str, designation:str) -> HoldsDesignation:
+ user_object = get_user_object_from_username(username=username)
+ user_designation = get_designation_obj_from_name(designation=designation)
+ obj = HoldsDesignation.objects.get(
+ user=user_object, designation=user_designation)
+ return obj
+
+def get_last_recv_tracking_for_user(file_id: int, username: str, designation: str)-> Tracking:
+ '''
+ This returns the last tracking where username+designation recieved file_id
+ '''
+
+ recv_user_obj = get_user_object_from_username(username)
+ recv_design_obj = get_designation_obj_from_name(designation)
+
+ last_tracking = Tracking.objects.filter(file_id=file_id,
+ receiver_id=recv_user_obj,
+ receive_design=recv_design_obj).order_by('-receive_date')[0]
+ return last_tracking
+
+def get_last_forw_tracking_for_user(file_id: int, username: str, designation: str) -> Tracking:
+ '''
+ Returns the last tracking where the specified user forwarded the file.
+ '''
+
+ # Get user and designation objects
+ sender_user_obj = get_ExtraInfo_object_from_username(username)
+ sender_designation_obj = get_HoldsDesignation_obj(username=username, designation=designation)
+
+ # Filter Tracking objects by file_id, sender_id, and sender_designation
+ last_tracking = Tracking.objects.filter(file_id=file_id,
+ current_id=sender_user_obj,
+ current_design=sender_designation_obj).order_by('-forward_date').first()
+ return last_tracking
From 25f717414d8ab77096a1a00e2573a62caf799aaa Mon Sep 17 00:00:00 2001
From: Aragorn-64
Date: Sun, 18 Feb 2024 01:51:14 +0530
Subject: [PATCH 32/68] fix inbox based on SDK
---
FusionIIIT/applications/filetracking/urls.py | 2 +-
FusionIIIT/applications/filetracking/views.py | 44 ++++++++++----
.../templates/filetracking/fileview2.html | 57 -------------------
FusionIIIT/templates/filetracking/inbox.html | 50 ++++++++++++++++
FusionIIIT/templates/filetracking/inward.html | 2 +-
5 files changed, 84 insertions(+), 71 deletions(-)
delete mode 100644 FusionIIIT/templates/filetracking/fileview2.html
create mode 100644 FusionIIIT/templates/filetracking/inbox.html
diff --git a/FusionIIIT/applications/filetracking/urls.py b/FusionIIIT/applications/filetracking/urls.py
index c48b3ab98..e48ae525f 100644
--- a/FusionIIIT/applications/filetracking/urls.py
+++ b/FusionIIIT/applications/filetracking/urls.py
@@ -11,7 +11,7 @@
url(r'^drafts/$', views.drafts, name='drafts'),
url(r'^fileview/(?P\d+)$', views.fileview, name='fileview'),
url(r'^fileview1/(?P\d+)$', views.fileview1, name='fileview1'),
- url(r'^fileview2/(?P\d+)$', views.fileview2, name='fileview2'),
+ url(r'^inbox/(?P\d+)$', views.inbox_view, name='inbox_view'),
url(r'^outward/$', views.outward, name='outward'),
url(r'^inward/$', views.inward, name='inward'),
url(r'^confirmdelete/(?P\d+)$',
diff --git a/FusionIIIT/applications/filetracking/views.py b/FusionIIIT/applications/filetracking/views.py
index d46050ebf..b09b7193d 100644
--- a/FusionIIIT/applications/filetracking/views.py
+++ b/FusionIIIT/applications/filetracking/views.py
@@ -11,7 +11,8 @@
from timeit import default_timer as time
from notification.views import office_module_notif, file_tracking_notif
from .utils import *
-
+from django.utils.dateparse import parse_datetime
+from .sdk.methods import *
@login_required(login_url="/accounts/login/")
def filetracking(request):
@@ -238,34 +239,53 @@ def fileview1(request, id):
@login_required(login_url="/accounts/login")
-def fileview2(request, id):
+def inbox_view(request, id):
"""
The function is used to fetch the files received by the user form other employees.
These files are filtered by receiver id and ordered by receive date.
@param:
request - trivial.
- id - user id
+ id - HoldsDesignation object id
@variables:
- inward_file - The Tracking object filtered by receiver_id i.e, present working user.
+ inward_files - File object with additional sent by information
context - Holds data needed to make necessary changes in the template.
"""
- inward_file = Tracking.objects.select_related('file_id__uploader__user', 'file_id__uploader__department', 'file_id__designation', 'current_id__user', 'current_id__department',
- 'current_design__user', 'current_design__working', 'current_design__designation', 'receiver_id', 'receive_design').filter(receiver_id=request.user).order_by('-receive_date')
+ # inward_file = Tracking.objects.select_related('file_id__uploader__user', 'file_id__uploader__department', 'file_id__designation', 'current_id__user', 'current_id__department',
+ # 'current_design__user', 'current_design__working', 'current_design__designation', 'receiver_id', 'receive_design').filter(receiver_id=request.user).order_by('-receive_date')
- user_designation = HoldsDesignation.objects.select_related(
+ user_HoldsDesignation_obj = HoldsDesignation.objects.select_related(
'user', 'working', 'designation').get(pk=id)
- s = str(user_designation).split(" - ")
- designations = s[1]
+ s = str(user_HoldsDesignation_obj).split(" - ")
+ designation = s[1]
+ inward_files = view_inbox(
+ username=user_HoldsDesignation_obj.user,
+ designation=user_HoldsDesignation_obj.designation,
+ src_module='filetracking'
+ )
+ inward_files = add_uploader_department_to_files_list(inward_files)
+ # print(inward_files)
+
+ # correct upload_date type and add recieve_date
+ for f in inward_files:
+ f['upload_date'] = parse_datetime(f['upload_date'])
+ print(type(f['upload_date']))
+
+ last_recv_tracking = get_last_recv_tracking_for_user(file_id=f['id'],
+ username=user_HoldsDesignation_obj.user,
+ designation=user_HoldsDesignation_obj.designation)
+ f['receive_date'] = last_recv_tracking.receive_date
+
+
context = {
- 'in_file': inward_file,
- 'designations': designations,
+ 'in_file': inward_files,
+ 'designations': designation,
}
- return render(request, 'filetracking/fileview2.html', context)
+ return render(request, 'filetracking/inbox.html', context)
@login_required(login_url="/accounts/login")
diff --git a/FusionIIIT/templates/filetracking/fileview2.html b/FusionIIIT/templates/filetracking/fileview2.html
deleted file mode 100644
index b56ca2dcc..000000000
--- a/FusionIIIT/templates/filetracking/fileview2.html
+++ /dev/null
@@ -1,57 +0,0 @@
-{% extends 'filetracking/filetracking.html' %}
-{% load static %}
-
-{% block filetracking_tab %}
-
-
-
-
-
- -{% endblock %} diff --git a/FusionIIIT/templates/filetracking/inbox.html b/FusionIIIT/templates/filetracking/inbox.html new file mode 100644 index 000000000..1dcce081b --- /dev/null +++ b/FusionIIIT/templates/filetracking/inbox.html @@ -0,0 +1,50 @@ +{% extends 'filetracking/filetracking.html' %} +{% load static %} +{% block filetracking_tab %} + + + +
+ +{% endblock %} diff --git a/FusionIIIT/templates/filetracking/inward.html b/FusionIIIT/templates/filetracking/inward.html index a42491ad2..5932089d8 100644 --- a/FusionIIIT/templates/filetracking/inward.html +++ b/FusionIIIT/templates/filetracking/inward.html @@ -20,7 +20,7 @@
{% for designation in designation %}
-
{% block filetracking_tab %}
@@ -106,7 +106,7 @@
{% comment %}The central-rail segment ends here!{% endcomment %}
- {% comment %}The right-rail segment starts here!{% endcomment %}
+
{% comment %}The right-margin segment!{% endcomment %}
From 1d270541b7672b64bdb428ee944c3e36da89ed09 Mon Sep 17 00:00:00 2001
From: Aragorn-64 - -{% endblock %} diff --git a/FusionIIIT/templates/filetracking/inbox.html b/FusionIIIT/templates/filetracking/inbox.html new file mode 100644 index 000000000..1dcce081b --- /dev/null +++ b/FusionIIIT/templates/filetracking/inbox.html @@ -0,0 +1,50 @@ +{% extends 'filetracking/filetracking.html' %} +{% load static %} +{% block filetracking_tab %} + + + +
+ +{% endblock %} diff --git a/FusionIIIT/templates/filetracking/inward.html b/FusionIIIT/templates/filetracking/inward.html index a42491ad2..5932089d8 100644 --- a/FusionIIIT/templates/filetracking/inward.html +++ b/FusionIIIT/templates/filetracking/inward.html @@ -20,7 +20,7 @@