From b07ea3f963bb86ee5afd678284097cf0ba7b0984 Mon Sep 17 00:00:00 2001 From: Divyansh Tripathi <55395696+theoden42@users.noreply.github.com> Date: Mon, 19 Feb 2024 11:56:57 +0530 Subject: [PATCH 01/34] fix 1. order of files in inbox and outbox 2. order of files is mantained in uniqueList function --- .../applications/filetracking/sdk/methods.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/FusionIIIT/applications/filetracking/sdk/methods.py b/FusionIIIT/applications/filetracking/sdk/methods.py index d85bc4755..4401d3913 100644 --- a/FusionIIIT/applications/filetracking/sdk/methods.py +++ b/FusionIIIT/applications/filetracking/sdk/methods.py @@ -102,7 +102,7 @@ def view_inbox(username: str, designation: str, src_module: str) -> list: receiver_id=recipient_object, receive_design=user_designation, file_id__src_module=src_module, - file_id__is_read=False) + file_id__is_read=False).order_by('receive_date'); received_files = [tracking.file_id for tracking in received_files_tracking] # remove duplicate file ids (from sending back and forth) @@ -131,7 +131,7 @@ def view_outbox(username: str, designation: str, src_module: str) -> list: current_id=sender_ExtraInfo_object, current_design=user_HoldsDesignation_object, file_id__src_module=src_module, - file_id__is_read=False) + file_id__is_read=False).order_by('-receive_date') sent_files = [tracking.file_id for tracking in sent_files_tracking] # remove duplicate file ids (from sending back and forth) @@ -141,9 +141,6 @@ def view_outbox(username: str, designation: str, src_module: str) -> list: 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(username: str, designation: str, src_module: str) -> dict: ''' @@ -348,8 +345,12 @@ 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)) + seen = set() + unique_list = [] + for item in l: + if item not in seen: + unique_list.append(item) + seen.add(item) return unique_list def add_uploader_department_to_files_list(files: list) -> list: @@ -402,4 +403,4 @@ def get_last_forw_tracking_for_user(file_id: int, username: str, designation: st return last_tracking def get_extra_info_object_from_id(id: int): - return ExtraInfo.objects.get(id=id) \ No newline at end of file + return ExtraInfo.objects.get(id=id) From 402c8c4a2f16951b2e120308b0d327a1f5237888 Mon Sep 17 00:00:00 2001 From: Divyansh Tripathi <55395696+theoden42@users.noreply.github.com> Date: Mon, 19 Feb 2024 12:02:57 +0530 Subject: [PATCH 02/34] fix login required on viewing file --- FusionIIIT/applications/filetracking/views.py | 1 + 1 file changed, 1 insertion(+) diff --git a/FusionIIIT/applications/filetracking/views.py b/FusionIIIT/applications/filetracking/views.py index fef932a9b..b3b49866e 100644 --- a/FusionIIIT/applications/filetracking/views.py +++ b/FusionIIIT/applications/filetracking/views.py @@ -359,6 +359,7 @@ def confirmdelete(request, id): return render(request, 'filetracking/confirmdelete.html', context) +@login_required(login_url="/accounts/login") def view_file(request, id): ''' This function is used to view a particular file received by an employee from another. From 5c6ab078448007d35d09fec160a9346c7421f014 Mon Sep 17 00:00:00 2001 From: Divyansh Tripathi <55395696+theoden42@users.noreply.github.com> Date: Mon, 19 Feb 2024 12:52:33 +0530 Subject: [PATCH 03/34] fix create_file method so that subject and description are also accepted --- 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 4401d3913..6431aafb9 100644 --- a/FusionIIIT/applications/filetracking/sdk/methods.py +++ b/FusionIIIT/applications/filetracking/sdk/methods.py @@ -11,6 +11,8 @@ def create_file( uploader_designation: str, receiver: str, receiver_designation: str, + subject: str = "", + description: str = "", src_module: str = "filetracking", src_object_id: str = "", file_extra_JSON: dict = {}, @@ -38,11 +40,14 @@ def create_file( new_file = File.objects.create( uploader=uploader_extrainfo_obj, + subject=subject, + description=description, 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.upload_file.save(attached_file.name, attached_file, save=True) From a4e01b3bbb443b50bd661eb956a1504f62dbaa03 Mon Sep 17 00:00:00 2001 From: Divyansh Tripathi <55395696+theoden42@users.noreply.github.com> Date: Sun, 3 Mar 2024 19:13:23 +0530 Subject: [PATCH 04/34] add rest api for create file and view file --- .../applications/filetracking/api/views.py | 46 ++++++++++++++----- 1 file changed, 34 insertions(+), 12 deletions(-) diff --git a/FusionIIIT/applications/filetracking/api/views.py b/FusionIIIT/applications/filetracking/api/views.py index 6694e749f..c4bb01189 100644 --- a/FusionIIIT/applications/filetracking/api/views.py +++ b/FusionIIIT/applications/filetracking/api/views.py @@ -2,25 +2,47 @@ from rest_framework.response import Response from rest_framework import status, permissions from rest_framework.authentication import TokenAuthentication +from ..models import File 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] + 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) + def post(self, request): + try: + current_user = request.user.username + current_designation = request.data.get('designation') + receiver_username = request.data.get('receiver_username') + receiver_designation = request.data.get('receiver_designation') + subject = request.data.get('subject') + description = request.data.get('description') + if None in [current_designation, receiver_username, receiver_designation, subject, description]: + return Response({'error': 'One or more required fields are missing.'}, status=status.HTTP_400_BAD_REQUEST) -class ViewFileView(APIView): - #authentication_classes = [TokenAuthentication] - #permission_classes = [permissions.IsAuthenticated] + file_id = create_file(uploader=current_user, uploader_designation=current_designation, + receiver=receiver_username, receiver_designation=receiver_designation, subject=subject, description=description) - def get(self, request, file_id, *args, **kwargs): - file_details = view_file(int(file_id)) - return Response(file_details) + return Response({'file_id': file_id}, status=status.HTTP_201_CREATED) + except Exception as e: + return Response({'error': str(e)}, status=status.HTTP_400_BAD_REQUEST) + + +class ViewFileView(APIView): + authentication_classes = [TokenAuthentication] + permission_classes = [permissions.IsAuthenticated] + + def get(self, request, file_id): + try: + file_details = view_file(int(file_id)) + return Response(file_details, status=status.HTTP_200_OK) + except ValueError: + return Response({'error': 'Invalid file ID format.'}, status=status.HTTP_400_BAD_REQUEST) + except File.DoesNotExist: + return Response({'error': 'File not found.'}, status=status.HTTP_404_NOT_FOUND) + except Exception as e: + return Response({'error': str(e)}, status=status.HTTP_400_BAD_REQUEST) class DeleteFileView(APIView): From 3760068d5468b61ffbb3fb68a61ed4ba924e2817 Mon Sep 17 00:00:00 2001 From: aish0749 Date: Mon, 4 Mar 2024 00:05:28 +0530 Subject: [PATCH 05/34] add rest api for create, view and delete file --- .../applications/filetracking/api/urls.py | 2 -- .../applications/filetracking/api/views.py | 34 +++++++++++++------ .../applications/filetracking/sdk/methods.py | 1 + 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/FusionIIIT/applications/filetracking/api/urls.py b/FusionIIIT/applications/filetracking/api/urls.py index 90f03b2ef..c375fd452 100644 --- a/FusionIIIT/applications/filetracking/api/urls.py +++ b/FusionIIIT/applications/filetracking/api/urls.py @@ -2,7 +2,6 @@ from .views import ( CreateFileView, ViewFileView, - DeleteFileView, ViewInboxView, ViewOutboxView, ViewHistoryView, @@ -13,7 +12,6 @@ urlpatterns = [ 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'), diff --git a/FusionIIIT/applications/filetracking/api/views.py b/FusionIIIT/applications/filetracking/api/views.py index c4bb01189..bf780fd30 100644 --- a/FusionIIIT/applications/filetracking/api/views.py +++ b/FusionIIIT/applications/filetracking/api/views.py @@ -1,3 +1,5 @@ +from venv import logger +from django.forms import ValidationError from rest_framework.views import APIView from rest_framework.response import Response from rest_framework import status, permissions @@ -36,6 +38,7 @@ class ViewFileView(APIView): def get(self, request, file_id): try: file_details = view_file(int(file_id)) + # print(file_details) return Response(file_details, status=status.HTTP_200_OK) except ValueError: return Response({'error': 'Invalid file ID format.'}, status=status.HTTP_400_BAD_REQUEST) @@ -43,20 +46,29 @@ def get(self, request, file_id): return Response({'error': 'File not found.'}, status=status.HTTP_404_NOT_FOUND) except Exception as e: return Response({'error': str(e)}, status=status.HTTP_400_BAD_REQUEST) + + def delete(self, request, file_id): + try: + # file_details = view_file(int(file_id)) + # print(file_details) + success = delete_file(int(file_id)) + if success: + return Response({'message': 'File deleted successfully'}, + status=status.HTTP_204_NO_CONTENT) + else : + return - -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: + except ValueError: + return Response({'error': 'Invalid file ID format'}, + status=status.HTTP_400_BAD_REQUEST) + except File.DoesNotExist: return Response({'error': 'File not found'}, status=status.HTTP_404_NOT_FOUND) + except ValidationError as e: + return Response(e.detail, status=status.HTTP_400_BAD_REQUEST) # Handle ValidationError specifically + except Exception as e: # Catch unexpected errors + logger.error(f"Unexpected error in DeleteFileView: {e}") + return Response({'error': 'An internal server error occurred'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR) class ViewInboxView(APIView): diff --git a/FusionIIIT/applications/filetracking/sdk/methods.py b/FusionIIIT/applications/filetracking/sdk/methods.py index 6431aafb9..bcfae52fb 100644 --- a/FusionIIIT/applications/filetracking/sdk/methods.py +++ b/FusionIIIT/applications/filetracking/sdk/methods.py @@ -1,3 +1,4 @@ +from amqp import NotFound from django.contrib.auth.models import User from applications.filetracking.models import Tracking, File from applications.globals.models import Designation, HoldsDesignation, ExtraInfo From a06d4372a630533f17fb7d5651248402b05b59fa Mon Sep 17 00:00:00 2001 From: aish0749 Date: Mon, 4 Mar 2024 01:11:53 +0530 Subject: [PATCH 06/34] add rest api for inbox, outbox, history view --- .../applications/filetracking/api/urls.py | 2 +- .../applications/filetracking/api/views.py | 139 ++++++++++++++---- 2 files changed, 110 insertions(+), 31 deletions(-) diff --git a/FusionIIIT/applications/filetracking/api/urls.py b/FusionIIIT/applications/filetracking/api/urls.py index c375fd452..9d26bc959 100644 --- a/FusionIIIT/applications/filetracking/api/urls.py +++ b/FusionIIIT/applications/filetracking/api/urls.py @@ -15,6 +15,6 @@ 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'^forwardfile/(?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 bf780fd30..50def429e 100644 --- a/FusionIIIT/applications/filetracking/api/views.py +++ b/FusionIIIT/applications/filetracking/api/views.py @@ -1,10 +1,11 @@ +import logging from venv import logger from django.forms import ValidationError 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 ..models import File +from ..models import File, Tracking from ..sdk.methods import create_file, view_file, delete_file, view_inbox, view_outbox, view_history, forward_file, get_designations class CreateFileView(APIView): @@ -72,48 +73,126 @@ def delete(self, request, file_id): class ViewInboxView(APIView): - #authentication_classes = [TokenAuthentication] - #permission_classes = [permissions.IsAuthenticated] + 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) + def get(self, request): + """ + API endpoint to view inbox files. + Expects query parameters: + - username (required): User requesting the inbox. + - designation (optional): Designation to filter files by. + - src_module (required): Source module to filter files by. + + Returns: + JSON response containing a list of serialized file data, including sender information. + """ + + username = request.data.get('username') + designation = request.data.get('designation') + src_module = request.data.get('src_module') + + if not username or not src_module: + return Response({'error': 'Missing required query parameters: username and src_module.'}, status=400) + + inbox_files = view_inbox(username, designation, src_module) + return Response(inbox_files) class ViewOutboxView(APIView): - #authentication_classes = [TokenAuthentication] - #permission_classes = [permissions.IsAuthenticated] + 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) + def get(self, request): + """ + API endpoint to view outbox files. -class ViewHistoryView(APIView): - #authentication_classes = [TokenAuthentication] - #permission_classes = [permissions.IsAuthenticated] + Expects query parameters: + - username (required): User requesting the outbox. + - designation (optional): Designation to filter files by. + - src_module (required): Source module to filter files by. - def get(self, request, file_id, *args, **kwargs): - history = view_history(int(file_id)) - return Response(history) + Returns: + JSON response containing a paginated list of serialized file data. + """ + username = request.data.get('username') + designation = request.data.get('designation') + src_module = request.data.get('src_module') -class ForwardFileView(APIView): - #authentication_classes = [TokenAuthentication] - #permission_classes = [permissions.IsAuthenticated] + if not username or not src_module: + return Response({'error': 'Missing required query parameters: username and src_module.'}, status=400) - 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) + outbox_files = view_outbox(username, designation, src_module) + return Response(outbox_files) +class ViewHistoryView(APIView): + authentication_classes = [TokenAuthentication] + permission_classes = [permissions.IsAuthenticated] + + def get(self, request, file_id): + """ + View history of a particular file with the given file_id. + + Args: + request (rest_framework.request.Request): The incoming request object. + file_id (int): Primary key of the file to retrieve history for. + + Returns: + rest_framework.response.Response: JSON response containing serialized tracking history. + """ + + try: + history = view_history(file_id) + return Response(history) + except Tracking.DoesNotExist: + return Response({'error': f'File with ID {file_id} not found.'}, status=404) + except Exception as e: + logger.error(f"An unexpected error occurred: {e}") + return Response({'error': 'Internal server error.'}, status=500) + +class ForwardFileView(APIView): +# # Authentication and permission classes (adjust based on your needs) + # authentication_classes = [TokenAuthentication] + # permission_classes = [permissions.IsAuthenticated] + + def post(self, request, file_id): +# # Extract data from request.data + receiver = request.data.get('receiver') + # receiver_designation = request.data.get('receiver_designation') + # file_extra_JSON = request.data.get('file_extra_JSON', {}) + # remarks = request.data.get('remarks', "") + + # # Validate data + # if not receiver or not receiver_designation: + # raise ValidationError("Missing required fields: receiver and receiver_designation") + + # # Extract and validate file attachment (if present) + # file_attachment = request.FILES.get('file_attachment') + # if file_attachment: + # if file_attachment.size > 10 * 1024 * 1024: # Adjust size limit as needed + # raise ValidationError("File size exceeds limit (10 MB)") + + # # Call forward_file function + # try: + # new_tracking_id = forward_file( + # int(file_id), + # receiver, + # receiver_designation, + # file_extra_JSON, + # remarks, + # file_attachment + # ) + # logging.info(f"Successfully forwarded file {file_id} with tracking ID: {new_tracking_id}") + # except Exception as e: + # logging.error(f"Error forwarding file {file_id}: {str(e)}") + # raise ValidationError(str(e)) # Re-raise exception with a user-friendly message + + # # Return response + # return Response({'tracking_id': new_tracking_id}, status=status.HTTP_201_CREATED) + class GetDesignationsView(APIView): #authentication_classes = [TokenAuthentication] #permission_classes = [permissions.IsAuthenticated] From 2ab199e7da0436611778042b6f501be35365ed7e Mon Sep 17 00:00:00 2001 From: aish0749 Date: Mon, 4 Mar 2024 16:39:54 +0530 Subject: [PATCH 07/34] add rest api for draft view, forward file --- .../applications/filetracking/api/urls.py | 2 + .../applications/filetracking/api/views.py | 82 +++++++++++-------- 2 files changed, 52 insertions(+), 32 deletions(-) diff --git a/FusionIIIT/applications/filetracking/api/urls.py b/FusionIIIT/applications/filetracking/api/urls.py index 9d26bc959..f63f45ff3 100644 --- a/FusionIIIT/applications/filetracking/api/urls.py +++ b/FusionIIIT/applications/filetracking/api/urls.py @@ -6,6 +6,7 @@ ViewOutboxView, ViewHistoryView, ForwardFileView, + DraftFileView, GetDesignationsView, ) @@ -16,5 +17,6 @@ url(r'^outbox/$', ViewOutboxView.as_view(), name='view_outbox'), url(r'^history/(?P\d+)/$', ViewHistoryView.as_view(), name='view_history'), url(r'^forwardfile/(?P\d+)/$', ForwardFileView.as_view(), name='forward_file'), + url(r'^draft/$', DraftFileView.as_view(), name='view_drafts'), 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 50def429e..145ccac5d 100644 --- a/FusionIIIT/applications/filetracking/api/views.py +++ b/FusionIIIT/applications/filetracking/api/views.py @@ -6,7 +6,7 @@ from rest_framework import status, permissions from rest_framework.authentication import TokenAuthentication from ..models import File, Tracking -from ..sdk.methods import create_file, view_file, delete_file, view_inbox, view_outbox, view_history, forward_file, get_designations +from ..sdk.methods import create_file, view_drafts, view_file, delete_file, view_inbox, view_outbox, view_history, forward_file, get_designations class CreateFileView(APIView): authentication_classes = [TokenAuthentication] @@ -154,44 +154,62 @@ def get(self, request, file_id): return Response({'error': 'Internal server error.'}, status=500) class ForwardFileView(APIView): -# # Authentication and permission classes (adjust based on your needs) - # authentication_classes = [TokenAuthentication] - # permission_classes = [permissions.IsAuthenticated] +# # # Authentication and permission classes (adjust based on your needs) + authentication_classes = [TokenAuthentication] + permission_classes = [permissions.IsAuthenticated] def post(self, request, file_id): # # Extract data from request.data receiver = request.data.get('receiver') - # receiver_designation = request.data.get('receiver_designation') - # file_extra_JSON = request.data.get('file_extra_JSON', {}) - # remarks = request.data.get('remarks', "") + receiver_designation = request.data.get('receiver_designation') + file_extra_JSON = request.data.get('file_extra_JSON', {}) + remarks = request.data.get('remarks', "") - # # Validate data - # if not receiver or not receiver_designation: - # raise ValidationError("Missing required fields: receiver and receiver_designation") + # Validate data + if not receiver or not receiver_designation: + raise ValidationError("Missing required fields: receiver and receiver_designation") # # Extract and validate file attachment (if present) - # file_attachment = request.FILES.get('file_attachment') - # if file_attachment: - # if file_attachment.size > 10 * 1024 * 1024: # Adjust size limit as needed - # raise ValidationError("File size exceeds limit (10 MB)") - - # # Call forward_file function - # try: - # new_tracking_id = forward_file( - # int(file_id), - # receiver, - # receiver_designation, - # file_extra_JSON, - # remarks, - # file_attachment - # ) - # logging.info(f"Successfully forwarded file {file_id} with tracking ID: {new_tracking_id}") - # except Exception as e: - # logging.error(f"Error forwarding file {file_id}: {str(e)}") - # raise ValidationError(str(e)) # Re-raise exception with a user-friendly message - - # # Return response - # return Response({'tracking_id': new_tracking_id}, status=status.HTTP_201_CREATED) + file_attachment = request.FILES.get('file_attachment') + if file_attachment: + if file_attachment.size > 10 * 1024 * 1024: # Adjust size limit as needed + raise ValidationError("File size exceeds limit (10 MB)") + + # Call forward_file function + try: + new_tracking_id = forward_file( + int(file_id), + receiver, + receiver_designation, + file_extra_JSON, + remarks, + file_attachment + ) + logging.info(f"Successfully forwarded file {file_id} with tracking ID: {new_tracking_id}") + except Exception as e: + logging.error(f"Error forwarding file {file_id}: {str(e)}") + raise ValidationError(str(e)) # Re-raise exception with a user-friendly message + + # Return response + return Response({'tracking_id': new_tracking_id}, status=status.HTTP_201_CREATED) + +class DraftFileView(APIView): + authentication_classes = [TokenAuthentication] + permission_classes = [permissions.IsAuthenticated] + + def get(self, request): + username = request.data.get('username') + designation = request.data.get('designation') + src_module = request.data.get('src_module') + + try: + draft_files = view_drafts(username, designation, src_module) + print(draft_files) + return Response(draft_files, status=status.HTTP_200_OK) + except Exception as e: + return Response({'error': str(e)}, status=status.HTTP_500_INTERNAL_SERVER_ERROR) + + class GetDesignationsView(APIView): #authentication_classes = [TokenAuthentication] From daab40e418348d735243f982e79610bfa69ab9d4 Mon Sep 17 00:00:00 2001 From: nidhibarapatre Date: Mon, 4 Mar 2024 18:09:04 +0530 Subject: [PATCH 08/34] Minor changes --- FusionIIIT/applications/filetracking/admin.py | 7 - FusionIIIT/applications/filetracking/apps.py | 5 - .../filetracking/migrations/0001_initial.py | 53 -- .../filetracking/migrations/__init__.py | 0 .../applications/filetracking/models.py | 45 -- FusionIIIT/applications/filetracking/tests.py | 3 - FusionIIIT/applications/filetracking/urls.py | 31 - FusionIIIT/applications/filetracking/utils.py | 7 - FusionIIIT/applications/filetracking/views.py | 637 ------------------ FusionIIIT/templates/dashboard/modules.html | 2 +- .../templates/dashboard/sidenavbar.html | 2 +- 11 files changed, 2 insertions(+), 790 deletions(-) delete mode 100644 FusionIIIT/applications/filetracking/admin.py delete mode 100644 FusionIIIT/applications/filetracking/apps.py delete mode 100644 FusionIIIT/applications/filetracking/migrations/0001_initial.py delete mode 100644 FusionIIIT/applications/filetracking/migrations/__init__.py delete mode 100644 FusionIIIT/applications/filetracking/models.py delete mode 100644 FusionIIIT/applications/filetracking/tests.py delete mode 100644 FusionIIIT/applications/filetracking/urls.py delete mode 100644 FusionIIIT/applications/filetracking/utils.py delete mode 100644 FusionIIIT/applications/filetracking/views.py diff --git a/FusionIIIT/applications/filetracking/admin.py b/FusionIIIT/applications/filetracking/admin.py deleted file mode 100644 index 82b78df95..000000000 --- a/FusionIIIT/applications/filetracking/admin.py +++ /dev/null @@ -1,7 +0,0 @@ -from django.contrib import admin - -# Register your models here. -from applications.filetracking.models import File, Tracking - -admin.site.register(File) -admin.site.register(Tracking) diff --git a/FusionIIIT/applications/filetracking/apps.py b/FusionIIIT/applications/filetracking/apps.py deleted file mode 100644 index 7e3d3b6d2..000000000 --- a/FusionIIIT/applications/filetracking/apps.py +++ /dev/null @@ -1,5 +0,0 @@ -from django.apps import AppConfig - - -class FileTrackingConfig(AppConfig): - name = 'applications.filetracking' diff --git a/FusionIIIT/applications/filetracking/migrations/0001_initial.py b/FusionIIIT/applications/filetracking/migrations/0001_initial.py deleted file mode 100644 index 6924ae1ff..000000000 --- a/FusionIIIT/applications/filetracking/migrations/0001_initial.py +++ /dev/null @@ -1,53 +0,0 @@ -# Generated by Django 3.1.5 on 2023-03-15 18:53 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('globals', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='File', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('subject', models.CharField(blank=True, max_length=100, null=True)), - ('description', models.CharField(blank=True, max_length=400, null=True)), - ('upload_date', models.DateTimeField(auto_now_add=True)), - ('upload_file', models.FileField(blank=True, upload_to='')), - ('is_read', models.BooleanField(default=False)), - ('designation', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='upload_designation', to='globals.designation')), - ('uploader', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='uploaded_files', to='globals.extrainfo')), - ], - options={ - 'db_table': 'File', - }, - ), - migrations.CreateModel( - name='Tracking', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('receive_date', models.DateTimeField(auto_now_add=True)), - ('forward_date', models.DateTimeField(auto_now_add=True)), - ('remarks', models.CharField(blank=True, max_length=250, null=True)), - ('upload_file', models.FileField(blank=True, upload_to='')), - ('is_read', models.BooleanField(default=False)), - ('current_design', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='globals.holdsdesignation')), - ('current_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')), - ('file_id', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='filetracking.file')), - ('receive_design', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='rec_design', to='globals.designation')), - ('receiver_id', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='receiver_id', to=settings.AUTH_USER_MODEL)), - ], - options={ - 'db_table': 'Tracking', - }, - ), - ] diff --git a/FusionIIIT/applications/filetracking/migrations/__init__.py b/FusionIIIT/applications/filetracking/migrations/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/FusionIIIT/applications/filetracking/models.py b/FusionIIIT/applications/filetracking/models.py deleted file mode 100644 index 5f9581a08..000000000 --- a/FusionIIIT/applications/filetracking/models.py +++ /dev/null @@ -1,45 +0,0 @@ -from django.db import models -from django.contrib.auth.models import User -from applications.globals.models import ExtraInfo, HoldsDesignation, Designation - - -class File(models.Model): - """ - This is file table which contains the all the files created by user - """ - uploader = models.ForeignKey(ExtraInfo, on_delete=models.CASCADE, related_name='uploaded_files') - designation = models.ForeignKey(Designation, on_delete=models.CASCADE, null=True, related_name='upload_designation') - subject = models.CharField(max_length=100, null=True, blank=True) - description = models.CharField(max_length=400, null=True, blank=True) - upload_date = models.DateTimeField(auto_now_add=True) - upload_file = models.FileField(blank=True) - is_read = models.BooleanField(default = False) - - - class Meta: - db_table = 'File' - - #def __str__(self): - #return str(self.ref_id) - - -class Tracking(models.Model): - """ - This is File Tracing Table which contains the status of each indivisual 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) - current_design = models.ForeignKey(HoldsDesignation, null=True, on_delete=models.CASCADE) - # 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') - - receive_date = models.DateTimeField(auto_now_add=True) - forward_date = models.DateTimeField(auto_now_add=True) - remarks = models.CharField(max_length=250, null=True, blank=True) - upload_file = models.FileField(blank=True) - is_read = models.BooleanField(default = False) - - class Meta: - db_table = 'Tracking' diff --git a/FusionIIIT/applications/filetracking/tests.py b/FusionIIIT/applications/filetracking/tests.py deleted file mode 100644 index e9137c85e..000000000 --- a/FusionIIIT/applications/filetracking/tests.py +++ /dev/null @@ -1,3 +0,0 @@ -# from django.test import TestCase - -# Create your tests here. diff --git a/FusionIIIT/applications/filetracking/urls.py b/FusionIIIT/applications/filetracking/urls.py deleted file mode 100644 index cb4a7563d..000000000 --- a/FusionIIIT/applications/filetracking/urls.py +++ /dev/null @@ -1,31 +0,0 @@ -from django.conf.urls import url - -from . import views - -app_name = 'filetracking' - -urlpatterns = [ - - url(r'^$', views.filetracking, name='filetracking'), - 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'^outward/$', views.outward, name='outward'), - url(r'^inward/$', views.inward, name='inward'), - 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'), - - ## 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'^archive_design/$', views.archive_design, name='archive_design'), - url(r'^archive_finish/(?P\d+)/$', views.archive_finish, name='archive_finish'), -] diff --git a/FusionIIIT/applications/filetracking/utils.py b/FusionIIIT/applications/filetracking/utils.py deleted file mode 100644 index 5ebd27374..000000000 --- a/FusionIIIT/applications/filetracking/utils.py +++ /dev/null @@ -1,7 +0,0 @@ -from .models import File, Tracking -from applications.globals.models import ExtraInfo, HoldsDesignation, Designation -from django.contrib.auth.models import User - -def get_designation(userid): - user_designation=HoldsDesignation.objects.select_related('user','working','designation').filter(user=userid) - return user_designation \ No newline at end of file diff --git a/FusionIIIT/applications/filetracking/views.py b/FusionIIIT/applications/filetracking/views.py deleted file mode 100644 index ef5d8f347..000000000 --- a/FusionIIIT/applications/filetracking/views.py +++ /dev/null @@ -1,637 +0,0 @@ -from django.contrib import messages -from django.shortcuts import render, get_object_or_404, redirect -from .models import File, Tracking -from applications.globals.models import ExtraInfo, HoldsDesignation, Designation -from django.template.defaulttags import csrf_token -from django.http import HttpResponse, HttpResponseRedirect, JsonResponse -from django.contrib.auth.decorators import login_required -from django.db import IntegrityError -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 .utils import * - - -@login_required(login_url = "/accounts/login/") -def filetracking(request): - """ - The function is used to create files by current user(employee). - It adds the employee(uploader) and file datails to a file(table) of filetracking(model) - if he intends to create file. - - @param: - request - trivial. - - @variables: - - - uploader - Employee who creates file. - subject - Title of the file. - description - Description of the file. - upload_file - Attachment uploaded while creating file. - file - The file object. - extrainfo - The Extrainfo object. - holdsdesignations - The HoldsDesignation object. - context - Holds data needed to make necessary changes in the template. - """ - 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) - 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") - - File.objects.create( - uploader=uploader, - description=description, - subject=subject, - designation=designation, - upload_file=upload_file - ) - - 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) - - 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") - - file = File.objects.create( - uploader=uploader, - description=description, - subject=subject, - designation=designation, - 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) - - receiver = request.POST.get('receiver') - try: - receiver_id = User.objects.get(username=receiver) - except Exception as e: - messages.error(request, 'Enter a valid Username') - return redirect('/filetracking/') - receive = request.POST.get('recieve') - try: - receive_design = Designation.objects.get(name=receive) - except Exception as e: - messages.error(request, 'Enter a valid Designation') - return redirect('/filetracking/') - - 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, - ) - #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() - designations = get_designation(request.user) - - context = { - 'file': file, - 'extrainfo': extrainfo, - 'holdsdesignations': holdsdesignations, - 'designations': designations, - } - return render(request, 'filetracking/composefile.html', context) - - -@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. - - @param: - request - trivial. - - @variables: - - - context - Holds data needed to make necessary changes in the template. - """ - designation = get_designation(request.user) - context = { - 'designation': designation, - } - return render(request, 'filetracking/drafts.html', context) - - -@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. - - @param: - request - trivial - id - user 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)) - - - - user_designation = HoldsDesignation.objects.select_related('user','working','designation').get(pk=id) - s = str(user_designation).split(" - ") - designations = s[1] - context = { - - 'draft': draft_file_list, - 'extrainfo': extrainfo, - 'designations': designations, - } - return render(request, 'filetracking/fileview.html', context) - - - -@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. - It displays files sent by user to other employees of a Tracking(table) of filetracking(model) - in the 'Outbox' tab of template. - - @param: - request - trivial. - id - user 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') - - user_designation = HoldsDesignation.objects.select_related('user','working','designation').get(pk=id) - - context = { - - 'out': outward_files, - 'abcd': user_designation, - } - return render(request, 'filetracking/fileview1.html', context) - - -@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. - - @param: - request - trivial. - id - user id - - @variables: - inward_file - The Tracking object filtered by receiver_id i.e, present working user. - 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') - - user_designation = HoldsDesignation.objects.select_related('user','working','designation').get(pk=id) - s = str(user_designation).split(" - ") - designations = s[1] - - context = { - - 'in_file': inward_file, - 'designations': designations, - } - return render(request, 'filetracking/fileview2.html', context) - - -@login_required(login_url = "/accounts/login") -def outward(request): - """ - This function fetches the different designations of the user and renders it on outward template - @param: - request - trivial. - - @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) - - -@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. - - @variables: - context - Holds the different designation data of the user - """ - 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): - - """ - The function is used to confirm the deletion of a file. - @param: - request - trivial. - id - user 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) - - context = { - 'j': file, - } - - return render(request, 'filetracking/confirmdelete.html',context) - - -@login_required(login_url = "/accounts/login") -def forward(request, id): - """ - The function is used to forward files received by user(employee) from other - employees which are filtered from Tracking(table) objects by current user - i.e. receiver_id to other employees. - It also gets track of file created by uploader through all users involved in file - along with their remarks and attachments - It displays details file of a File(table) and remarks and attachments of user involved - in file of Tracking(table) of filetracking(model) in the template. - - @param: - request - trivial. - id - id of the file object which the user intends to forward to other employee. - - @variables: - file - The File object. - track - The Tracking object. - remarks = Remarks posted by user. - receiver = Receiver to be selected by user for forwarding file. - receiver_id = Receiver_id who has been selected for forwarding file. - upload_file = File attached by user. - extrainfo = ExtraInfo object. - 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) - - 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') - - - designations = get_designation(request.user) - - context = { - - 'designations':designations, - 'file': file, - 'track': track, - } - - return render(request, 'filetracking/forward.html', context) - - -@login_required(login_url = "/accounts/login") -def archive_design(request): - - designation = HoldsDesignation.objects.select_related('user','working','designation').filter(user=request.user) - - context = { - 'designation': designation, - } - return render( request, 'filetracking/archive_design.html', context) - - - - - -@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') - - - 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) - s = str(abcd).split(" - ") - designations = s[1] - #designations = HoldsDesignation.objects.filter(user=request.user) - # for x in designations: - # if abcd==x: - # designations=abcd - - context = { - - 'draft': draft, - 'extrainfo': extrainfo, - 'designations': designations, - } - - - - - return render(request, 'filetracking/archive.html' , context) - - -@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) - track = Tracking.objects.filter(file_id=file1) - - - - return render(request, 'filetracking/archive_finish.html', {'file': file1, 'track': track}) - - - - -@login_required(login_url = "/accounts/login") -def finish_design(request): - - designation = HoldsDesignation.objects.select_related('user','working','designation').filter(user=request.user) - - context = { - 'designation': designation, - } - return render( request, 'filetracking/finish_design.html', context) - - -@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) - - - context = { - - 'out': out, - 'abcd': abcd, - } - return render(request, 'filetracking/finish_fileview.html', context) - - - - -@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) - 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}) - - - - -def AjaxDropdown1(request): - """ - This function returns the designation of receiver on the forward or compose file template. - - @param: - request - trivial. - - - @variables: - context - return the httpresponce containing the matched designation of the user - """ - if request.method == 'POST': - value = request.POST.get('value') - - hold = Designation.objects.filter(name__startswith=value) - holds = serializers.serialize('json', list(hold)) - context = { - '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 - """ - if request.method == 'POST': - value = request.POST.get('value') - users = User.objects.filter(username__startswith=value) - users = serializers.serialize('json', list(users)) - - context = { - 'users': users - } - return HttpResponse(JsonResponse(context), content_type='application/json') - - -def test(request): - return HttpResponse('success') - - - -@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.delete() - return redirect('/filetracking/drafts/') - - - - -def forward_inward(request,id): - - """ This function is used forward the files which are available in the inbox of the user . - - @param: - request - trivial - id - id of the file that is going to forward - - @variables: - 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) - designations = get_designation(request.user) - - context = { - - 'designations':designations, - 'file': file, - 'track': track, - } - return render(request, 'filetracking/forward.html', context) - - diff --git a/FusionIIIT/templates/dashboard/modules.html b/FusionIIIT/templates/dashboard/modules.html index 73fc33d85..1b1e7b07f 100755 --- a/FusionIIIT/templates/dashboard/modules.html +++ b/FusionIIIT/templates/dashboard/modules.html @@ -130,7 +130,7 @@
- +
diff --git a/FusionIIIT/templates/dashboard/sidenavbar.html b/FusionIIIT/templates/dashboard/sidenavbar.html index 81cecbe94..655780b8c 100644 --- a/FusionIIIT/templates/dashboard/sidenavbar.html +++ b/FusionIIIT/templates/dashboard/sidenavbar.html @@ -77,7 +77,7 @@

Library Module

Awards & Scholarship

 - +

Complaint Module

 {% if user.extrainfo.user_type != 'faculty' %} From 92faf40bf6067c8bac4dea5748a7d73dbc0cf41f Mon Sep 17 00:00:00 2001 From: nidhibarapatre Date: Mon, 4 Mar 2024 18:31:41 +0530 Subject: [PATCH 09/34] Implementation of FTS and completion of the redirect functionality --- .gitignore | 3 + .../applications/complaint_system/models.py | 6 +- .../applications/complaint_system/urls.py | 7 +- .../applications/complaint_system/views.py | 1330 +++++++++++++++-- FusionIIIT/applications/filetracking/admin.py | 7 + .../filetracking/api/serializers.py | 24 + .../applications/filetracking/api/urls.py | 22 + .../applications/filetracking/api/views.py | 89 ++ FusionIIIT/applications/filetracking/apps.py | 5 + .../applications/filetracking/models.py | 51 + .../applications/filetracking/sdk/methods.py | 405 +++++ FusionIIIT/applications/filetracking/tests.py | 3 + FusionIIIT/applications/filetracking/urls.py | 42 + FusionIIIT/applications/filetracking/utils.py | 7 + FusionIIIT/applications/filetracking/views.py | 727 +++++++++ .../complaintModule/add_workers.html | 32 +- .../complaintModule/assignworker.html | 41 +- .../complaintModule/carefeedback.html | 127 ++ .../complaintModule/complaint_caretaker.html | 47 +- .../complaint_caretaker_detail.html | 6 +- .../complaint_user_detail.html | 3 +- .../complainthistory_care_final.html | 325 ++++ .../complainthistory_super_final.html | 362 +++++ .../complainthistory_user.html | 608 +------- .../complainthistory_user_final.html | 343 ++--- .../templates/complaintModule/feedback.html | 8 +- .../complaintModule/overdue_super.html | 12 +- .../complaintModule/overduecomplaint.html | 38 +- ..._caretaker.html => resolve_caretaker.html} | 12 +- .../complaintModule/resolve_pending.html | 13 +- .../complaintModule/resolved_super.html | 6 +- .../complaintModule/supervisor1.html | 54 +- ...complaint.html => unresolvecomplaint.html} | 62 +- .../complaintModule/unresolved_super.html | 42 +- .../templates/filetracking/archive.html | 51 +- .../filetracking/archive_design.html | 2 +- .../filetracking/archive_finish.html | 57 +- .../templates/filetracking/confirmdelete.html | 4 +- .../templates/filetracking/draft_design.html | 30 + FusionIIIT/templates/filetracking/drafts.html | 76 +- .../templates/filetracking/filetracking.html | 14 +- .../templates/filetracking/fileview.html | 51 - .../templates/filetracking/fileview1.html | 49 - .../templates/filetracking/fileview2.html | 57 - .../templates/filetracking/forward.html | 8 +- FusionIIIT/templates/filetracking/inbox.html | 50 + FusionIIIT/templates/filetracking/inward.html | 2 +- FusionIIIT/templates/filetracking/outbox.html | 45 + .../templates/filetracking/outward.html | 2 +- .../templates/filetracking/viewfile.html | 126 ++ docker-compose.yml | 4 +- requirements.txt | 4 +- 52 files changed, 4083 insertions(+), 1418 deletions(-) create mode 100644 FusionIIIT/applications/filetracking/admin.py 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/apps.py create mode 100644 FusionIIIT/applications/filetracking/models.py create mode 100644 FusionIIIT/applications/filetracking/sdk/methods.py create mode 100644 FusionIIIT/applications/filetracking/tests.py create mode 100644 FusionIIIT/applications/filetracking/urls.py create mode 100644 FusionIIIT/applications/filetracking/utils.py create mode 100644 FusionIIIT/applications/filetracking/views.py create mode 100644 FusionIIIT/templates/complaintModule/carefeedback.html create mode 100644 FusionIIIT/templates/complaintModule/complainthistory_care_final.html create mode 100644 FusionIIIT/templates/complaintModule/complainthistory_super_final.html rename FusionIIIT/templates/complaintModule/{complainthistory_caretaker.html => resolve_caretaker.html} (96%) rename FusionIIIT/templates/complaintModule/{resolvecomplaint.html => unresolvecomplaint.html} (85%) create mode 100644 FusionIIIT/templates/filetracking/draft_design.html delete mode 100644 FusionIIIT/templates/filetracking/fileview.html delete mode 100644 FusionIIIT/templates/filetracking/fileview1.html delete mode 100644 FusionIIIT/templates/filetracking/fileview2.html create mode 100644 FusionIIIT/templates/filetracking/inbox.html create mode 100644 FusionIIIT/templates/filetracking/outbox.html create mode 100644 FusionIIIT/templates/filetracking/viewfile.html diff --git a/.gitignore b/.gitignore index 497fd7a16..3801de163 100644 --- a/.gitignore +++ b/.gitignore @@ -72,3 +72,6 @@ node_modules/ FusionIIIT/static/ package-lock.json + +# migrations +migrations/ \ No newline at end of file diff --git a/FusionIIIT/applications/complaint_system/models.py b/FusionIIIT/applications/complaint_system/models.py index 9f8849e69..22bb59832 100644 --- a/FusionIIIT/applications/complaint_system/models.py +++ b/FusionIIIT/applications/complaint_system/models.py @@ -42,7 +42,7 @@ class Caretaker(models.Model): # no_of_comps = models.CharField(max_length=1000) def __str__(self): - return str(self.id) + '-' + self.area + return str(self.id) + '-' + str(self.area) class Workers(models.Model): @@ -82,7 +82,7 @@ def __str__(self): class Supervisor(models.Model): sup_id = models.ForeignKey(ExtraInfo, on_delete=models.CASCADE) - area = models.CharField(choices=Constants.AREA, max_length=20) + area = models.CharField(choices=Constants.AREA, max_length=20,default='hall-3') def __str__(self): - return str(self.sup_id.user.username) + return str(self.id) + '-' + str(self.area) diff --git a/FusionIIIT/applications/complaint_system/urls.py b/FusionIIIT/applications/complaint_system/urls.py index b95605ade..c6d68fdef 100644 --- a/FusionIIIT/applications/complaint_system/urls.py +++ b/FusionIIIT/applications/complaint_system/urls.py @@ -18,6 +18,7 @@ # caretaker + url(r'^caretaker/lodge/$', views.caretakerlodge), url(r'^caretaker/$', views.caretaker, name='caretaker'), url(r'^caretaker/feedback/(?P[0-9]+)/$', views.feedback_care), url(r'^caretaker/worker_id_know_more/(?P[0-9]+)/complaint_reassign/(?P[0-9]+)/discharge_worker/$', views.discharge_worker,name='discharge_worker'), @@ -27,15 +28,18 @@ url(r'^caretaker/pending/(?P[0-9]+)/$', views.resolvepending), url(r'^caretaker/detail2/(?P[0-9]+)/$', views.detail2,name='detail2'), url(r'^caretaker/search_complaint$', views.search_complaint), + url(r'^caretaker/(?P[0-9]+)/feedback/$', views.submitfeedbackcaretaker), # supervisor + url(r'^supervisor/lodge/$', views.supervisorlodge), url(r'^supervisor/$', views.supervisor), url(r'^supervisor/feedback/(?P[0-9]+)/$', views.feedback_super), url(r'^supervisor/caretaker_id_know_more/(?P[0-9]+)/$', views.caretaker_id_know_more), url(r'^supervisor/caretaker_id_know_more/(?P[0-9]+)/complaint_reassign_super/(?P[0-9]+)/$', views.complaint_reassign_super, name = 'complaint_reassign_super'), url(r'^supervisor/detail3/(?P[0-9]+)/$', views.detail3, name = 'detail3'), - + url(r'^supervisor/pending/(?P[0-9]+)/$', views.resolvependingsuper), + url(r'^supervisor/(?P[0-9]+)/$', views.submitfeedbacksuper), @@ -45,6 +49,7 @@ url(r'^caretaker/deletecomplaint/(?P[0-9]+)/$', views.deletecomplaint), # url(r'^caretaker/(?P[0-9]+)/$', views.assign_worker), url(r'^caretaker/(?P[0-9]+)/(?P[0-9]+)/$', views.changestatus), + url(r'^supervisor/(?P[0-9]+)/(?P[0-9]+)/$', views.changestatussuper), url(r'^api/',include('applications.complaint_system.api.urls')) diff --git a/FusionIIIT/applications/complaint_system/views.py b/FusionIIIT/applications/complaint_system/views.py index b566856aa..38852979c 100644 --- a/FusionIIIT/applications/complaint_system/views.py +++ b/FusionIIIT/applications/complaint_system/views.py @@ -12,6 +12,12 @@ from notifications.models import Notification from .models import Caretaker, StudentComplain, Supervisor, Workers from notification.views import complaint_system_notif + + +from applications.filetracking.sdk.methods import * +from applications.filetracking.models import * + + #function for reassign to another worker @login_required def complaint_reassign(request,wid,iid): @@ -121,30 +127,60 @@ def assign_worker(request, comp_id1): a = get_object_or_404(User, username=request.user.username) y = ExtraInfo.objects.all().select_related('user','department').filter(user=a).first() comp_id = y.id - if type == 'assign': - complaint_finish = request.POST.get('complaint_finish', '') - worker_id = request.POST.get('assign_worker', '') - w = Workers.objects.select_related('caretaker_id','caretaker_id__staff_id','caretaker_id__staff_id__user','caretaker_id__staff_id__department').get(id=worker_id) - StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').select_for_update().filter(id=comp_id1).\ - update(worker_id=w, status=1) - complainer_details = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').get(id=comp_id1) - student = 0 - message = "Worker has been assigned to your complaint" - complaint_system_notif(request.user, complainer_details.complainer.user ,'assign_worker_alert',complainer_details.id,student,message) - return HttpResponseRedirect('/complaint/caretaker/') - elif type == 'redirect': - assign_caretaker = request.POST.get('assign_caretaker', '') - c = Caretaker.objects.select_related('staff_id','staff_id__user','staff_id__department').get(id=assign_caretaker) - c1 = Caretaker.objects.select_related('staff_id','staff_id__user','staff_id__department').get(id=comp_id) - remark = 'Redirect complaint from ' + c1.area - StudentComplain.objects.select_for_update().filter(id=comp_id1).\ - update(location=c.area, remarks=remark) - complainer_details = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').get(id=comp_id1) - student=0 - message = "Your Complaint has been redirected to another caretaker" - complaint_system_notif(request.user, complainer_details.complainer.user ,'comp_redirect_alert',complainer_details.id,student,message) - return HttpResponseRedirect('/complaint/caretaker/') + # if a.username=="shyams": + # desgn="hall3caretaker" + # if type == 'assign': + # complaint_finish = request.POST.get('complaint_finish', '') + # worker_id = request.POST.get('assign_worker', '') + # w = Workers.objects.select_related('caretaker_id','caretaker_id__staff_id','caretaker_id__staff_id__user','caretaker_id__staff_id__department').get(id=worker_id) + # StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').select_for_update().filter(id=comp_id1).\ + # update(worker_id=w, status=1) + # complainer_details = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').get(id=comp_id1) + # student = 0 + # message = "Worker has been assigned to your complaint" + # complaint_system_notif(request.user, complainer_details.complainer.user ,'assign_worker_alert',complainer_details.id,student,message) + + # return HttpResponseRedirect('/complaint/caretaker/') + # elif type == 'redirect': + print(comp_id1) + print("1234567890") + assign_caretaker = request.POST.get('assign_caretaker', '') + # c = Caretaker.objects.select_related('staff_id','staff_id__user','staff_id__department').get(id=assign_caretaker) + c1 = Caretaker.objects.select_related('staff_id','staff_id__user','staff_id__department').get(staff_id=comp_id) + c2=Supervisor.objects.all().filter(area=c1.area) + # c3=User.objects.all().filter(id=c2[0].sup_id.id) + # print(c3[0]) + y1 = ExtraInfo.objects.all().select_related('user','department').filter(id=c2[0].sup_id.id).first() + print(y1) + # b = get_object_or_404(User, id=y1.user.username) + # remark = 'Redirect complaint from ' + c1.area + # StudentComplain.objects.select_for_update().filter(id=comp_id1).\ + # update(location=c.area, remarks=remark) + complainer_details = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').get(id=comp_id1) + student=0 + message = "Your Complaint has been redirected to supervisor" + complaint_system_notif(request.user, complainer_details.complainer.user ,'comp_redirect_alert',complainer_details.id,student,message) + # return render(request, "complaintModule/assignworker.html", + # {'detail': detail, 'worker': worker, 'flag': + # flag, 'total_caretaker': total_caretaker,'a':a, 'total_caretakers_in_area':total_caretakers_in_area}) + + sup = HoldsDesignation.objects.select_related('user','working','designation').get(user = y1.user_id) + print(sup.designation) + + user_details=User.objects.get(id=y.user_id) + des=HoldsDesignation.objects.filter(user=user_details).all() + file_id = create_file(uploader=a.username, + uploader_designation=des[0].designation, + receiver=c2[0].sup_id.user, + receiver_designation=sup.designation, + src_module="complaint", + src_object_id= str(comp_id1), + file_extra_JSON= {}, + attached_file = None) + + + return HttpResponseRedirect('/complaint/caretaker/') else: y = ExtraInfo.objects.all().select_related('user','department').get(id=y.id) a = Caretaker.objects.select_related('staff_id','staff_id__user','staff_id__department').get(staff_id=y) @@ -153,7 +189,8 @@ def assign_worker(request, comp_id1): try: detail = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(id=comp_id1).first() total_caretaker = Caretaker.objects.select_related('staff_id','staff_id__user','staff_id__department').all() - total_caretakers_in_area = Caretaker.objects.select_related('staff_id','staff_id__user','staff_id__department').filter(area=b and id!=a.id) + total_caretakers_in_area = Supervisor.objects.select_related('sup_id').filter(area=b ) + # supervisors_in_area= HoldsDesignation.objects.select_related('user','working','designation').get(total_caretakers_in_area = dsgn) workertemp = [] worker = [] flag = '' @@ -283,12 +320,31 @@ def check(request): print('----------------------------') print('----------------------------') print('----------------------------') - if b.user_type == 'student': + supervisor_list=Supervisor.objects.all() + caretaker_list=Caretaker.objects.all() + is_supervisor=False + is_caretaker=False + for i in supervisor_list: + if b.id==i.sup_id_id: + is_supervisor=True + break + for i in caretaker_list: + if b.id==i.staff_id_id: + is_caretaker=True + break + if is_supervisor: + return HttpResponseRedirect('/complaint/supervisor/') + elif is_caretaker: + return HttpResponseRedirect('/complaint/caretaker/') + + elif b.user_type == 'student': return HttpResponseRedirect('/complaint/user/') + # elif b.user_type == 'fx': + # return HttpResponseRedirect('/complaint/supervisor/') elif b.user_type == 'staff': - return HttpResponseRedirect('/complaint/caretaker/') + return HttpResponseRedirect('/complaint/user/') elif b.user_type == 'faculty': - return HttpResponseRedirect('/complaint/supervisor/') + return HttpResponseRedirect('/complaint/user/') else: return HttpResponse("

wrong user credentials

") else: @@ -338,7 +394,7 @@ def user(request): complaint_finish = datetime.now() + timedelta(days=4) elif comp_type == 'other': complaint_finish = datetime.now() + timedelta(days=3) - y = ExtraInfo.objects.all().select_related('user','department').get(id=comp_id) + # y = ExtraInfo.objects.all().get(id=comp_id) #check if location given if location!="": # x = StudentComplain(complainer=y, @@ -352,6 +408,8 @@ def user(request): # x.save() + user_details=User.objects.get(id=y.user_id) + obj1, created = StudentComplain.objects.get_or_create(complainer=y, complaint_type=comp_type, location=location, @@ -361,7 +419,8 @@ def user(request): complaint_finish=complaint_finish, upload_complaint=comp_file) - + + historytemp = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(complainer=y).order_by('-id') history = [] j = 1 @@ -408,6 +467,19 @@ def user(request): dsgn = "rewacaretaker" caretaker_name = HoldsDesignation.objects.select_related('user','working','designation').get(designation__name = dsgn) + c1=HoldsDesignation.objects.filter(user_id=y.user_id).all() + print(c1[0].designation) + file_id = create_file(uploader=user_details.username, + uploader_designation=c1[0].designation, + receiver=caretaker_name.user.username, + receiver_designation=caretaker_name.designation, + src_module="complaint", + src_object_id= str(obj1.id), + file_extra_JSON= {}, + attached_file = None) + + # print(" wertyuioiuhygfdsdfghjk") + print(file_id) # This is to allow the student student = 1 @@ -419,6 +491,9 @@ def user(request): # next = request.POST.get('next', '/') messages.success(request,message) + + + return HttpResponseRedirect('/complaint/user') else: @@ -426,6 +501,8 @@ def user(request): y = ExtraInfo.objects.all().select_related('user','department').filter(user=a).first() historytemp = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(complainer=y).order_by('-id') history=[] + user_details=User.objects.get(id=y.user_id) + notification = Notification.objects.filter(recipient=a.id) notification = notification.filter(data__exact={'url':'complaint:detail','module':'Complaint System'}) @@ -437,45 +514,48 @@ def user(request): # notification_message.append(notification.verb+' by '+ to + ' ' + duration + ' ago ') - + c1=HoldsDesignation.objects.filter(user_id=y.user_id).all() + print(c1[0].designation) + # c2=Designation.objects.filter(i) j = 1 for i in historytemp: history.append(i) - # if j%2 != 0: - # history.append(i) - # j = j+1 - - for i in history: - i.serial_no = j - j = j+1 + # # if j%2 != 0: + # # history.append(i) + # # j = j+1 - # if location == "hall-1": - # dsgn ="hall1caretaker" - # elif location =="hall-3": - # dsgn ="hall3caretaker" - # elif location =="hall-4": - # dsgn ="hall4caretaker" - # elif location =="CC1": - # dsgn ="CC convenor" - # elif location =="CC2": - # dsgn ="CC2 convener" - # elif location == "core_lab": - # dsgn = "corelabcaretaker" - # elif location =="LHTC": - # dsgn ="lhtccaretaker" - # elif location =="NR2": - # dsgn ="nr2caretaker" - # else: - # dsgn = "rewacaretaker" - # caretaker_name = HoldsDesignation.objects.get(designation__name = dsgn) + - # complaint_system_notif(request.user, caretaker_name.user,'lodge_comp_alert') + outbox_files = view_outbox( + username=user_details.username, + designation=c1[0].designation, + src_module="complaint" + ) + + outbox=[] + comp_list=set() + for i in outbox_files: + + outbox.append(i) + + for i in outbox: + file_history = view_history(file_id=i['id']) + + comp=File.objects.filter(uploader=file_history[0]['current_id']) + for j in comp: + c=StudentComplain.objects.all().filter(id=j.src_object_id) + comp_list.add(c) + print(c[0]) + + break + complaint_final_list=[] + for i in comp_list: + complaint_final_list.append(i[0]) return render(request, "complaintModule/complaint_user.html", - {'history': history,'notification':notification, 'comp_id': y.id}) + {'history': complaint_final_list,'notification':notification, 'comp_id': y.id, 'outbox':outbox}) + - return render(request, "complaintModule/complaint_user.html", - {'history': history, 'comp_id': comp_id }) @login_required def save_comp(request): """ @@ -543,21 +623,21 @@ def caretaker(request): """ current_user = get_object_or_404(User, username=request.user.username) y = ExtraInfo.objects.all().select_related('user','department').filter(user=current_user).first() - + if request.method == 'POST': - type = request.POST.get('submit', '') - worker_type = request.POST.get('complaint_type', '') - name = request.POST.get('name', '') - phone = request.POST.get('phone_no', '') - age = request.POST.get('age', '') - try: - y = ExtraInfo.objects.all().select_related('user','department').get(id=y.id) - a = Caretaker.objects.select_related('staff_id','staff_id__user','staff_id__department').get(staff_id=y) - except Exception as e: - a = None - y = None - intage = int(age) - intphone = int(phone) + # type = request.POST.get('submit', '') + # worker_type = request.POST.get('complaint_type', '') + # name = request.POST.get('name', '') + # phone = request.POST.get('phone_no', '') + # age = request.POST.get('age', '') + # try: + # y = ExtraInfo.objects.all().select_related('user','department').get(id=y.id) + # a = Caretaker.objects.select_related('staff_id','staff_id__user','staff_id__department').get(staff_id=y) + # except Exception as e: + # a = None + # y = None + # intage = int(age) + # intphone = int(phone) # if len(phone) == 10 and intage > 20 and intage < 50 and intphone > 1999999999: # x = Workers(caretaker_id=a, # name=name, @@ -567,77 +647,211 @@ def caretaker(request): # if not Workers.objects.filter(caretaker_id=a,name=name, age=age,phone=phone,worker_type=worker_type).exists(): # x.save() - if len(phone) == 10 and intage > 20 and intage < 50 and intphone > 1999999999: - obj, created = Workers.objects.get_or_create(caretaker_id=a, - name=name, - age=age, - phone=phone, - worker_type=worker_type) + # if len(phone) == 10 and intage > 20 and intage < 50 and intphone > 1999999999: + # obj, created = Workers.objects.get_or_create(caretaker_id=a, + # name=name, + # age=age, + # phone=phone, + # worker_type=worker_type) - b = a.area - historytemp = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(location=b).order_by('-id') + # b = a.area + # historytemp = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(location=b).order_by('-id') + # history = [] + # j = 1 + # k = 1 + # for i in historytemp: + # history.append(i) + # # if j%2 == 1: + # # history.append(i) + # # j = j+1 + + # for h in history: + # h.serial_no = k + # k=k+1 + user_details=User.objects.get(id=y.user_id) + # if user_details.username=="shyams": + # desgn="hall3caretaker" + # if user_details.username=="hall4caretaker": + # desgn="hall4caretaker" + + # total_worker = [] + + + # total_workertemp = Workers.objects.select_related('caretaker_id','caretaker_id__staff_id','caretaker_id__staff_id__user','caretaker_id__staff_id__department').filter(caretaker_id=a) + # j = 1 + # for i in total_workertemp: + # if j%2 != 0: + # total_worker.append(i) + # j = j + 1 + + + # for i in total_workertemp: + # total_worker.append(i) + + complaint_assign_no = [] + comp_type = request.POST.get('complaint_type', '') + location = request.POST.get('Location', '') + specific_location = request.POST.get('specific_location', '') + comp_file = request.FILES.get('myfile') + + details = request.POST.get('details', '') + status = 0 + # finish time is according to complaint type + complaint_finish = datetime.now() + timedelta(days=2) + if comp_type == 'Electricity': + complaint_finish = datetime.now() + timedelta(days=2) + elif comp_type == 'carpenter': + complaint_finish = datetime.now() + timedelta(days=2) + elif comp_type == 'plumber': + complaint_finish = datetime.now() + timedelta(days=2) + elif comp_type == 'garbage': + complaint_finish = datetime.now() + timedelta(days=1) + elif comp_type == 'dustbin': + complaint_finish = datetime.now() + timedelta(days=1) + elif comp_type == 'internet': + complaint_finish = datetime.now() + timedelta(days=4) + elif comp_type == 'other': + complaint_finish = datetime.now() + timedelta(days=3) + # y = ExtraInfo.objects.all().select_related('user','department').get(id=comp_id) + #check if location given + if location!="": + user_details=User.objects.get(id=y.user_id) + obj1, created = StudentComplain.objects.get_or_create(complainer=y, + complaint_type=comp_type, + location=location, + specific_location=specific_location, + details=details, + status=status, + complaint_finish=complaint_finish, + upload_complaint=comp_file) + + historytemp = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(complainer=y).order_by('-id') history = [] j = 1 k = 1 for i in historytemp: history.append(i) - # if j%2 == 1: + # if j%2 != 0: # history.append(i) # j = j+1 + + for h in history: h.serial_no = k - k=k+1 + k = k+1 + # if location == "hall1": + # dsgn = "hall1caretaker" + # elif location == "hall3": + # dsgn = "hall3caretaker" + # else : + # dsgn = "hall4caretaker" + if location == "hall-1": + dsgn ="hall1caretaker" + elif location =="hall-3": + dsgn ="hall3caretaker" + elif location =="hall-4": + dsgn ="hall4caretaker" + elif location =="CC1": + dsgn ="cc1convener" + elif location =="CC2": + dsgn ="CC2 convener" + elif location == "core_lab": + dsgn = "corelabcaretaker" + elif location =="LHTC": + dsgn ="lhtccaretaker" + elif location =="NR2": + dsgn ="nr2caretaker" + elif location =="Maa Saraswati Hostel": + dsgn ="mshcaretaker" + elif location =="Nagarjun Hostel": + dsgn ="nhcaretaker" + elif location =="Panini Hostel": + dsgn ="phcaretaker" + else: + dsgn = "rewacaretaker" + caretaker_name = HoldsDesignation.objects.select_related('user','working','designation').get(designation__name = dsgn) + print(caretaker_name.user.username) + print(user_details.username) + print(caretaker_name.designation) + user_details=User.objects.get(id=y.user_id) + des=HoldsDesignation.objects.filter(user=user_details).all() + file_id = create_file(uploader=user_details.username, + uploader_designation=des[0].designation, + receiver=caretaker_name.user.username, + receiver_designation=dsgn, + src_module="complaint", + src_object_id= str(obj1.id), + file_extra_JSON= {}, + attached_file = None) - total_worker = [] - total_workertemp = Workers.objects.select_related('caretaker_id','caretaker_id__staff_id','caretaker_id__staff_id__user','caretaker_id__staff_id__department').filter(caretaker_id=a) - j = 1 - # for i in total_workertemp: - # if j%2 != 0: - # total_worker.append(i) - # j = j + 1 - - for i in total_workertemp: - total_worker.append(i) + # This is to allow the student + student = 1 + message = "A New Complaint has been lodged" + complaint_system_notif(request.user, caretaker_name.user,'lodge_comp_alert',obj1.id,student,message) + + # return render(request, "complaintModule/complaint_user.html", + # {'history': history, 'comp_id': comp_id }) + # next = request.POST.get('next', '/') + + messages.success(request,message) + # return HttpResponseRedirect('/complaint/user') - complaint_assign_no = [] - for x in total_worker: - worker = Workers.objects.select_related('caretaker_id','caretaker_id__staff_id','caretaker_id__staff_id__user','caretaker_id__staff_id__department').get(id=x.id) - temp = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(worker_id=worker).count() - worker.total_complaint = temp - complaint_assign_no.append(worker) + # for x in total_worker: + # worker = Workers.objects.select_related('caretaker_id','caretaker_id__staff_id','caretaker_id__staff_id__user','caretaker_id__staff_id__department').get(id=x.id) + # temp = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(worker_id=worker).count() + # worker.total_complaint = temp + # complaint_assign_no.append(worker) notification = Notification.objects.filter(recipient=current_user.id) notification = notification.filter(data__exact={'url':'complaint:detail2','module':'Complaint System'}) return render(request, "complaintModule/complaint_caretaker.html", {'history': history, 'comp_id': y.id, - 'notification': notification, 'total_worker': - total_worker, 'complaint_assign_no': complaint_assign_no}) + 'notification': notification, 'complaint_assign_no': complaint_assign_no}) else: - y = ExtraInfo.objects.all().select_related('user','department').get(id=y.id) - a = Caretaker.objects.select_related('staff_id','staff_id__user','staff_id__department').get(staff_id=y) + # y = ExtraInfo.objects.all().select_related('user','department').get(id=y.id) + + a = Caretaker.objects.select_related('staff_id','staff_id__user','staff_id__department').get(staff_id=y.id) b = a.area history = [] historytemp = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(location=b).order_by('-id') - total_worker = [] - total_workertemp = Workers.objects.select_related('caretaker_id','caretaker_id__staff_id','caretaker_id__staff_id__user','caretaker_id__staff_id__department').filter(caretaker_id=a) - j = 1 - for i in total_workertemp: - total_worker.append(i) + # total_worker = [] + # total_workertemp = Workers.objects.select_related('caretaker_id','caretaker_id__staff_id','caretaker_id__staff_id__user','caretaker_id__staff_id__department').filter(caretaker_id=a) + # j = 1 + # for i in total_workertemp: + # total_worker.append(i) + # complaint_assign_no = [] complaint_assign_no = [] - complaint_assign_no = [] + user_details=User.objects.get(id=y.user_id) + # if user_details.username=="shyams": + # desgn="hall3caretaker" + # if user_details.username=="hall4caretaker": + # desgn="hall4caretaker" + # a = get_object_or_404(User, username=request.user.username) + # y = ExtraInfo.objects.all().select_related('user','department').filter(user=a).first() + carehistorytemp = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(complainer=y).order_by('-id') + carehistory=[] + j = 1 + for i in carehistorytemp: + carehistory.append(i) + # if j%2 != 0: + # history.append(i) + # j = j+1 - for x in total_worker: - worker = Workers.objects.select_related('caretaker_id','caretaker_id__staff_id','caretaker_id__staff_id__user','caretaker_id__staff_id__department').get(id=x.id) - temp = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(worker_id=worker).count() - worker.total_complaint = temp - complaint_assign_no.append(worker) + for i in carehistory: + i.serial_no = j + j = j+1 + # for x in total_worker: + # worker = Workers.objects.select_related('caretaker_id','caretaker_id__staff_id','caretaker_id__staff_id__user','caretaker_id__staff_id__department').get(id=x.id) + # temp = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(worker_id=worker).count() + # worker.total_complaint = temp + # complaint_assign_no.append(worker) overduecomplaint = [] j = 1 @@ -658,14 +872,87 @@ def caretaker(request): notification = Notification.objects.filter(recipient=current_user.id) notification = notification.filter(data__exact={'url':'complaint:detail2','module':'Complaint System'}) + user_details=User.objects.get(id=y.user_id) + # print(y.user_type) + # print(user_details.username) + # print(user_details) - + des=HoldsDesignation.objects.filter(user=user_details).all() + # print(y.user_id) + # print(user_details) + # print(des[0].designation) + user_object = get_user_object_from_username(y.user.username) + user_des=HoldsDesignation.objects.filter(user=user_details).all() + # print(user_object) + # print(user_des) + outbox_files = view_outbox( + username=user_details.username, + designation=des[0].designation, + src_module="complaint" + ) + + outbox=[] + comp_list=set() + for i in outbox_files: + # print(i) + outbox.append(i) + for i in outbox: + file_history = view_history(file_id=i['id']) + + comp=File.objects.filter(uploader=file_history[0]['current_id']) + for j in comp: + c=StudentComplain.objects.all().filter(id=j.src_object_id) + comp_list.add(c) + # print(c[0]) + + break + complaint_final_list=[] + for i in comp_list: + complaint_final_list.append(i[0]) + print(user_details.username) + print(des[0].designation) + inbox_files = view_inbox( + username=user_details.username, + designation=des[0].designation, + src_module="complaint" + ) + print(inbox_files) + + inbox=[] + comp_list_in=set() + for i in inbox_files: + # print(i) + inbox.append(i) + file_history_list=[] + for i in inbox: + file_history = view_history(file_id=i['id']) + # print(file_history[0]) + file_history_list.append(file_history[0]) + # print(file_history[0]['file_id']) + comp=File.objects.filter(id=file_history[0]['file_id']) + print(comp[0].src_object_id) + for j in comp: + c=StudentComplain.objects.all().filter(id=j.src_object_id) + comp_list_in.add(c) + # print(c[0]) + + # break + # file_history_list_final=uniqueList(file_history_list) + # print(file_history_list) + complaint_final_list_in=[] + for i in comp_list_in: + complaint_final_list_in.append(i[0]) + + # print(complaint_final_list_in) + return render(request, "complaintModule/complaint_caretaker.html", - { 'history': history, 'comp_id': y.id, 'total_worker': total_worker, - 'complaint_assign_no': total_worker, + { 'history': complaint_final_list_in, + 'comp_id': y.id, + 'carehistory':complaint_final_list, 'notification':notification, - 'overduecomplaint': overduecomplaint, 'care_id': a}) + 'overduecomplaint': overduecomplaint, + 'care_id': a}) @login_required def remove_worker_from_complaint(request,complaint_id): @@ -711,6 +998,37 @@ def changestatus(request, complaint_id, status): return HttpResponseRedirect('/complaint/caretaker/') + + +@login_required +def changestatussuper(request, complaint_id, status): + """ + The function is used by caretaker to change the status of a complaint. + @param: + request - trivial. + complaint_id - used to get complaint_id registered. + status-used to get the current status of complaints + + @variables: + issue - The issue object. + supported - True if the user's intention is to support the issue. + support_count - Total supporters of the above issue. + context - Holds data needed to make necessary changes in the template. + """ + if status == '3': + StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(id=complaint_id).\ + update(status=status, worker_id='') + return HttpResponseRedirect('/complaint/supervisor/') + elif status == '2': + StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(id=complaint_id).\ + update(status=status, worker_id='') + return HttpResponseRedirect('/complaint/supervisor/') + else: + StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(id=complaint_id).\ + update(status=status) + return HttpResponseRedirect('/complaint/supervisor/') + + @login_required def removew(request, work_id): """ @@ -821,8 +1139,8 @@ def supervisor(request): # print("--------------------------") # testEntry() current_user = get_object_or_404(User, username=request.user.username) - y = ExtraInfo.objects.all().select_related('user','department').filter(user=current_user).first() + comp_id = y.id if request.method == 'POST' : try: y = ExtraInfo.objects.all().select_related('user','department').get(id=y.id) @@ -843,6 +1161,8 @@ def supervisor(request): # if j%2 != 0: # all_complaint.append(i) # j = j + 1 + + overduecomplaint = [] for i in all_complaint: if i.status != 2 and i.status != 3: @@ -850,44 +1170,255 @@ def supervisor(request): i.delay = date.today() - i.complaint_finish overduecomplaint.append(i) - return render(request, "complaintModule/supervisor1.html", - {'all_caretaker': all_caretaker, 'all_complaint': all_complaint, - 'overduecomplaint': overduecomplaint, 'area': area,'num':num}) - else: - print('xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx') - y = ExtraInfo.objects.all().select_related('user','department').get(id=y.id) - try: - a = get_object_or_404(Supervisor, sup_id=y) - except : - return HttpResponseRedirect('/') - - #print(a) - # if(len(a)==0) : - # return render('../dashboard/') - a = Supervisor.objects.select_related('sup_id','sup_id__user','sup_id__department').get(sup_id=y) - all_caretaker = Caretaker.objects.select_related('staff_id','staff_id__user','staff_id__department').filter(area=a.area).order_by('-id') - area = all_caretaker[0].area - numtemp = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(location = area).filter(status = 0).count() - num = int(numtemp/2+0.5) - all_complaint = [] - all_complainttemp = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(location=a.area).order_by('-id') - j = 1 - for i in all_complainttemp: - all_complaint.append(i) - # if j%2 != 0: - # all_complaint.append(i) - # j = j + 1 - overduecomplaint = [] - for i in all_complaint: - if i.status != 2 and i.status != 3: - if i.complaint_finish < date.today(): - i.delay = date.today() - i.complaint_finish - overduecomplaint.append(i) - - return render(request, "complaintModule/supervisor1.html", - {'all_caretaker': all_caretaker, 'all_complaint': all_complaint, - 'overduecomplaint': overduecomplaint, 'area': area, 'num' : num}) - + comp_type = request.POST.get('complaint_type', '') + location = request.POST.get('Location', '') + specific_location = request.POST.get('specific_location', '') + comp_file = request.FILES.get('myfile') + + details = request.POST.get('details', '') + status = 0 + # finish time is according to complaint type + complaint_finish = datetime.now() + timedelta(days=2) + if comp_type == 'Electricity': + complaint_finish = datetime.now() + timedelta(days=2) + elif comp_type == 'carpenter': + complaint_finish = datetime.now() + timedelta(days=2) + elif comp_type == 'plumber': + complaint_finish = datetime.now() + timedelta(days=2) + elif comp_type == 'garbage': + complaint_finish = datetime.now() + timedelta(days=1) + elif comp_type == 'dustbin': + complaint_finish = datetime.now() + timedelta(days=1) + elif comp_type == 'internet': + complaint_finish = datetime.now() + timedelta(days=4) + elif comp_type == 'other': + complaint_finish = datetime.now() + timedelta(days=3) + y = ExtraInfo.objects.all().select_related('user','department').get(id=comp_id) + #check if location given + if location!="": + # x = StudentComplain(complainer=y, + # complaint_type=comp_type, + # location=location, + # specific_location=specific_location, + # details=details, + # status=status, + # complaint_finish=complaint_finish, + # upload_complaint=comp_file) + + + # x.save() + obj1, created = StudentComplain.objects.get_or_create(complainer=y, + complaint_type=comp_type, + location=location, + specific_location=specific_location, + details=details, + status=status, + complaint_finish=complaint_finish, + upload_complaint=comp_file) + + + historytemp = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(complainer=y).order_by('-id') + history = [] + j = 1 + k = 1 + for i in historytemp: + history.append(i) + # if j%2 != 0: + # history.append(i) + # j = j+1 + + + for h in history: + h.serial_no = k + k = k+1 + # if location == "hall1": + # dsgn = "hall1caretaker" + # elif location == "hall3": + # dsgn = "hall3caretaker" + # else : + # dsgn = "hall4caretaker" + if location == "hall-1": + dsgn ="hall1caretaker" + elif location =="hall-3": + dsgn ="hall3caretaker" + elif location =="hall-4": + dsgn ="hall4caretaker" + elif location =="CC1": + dsgn ="cc1convener" + elif location =="CC2": + dsgn ="CC2 convener" + elif location == "core_lab": + dsgn = "corelabcaretaker" + elif location =="LHTC": + dsgn ="lhtccaretaker" + elif location =="NR2": + dsgn ="nr2caretaker" + elif location =="Maa Saraswati Hostel": + dsgn ="mshcaretaker" + elif location =="Nagarjun Hostel": + dsgn ="nhcaretaker" + elif location =="Panini Hostel": + dsgn ="phcaretaker" + else: + dsgn = "rewacaretaker" + caretaker_name = HoldsDesignation.objects.select_related('user','working','designation').get(designation__name = dsgn) + user_details=User.objects.get(id=y.user_id) + c2=Supervisor.objects.all().filter(area=area) + print(caretaker_name.user.username) + print(user_details.username) + print(caretaker_name.designation) + + # sup = HoldsDesignation.objects.select_related('user','working','designation').get(user = y.id) + # print(sup.designation) + + user_details=User.objects.get(id=y.user_id) + des=HoldsDesignation.objects.filter(user=user_details).all() + + + file_id = create_file(uploader=user_details.username, + uploader_designation=des[0].designation, + receiver=caretaker_name.user.username, + receiver_designation=str(caretaker_name.designation), + src_module="complaint", + src_object_id= str(obj1.id), + file_extra_JSON= {}, + attached_file = None) + + + # This is to allow the student + student = 1 + message = "A New Complaint has been lodged" + complaint_system_notif(request.user, caretaker_name.user,'lodge_comp_alert',obj1.id,student,message) + + # return render(request, "complaintModule/complaint_user.html", + # {'history': history, 'comp_id': comp_id }) + # next = request.POST.get('next', '/') + + messages.success(request,message) + # return HttpResponseRedirect('/complaint/user') + + return render(request, "complaintModule/supervisor1.html", + {'all_caretaker': all_caretaker, 'all_complaint': all_complaint, + 'overduecomplaint': overduecomplaint, 'area': area,'num':num}) + else: + # y = ExtraInfo.objects.all().select_related('user','department').get(id=y.id).fi + # try: + # a = get_object_or_404(Supervisor, sup_id=y) + # except : + # return HttpResponseRedirect('/') + + #print(a) + # if(len(a)==0) : + # return render('../dashboard/') + a = get_object_or_404(User, username=request.user.username) + # y = ExtraInfo.objects.all().select_related('user','department').filter(user=a).first() + historytemp = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(complainer=y).order_by('-id') + history=[] + j = 1 + for i in historytemp: + history.append(i) + # if j%2 != 0: + # history.append(i) + # j = j+1 + + for i in history: + i.serial_no = j + j = j+1 + a = Supervisor.objects.select_related('sup_id','sup_id__user','sup_id__department').get(sup_id=y) + all_caretaker = Caretaker.objects.select_related('staff_id','staff_id__user','staff_id__department').filter(area=a.area).order_by('-id') + area = all_caretaker[0].area + # desgn=HoldsDesignation.objects.select_related('user','working','designation').get(user = y.id) + # desgn="hall3supervisor" + numtemp = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(location = area).filter(status = 0).count() + num = int(numtemp/2+0.5) + all_complaint = [] + user_details=User.objects.get(id=y.user_id) + all_complainttemp = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(location=a.area).order_by('-id') + j = 1 + for i in all_complainttemp: + all_complaint.append(i) + # if j%2 != 0: + # all_complaint.append(i) + # j = j + 1 + overduecomplaint = [] + for i in all_complaint: + if i.status != 2 and i.status != 3: + if i.complaint_finish < date.today(): + i.delay = date.today() - i.complaint_finish + overduecomplaint.append(i) + + # print(y.user_id) + # print(des[0].designation) + # u=ExtraInfo.objects.filter(user=y.user_id).all() + # print(u) + # des=HoldsDesignation.objects.filter(user=u[0].id).all() + # print(des[0].designation.name) + + + current_user = get_object_or_404(User, username=request.user.username) + y = ExtraInfo.objects.all().select_related('user','department').filter(user=current_user).first() + user_details=User.objects.get(id=y.user_id) + des=HoldsDesignation.objects.filter(user=user_details).all() + print(y.user_id) + print(user_details.username) + print(des[0].user) + outbox_files = view_outbox( + username=user_details.username, + designation=des[0].designation, + src_module="complaint" + ) + + outbox=[] + comp_list=set() + for i in outbox_files: + # print(i) + outbox.append(i) + + for i in outbox: + file_history = view_history(file_id=i['id']) + + comp=File.objects.filter(uploader=file_history[0]['current_id']) + for j in comp: + c=StudentComplain.objects.all().filter(id=j.src_object_id) + comp_list.add(c) + # print(c[0]) + + break + complaint_final_list=[] + for i in comp_list: + complaint_final_list.append(i[0]) + + inbox_files = view_inbox( + username=user_details.username, + designation=des[0].designation, + src_module="complaint" + ) + + inbox=[] + comp_list_in=set() + for i in inbox_files: + print(i) + inbox.append(i) + + for i in inbox: + file_history = view_history(file_id=i['id']) + + comp=File.objects.filter(uploader=file_history[0]['current_id']) + for j in comp: + c=StudentComplain.objects.all().filter(id=j.src_object_id) + comp_list_in.add(c) + print(c[0]) + + break + complaint_final_list_in=[] + for i in comp_list_in: + complaint_final_list_in.append(i[0]) + print(complaint_final_list_in) + return render(request, "complaintModule/supervisor1.html", + + {'history':complaint_final_list_in,'all_caretaker': all_caretaker, 'all_complaint': all_complaint,'outbox':complaint_final_list, + 'overduecomplaint': overduecomplaint, 'area': area, 'num' : num}) + @login_required def caretaker_id_know_more(request,caretaker_id): this_caretaker = Caretaker.objects.select_related('staff_id','staff_id__user','staff_id__department').get(id = caretaker_id) @@ -935,6 +1466,36 @@ def resolvepending(request, cid): # complainer_details = StudentComplain.objects.get(id=cid) # complaint_system_notif(request.user, complainer_details.complainer.user ,'comp_resolved_alert') return render(request,"complaintModule/resolve_pending.html",{"a" : a,"thiscomplaint" : thiscomplaint}) + + + + +@login_required +def resolvependingsuper(request, cid): + a = get_object_or_404(User, username=request.user.username) + y = ExtraInfo.objects.all().select_related('user','department').filter(user=a).first() + thiscomplaint = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').get(id=cid) + if request.method == 'POST': + newstatus = request.POST.get('yesorno','') + comment = request.POST.get('comment') + intstatus = 0 + if newstatus == 'Yes': + intstatus = 2 + else: + intstatus = 3 + StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(id=cid).\ + update(status=intstatus) + StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(id=cid).\ + update(comment=comment) + complainer_details = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').get(id=cid) + student=0 + message = "Congrats! Your complaint has been resolved" + complaint_system_notif(request.user, complainer_details.complainer.user ,'comp_resolved_alert',complainer_details.id,student,message) + return HttpResponseRedirect("/complaint/supervisor/") + else: + # complainer_details = StudentComplain.objects.get(id=cid) + # complaint_system_notif(request.user, complainer_details.complainer.user ,'comp_resolved_alert') + return render(request,"complaintModule/resolve_pending.html",{"a" : a,"thiscomplaint" : thiscomplaint}) @@ -1033,3 +1594,456 @@ def detail3(request, detailcomp_id1): loc = detail3.location care = Caretaker.objects.select_related('staff_id','staff_id__user','staff_id__department').filter(area=loc).first() return render(request, "complaintModule/complaint_supervisor_detail.html", {"detail3": detail3,"comp_id":comp_id,"care":care,"num":num}) + + + + +@login_required + +def supervisorlodge(request): + """ + The function is used to register a complaint + @param: + request - trivial. + + + @variables: + issue - The issue object. + supported - True if the user's intention is to support the issue. + support_count - Total supporters of the above issue. + context - Holds data needed to make necessary changes in the template. + """ + a = get_object_or_404(User, username=request.user.username) + y = ExtraInfo.objects.all().select_related('user','department').filter(user=a).first() + num = 1 + comp_id = y.id + if request.method == 'POST': + comp_type = request.POST.get('complaint_type', '') + location = request.POST.get('Location', '') + specific_location = request.POST.get('specific_location', '') + comp_file = request.FILES.get('myfile') + + details = request.POST.get('details', '') + status = 0 + # finish time is according to complaint type + complaint_finish = datetime.now() + timedelta(days=2) + if comp_type == 'Electricity': + complaint_finish = datetime.now() + timedelta(days=2) + elif comp_type == 'carpenter': + complaint_finish = datetime.now() + timedelta(days=2) + elif comp_type == 'plumber': + complaint_finish = datetime.now() + timedelta(days=2) + elif comp_type == 'garbage': + complaint_finish = datetime.now() + timedelta(days=1) + elif comp_type == 'dustbin': + complaint_finish = datetime.now() + timedelta(days=1) + elif comp_type == 'internet': + complaint_finish = datetime.now() + timedelta(days=4) + elif comp_type == 'other': + complaint_finish = datetime.now() + timedelta(days=3) + y = ExtraInfo.objects.all().select_related('user','department').get(id=comp_id) + #check if location given + if location!="": + # x = StudentComplain(complainer=y, + # complaint_type=comp_type, + # location=location, + # specific_location=specific_location, + # details=details, + # status=status, + # complaint_finish=complaint_finish, + # upload_complaint=comp_file) + + + # x.save() + obj1, created = StudentComplain.objects.get_or_create(complainer=y, + complaint_type=comp_type, + location=location, + specific_location=specific_location, + details=details, + status=status, + complaint_finish=complaint_finish, + upload_complaint=comp_file) + + + historytemp = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(complainer=y).order_by('-id') + history = [] + j = 1 + k = 1 + for i in historytemp: + history.append(i) + # if j%2 != 0: + # history.append(i) + # j = j+1 + + + for h in history: + h.serial_no = k + k = k+1 + # if location == "hall1": + # dsgn = "hall1caretaker" + # elif location == "hall3": + # dsgn = "hall3caretaker" + # else : + # dsgn = "hall4caretaker" + if location == "hall-1": + dsgn ="hall1caretaker" + elif location =="hall-3": + dsgn ="hall3caretaker" + elif location =="hall-4": + dsgn ="hall4caretaker" + elif location =="CC1": + dsgn ="cc1convener" + elif location =="CC2": + dsgn ="CC2 convener" + elif location == "core_lab": + dsgn = "corelabcaretaker" + elif location =="LHTC": + dsgn ="lhtccaretaker" + elif location =="NR2": + dsgn ="nr2caretaker" + elif location =="Maa Saraswati Hostel": + dsgn ="mshcaretaker" + elif location =="Nagarjun Hostel": + dsgn ="nhcaretaker" + elif location =="Panini Hostel": + dsgn ="phcaretaker" + else: + dsgn = "rewacaretaker" + caretaker_name = HoldsDesignation.objects.select_related('user','working','designation').get(designation__name = dsgn) + + + # This is to allow the student + student = 1 + message = "A New Complaint has been lodged" + complaint_system_notif(request.user, caretaker_name.user,'lodge_comp_alert',obj1.id,student,message) + + # return render(request, "complaintModule/complaint_user.html", + # {'history': history, 'comp_id': comp_id }) + # next = request.POST.get('next', '/') + + messages.success(request,message) + return HttpResponseRedirect('/complaint/supervisor') + + else: + a = get_object_or_404(User, username=request.user.username) + y = ExtraInfo.objects.all().select_related('user','department').filter(user=a).first() + historytemp = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(complainer=y).order_by('-id') + history=[] + + notification = Notification.objects.filter(recipient=a.id) + notification = notification.filter(data__exact={'url':'complaint:detail','module':'Complaint System'}) + # notification_message = [] + # for notification in x: + # to = User.objects.get(id=notification.actor_object_id).username + # from django.utils.timesince import timesince as timesince_ + # duration = timesince_(notification.timestamp,None) + # notification_message.append(notification.verb+' by '+ to + ' ' + duration + ' ago ') + + + + + j = 1 + for i in historytemp: + history.append(i) + # if j%2 != 0: + # history.append(i) + # j = j+1 + + for i in history: + i.serial_no = j + j = j+1 + + # if location == "hall-1": + # dsgn ="hall1caretaker" + # elif location =="hall-3": + # dsgn ="hall3caretaker" + # elif location =="hall-4": + # dsgn ="hall4caretaker" + # elif location =="CC1": + # dsgn ="CC convenor" + # elif location =="CC2": + # dsgn ="CC2 convener" + # elif location == "core_lab": + # dsgn = "corelabcaretaker" + # elif location =="LHTC": + # dsgn ="lhtccaretaker" + # elif location =="NR2": + # dsgn ="nr2caretaker" + # else: + # dsgn = "rewacaretaker" + # caretaker_name = HoldsDesignation.objects.get(designation__name = dsgn) + + # complaint_system_notif(request.user, caretaker_name.user,'lodge_comp_alert') + return render(request, "complaintModule/supervisor1.html", + {'history': history,'notification':notification, 'comp_id': y.id}) + + return render(request, "complaintModule/complaint_user.html", + {'history': history, 'comp_id': comp_id }) + + + + +@login_required +def submitfeedbacksuper(request, complaint_id): + """ + The function is used by the complainant to enter feedback after the complaint has been resolved + @param: + request - trivial. + complaint_id - id of the registerd complaint. + + @variables: + issue - The issue object. + supported - True if the user's intention is to support the issue. + support_count - Total supporters of the above issue. + context - Holds data needed to make necessary changes in the template. + """ + + if request.method == 'POST': + feedback = request.POST.get('feedback', '') + rating = request.POST.get('rating', '') + StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(id=complaint_id).\ + update(feedback=feedback, flag=rating) + a = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(id=complaint_id).first() + care = Caretaker.objects.select_related('staff_id','staff_id__user','staff_id__department').filter(area=a.location).first() + rate = care.rating + newrate = 0 + if rate == 0: + newrate = rating + else: + a1 = int(rating) + b1 = int(rate) + c1 = int((a1+b1)/2) + newrate = c1 + + Caretaker.objects.select_related('staff_id','staff_id__user','staff_id__department').filter(area=a.location).update(rating=newrate) + return HttpResponseRedirect('/complaint/supervisor/') + return render(request,"complaintModule/feedback.html",{'a' : a}) + + else: + a = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').get(id=complaint_id) + return render(request, "complaintModule/submit_feedback.html", {'a': a}) + + + +@login_required + +def caretakerlodge(request): + """ + The function is used to register a complaint + @param: + request - trivial. + + + @variables: + issue - The issue object. + supported - True if the user's intention is to support the issue. + support_count - Total supporters of the above issue. + context - Holds data needed to make necessary changes in the template. + """ + a = get_object_or_404(User, username=request.user.username) + y = ExtraInfo.objects.all().select_related('user','department').filter(user=a).first() + num = 1 + comp_id = y.id + if request.method == 'POST': + comp_type = request.POST.get('complaint_type', '') + location = request.POST.get('Location', '') + specific_location = request.POST.get('specific_location', '') + comp_file = request.FILES.get('myfile') + + details = request.POST.get('details', '') + status = 0 + # finish time is according to complaint type + complaint_finish = datetime.now() + timedelta(days=2) + if comp_type == 'Electricity': + complaint_finish = datetime.now() + timedelta(days=2) + elif comp_type == 'carpenter': + complaint_finish = datetime.now() + timedelta(days=2) + elif comp_type == 'plumber': + complaint_finish = datetime.now() + timedelta(days=2) + elif comp_type == 'garbage': + complaint_finish = datetime.now() + timedelta(days=1) + elif comp_type == 'dustbin': + complaint_finish = datetime.now() + timedelta(days=1) + elif comp_type == 'internet': + complaint_finish = datetime.now() + timedelta(days=4) + elif comp_type == 'other': + complaint_finish = datetime.now() + timedelta(days=3) + y = ExtraInfo.objects.all().select_related('user','department').get(id=comp_id) + #check if location given + if location!="": + # x = StudentComplain(complainer=y, + # complaint_type=comp_type, + # location=location, + # specific_location=specific_location, + # details=details, + # status=status, + # complaint_finish=complaint_finish, + # upload_complaint=comp_file) + + + # x.save() + obj1, created = StudentComplain.objects.get_or_create(complainer=y, + complaint_type=comp_type, + location=location, + specific_location=specific_location, + details=details, + status=status, + complaint_finish=complaint_finish, + upload_complaint=comp_file) + + + historytemp = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(complainer=y).order_by('-id') + history = [] + j = 1 + k = 1 + for i in historytemp: + history.append(i) + # if j%2 != 0: + # history.append(i) + # j = j+1 + + + for h in history: + h.serial_no = k + k = k+1 + # if location == "hall1": + # dsgn = "hall1caretaker" + # elif location == "hall3": + # dsgn = "hall3caretaker" + # else : + # dsgn = "hall4caretaker" + if location == "hall-1": + dsgn ="hall1caretaker" + elif location =="hall-3": + dsgn ="hall3caretaker" + elif location =="hall-4": + dsgn ="hall4caretaker" + elif location =="CC1": + dsgn ="cc1convener" + elif location =="CC2": + dsgn ="CC2 convener" + elif location == "core_lab": + dsgn = "corelabcaretaker" + elif location =="LHTC": + dsgn ="lhtccaretaker" + elif location =="NR2": + dsgn ="nr2caretaker" + elif location =="Maa Saraswati Hostel": + dsgn ="mshcaretaker" + elif location =="Nagarjun Hostel": + dsgn ="nhcaretaker" + elif location =="Panini Hostel": + dsgn ="phcaretaker" + else: + dsgn = "rewacaretaker" + caretaker_name = HoldsDesignation.objects.select_related('user','working','designation').get(designation__name = dsgn) + + + # This is to allow the student + student = 1 + message = "A New Complaint has been lodged" + complaint_system_notif(request.user, caretaker_name.user,'lodge_comp_alert',obj1.id,student,message) + + # return render(request, "complaintModule/complaint_user.html", + # {'history': history, 'comp_id': comp_id }) + # next = request.POST.get('next', '/') + + messages.success(request,message) + return HttpResponseRedirect('/complaint/caretaker') + + else: + a = get_object_or_404(User, username=request.user.username) + y = ExtraInfo.objects.all().select_related('user','department').filter(user=a).first() + historytemp = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(complainer=y).order_by('-id') + history=[] + + notification = Notification.objects.filter(recipient=a.id) + notification = notification.filter(data__exact={'url':'complaint:detail','module':'Complaint System'}) + # notification_message = [] + # for notification in x: + # to = User.objects.get(id=notification.actor_object_id).username + # from django.utils.timesince import timesince as timesince_ + # duration = timesince_(notification.timestamp,None) + # notification_message.append(notification.verb+' by '+ to + ' ' + duration + ' ago ') + + + + + j = 1 + for i in historytemp: + history.append(i) + # if j%2 != 0: + # history.append(i) + # j = j+1 + + for i in history: + i.serial_no = j + j = j+1 + + # if location == "hall-1": + # dsgn ="hall1caretaker" + # elif location =="hall-3": + # dsgn ="hall3caretaker" + # elif location =="hall-4": + # dsgn ="hall4caretaker" + # elif location =="CC1": + # dsgn ="CC convenor" + # elif location =="CC2": + # dsgn ="CC2 convener" + # elif location == "core_lab": + # dsgn = "corelabcaretaker" + # elif location =="LHTC": + # dsgn ="lhtccaretaker" + # elif location =="NR2": + # dsgn ="nr2caretaker" + # else: + # dsgn = "rewacaretaker" + # caretaker_name = HoldsDesignation.objects.get(designation__name = dsgn) + + # complaint_system_notif(request.user, caretaker_name.user,'lodge_comp_alert') + return render(request, "complaintModule/complaint_caretaker.html", + {'history': history,'notification':notification, 'comp_id': y.id}) + + return render(request, "complaintModule/complaint_user.html", + {'history': history, 'comp_id': comp_id }) + + +@login_required +def submitfeedbackcaretaker(request, complaint_id): + """ + The function is used by the complainant to enter feedback after the complaint has been resolved + @param: + request - trivial. + complaint_id - id of the registerd complaint. + + @variables: + issue - The issue object. + supported - True if the user's intention is to support the issue. + support_count - Total supporters of the above issue. + context - Holds data needed to make necessary changes in the template. + """ + + if request.method == 'POST': + feedback = request.POST.get('feedback', '') + rating = request.POST.get('rating', '') + StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(id=complaint_id).\ + update(feedback=feedback, flag=rating) + a = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(id=complaint_id).first() + care = Caretaker.objects.select_related('staff_id','staff_id__user','staff_id__department').filter(area=a.location).first() + rate = care.rating + newrate = 0 + if rate == 0: + newrate = rating + else: + a1 = int(rating) + b1 = int(rate) + c1 = int((a1+b1)/2) + newrate = c1 + + Caretaker.objects.select_related('staff_id','staff_id__user','staff_id__department').filter(area=a.location).update(rating=newrate) + return HttpResponseRedirect('/complaint/caretaker/') + return render(request,"complaintModule/feedback.html",{'a' : a}) + + else: + a = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').get(id=complaint_id) + return render(request, "complaintModule/submit_feedback.html", {'a': a}) \ No newline at end of file diff --git a/FusionIIIT/applications/filetracking/admin.py b/FusionIIIT/applications/filetracking/admin.py new file mode 100644 index 000000000..82b78df95 --- /dev/null +++ b/FusionIIIT/applications/filetracking/admin.py @@ -0,0 +1,7 @@ +from django.contrib import admin + +# Register your models here. +from applications.filetracking.models import File, Tracking + +admin.site.register(File) +admin.site.register(Tracking) diff --git a/FusionIIIT/applications/filetracking/api/serializers.py b/FusionIIIT/applications/filetracking/api/serializers.py new file mode 100644 index 000000000..bdae2024e --- /dev/null +++ b/FusionIIIT/applications/filetracking/api/serializers.py @@ -0,0 +1,24 @@ +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__' + + +class FileHeaderSerializer(serializers.ModelSerializer): + ''' + This serializes everything except the attachments of a file and whether it is read or not + ''' + class Meta: + model = File + exclude = ['upload_file', 'is_read'] diff --git a/FusionIIIT/applications/filetracking/api/urls.py b/FusionIIIT/applications/filetracking/api/urls.py new file mode 100644 index 000000000..90f03b2ef --- /dev/null +++ b/FusionIIIT/applications/filetracking/api/urls.py @@ -0,0 +1,22 @@ +from django.conf.urls import url +from .views import ( + CreateFileView, + ViewFileView, + DeleteFileView, + ViewInboxView, + ViewOutboxView, + ViewHistoryView, + ForwardFileView, + GetDesignationsView, +) + +urlpatterns = [ + 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 new file mode 100644 index 000000000..6694e749f --- /dev/null +++ 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/apps.py b/FusionIIIT/applications/filetracking/apps.py new file mode 100644 index 000000000..7e3d3b6d2 --- /dev/null +++ b/FusionIIIT/applications/filetracking/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class FileTrackingConfig(AppConfig): + name = 'applications.filetracking' diff --git a/FusionIIIT/applications/filetracking/models.py b/FusionIIIT/applications/filetracking/models.py new file mode 100644 index 000000000..9d78b24c9 --- /dev/null +++ b/FusionIIIT/applications/filetracking/models.py @@ -0,0 +1,51 @@ +from django.db import models +from django.contrib.auth.models import User +from applications.globals.models import ExtraInfo, HoldsDesignation, Designation + + +class File(models.Model): + """ + This is file table which contains the all the files created by user + """ + uploader = models.ForeignKey(ExtraInfo, on_delete=models.CASCADE, related_name='uploaded_files') + designation = models.ForeignKey(Designation, on_delete=models.CASCADE, null=True, related_name='upload_designation') + subject = models.CharField(max_length=100, null=True, blank=True) + description = models.CharField(max_length=400, null=True, blank=True) + upload_date = models.DateTimeField(auto_now_add=True) + upload_file = models.FileField(blank=True) + 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 = models.JSONField(null=True) + + class Meta: + db_table = 'File' + + #def __str__(self): + #return str(self.ref_id) + + +class Tracking(models.Model): + """ + 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) + current_design = models.ForeignKey(HoldsDesignation, null=True, on_delete=models.CASCADE) + 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') + + receive_date = models.DateTimeField(auto_now_add=True) + forward_date = models.DateTimeField(auto_now_add=True) + remarks = models.CharField(max_length=250, null=True, blank=True) + upload_file = models.FileField(blank=True) + is_read = models.BooleanField(default = False) + + # additions for API + 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 new file mode 100644 index 000000000..d85bc4755 --- /dev/null +++ b/FusionIIIT/applications/filetracking/sdk/methods.py @@ -0,0 +1,405 @@ +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 +from django.core.exceptions import ValidationError +from typing import Any + + +def create_file( + uploader: str, + uploader_designation: str, + receiver: str, + receiver_designation: str, + 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 + ''' + + ''' + Functioning: + 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 = 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, + ) + + 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) + + 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: + return new_file.id + + +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 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 + +# inbox and outbox could be sorted based on most recent linked tracking entry + +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 + ''' + 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( + receiver_id=recipient_object, + receive_design=user_designation, + 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) + received_files_unique = uniqueList(received_files) + + 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) -> list: + ''' + This function is used to get all the files in the outbox of a particular user and designation + ''' + user_designation = get_designation_obj_from_name(designation=designation) + user_object = get_user_object_from_username(username) + 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, + 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) + sent_files_unique = uniqueList(sent_files) + + sent_files_serialized = FileHeaderSerializer(sent_files_unique, many=True) + 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(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 + ''' + user_designation = Designation.objects.get(name=designation) + 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 + + + +def archive_file(file_id: int) -> bool: + ''' + This function is used to archive a file and returns true if the archiving was successful + ''' + try: + File.objects.filter(id=file_id).update(is_read=True) + return True + except File.DoesNotExist: + return False + + + +def create_draft( + uploader: str, + uploader_designation: str, + 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 + Later this file can be sent to someone by forward_file by using draft file_id + ''' + 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 view_drafts(username: str, designation: str, src_module: str) -> dict: + ''' + This function is used to get all the files in the drafts (has not been sent) of a particular user and designation + ''' + 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 forward_file( + file_id: int, + receiver: str, + receiver_designation: str, + file_extra_JSON: dict, + remarks: str = "", + 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 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) + 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, + 'remarks': remarks, + } + 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() + 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 + ''' + 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 + + +# 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 + ''' + 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 + +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 + +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_Extrainfo = file['uploader'] + 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 + +def get_extra_info_object_from_id(id: int): + return ExtraInfo.objects.get(id=id) \ No newline at end of file diff --git a/FusionIIIT/applications/filetracking/tests.py b/FusionIIIT/applications/filetracking/tests.py new file mode 100644 index 000000000..a79ca8be5 --- /dev/null +++ b/FusionIIIT/applications/filetracking/tests.py @@ -0,0 +1,3 @@ +# from django.test import TestCase + +# Create your tests here. diff --git a/FusionIIIT/applications/filetracking/urls.py b/FusionIIIT/applications/filetracking/urls.py new file mode 100644 index 000000000..01bc4d206 --- /dev/null +++ b/FusionIIIT/applications/filetracking/urls.py @@ -0,0 +1,42 @@ +from django.conf.urls import url, include + +from . import views +from .api import urls + +app_name = 'filetracking' + +urlpatterns = [ + + url(r'^$', views.filetracking, name='filetracking'), + url(r'^draftdesign/$', views.draft_design, name='draft_design'), + url(r'^drafts/(?P\d+)$', views.drafts_view, name='drafts_view'), + url(r'^outbox/(?P\d+)$', views.outbox_view, name='outbox_view'), + 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+)$', + views.confirmdelete, name='confirm_delete'), + url(r'^archive/(?P\d+)/$', views.archive_view, name='archive_view'), + url(r'^finish/(?P\d+)/$', views.archive_file, name='finish_file'), + url(r'^viewfile/(?P\d+)/$', views.view_file, name='view_file_view'), + 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'), + + # 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'^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(urls)) + +] diff --git a/FusionIIIT/applications/filetracking/utils.py b/FusionIIIT/applications/filetracking/utils.py new file mode 100644 index 000000000..5ebd27374 --- /dev/null +++ b/FusionIIIT/applications/filetracking/utils.py @@ -0,0 +1,7 @@ +from .models import File, Tracking +from applications.globals.models import ExtraInfo, HoldsDesignation, Designation +from django.contrib.auth.models import User + +def get_designation(userid): + user_designation=HoldsDesignation.objects.select_related('user','working','designation').filter(user=userid) + return user_designation \ No newline at end of file diff --git a/FusionIIIT/applications/filetracking/views.py b/FusionIIIT/applications/filetracking/views.py new file mode 100644 index 000000000..fef932a9b --- /dev/null +++ b/FusionIIIT/applications/filetracking/views.py @@ -0,0 +1,727 @@ +from django.contrib import messages +from django.shortcuts import render, get_object_or_404, redirect +from .models import File, Tracking +from applications.globals.models import ExtraInfo, HoldsDesignation, Designation +from django.template.defaulttags import csrf_token +from django.http import HttpResponse, HttpResponseRedirect, JsonResponse +from django.contrib.auth.decorators import login_required +from django.db import IntegrityError +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 .utils import * +from django.utils.dateparse import parse_datetime +from .sdk.methods import * + +@login_required(login_url="/accounts/login/") +def filetracking(request): + """ + The function is used to create files by current user(employee). + It adds the employee(uploader) and file datails to a file(table) of filetracking(model) + if he intends to create file. + + @param: + request - trivial. + + @variables: + + + uploader - Employee who creates file. + subject - Title of the file. + description - Description of the file. + upload_file - Attachment uploaded while creating file. + file - The file object. + extrainfo - The Extrainfo object. + holdsdesignations - The HoldsDesignation object. + context - Holds data needed to make necessary changes in the template. + """ + 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) + upload_file = request.FILES.get('myfile') + 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, + description=description, + subject=subject, + designation=designation, + upload_file=upload_file + ) + + 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) + + upload_file = request.FILES.get('myfile') + 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( + uploader=uploader, + description=description, + subject=subject, + designation=designation, + 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) + + receiver = request.POST.get('receiver') + try: + receiver_id = User.objects.get(username=receiver) + except Exception as e: + messages.error(request, 'Enter a valid Username') + return redirect('/filetracking/') + receive = request.POST.get('recieve') + try: + receive_design = Designation.objects.get(name=receive) + except Exception as e: + messages.error(request, 'Enter a valid Designation') + return redirect('/filetracking/') + + 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, + ) + # 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() + designations = get_designation(request.user) + + context = { + 'file': file, + 'extrainfo': extrainfo, + 'holdsdesignations': holdsdesignations, + 'designations': designations, + } + return render(request, 'filetracking/composefile.html', context) + + +@login_required(login_url="/accounts/login") +def draft_design(request): + """ + The function is used to get the designation of the user and renders it on draft template. + + @param: + request - trivial. + + @variables: + + + context - Holds data needed to make necessary changes in the template. + """ + designation = get_designation(request.user) + context = { + 'designation': designation, + } + return render(request, 'filetracking/draft_design.html', context) + + +@login_required(login_url="/accounts/login") +def drafts_view(request, id): + """ + This function is used to view all the drafts created by the user ordered by upload date.it collects all the created files from File object. + + @param: + request - trivial + id - user id + + @parameters + draft - file obeject containing all the files created by user + context - holds data needed to render the template + + + + """ + user_HoldsDesignation_obj = HoldsDesignation.objects.select_related( + 'user', 'working', 'designation').get(pk=id) + s = str(user_HoldsDesignation_obj).split(" - ") + designation = s[1] + draft_files = view_drafts( + username=user_HoldsDesignation_obj.user, + designation=user_HoldsDesignation_obj.designation, + src_module='filetracking' + ) + + # Correct upload_date type + for f in draft_files: + f['upload_date'] = parse_datetime(f['upload_date']) + f['uploader'] = get_extra_info_object_from_id(f['uploader']) + + draft_files = add_uploader_department_to_files_list(draft_files) + + context = { + 'draft_files': draft_files, + 'designations': designation, + } + return render(request, 'filetracking/drafts.html', context) + + +@login_required(login_url="/accounts/login") +def outbox_view(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. + It displays files sent by user to other employees of a Tracking(table) of filetracking(model) + in the 'Outbox' tab of template. + + @param: + request - trivial. + id - user id + + @variables: + outward_files - File objects filtered by current_id i.e, present working user. + context - Holds data needed to make necessary changes in the template. + + """ + user_HoldsDesignation_obj = HoldsDesignation.objects.select_related( + 'user', 'working', 'designation').get(pk=id) + s = str(user_HoldsDesignation_obj).split(" - ") + designation = s[1] + + # 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) + + outward_files = view_outbox(username=user_HoldsDesignation_obj.user, + designation=user_HoldsDesignation_obj.designation, + src_module='filetracking') + + for f in outward_files: + last_forw_tracking = get_last_forw_tracking_for_user(file_id=f['id'], + username=user_HoldsDesignation_obj.user, + designation=user_HoldsDesignation_obj.designation) + f['sent_to_user'] = last_forw_tracking.receiver_id + f['sent_to_design'] = last_forw_tracking.receive_design + f['last_sent_date'] = last_forw_tracking.forward_date + + f['upload_date'] = parse_datetime(f['upload_date']) + f['uploader'] = get_extra_info_object_from_id(f['uploader']) + + outward_files = add_uploader_department_to_files_list(outward_files) + + context = { + + 'out_files': outward_files, + 'viewer_designation': designation, + } + return render(request, 'filetracking/outbox.html', context) + + +@login_required(login_url="/accounts/login") +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 - HoldsDesignation object id + + @variables: + 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') + + user_HoldsDesignation_obj = HoldsDesignation.objects.select_related( + 'user', 'working', 'designation').get(pk=id) + 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' + ) + + # correct upload_date type and add recieve_date + for f in inward_files: + f['upload_date'] = parse_datetime(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 + f['uploader'] = get_extra_info_object_from_id(f['uploader']) + + inward_files = add_uploader_department_to_files_list(inward_files) + + + context = { + + 'in_file': inward_files, + 'designations': designation, + } + return render(request, 'filetracking/inbox.html', context) + + +@login_required(login_url="/accounts/login") +def outward(request): + """ + This function fetches the different designations of the user and renders it on outward template + @param: + request - trivial. + + @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) + + +@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. + + @variables: + context - Holds the different designation data of the user + """ + 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): + """ + The function is used to confirm the deletion of a file. + @param: + request - trivial. + id - user 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) + + context = { + 'j': file, + } + + return render(request, 'filetracking/confirmdelete.html', context) + +def view_file(request, id): + ''' + This function is used to view a particular file received by an employee from another. + This function also conditionally renders two forms 'forward_file' and 'archive_file' + based on if the user has necessary permissions or not. + The business permissions are as follows: + 1. User can forward file only if they are the last recipient of the file + 2. User can archive a file only if they have received it last and they are also the original owner of the file + + To forward the file and to archive the file separate views with POST request are called + + It displays the details file of a File and remarks as well as the attachments of all the users + who have been involved till that point of the workflow. + + @param: + request - Trivial. + id - ID of the file object which the user intends to forward to another employee. + + @variables: + file - The File object. + track - The Tracking object. + designation - the designations of the 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).order_by('receive_date') + designations = get_designation(request.user) + + forward_enable = False + archive_enable = False + + current_owner = get_current_file_owner(file.id) + file_uploader = get_user_object_from_username(file.uploader.user.username) + + + if current_owner == request.user and file.is_read is False: + forward_enable = True + if current_owner == request.user and file_uploader == request.user and file.is_read is False: + archive_enable = True + + context = { + 'designations': designations, + 'file': file, + 'track': track, + 'forward_enable': forward_enable, + 'archive_enable': archive_enable, + } + return render(request, 'filetracking/viewfile.html', context) + +@login_required(login_url="/accounts/login") +def archive_file(request, id): + '''This function is used to archive a file. + It returns unauthorized access if the user is not file uploader + and the current owner of the file + ''' + if request.method == "POST": + file = get_object_or_404(File, id=id); + current_owner = get_current_file_owner(file.id) + file_uploader = get_user_object_from_username(file.uploader.user.username) + if current_owner == request.user and file_uploader == request.user: + file.is_read = True + file.save() + messages.success(request, 'File Archived') + else: + messages.error(request, 'Unauthorized access') + + return render(request, 'filetracking/composefile.html') + +@login_required(login_url="/accounts/login") +def forward(request, id): + """ + The function is used to forward files received by user(employee) from other + employees which are filtered from Tracking(table) objects by current user + i.e. receiver_id to other employees. + It also gets track of file created by uploader through all users involved in file + along with their remarks and attachments + It displays details file of a File(table) and remarks and attachments of user involved + in file of Tracking(table) of filetracking(model) in the template. + + @param: + request - trivial. + id - id of the file object which the user intends to forward to other employee. + + @variables: + file - The File object. + track - The Tracking object. + remarks = Remarks posted by user. + receiver = Receiver to be selected by user for forwarding file. + receiver_id = Receiver_id who has been selected for forwarding file. + upload_file = File attached by user. + extrainfo = ExtraInfo object. + 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).order_by('receive_date') + + if request.method == "POST": + if 'finish' in request.POST: + file.is_read = 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') + + designations = get_designation(request.user) + + context = { + + 'designations': designations, + 'file': file, + 'track': track, + } + + return render(request, 'filetracking/forward.html', context) + + +@login_required(login_url="/accounts/login") +def archive_design(request): + + designation = HoldsDesignation.objects.select_related( + 'user', 'working', 'designation').filter(user=request.user) + + context = { + 'designation': designation, + } + return render(request, 'filetracking/archive_design.html', context) + + +@login_required(login_url="/accounts/login") +def archive_view(request, id): + """ + The function is used to fetch the files in the user's archive + (those which have passed by user and been archived/finished) + + @param: + request - trivial. + id - HoldsDesignation object id + + @variables: + archive_files - File object with additional information + context - Holds data needed to make necessary changes in the template. + + """ + user_HoldsDesignation_obj = HoldsDesignation.objects.select_related( + 'user', 'working', 'designation').get(pk=id) + s = str(user_HoldsDesignation_obj).split(" - ") + designation = s[1] + + archive_files = view_archived( + username=user_HoldsDesignation_obj.user, + designation=user_HoldsDesignation_obj.designation, + src_module='filetracking' + ) + + # correct upload_date type and add receive_date + for f in archive_files: + f['upload_date'] = parse_datetime(f['upload_date']) + f['designation'] = Designation.objects.get(id=f['designation']) + f['uploader'] = get_extra_info_object_from_id(f['uploader']) + + archive_files = add_uploader_department_to_files_list(archive_files) + + context = { + 'archive_files': archive_files, + 'designations': designation, + } + return render(request, 'filetracking/archive.html', context) + + + +@login_required(login_url="/accounts/login") +def archive_finish(request, 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") +def finish_design(request): + + designation = HoldsDesignation.objects.select_related( + 'user', 'working', 'designation').filter(user=request.user) + + context = { + 'designation': designation, + } + return render(request, 'filetracking/finish_design.html', context) + + +@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) + + context = { + + 'out': out, + 'abcd': abcd, + } + return render(request, 'filetracking/finish_fileview.html', context) + + +@login_required(login_url="/accounts/login") +def finish(request, 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}) + + +def AjaxDropdown1(request): + """ + This function returns the designation of receiver on the forward or compose file template. + + @param: + request - trivial. + + + @variables: + context - return the httpresponce containing the matched designation of the user + """ + if request.method == 'POST': + value = request.POST.get('value') + + hold = Designation.objects.filter(name__startswith=value) + holds = serializers.serialize('json', list(hold)) + context = { + '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 + """ + if request.method == 'POST': + value = request.POST.get('value') + users = User.objects.filter(username__startswith=value) + users = serializers.serialize('json', list(users)) + + context = { + 'users': users + } + return HttpResponse(JsonResponse(context), content_type='application/json') + + +def test(request): + return HttpResponse('success') + + +@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.delete() + return redirect('/filetracking/draftdesign/') + + +def forward_inward(request, id): + """ This function is used forward the files which are available in the inbox of the user . + + @param: + request - trivial + id - id of the file that is going to forward + + @variables: + 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) + designations = get_designation(request.user) + + context = { + + 'designations': designations, + 'file': file, + 'track': track, + } + return render(request, 'filetracking/forward.html', context) diff --git a/FusionIIIT/templates/complaintModule/add_workers.html b/FusionIIIT/templates/complaintModule/add_workers.html index 842d4397a..4ea009064 100644 --- a/FusionIIIT/templates/complaintModule/add_workers.html +++ b/FusionIIIT/templates/complaintModule/add_workers.html @@ -2,16 +2,16 @@ {% block lodgecomplaint %} {% comment %}The tab menu starts here!{% endcomment %} -
+ -
+ -
+ -
+ @@ -112,7 +112,7 @@ -
+ -
ID: {{a.id}}
+ + - - + \ No newline at end of file diff --git a/FusionIIIT/templates/complaintModule/assignworker.html b/FusionIIIT/templates/complaintModule/assignworker.html index 458d05ff9..5c450867b 100644 --- a/FusionIIIT/templates/complaintModule/assignworker.html +++ b/FusionIIIT/templates/complaintModule/assignworker.html @@ -34,11 +34,10 @@
{% comment %}The Tab-Menu starts here!{% endcomment %} -
+
- Assign Workers / Redirect + Redirect @@ -52,17 +51,16 @@
{% comment %}The ... start here!{% endcomment %}
-
- + + Redirect
-
+ - -
+ +
-

If you think that this complaint does not belong to you .
- You a can pass this complaint to required caretaker .

+

If you think that this complaint does not belong to you ,
+ you can pass this complaint to required supervisor .

{% csrf_token %}
@@ -202,16 +200,17 @@

If you think that this complaint does not belong to you .

You have assigned a worker. First, remove the worker from this complaint then declined this complaint. - .

+ . + {% else %} - +

@@ -223,7 +222,7 @@

You have assigned a worker. First, remove the worker from this complaint the {% if total_caretakers_in_area %} {% endif %} @@ -261,7 +260,8 @@

You have assigned a worker. First, remove the worker from this complaint the {% endblock %} {% block javascript %} - + @@ -270,5 +270,4 @@

You have assigned a worker. First, remove the worker from this complaint the {% block css %} - {% endblock %} - + {% endblock %} \ No newline at end of file diff --git a/FusionIIIT/templates/complaintModule/carefeedback.html b/FusionIIIT/templates/complaintModule/carefeedback.html new file mode 100644 index 000000000..3b943eb78 --- /dev/null +++ b/FusionIIIT/templates/complaintModule/carefeedback.html @@ -0,0 +1,127 @@ +{% load static %} +{% block feedback %} + + {% comment %}The tab menu starts here!{% endcomment %} + + +
+ + Feedback for Complaints + + + +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + {% for a in carehistory %} + {% if a.status == 2 %} + + + + + + + + + + + + + + + + + + + + {% endif %} + {% endfor %} +
+ Date       + + + Type + + Location + + Details + + Status + + Feedback +
+ {{ a.complaint_date }} + + {{ a.complaint_type }} + + {{ a.location }} -
+ + {{ a.specific_location }} + 		+ + + + + {% if a.feedback == '' %} +
+
+ + + + +
+ +
+ {% else %} +
+ {{ a.feedback }} +
+ {% endif %} +
+
+
+
+
+ : Completed       +
+
+
+
+{% endblock %} \ No newline at end of file diff --git a/FusionIIIT/templates/complaintModule/complaint_caretaker.html b/FusionIIIT/templates/complaintModule/complaint_caretaker.html index 688097058..b8979d093 100644 --- a/FusionIIIT/templates/complaintModule/complaint_caretaker.html +++ b/FusionIIIT/templates/complaintModule/complaint_caretaker.html @@ -61,21 +61,36 @@
- + + + Lodge a Complaint + - Resolved Complaints + Complaint History + Feedback + + + + + + Resolved Complaints + + + + Unresolved Complaints - + Overdue Complaints @@ -93,11 +108,12 @@ {% comment %} The central-rail segment starts here! {% endcomment %} -
+
+ {% comment %}The ... start here!{% endcomment %}
{% block lodgecomplaint %} - {% include 'complaintModule/add_workers.html' %} + {% include 'complaintModule/lodgecomplaint_user.html' %} {% endblock %}
{% comment %}The ... end here!{% endcomment %} @@ -105,18 +121,33 @@ {% comment %}The ... starts here!{% endcomment %}
{% block complainthistory %} - {% include 'complaintModule/complainthistory_caretaker.html' %} + {% include 'complaintModule/complainthistory_care_final.html' %} {% endblock %}
{% comment %}The ... ends here!{% endcomment %} {% comment %}The ... starts here!{% endcomment %}
+ {% block feedback %} + {% include 'complaintModule/carefeedback.html' %} + {% endblock %} +
+ {% comment %}The ... ends here!{% endcomment %} + {% comment %}The ... starts here!{% endcomment %} +
{% block resolvecomplaint %} - {% include 'complaintModule/resolvecomplaint.html' %} + {% include 'complaintModule/resolve_caretaker.html' %} + {% endblock %} +
+ {% comment %}The ... ends here!{% endcomment %} + + {% comment %}The ... starts here!{% endcomment %} +
+ {% block unresolvecomplaint %} + {% include 'complaintModule/unresolvecomplaint.html' %} {% endblock %}
-
+
{% block overduecomplaint %} {% include 'complaintModule/overduecomplaint.html' %} {% endblock %} diff --git a/FusionIIIT/templates/complaintModule/complaint_caretaker_detail.html b/FusionIIIT/templates/complaintModule/complaint_caretaker_detail.html index 790d00b6f..c760a907e 100644 --- a/FusionIIIT/templates/complaintModule/complaint_caretaker_detail.html +++ b/FusionIIIT/templates/complaintModule/complaint_caretaker_detail.html @@ -98,7 +98,7 @@

Complaint ID : {{ comp_id }}
Complaint Details : {{detail2.details }}
- Worker Assigned : {{ worker_name }} +

{% if num == 1 %} @@ -123,12 +123,12 @@

- {% if worker_name is None %} +

diff --git a/FusionIIIT/templates/complaintModule/complaint_user_detail.html b/FusionIIIT/templates/complaintModule/complaint_user_detail.html index 3034d3eec..a8751f6d9 100644 --- a/FusionIIIT/templates/complaintModule/complaint_user_detail.html +++ b/FusionIIIT/templates/complaintModule/complaint_user_detail.html @@ -95,7 +95,8 @@

Complaint ID : {{ comp_id }}
Complaint Details : {{detail.details }}
- Worker Assigned : {{ worker_name }}
+ +
diff --git a/FusionIIIT/templates/complaintModule/complainthistory_care_final.html b/FusionIIIT/templates/complaintModule/complainthistory_care_final.html new file mode 100644 index 000000000..37900c753 --- /dev/null +++ b/FusionIIIT/templates/complaintModule/complainthistory_care_final.html @@ -0,0 +1,325 @@ + +{% load static %} +{% block complainthistory %} + +{% comment %}The tab menu starts here!{% endcomment %} +
+
+ + Pending
Complaints + + + Resolved
Complaints + + + Declined
Complaints + +
+ + +
+
+ + + + + + + + + + + + + + + + + + + + {% for a in carehistory %} + {% if a.status == 0 %} + + + + + + + + + + + + + + + + + + + {% endif %} + {% endfor %} +
+ S.No + + Date + + Complaint
+ Type + 		+ Location + + Details +
+

+
+ {{a.serial_no}} +
+ +
+
+ +

+ 		+ {{ a.complaint_date }} + + {{ a.complaint_type }} + + {{ a.specific_location }},  + {{ a.location }} + + +
+ +
+
+
+
+ + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + {% for a in carehistory %} + {% if a.status == 2 %} + + + + + + + + + + + + + + {% endif %} + {% endfor %} +
+ S.No + + Date + + Complaint
+ Type + 		+ Location + + Details +
+

+
+ {{ a.serial_no }} +
+ +
+
+ +

+ 		+ {{ a.complaint_date }} + + {{ a.complaint_type }} + + {{ a.specific_location }},  + {{ a.location }} + + +
+ +
+
+
+
+ + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + {% for a in carehistory %} + {% if a.status == 3 %} + + + + + + + + + + + + + + + {% endif %} + {% endfor %} +
+ S.No + + Date + + Complaint
+ Type + 		+ Location + + Details +
+

+
+ {{ a.serial_no }} +
+ +
+
+ +

+ 		+ {{ a.complaint_date }} + + {{ a.complaint_type }} + + {{ a.specific_location }},  + {{ a.location }} + + +
+ +
+
+
+
+
+ +{% endblock%} \ No newline at end of file diff --git a/FusionIIIT/templates/complaintModule/complainthistory_super_final.html b/FusionIIIT/templates/complaintModule/complainthistory_super_final.html new file mode 100644 index 000000000..53270c9c1 --- /dev/null +++ b/FusionIIIT/templates/complaintModule/complainthistory_super_final.html @@ -0,0 +1,362 @@ + +{% load static %} +{% block complainthistory %} + + {% comment %}The tab menu starts here!{% endcomment %} +
+ +
+ + Pending
Complaints + + + + Resolved
Complaints + + + Declined
Complaints + +
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + {% for a in outbox %} + {% if a.status == 0 %} + + + + + + + + + + + + + + + + + + + {% endif %} + {% endfor %} +
+ S.No + + Date + + Complaint
+ Type + 		+ Location + + Details +
+

+
+ {{a.serial_no}} +
+ +
+
+ +

+ 		+ {{ a.complaint_date }} + + {{ a.complaint_type }} + + {{ a.specific_location }},  + {{ a.location }} + + +
+ +
+
+
+
+ + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + {% for a in outbox %} + {% if a.status == 2 %} + + + + + + + + + + + + + + {% endif %} + {% endfor %} +
+ S.No + + Date + + Complaint
+ Type + 		+ Location + + Details +
+

+
+ {{ a.serial_no }} +
+ +
+
+ +

+ 		+ {{ a.complaint_date }} + + {{ a.complaint_type }} + + {{ a.specific_location }},  + {{ a.location }} + + +
+ +
+
+
+
+ + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + {% for a in outbox %} + {% if a.status == 3 %} + + + + + + + + + + + + + + + {% endif %} + {% endfor %} +
+ S.No + + Date + + Complaint
+ Type + 		+ Location + + Details +
+

+
+ {{ a.serial_no }} +
+ +
+
+ +

+ 		+ {{ a.complaint_date }} + + {{ a.complaint_type }} + + {{ a.specific_location }},  + {{ a.location }} + + +
+ +
+
+
+
+
+ + {% endblock%} \ No newline at end of file diff --git a/FusionIIIT/templates/complaintModule/complainthistory_user.html b/FusionIIIT/templates/complaintModule/complainthistory_user.html index 93c895a83..f02124d9a 100644 --- a/FusionIIIT/templates/complaintModule/complainthistory_user.html +++ b/FusionIIIT/templates/complaintModule/complainthistory_user.html @@ -1,4 +1,3 @@ -<<<<<<< HEAD {% load static %} {% block complainthistory %} @@ -7,601 +6,9 @@ Pending Complaints - + - - - - - - - - - NOT ASSIGNED - - - - - - - {% endif %} - {% endfor %} - - -
-
- - - - - -
-

- - - - - - - - - - - -
-
- -
-
- : Pending       - : Worker Assigned       - : Completed       - : Declined       -
-
- - -
-
- - - - - - - - - - - - - - - - - - - - - {% for a in history %} - {% if a.status == 1 %} - - - - - - - - - - - - - - - - - - - - - {% endif %} - {% endfor %} -
- S.no - - Date - - Type - - Location - - Specific
Location - 		- Details - - Status - - Worker
Name -
-

- -
- {{ a.serial_no }} -
- -
-
-

- 		- {{ a.complaint_date }} - - {{ a.complaint_type }} - - {{ a.location }} - - {{ a.specific_location }} - - - - - - - - - - - - - - - {{ a.worker_id }} - -
- -
-
- - - -
-
- - - - - - - - - -
-
- -
-
- : Pending       - : Worker Assigned       - : Completed       - : Declined       -
-
- - -
-
- - - - - - - - - - - - - - - - - - - - - {% for a in history %} - {% if a.status == 2 %} - - - - - - - - - - - - - - - - - - - - - {% endif %} - {% endfor %} -
- S.no - - Date - - Type - - Location - - Specific
Location - 		- Details - - Status - - Worker
Name -
-

- -
- {{ a.serial_no }} -
- -
-
-

- 		- {{ a.complaint_date }} - - {{ a.complaint_type }} - - {{ a.location }} - - {{ a.specific_location }} - - - - - - - - - - - - - - - {{ a.worker_id }} - -
- -
-
- - - -
-
- - - - - - - - - - - - - -
-
- -
-
- : Pending       - : Worker Assigned       - : Completed       - : Declined       -
-
- - -
-
- - - - - - - - - - - - - - - - - - - - - {% for a in history %} - {% if a.status == 3 %} - - - - - - - - - - - - - - - - - - - - - {% endif %} - {% endfor %} -
- S.no - - Date - - Type - - Location - - Specific
Location - 		- Details - - Status - - Worker
Name -
-

- -
- {{ a.serial_no }} -
- -
-
-

- 		- {{ a.complaint_date }} - - {{ a.complaint_type }} - - {{ a.location }} - - {{ a.specific_location }} - - - - - - - - - - - - - {{ a.worker_id }} - -
- -
-
- - - -
-
- -======= -{% load static %} -{% block complainthistory %} - - {% comment %}The tab menu starts here!{% endcomment %} -
- - Pending Complaints - - - On-Hold Complaints - + --> Resolved Complaints @@ -616,7 +23,7 @@

: Pending       - : Worker Assigned       + : Completed       : Declined      
@@ -660,9 +67,9 @@

Status - + @@ -717,11 +124,11 @@

- + @@ -1182,5 +589,4 @@

->>>>>>> upstream/master {% endblock %} \ No newline at end of file diff --git a/FusionIIIT/templates/complaintModule/complainthistory_user_final.html b/FusionIIIT/templates/complaintModule/complainthistory_user_final.html index a6f01f6e9..d1c8a144a 100644 --- a/FusionIIIT/templates/complaintModule/complainthistory_user_final.html +++ b/FusionIIIT/templates/complaintModule/complainthistory_user_final.html @@ -4,38 +4,30 @@ {% block complainthistory %} {% comment %}The tab menu starts here!{% endcomment %} -
- - Pending
Complaints - - - On-Hold
Complaints +
+ +
+ + Pending
Complaints + Resolved
Complaints - + Declined
Complaints
- - -
+ + +
- - - S.No - - - + - + - + @@ -71,31 +63,31 @@ - - + {% for a in history %} {% if a.status == 0 %} - - - - - + + - - - - - - - {% endif %} - {% endfor %} -
+ + Date - Complaint
+ Complaint
Type 		Location + + -
-

+ + +

+

{{a.serial_no}}
- +

@@ -114,123 +106,15 @@

-

- NOT ASSIGN -
- -
-
-
-
- - - - - - - - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - {% for a in history %} - {% if a.status == 1 %} - - - - - - - - - + + {% endif %} {% endfor %}
- S.No - - Date - - Complaint
- Type - 		- Location - - Details - - Worker
Name -
-

-
- {{ a.serial_no }} -
- -
-
- -

- 		- {{ a.complaint_date }} - - {{ a.complaint_type }} - - {{ a.specific_location }},  - {{ a.location }} - - - - {{ a.worker_id.name }} -
@@ -240,12 +124,22 @@

+ + + + + + + + + + - -
+ +
- +
--> + margin: auto;"> - - - - + + + - + - - + Type + + + - + + + {% for a in history %} {% if a.status == 2 %} @@ -311,10 +205,10 @@

{{ a.serial_no }}
- +
- +

{% endif %} {% endfor %}
- S.No - +
+ S.No + Date Complaint
- Type - 		- Location - + Location + Details @@ -294,13 +188,13 @@

-

+ - - -
@@ -333,33 +227,33 @@

-

+ +
- +
- - - - - - - - -
+ + + + + + + + +
- + - + margin: auto;"> - - - - - - + + + + + - - - + Type + + + + @@ -404,20 +298,20 @@

- - - - + {% for a in history %} - {% if a.status == 3 %} + {% if a.status == 3 %} - - - - - {% endif %} - {% endfor %} -
- S.No - - Date - +
+ S.No + + Date + Complaint
- Type - 		- Location - + Location + Details +
@@ -425,10 +319,10 @@

{{ a.serial_no }}
- +
- +

@@ -445,20 +339,21 @@

+ -
- + + + + + {% endif %} + {% endfor %} + + +

diff --git a/FusionIIIT/templates/complaintModule/feedback.html b/FusionIIIT/templates/complaintModule/feedback.html index 4ba824cfd..2a9504d9f 100644 --- a/FusionIIIT/templates/complaintModule/feedback.html +++ b/FusionIIIT/templates/complaintModule/feedback.html @@ -49,10 +49,10 @@ Status - + Feedback @@ -86,9 +86,9 @@ - + {% if a.feedback == '' %}
diff --git a/FusionIIIT/templates/complaintModule/overdue_super.html b/FusionIIIT/templates/complaintModule/overdue_super.html index 16acddd53..ab8842d01 100644 --- a/FusionIIIT/templates/complaintModule/overdue_super.html +++ b/FusionIIIT/templates/complaintModule/overdue_super.html @@ -49,9 +49,9 @@ - + @@ -109,11 +109,11 @@

{% endif %} --> - + - {% endif %} - + diff --git a/FusionIIIT/templates/complaintModule/overduecomplaint.html b/FusionIIIT/templates/complaintModule/overduecomplaint.html index 6601a7ad8..0ece2a405 100644 --- a/FusionIIIT/templates/complaintModule/overduecomplaint.html +++ b/FusionIIIT/templates/complaintModule/overduecomplaint.html @@ -30,7 +30,7 @@ - Register
Date + Register Date @@ -46,12 +46,12 @@ Delay (days) - + + @@ -93,31 +93,31 @@

{{ a.delay.days }} days - + - {% elif a.status == 1 %} - + - {% elif a.status == 2 %} - + - {% elif a.status == 3 %} - + - {% endif %} + + - {% endif %} - + diff --git a/FusionIIIT/templates/complaintModule/complainthistory_caretaker.html b/FusionIIIT/templates/complaintModule/resolve_caretaker.html similarity index 96% rename from FusionIIIT/templates/complaintModule/complainthistory_caretaker.html rename to FusionIIIT/templates/complaintModule/resolve_caretaker.html index 74ef9798f..0578334bd 100644 --- a/FusionIIIT/templates/complaintModule/complainthistory_caretaker.html +++ b/FusionIIIT/templates/complaintModule/resolve_caretaker.html @@ -18,9 +18,7 @@
- - - + {% csrf_token %} - @@ -105,7 +103,7 @@

-

- @@ -49,7 +49,7 @@ - {% for a in all_complaint %} + {% for a in inbox %} {% if a.status == 2 %} @@ -104,7 +104,7 @@

-
+
: These Complaints have been RESOLVED!      
diff --git a/FusionIIIT/templates/complaintModule/supervisor1.html b/FusionIIIT/templates/complaintModule/supervisor1.html index 9e25db8f1..145ad4aee 100644 --- a/FusionIIIT/templates/complaintModule/supervisor1.html +++ b/FusionIIIT/templates/complaintModule/supervisor1.html @@ -35,19 +35,34 @@
- - View Caretaker + + Lodge a Complaint + - Resolved Complaints + Complaint History + - Unresolved Complaints + Feedback + + + + + View Caretaker - + + + Redirected Complaints + + + Overdue Complaints @@ -73,26 +88,49 @@
{% comment %}The ... start here!{% endcomment %}
+ {% block lodgecomplaint %} + {% include 'complaintModule/lodgecomplaint_user.html' %} + {% endblock %} +
+ {% comment %}The ... end here!{% endcomment %} + + {% comment %}The ... starts here!{% endcomment %} +
+ {% block complainthistory %} + {% include 'complaintModule/complainthistory_super_final.html' %} + {% endblock %} +
+ {% comment %}The ... ends here!{% endcomment %} + + {% comment %}The ... starts here!{% endcomment %} +
+ {% block feedback %} + {% include 'complaintModule/feedback.html' %} + {% endblock %} +
+ {% comment %}The ... ends here!{% endcomment %} + {% comment %}The ... start here!{% endcomment %} +
{% block managecaretakers %} {% include 'complaintModule/manage_caretakers.html' %} {% endblock %}
{% comment %}The ... end here!{% endcomment %} {% comment %}The ... start here!{% endcomment %} -
+
{% block resolvedsuper %} {% include 'complaintModule/resolved_super.html' %} {% endblock %}
{% comment %}The ... end here!{% endcomment %} {% comment %}The ... start here!{% endcomment %} -
+
{% block unresolvedsuper %} {% include 'complaintModule/unresolved_super.html' %} {% endblock %}
{% comment %}The ... end here!{% endcomment %} -
+
{% block overduesuper %} {% include 'complaintModule/overdue_super.html' %} {% endblock %} diff --git a/FusionIIIT/templates/complaintModule/resolvecomplaint.html b/FusionIIIT/templates/complaintModule/unresolvecomplaint.html similarity index 85% rename from FusionIIIT/templates/complaintModule/resolvecomplaint.html rename to FusionIIIT/templates/complaintModule/unresolvecomplaint.html index a2d48ec12..08f55a24e 100644 --- a/FusionIIIT/templates/complaintModule/resolvecomplaint.html +++ b/FusionIIIT/templates/complaintModule/unresolvecomplaint.html @@ -9,9 +9,9 @@ Pending Complaints - +
@@ -28,7 +28,7 @@

- @@ -55,18 +55,22 @@ - - + + + {% for a in history %} - {% if a.status == 0 %} + {% if a.status == 0 %} {% for a in history %} @@ -225,10 +235,10 @@

-

diff --git a/FusionIIIT/templates/complaintModule/unresolved_super.html b/FusionIIIT/templates/complaintModule/unresolved_super.html index d176a29be..d8d5a82ac 100644 --- a/FusionIIIT/templates/complaintModule/unresolved_super.html +++ b/FusionIIIT/templates/complaintModule/unresolved_super.html @@ -4,13 +4,13 @@ {% comment %}The tab menu starts here!{% endcomment %}
- Pending Complaints + Redirected Complaints - +
@@ -51,17 +51,19 @@ - + - - {% for a in all_complaint %} + {% for a in history %} {% if a.status == 0 %} @@ -91,11 +93,19 @@

-

@@ -108,14 +118,6 @@


- - -
-
- : These Complaints Are YET TO BE ASSIGNED To A Worker !       - -
-
@@ -174,7 +176,7 @@

- {% for a in all_complaint %} + {% for a in history %} {% if a.status == 1 %}

diff --git a/FusionIIIT/templates/filetracking/archive.html b/FusionIIIT/templates/filetracking/archive.html index ddf3fc617..1d58182e9 100644 --- a/FusionIIIT/templates/filetracking/archive.html +++ b/FusionIIIT/templates/filetracking/archive.html @@ -4,50 +4,39 @@ {% block filetracking_tab %}

- - Archived Files + + Archived Files  for {{request.user.extrainfo.user}} - {{designations}}

-
-
+ Feedback + {% if a.feedback != "" %} diff --git a/FusionIIIT/templates/complaintModule/resolve_pending.html b/FusionIIIT/templates/complaintModule/resolve_pending.html index 71fc9ef80..9138ceea7 100644 --- a/FusionIIIT/templates/complaintModule/resolve_pending.html +++ b/FusionIIIT/templates/complaintModule/resolve_pending.html @@ -68,8 +68,8 @@ action="."> {% csrf_token %}
- Update The status -
Complaint ID :{{ thiscomplaint.id }}
+ Update the status of + Complaint ID :{{ thiscomplaint.id }}

@@ -101,16 +101,16 @@ Click here! -
+
- Did The Assigned Worker Resolved The Issue?
- If You Say No, The status of the complaint will automatically be set to + Has the issue been resolved?
+ If you say no, the status of the complaint will automatically be set to "Declined">

@@ -125,6 +125,7 @@

+
Any Comments (Optional) diff --git a/FusionIIIT/templates/complaintModule/resolved_super.html b/FusionIIIT/templates/complaintModule/resolved_super.html index e5e6de4af..ef5052ea3 100644 --- a/FusionIIIT/templates/complaintModule/resolved_super.html +++ b/FusionIIIT/templates/complaintModule/resolved_super.html @@ -37,7 +37,7 @@
Specific
Location 		+ Details
+ Student + - Assign worker + Change status + Redirect +
@@ -95,14 +99,25 @@

-

+ + +
+
+ + + +
+
- @@ -123,12 +138,7 @@

-
-
- : These Complaints Are YET TO BE ASSIGNED To A Worker !       - -
-
+

@@ -177,21 +187,21 @@

Specific
Location --> -

+ - + - +
+ +
Details + Change status + +
+ + +
+
+ + + +
+
+
- + - - - - + + - {% for j in draft %} - {% ifequal designations j.designation|stringformat:'s' %} - - - - - - - - - - - {% endifequal %} - {% endfor %} + {% for f in archive_files %} + + + + + {% comment %} {% endcomment %} + + + {% endfor %} -
Created By File IDCreated By SubjectDateView FileForwardView Archived File
{{j.uploader.user}} - {{j.designation}}{{request.user.extrainfo.department.name}}-{{j.upload_date.year}}-{{j.upload_date.month}}-#{{j.id}}{{j.subject}}{{j.upload_date}}
{{f.uploader_department}}-{{f.upload_date.year}}-{{f.upload_date.month}}-#{{f.id}}{{f.uploader}}-{{f.designation}}{{f.subject|default:"None"}}{{f.upload_date}} + +
-
- -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/FusionIIIT/templates/filetracking/archive_design.html b/FusionIIIT/templates/filetracking/archive_design.html index bf95ad805..c94542022 100644 --- a/FusionIIIT/templates/filetracking/archive_design.html +++ b/FusionIIIT/templates/filetracking/archive_design.html @@ -20,7 +20,7 @@

{% for designation in designation %} - {% endfor %} diff --git a/FusionIIIT/templates/filetracking/archive_finish.html b/FusionIIIT/templates/filetracking/archive_finish.html index 610882c04..25183fd48 100644 --- a/FusionIIIT/templates/filetracking/archive_finish.html +++ b/FusionIIIT/templates/filetracking/archive_finish.html @@ -2,51 +2,39 @@ {% load static %} {% block filetracking_tab %} - {% comment %}the compounder prescription tab starts here {% endcomment %}

- Note Sheet + Note Sheet

- {% comment %}the ambulance schedule tab starts here {% endcomment %}
- -
+ {% csrf_token %} -
- {% comment %}The Dropdown field starts here!{% endcomment %}
File Details
-
- Uploader - {{file.uploader}} - File ID - {{file.ref_id}} - Subject - {{file.subject}} - Date - {{file.upload_date}} -
-
File Description
@@ -55,16 +43,11 @@

- - - - Attachments :  {{file.upload_file}} - - - - -
-
+ + Attachments :  {{file.upload_file}} + +
+
@@ -130,32 +113,16 @@

- -
- +


- - - +
+ +

-
- -
-

- {% comment %}the compounder prescription tab ends here {% endcomment %} -{% endblock %} - - - \ No newline at end of file +{% endblock %} \ No newline at end of file diff --git a/FusionIIIT/templates/filetracking/confirmdelete.html b/FusionIIIT/templates/filetracking/confirmdelete.html index 28890aa1f..f75d0caeb 100644 --- a/FusionIIIT/templates/filetracking/confirmdelete.html +++ b/FusionIIIT/templates/filetracking/confirmdelete.html @@ -110,9 +110,9 @@

Delete file

- + - +
diff --git a/FusionIIIT/templates/filetracking/draft_design.html b/FusionIIIT/templates/filetracking/draft_design.html new file mode 100644 index 000000000..27e22daeb --- /dev/null +++ b/FusionIIIT/templates/filetracking/draft_design.html @@ -0,0 +1,30 @@ +{% extends 'filetracking/filetracking.html' %} +{% load static %} + +{% block filetracking_tab %} +
+

+ + Drafts + +

+ +
+ +
+
+ {% endfor %} + + + + +
+ +{% endblock %} diff --git a/FusionIIIT/templates/filetracking/drafts.html b/FusionIIIT/templates/filetracking/drafts.html index 434911a5b..1e0f8539e 100644 --- a/FusionIIIT/templates/filetracking/drafts.html +++ b/FusionIIIT/templates/filetracking/drafts.html @@ -1,30 +1,46 @@ -{% extends 'filetracking/filetracking.html' %} -{% load static %} - -{% block filetracking_tab %} -
-

- - Drafts - -

- -
- -
-
- {% endfor %} - - - - -
- -{% endblock %} +{% extends 'filetracking/filetracking.html' %} +{% load static %} + +{% block filetracking_tab %} +
+

+ + Draft Files  for {{request.user.extrainfo.user}} - {{designations}} + +

+
+ +
+ + + + + + + + + + + + + {% for draft in draft_files %} + + + + + + + + {% endfor %} + +
File IDSubjectDate CreatedView DraftDelete Draft
{{ draft.uploader_department }}-{{ draft.upload_date.year }}-{{ draft.upload_date.month }}-#{{ draft.id }}{{ draft.subject|default:"None" }}{{ draft.upload_date }} + + + + + + + +
+
+{% endblock %} diff --git a/FusionIIIT/templates/filetracking/filetracking.html b/FusionIIIT/templates/filetracking/filetracking.html index 4ae903241..17c81ed3f 100644 --- a/FusionIIIT/templates/filetracking/filetracking.html +++ b/FusionIIIT/templates/filetracking/filetracking.html @@ -13,7 +13,7 @@ {% endblock %} {% comment %}The grid starts here!{% endcomment %} -
+
{% comment %}The left-margin segment!{% endcomment %}
@@ -40,7 +40,7 @@ - + Drafts @@ -60,10 +60,10 @@ correction team 24 --> - + Archive @@ -96,7 +96,7 @@ {% comment %} The central-rail segment starts here! {% endcomment %} -
+
{% comment %}The ... start here!{% endcomment %}
{% 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 %}
diff --git a/FusionIIIT/templates/filetracking/fileview.html b/FusionIIIT/templates/filetracking/fileview.html deleted file mode 100644 index 13e857cb3..000000000 --- a/FusionIIIT/templates/filetracking/fileview.html +++ /dev/null @@ -1,51 +0,0 @@ -{% extends 'filetracking/filetracking.html' %} -{% load static %} - -{% block filetracking_tab %} -
-

- - Drafts - -

- -
- -
- - - - - - - - - - - - - - {% for j in draft %} - {% ifequal designations j.designation|stringformat:'s' %} - - - - - - - - - - {% endifequal %} - {% endfor %} - - -
Created ByFile IDSubjectDateView FileDelete File
{{j.uploader.user}} - {{j.designation}}{{request.user.extrainfo.department.name}}-{{j.upload_date.year}}-{{j.upload_date.month}}-#{{j.id}}{{j.subject}}{{j.upload_date}}
- -
- -{% endblock %} \ No newline at end of file diff --git a/FusionIIIT/templates/filetracking/fileview1.html b/FusionIIIT/templates/filetracking/fileview1.html deleted file mode 100644 index 349111328..000000000 --- a/FusionIIIT/templates/filetracking/fileview1.html +++ /dev/null @@ -1,49 +0,0 @@ -{% extends 'filetracking/filetracking.html' %} -{% load static %} - -{% block filetracking_tab %} -
-

- - Outward Files - -

-
- -
- - - - - - - - - - - - - - - {% for i in out %} - {% ifequal abcd i.current_design %} - - - - - - - - - - {% endifequal %} - {% endfor %} - - -
Sent AsSent ToFile IDSubjectDateView File
{{i.current_design}}{{i.receiver_id}}-{{i.receive_design}}{{i.file_id.uploader.department.name}}-{{i.file_id.upload_date.year}}-{{i.file_id.upload_date.month}}-#{{i.file_id.id}}{{i.file_id.subject}}{{i.receive_date}} -
-
- -{% endblock %} 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 %} -
-

- - Inward Files - -

- -
- -
- - - - - - - - - - - - - - - - {% for j in in_file %} - {% ifequal designations j.receive_design|stringformat:'s' %} - - - - - - - - - - - - - - - - {% endifequal %} - {% endfor %} - - -
Received asSend byFile IDSubjectDateView File
{{request.user.extrainfo.user}} - {{j.receive_design}}{{j.current_design}}{{j.file_id.uploader.department.name}}-{{j.file_id.upload_date.year}}-{{j.file_id.upload_date.month}}-#{{j.file_id.id}} {{j.file_id.subject}}{{j.receive_date}}
- -
- -{% endblock %} diff --git a/FusionIIIT/templates/filetracking/forward.html b/FusionIIIT/templates/filetracking/forward.html index b585c7506..85f596535 100644 --- a/FusionIIIT/templates/filetracking/forward.html +++ b/FusionIIIT/templates/filetracking/forward.html @@ -41,8 +41,8 @@
{% for t in track %} -
-
+
+
{{t.current_design}} @@ -252,8 +252,8 @@ {% for t in track %} -
-
+
+
diff --git a/FusionIIIT/templates/filetracking/inbox.html b/FusionIIIT/templates/filetracking/inbox.html new file mode 100644 index 000000000..a5619e4ca --- /dev/null +++ b/FusionIIIT/templates/filetracking/inbox.html @@ -0,0 +1,50 @@ +{% extends 'filetracking/filetracking.html' %} +{% load static %} +{% block filetracking_tab %} +
+

+ + Inward Files  for {{request.user.extrainfo.user}} - {{designations}} + +

+
+
+ + + + + + + + + + + + + + + {% for f in in_file %} + + + + + + + + {% endfor %} + + +
Sent byFile IDSubjectLast ReceivedView File
{{f.sent_by_user}}-{{f.sent_by_designation}}{{f.uploader_department}}-{{f.upload_date.year}}-{{f.upload_date.month}}-#{{f.id}} {{f.subject|default:"None"}}{{f.receive_date}} + +
+ +
+ +{% 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 %} - {% endfor %} diff --git a/FusionIIIT/templates/filetracking/outbox.html b/FusionIIIT/templates/filetracking/outbox.html new file mode 100644 index 000000000..416606d46 --- /dev/null +++ b/FusionIIIT/templates/filetracking/outbox.html @@ -0,0 +1,45 @@ +{% extends 'filetracking/filetracking.html' %} +{% load static %} + +{% block filetracking_tab %} +
+

+ + Outward Files  for {{request.user.extrainfo.user}} - {{viewer_designation}} + +

+
+ +
+ + + + + + + + + + + + + {% for f in out_files %} + + + + + + + + {% endfor %} + + + +
File IDSent ToSubjectLast SentView File
{{f.uploader_department}}-{{f.upload_date.year}}-{{f.upload_date.month}}-#{{f.id}}{{f.sent_to_user}}-{{f.sent_to_design}}{{f.subject|default:"None"}}{{f.last_sent_date}} + +
+
+ +{% endblock %} diff --git a/FusionIIIT/templates/filetracking/outward.html b/FusionIIIT/templates/filetracking/outward.html index 73c3082f6..2666672e2 100644 --- a/FusionIIIT/templates/filetracking/outward.html +++ b/FusionIIIT/templates/filetracking/outward.html @@ -16,7 +16,7 @@

{% for designation in designation %} - {% endfor %} diff --git a/FusionIIIT/templates/filetracking/viewfile.html b/FusionIIIT/templates/filetracking/viewfile.html new file mode 100644 index 000000000..52decf934 --- /dev/null +++ b/FusionIIIT/templates/filetracking/viewfile.html @@ -0,0 +1,126 @@ +{% extends 'filetracking/filetracking.html' %} +{% load static %} + +{% block filetracking_tab %} + +
+ + Note Sheet + + + Attachments + +
+ +
+
+ Created By :-{{file.uploader.user}}-{{file.designation}} + File ID :{{file.uploader.department.name}}-{{file.upload_date.year}}-{{file.upload_date.month}}-#{{file.id}} +
+
+ {% csrf_token %} +
+
+
Subject - {{file.subject}}
+
+
+
+
+ 
{{file.description}}
+
+
+ {% for t in track %} +
+
+
+ {{t.current_design}} + + {{t.forward_date}} + + + +
+ Received by: {{t.receiver_id}}-{{t.receive_design}} +
+ +
+ 
+                                                {% if t.remarks %}
+                                                    {{t.remarks}}
+                                                {% else %}
+                                                    No Remarks
+                                                {% endif %}
+
+
+
+
+
+
+ {% endfor %} + +
+ + + + + +
+
+ +
+
+
+



+
+
+
+ +
+
+ Created By :{{file.uploader.user}}-{{file.designation}} + File ID :{{file.uploader.department.name}}-{{file.upload_date.year}}-{{file.upload_date.month}}-#{{file.id}} +
+
+
+
+
+ {% for t in track %} +
+
+
+ + {% if t.upload_file %} + + {{t.upload_file}} + + {% else %} + No Attachment + {% endif %} + +
+ {{t.current_design}} + + {{t.forward_date}} + + +
+
+
+
+ {% endfor %} + +
+ +
+
+
+
+
+ + +{% endblock %} + 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..1898a8177 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 @@ -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 79ef20d1a53a92391ed1b0fc9a4e1af90dd489df Mon Sep 17 00:00:00 2001 From: Divyansh Tripathi <55395696+theoden42@users.noreply.github.com> Date: Tue, 5 Mar 2024 15:59:25 +0530 Subject: [PATCH 10/34] prevent student access of the filetracking module --- .../applications/filetracking/decorators.py | 38 +++++++++++++++++++ FusionIIIT/applications/filetracking/views.py | 2 + 2 files changed, 40 insertions(+) create mode 100644 FusionIIIT/applications/filetracking/decorators.py diff --git a/FusionIIIT/applications/filetracking/decorators.py b/FusionIIIT/applications/filetracking/decorators.py new file mode 100644 index 000000000..05cc7cc51 --- /dev/null +++ b/FusionIIIT/applications/filetracking/decorators.py @@ -0,0 +1,38 @@ +from django.shortcuts import render, get_object_or_404 +from django.contrib.auth.models import User +from applications.globals.models import ExtraInfo, HoldsDesignation + + +def user_check(request): + """ + This function is used to check if the user is a student or not. + Its return type is bool. + @param: + request - contains metadata about the requested page + + @Variables: + current_user - get user from request + user_details - extract details of the user from the database + desig_id - check for designation + student - designation for a student + final_user - final designation of the request(our user) + """ + try: + current_user = get_object_or_404(User, username=request.user.username) + user_details = ExtraInfo.objects.select_related('user','department').get(user=request.user) + des = HoldsDesignation.objects.all().select_related().filter(user=request.user).first() + if str(des.designation) == "student": + return True + else: + return False + except Exception as e: + return False + +def user_is_student(view_func): + def _wrapped_view(request, *args, **kwargs): + if user_check(request): + return render(request, 'filetracking/fileTrackingNotAllowed.html') + else: + return view_func(request, *args, **kwargs) + return _wrapped_view + diff --git a/FusionIIIT/applications/filetracking/views.py b/FusionIIIT/applications/filetracking/views.py index e3fd4d68d..c03ea1cfc 100644 --- a/FusionIIIT/applications/filetracking/views.py +++ b/FusionIIIT/applications/filetracking/views.py @@ -13,8 +13,10 @@ from .utils import * from django.utils.dateparse import parse_datetime from .sdk.methods import * +from .decorators import * @login_required(login_url="/accounts/login/") +@user_is_student def filetracking(request): """ The function is used to create files by current user(employee). From c3f14b7467399fa902de91add0429b3bf53ccde9 Mon Sep 17 00:00:00 2001 From: Divyansh Tripathi <55395696+theoden42@users.noreply.github.com> Date: Tue, 5 Mar 2024 17:23:16 +0530 Subject: [PATCH 11/34] add dropdown filtering based on reciever username and update notallowed template --- .../applications/filetracking/sdk/methods.py | 14 +++++++++++++- FusionIIIT/applications/filetracking/urls.py | 1 + FusionIIIT/applications/filetracking/views.py | 7 +++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/FusionIIIT/applications/filetracking/sdk/methods.py b/FusionIIIT/applications/filetracking/sdk/methods.py index 6431aafb9..c6f9ebc53 100644 --- a/FusionIIIT/applications/filetracking/sdk/methods.py +++ b/FusionIIIT/applications/filetracking/sdk/methods.py @@ -190,6 +190,16 @@ def archive_file(file_id: int) -> bool: except File.DoesNotExist: return False +def unarchive_file(file_id: int) -> bool: + ''' + This functions is used to unarchive a file and returns true if the unarchiving was successful + ''' + try: + File.objects.filter(id=file_id).update(is_read=False) + return True + except File.DoesNotExist: + return False + def create_draft( @@ -334,7 +344,9 @@ def get_designations(username: str) -> list: ''' user = User.objects.get(username=username) designations_held = HoldsDesignation.objects.filter(user=user) - designation_name = [designation.name for designation in designations_held] + designation_name = [hold_designation.designation.name for hold_designation in designations_held] + return designation_name + def get_user_object_from_username(username: str) -> User: user = User.objects.get(username=username) diff --git a/FusionIIIT/applications/filetracking/urls.py b/FusionIIIT/applications/filetracking/urls.py index 6a6e5e326..28c8deac1 100644 --- a/FusionIIIT/applications/filetracking/urls.py +++ b/FusionIIIT/applications/filetracking/urls.py @@ -35,6 +35,7 @@ url(r'^archive_design/$', views.archive_design, name='archive_design'), url(r'^archive_finish/(?P\d+)/$', views.archive_finish, name='archive_finish'), + url(r'^getdesignations/(?P\w+)/$', views.get_designations_view, name="get_user_designations"), # REST api urls url(r'^api/', include(urls)) diff --git a/FusionIIIT/applications/filetracking/views.py b/FusionIIIT/applications/filetracking/views.py index c03ea1cfc..b6d9e3bff 100644 --- a/FusionIIIT/applications/filetracking/views.py +++ b/FusionIIIT/applications/filetracking/views.py @@ -8,6 +8,7 @@ from django.db import IntegrityError from django.core import serializers from django.contrib.auth.models import User +from django.http import JsonResponse from timeit import default_timer as time from notification.views import office_module_notif, file_tracking_notif from .utils import * @@ -723,3 +724,9 @@ def forward_inward(request,id): 'track': track, } return render(request, 'filetracking/forward.html', context) + +def get_designations_view(request, username): + designations = get_designations(username) + print(designations) + return JsonResponse(designations, safe=False) + From 3f43b275742619829e1a34a22964d7398be9840c Mon Sep 17 00:00:00 2001 From: nidhibarapatre Date: Wed, 6 Mar 2024 18:38:21 +0530 Subject: [PATCH 12/34] Change in model of supervisor --- .../applications/complaint_system/models.py | 4 +- .../applications/complaint_system/views.py | 42 +++---------------- 2 files changed, 8 insertions(+), 38 deletions(-) diff --git a/FusionIIIT/applications/complaint_system/models.py b/FusionIIIT/applications/complaint_system/models.py index 22bb59832..193eb324a 100644 --- a/FusionIIIT/applications/complaint_system/models.py +++ b/FusionIIIT/applications/complaint_system/models.py @@ -82,7 +82,7 @@ def __str__(self): class Supervisor(models.Model): sup_id = models.ForeignKey(ExtraInfo, on_delete=models.CASCADE) - area = models.CharField(choices=Constants.AREA, max_length=20,default='hall-3') + type = models.CharField(choices=Constants.COMPLAINT_TYPE, max_length=30,default='Electricity') def __str__(self): - return str(self.id) + '-' + str(self.area) + return str(self.id) + '-' + str(self.type) diff --git a/FusionIIIT/applications/complaint_system/views.py b/FusionIIIT/applications/complaint_system/views.py index 38852979c..cb929f35f 100644 --- a/FusionIIIT/applications/complaint_system/views.py +++ b/FusionIIIT/applications/complaint_system/views.py @@ -127,57 +127,27 @@ def assign_worker(request, comp_id1): a = get_object_or_404(User, username=request.user.username) y = ExtraInfo.objects.all().select_related('user','department').filter(user=a).first() comp_id = y.id - - # if a.username=="shyams": - # desgn="hall3caretaker" - # if type == 'assign': - # complaint_finish = request.POST.get('complaint_finish', '') - # worker_id = request.POST.get('assign_worker', '') - # w = Workers.objects.select_related('caretaker_id','caretaker_id__staff_id','caretaker_id__staff_id__user','caretaker_id__staff_id__department').get(id=worker_id) - # StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').select_for_update().filter(id=comp_id1).\ - # update(worker_id=w, status=1) - # complainer_details = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').get(id=comp_id1) - # student = 0 - # message = "Worker has been assigned to your complaint" - # complaint_system_notif(request.user, complainer_details.complainer.user ,'assign_worker_alert',complainer_details.id,student,message) - - # return HttpResponseRedirect('/complaint/caretaker/') - # elif type == 'redirect': - print(comp_id1) - print("1234567890") assign_caretaker = request.POST.get('assign_caretaker', '') - # c = Caretaker.objects.select_related('staff_id','staff_id__user','staff_id__department').get(id=assign_caretaker) c1 = Caretaker.objects.select_related('staff_id','staff_id__user','staff_id__department').get(staff_id=comp_id) c2=Supervisor.objects.all().filter(area=c1.area) - # c3=User.objects.all().filter(id=c2[0].sup_id.id) - # print(c3[0]) y1 = ExtraInfo.objects.all().select_related('user','department').filter(id=c2[0].sup_id.id).first() - print(y1) - # b = get_object_or_404(User, id=y1.user.username) - # remark = 'Redirect complaint from ' + c1.area - # StudentComplain.objects.select_for_update().filter(id=comp_id1).\ - # update(location=c.area, remarks=remark) complainer_details = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').get(id=comp_id1) student=0 message = "Your Complaint has been redirected to supervisor" complaint_system_notif(request.user, complainer_details.complainer.user ,'comp_redirect_alert',complainer_details.id,student,message) - # return render(request, "complaintModule/assignworker.html", - # {'detail': detail, 'worker': worker, 'flag': - # flag, 'total_caretaker': total_caretaker,'a':a, 'total_caretakers_in_area':total_caretakers_in_area}) - sup = HoldsDesignation.objects.select_related('user','working','designation').get(user = y1.user_id) print(sup.designation) - + files=File.objects.all().filter(src_object_id=comp_id1) + print("----------") + print(files.first().id) user_details=User.objects.get(id=y.user_id) des=HoldsDesignation.objects.filter(user=user_details).all() - file_id = create_file(uploader=a.username, - uploader_designation=des[0].designation, + file=forward_file(file_id= files.first().id, receiver=c2[0].sup_id.user, receiver_designation=sup.designation, - src_module="complaint", - src_object_id= str(comp_id1), file_extra_JSON= {}, - attached_file = None) + remarks = "", + file_attachment= None) return HttpResponseRedirect('/complaint/caretaker/') From a97f4823a6e3863aefbc6416a2b41cf8f14ca86d Mon Sep 17 00:00:00 2001 From: Divyansh Tripathi <55395696+theoden42@users.noreply.github.com> Date: Thu, 7 Mar 2024 11:59:54 +0530 Subject: [PATCH 13/34] add option to unarchive files --- FusionIIIT/applications/filetracking/urls.py | 2 + FusionIIIT/applications/filetracking/views.py | 22 ++++++-- .../templates/filetracking/composefile.html | 41 ++++++++++++--- .../templates/filetracking/forward.html | 50 +++++++++++++++---- 4 files changed, 94 insertions(+), 21 deletions(-) diff --git a/FusionIIIT/applications/filetracking/urls.py b/FusionIIIT/applications/filetracking/urls.py index 28c8deac1..4906a7a48 100644 --- a/FusionIIIT/applications/filetracking/urls.py +++ b/FusionIIIT/applications/filetracking/urls.py @@ -35,6 +35,8 @@ url(r'^archive_design/$', views.archive_design, name='archive_design'), url(r'^archive_finish/(?P\d+)/$', views.archive_finish, name='archive_finish'), + url(r'unarchive/(?P\d+)/$', + views.unarchive_file, name='unarchive'), url(r'^getdesignations/(?P\w+)/$', views.get_designations_view, name="get_user_designations"), # REST api urls diff --git a/FusionIIIT/applications/filetracking/views.py b/FusionIIIT/applications/filetracking/views.py index b6d9e3bff..fe9829425 100644 --- a/FusionIIIT/applications/filetracking/views.py +++ b/FusionIIIT/applications/filetracking/views.py @@ -39,6 +39,7 @@ def filetracking(request): holdsdesignations - The HoldsDesignation object. context - Holds data needed to make necessary changes in the template. """ + print(request.POST) if request.method == "POST": try: if 'save' in request.POST: @@ -99,8 +100,9 @@ def filetracking(request): except Exception as e: messages.error(request, 'Enter a valid Username') return redirect('/filetracking/') - receive = request.POST.get('recieve') + receive = request.POST.get('receive') try: + print(receive) receive_design = Designation.objects.get(name=receive) except Exception as e: messages.error(request, 'Enter a valid Designation') @@ -483,7 +485,7 @@ def forward(request, id): 'track': track, } return render(request, 'filetracking/forward.html', context) - receive = request.POST.get('recieve') + receive = request.POST.get('receive') try: receive_design = Designation.objects.get(name=receive) except Exception as e: @@ -727,6 +729,20 @@ def forward_inward(request,id): def get_designations_view(request, username): designations = get_designations(username) - print(designations) return JsonResponse(designations, safe=False) + +def unarchive_file(request, id): + try: + file = get_object_or_404(File, id=id) + file.is_read = False + file.save() + messages.success(request, 'File unarchived') + except File.DoesNotExist: + messages.error(request, 'File does not exist') + except Exception as e: + messages.error(request, 'Unable to unarchive: {}'.format(str(e))) + + return render(request, 'filetracking/archive.html') + + diff --git a/FusionIIIT/templates/filetracking/composefile.html b/FusionIIIT/templates/filetracking/composefile.html index 819e71479..f42e55f92 100644 --- a/FusionIIIT/templates/filetracking/composefile.html +++ b/FusionIIIT/templates/filetracking/composefile.html @@ -104,13 +104,9 @@

@@ -210,6 +206,37 @@

}); + + {% endblock %} + + + {% endblock %} From b0109b8ad33cd6ace72cd0bf2bab776d5f49a3db Mon Sep 17 00:00:00 2001 From: Divyansh Tripathi <55395696+theoden42@users.noreply.github.com> Date: Thu, 7 Mar 2024 12:01:21 +0530 Subject: [PATCH 14/34] fix template for filetrackingnotallowed page --- .../filetracking/fileTrackingNotAllowed.html | 43 ++++++++++++++++++- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/FusionIIIT/templates/filetracking/fileTrackingNotAllowed.html b/FusionIIIT/templates/filetracking/fileTrackingNotAllowed.html index f2a8c0685..791e57f77 100644 --- a/FusionIIIT/templates/filetracking/fileTrackingNotAllowed.html +++ b/FusionIIIT/templates/filetracking/fileTrackingNotAllowed.html @@ -1,2 +1,41 @@ -

File Tracking Module is not allowed for Students. -

+{% extends 'globals/base.html' %} +{% load static %} + +{% block title %} + File Tracking +{% endblock %} + +{% block body %} + {% block navBar %} + {% include 'dashboard/navbar.html' %} + {% endblock %} + +
+
+ +
+
+
+ File Tracking Not Available +
+

This feature is not open for students.

+
+ Go to Dashboard +
+ +
+
+ +
+
+ +
+
+{% endblock %} + +{% block javascript %} + + + +{% endblock %} + From 586775a93ab2e751457f67b8360cb3aaa32c10e2 Mon Sep 17 00:00:00 2001 From: Divyansh Tripathi <55395696+theoden42@users.noreply.github.com> Date: Thu, 7 Mar 2024 12:01:41 +0530 Subject: [PATCH 15/34] fix attachments view in the history of the file --- .../templates/filetracking/viewfile.html | 56 ++++++++++++------- 1 file changed, 37 insertions(+), 19 deletions(-) diff --git a/FusionIIIT/templates/filetracking/viewfile.html b/FusionIIIT/templates/filetracking/viewfile.html index 52decf934..b2bd29c95 100644 --- a/FusionIIIT/templates/filetracking/viewfile.html +++ b/FusionIIIT/templates/filetracking/viewfile.html @@ -32,37 +32,55 @@ {% for t in track %}
-
- {{t.current_design}} - - {{t.forward_date}} - +
+ {{ t.current_design }} + + {{ t.forward_date }} + -
- Received by: {{t.receiver_id}}-{{t.receive_design}} -
- -
- 
-                                                {% if t.remarks %}
-                                                    {{t.remarks}}
-                                                {% else %}
-                                                    No Remarks
-                                                {% endif %}
+                                        

+                                            Received by: {{ t.receiver_id }}-{{ t.receive_design }}
+                                        

 
-
-
+
+ 
+                                            {% if t.remarks %}
+                                                {{ t.remarks }}
+                                            {% else %}
+                                                No Remarks
+                                            {% endif %}
+
+ {% if t.upload_file %} + Attachment: {{ t.upload_file }} + {% else %} + No attachments + {% endif %}
+
{% endfor %} - +
+ + {% if not file.is_read %} + + {% else %} + + {% endif %} + + diff --git a/FusionIIIT/templates/filetracking/editdraft.html b/FusionIIIT/templates/filetracking/editdraft.html new file mode 100644 index 000000000..204ac0e41 --- /dev/null +++ b/FusionIIIT/templates/filetracking/editdraft.html @@ -0,0 +1,199 @@ +{% extends 'filetracking/filetracking.html' %} +{% load static %} + +{% block filetracking_tab %} + +
+ + Note Sheet + + + + Attachments + +
+ +
+ +
+ Created By :-{{file.uploader.user}}-{{file.designation}} + File ID :{{file.uploader.department.name}}-{{file.upload_date.year}}-{{file.upload_date.month}}-#{{file.id}} +
+ +
+ {% csrf_token %} + +
+
+
Subject-
+
+ +
+
+
+ +
+
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
+ +
+ +
+ + +
+
+
+ +
+ +
+
+
+ +
+ +
+ Created By :{{file.uploader.user}}-{{file.designation}} + File ID :{{file.uploader.department.name}}-{{file.upload_date.year}}-{{file.upload_date.month}}-#{{file.id}} +
+ +
+
+
+
+ {% for t in track %} +
+
+
+ + {% if t.upload_file %} + + {{t.upload_file}} + + {% else %} + No Attachment + {% endif %} + + +
+ {{t.current_design}} + + {{t.forward_date}} + + +
+
+
+
+ {% endfor %} + +
+
+
+
+
+
+ + + + + +{% endblock %} + From d50d0e6ba97b84c96d9874ba9144b8109363d159 Mon Sep 17 00:00:00 2001 From: nidhibarapatre Date: Fri, 8 Mar 2024 10:22:23 +0530 Subject: [PATCH 17/34] Complition of redirect functionality and pagination --- .../applications/complaint_system/models.py | 2 +- .../static/complaint_system/js/rating.js | 95 ++++++++++ .../applications/complaint_system/views.py | 85 +++++---- .../complaintModule/assignworker.html | 13 +- .../complaintModule/carefeedback.html | 8 +- .../complaintModule/complaint_caretaker.html | 13 +- .../complaint_caretaker_detail.html | 4 +- .../complaint_supervisor_detail.html | 4 +- .../complaint_user_detail.html | 4 +- .../complainthistory_care_final.html | 48 +++-- .../complainthistory_super_final.html | 48 +++-- .../complainthistory_user_final.html | 48 +++-- .../templates/complaintModule/feedback.html | 8 +- .../complaintModule/overdue_complaint1.html | 4 +- .../complaintModule/overdue_super.html | 20 +-- .../complaintModule/overduecomplaint.html | 20 +-- .../complaintModule/resolve_caretaker.html | 10 +- .../complaintModule/supervisor1.html | 14 +- .../complaintModule/unresolvecomplaint.html | 18 +- .../complaintModule/unresolved_super.html | 164 +++++++++--------- 20 files changed, 403 insertions(+), 227 deletions(-) diff --git a/FusionIIIT/applications/complaint_system/models.py b/FusionIIIT/applications/complaint_system/models.py index 193eb324a..af633fef0 100644 --- a/FusionIIIT/applications/complaint_system/models.py +++ b/FusionIIIT/applications/complaint_system/models.py @@ -85,4 +85,4 @@ class Supervisor(models.Model): type = models.CharField(choices=Constants.COMPLAINT_TYPE, max_length=30,default='Electricity') def __str__(self): - return str(self.id) + '-' + str(self.type) + return str(self.sup_id) + '-' + str(self.type) diff --git a/FusionIIIT/applications/complaint_system/static/complaint_system/js/rating.js b/FusionIIIT/applications/complaint_system/static/complaint_system/js/rating.js index 3884f885b..926158007 100644 --- a/FusionIIIT/applications/complaint_system/static/complaint_system/js/rating.js +++ b/FusionIIIT/applications/complaint_system/static/complaint_system/js/rating.js @@ -767,3 +767,98 @@ $.fn.rating.settings = { }; })( jQuery, window, document ); + + +function paginate(tableId, rowsPerPage, paginationDiv) { + var currentPage = 1; + var tableRows = document.querySelectorAll('#' + tableId + ' tbody tr'); + var totalPages = Math.ceil(tableRows.length / rowsPerPage); + + function displayRows() { + var startIndex = (currentPage - 1) * rowsPerPage; + var endIndex = startIndex + rowsPerPage; + tableRows.forEach(function (row, index) { + if (index >= startIndex && index < endIndex) { + row.style.display = ''; + } else { + row.style.display = 'none'; + } + }); + } + + function generatePagination() { + var pagination = document.getElementById(paginationDiv); + pagination.innerHTML = ''; + + var maxPagesToShow = 5; + + // Calculate the range of pages to display + var startPage = Math.max(1, currentPage - Math.floor(maxPagesToShow / 2)); + var endPage = Math.min(totalPages, startPage + maxPagesToShow - 1); + + // Adjust startPage and endPage if needed + if (endPage - startPage < maxPagesToShow - 1) { + startPage = Math.max(1, endPage - maxPagesToShow + 1); + } + + // Create the backward scroll button + if (currentPage > 1) { + pagination.appendChild(createScrollButton('<')); + } + + // Create the page links + for (var i = startPage; i <= endPage; i++) { + pagination.appendChild(createPageLink(i)); + } + + // Create the forward scroll button + if (currentPage < totalPages) { + pagination.appendChild(createScrollButton('>')); + } +} + +function createScrollButton(label) { + var button = document.createElement('button'); + button.textContent = label; + button.addEventListener('click', function () { + if (label === '<') { + currentPage = Math.max(1, currentPage - 1); + } else { + currentPage = Math.min(totalPages, currentPage + 1); + } + displayRows(); + generatePagination(); + }); + return button; +} + + + function createPageLink(pageNumber) { + var link = document.createElement('a'); + link.href = '#'; + link.textContent = pageNumber; + link.style.display = 'inline-block'; + link.style.padding = '5px 10px'; + link.style.marginRight = '5px'; + link.style.color = '#333'; + link.style.textDecoration = 'none'; + link.style.border = '1px solid #ccc'; + link.style.borderRadius = '3px'; + + if (pageNumber === currentPage) { + link.style.backgroundColor = '#007bff'; + link.style.color = '#fff'; + } + + link.addEventListener('click', function () { + currentPage = parseInt(this.textContent); + displayRows(); + generatePagination(); + }); + + return link; + } + + displayRows(); + generatePagination(); +} \ No newline at end of file diff --git a/FusionIIIT/applications/complaint_system/views.py b/FusionIIIT/applications/complaint_system/views.py index cb929f35f..52349b139 100644 --- a/FusionIIIT/applications/complaint_system/views.py +++ b/FusionIIIT/applications/complaint_system/views.py @@ -129,25 +129,41 @@ def assign_worker(request, comp_id1): comp_id = y.id assign_caretaker = request.POST.get('assign_caretaker', '') c1 = Caretaker.objects.select_related('staff_id','staff_id__user','staff_id__department').get(staff_id=comp_id) - c2=Supervisor.objects.all().filter(area=c1.area) - y1 = ExtraInfo.objects.all().select_related('user','department').filter(id=c2[0].sup_id.id).first() - complainer_details = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').get(id=comp_id1) - student=0 - message = "Your Complaint has been redirected to supervisor" - complaint_system_notif(request.user, complainer_details.complainer.user ,'comp_redirect_alert',complainer_details.id,student,message) - sup = HoldsDesignation.objects.select_related('user','working','designation').get(user = y1.user_id) - print(sup.designation) - files=File.objects.all().filter(src_object_id=comp_id1) + # c2=Supervisor.objects.all().filter(area=c1.area) + # y1 = ExtraInfo.objects.all().select_related('user','department').filter(id=c2[0].sup_id.id).first() + complaint_details = StudentComplain.objects.all().filter(id=comp_id1) + # update(complaint_details[0].status=1) + StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(id=comp_id1).\ + update(status=1) + print(complaint_details) + complaint_type=complaint_details[0].complaint_type + print(complaint_type) + supervisor=Supervisor.objects.all().filter(type=complaint_type) print("----------") - print(files.first().id) - user_details=User.objects.get(id=y.user_id) - des=HoldsDesignation.objects.filter(user=user_details).all() + print(supervisor[0].sup_id.id) + print("----------") + supervisor_details=ExtraInfo.objects.all().filter(id=supervisor[0].sup_id.id) + print(supervisor_details[0].user_id) + # supervisor_id=ExtraInfo.objects.all().filter(id=supervisor) + # student=0 + # message = "Your Complaint has been redirected to supervisor" + # complaint_system_notif(request.user, complainer_details.complainer.user ,'comp_redirect_alert',complainer_details.id,student,message) + sup = HoldsDesignation.objects.select_related('user','working','designation').filter(user = supervisor_details[0].user_id) + print(sup[0].designation) + # print(sup.designation) + files=File.objects.all().filter(src_object_id=comp_id1) + # print("----------") + # print(files.first().id) + # user_details=User.objects.get(id=y.user_id) + # des=HoldsDesignation.objects.filter(user=user_details).all() + supervisor_username=User.objects.all().filter(id=supervisor_details[0].user_id) file=forward_file(file_id= files.first().id, - receiver=c2[0].sup_id.user, - receiver_designation=sup.designation, + receiver=supervisor_username[0].username, + receiver_designation=sup[0].designation, file_extra_JSON= {}, remarks = "", file_attachment= None) + print(file) return HttpResponseRedirect('/complaint/caretaker/') @@ -159,7 +175,7 @@ def assign_worker(request, comp_id1): try: detail = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(id=comp_id1).first() total_caretaker = Caretaker.objects.select_related('staff_id','staff_id__user','staff_id__department').all() - total_caretakers_in_area = Supervisor.objects.select_related('sup_id').filter(area=b ) + total_caretakers_in_area = Supervisor.objects.select_related('sup_id') # supervisors_in_area= HoldsDesignation.objects.select_related('user','working','designation').get(total_caretakers_in_area = dsgn) workertemp = [] worker = [] @@ -1295,7 +1311,7 @@ def supervisor(request): i.serial_no = j j = j+1 a = Supervisor.objects.select_related('sup_id','sup_id__user','sup_id__department').get(sup_id=y) - all_caretaker = Caretaker.objects.select_related('staff_id','staff_id__user','staff_id__department').filter(area=a.area).order_by('-id') + all_caretaker = Caretaker.objects.select_related('staff_id','staff_id__user','staff_id__department').order_by('-id') area = all_caretaker[0].area # desgn=HoldsDesignation.objects.select_related('user','working','designation').get(user = y.id) # desgn="hall3supervisor" @@ -1303,7 +1319,7 @@ def supervisor(request): num = int(numtemp/2+0.5) all_complaint = [] user_details=User.objects.get(id=y.user_id) - all_complainttemp = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(location=a.area).order_by('-id') + all_complainttemp = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').order_by('-id') j = 1 for i in all_complainttemp: all_complaint.append(i) @@ -1329,9 +1345,9 @@ def supervisor(request): y = ExtraInfo.objects.all().select_related('user','department').filter(user=current_user).first() user_details=User.objects.get(id=y.user_id) des=HoldsDesignation.objects.filter(user=user_details).all() - print(y.user_id) - print(user_details.username) - print(des[0].user) + # print(y.user_id) + # print(user_details.username) + # print(des[0].user) outbox_files = view_outbox( username=user_details.username, designation=des[0].designation, @@ -1357,29 +1373,36 @@ def supervisor(request): complaint_final_list=[] for i in comp_list: complaint_final_list.append(i[0]) - + print("**********") + print(des[0].designation) + print(user_details.username) inbox_files = view_inbox( username=user_details.username, designation=des[0].designation, src_module="complaint" ) - + print(inbox_files) inbox=[] comp_list_in=set() for i in inbox_files: - print(i) inbox.append(i) + # print(inbox[0]['id']) for i in inbox: file_history = view_history(file_id=i['id']) - - comp=File.objects.filter(uploader=file_history[0]['current_id']) - for j in comp: - c=StudentComplain.objects.all().filter(id=j.src_object_id) - comp_list_in.add(c) - print(c[0]) + print(i['id']) + comp=File.objects.filter(id=i['id']) + print(comp[0].src_object_id) + complaint=StudentComplain.objects.all().filter(id=comp[0].src_object_id) + print(complaint) + comp_list_in.add(complaint) + # print(complaint[0]) + # for j in comp: + # c=StudentComplain.objects.all().filter(id=j.src_object_id) + # comp_list_in.add(c) + # print(c[0]) - break + # break complaint_final_list_in=[] for i in comp_list_in: complaint_final_list_in.append(i[0]) @@ -1392,7 +1415,7 @@ def supervisor(request): @login_required def caretaker_id_know_more(request,caretaker_id): this_caretaker = Caretaker.objects.select_related('staff_id','staff_id__user','staff_id__department').get(id = caretaker_id) - this_caretaker_area = this_caretaker.area; + this_caretaker_area = this_caretaker.area list_pending_complaints = [] list_pending_complaintstemp = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(location = this_caretaker_area).filter(status = 0) j = 1 diff --git a/FusionIIIT/templates/complaintModule/assignworker.html b/FusionIIIT/templates/complaintModule/assignworker.html index 5c450867b..1cbfa43e2 100644 --- a/FusionIIIT/templates/complaintModule/assignworker.html +++ b/FusionIIIT/templates/complaintModule/assignworker.html @@ -162,8 +162,8 @@

-

If you think that this complaint does not belong to you ,
- you can pass this complaint to required supervisor .

+

If you want to redirect this complaint ,
+ you can pass this complaint to specific Incharge .

{% csrf_token %}
@@ -203,8 +203,9 @@

You have assigned a worker. First, remove the worker from this complaint the .

{% else %} - -
@@ -154,5 +154,9 @@

- + {% endblock %} \ No newline at end of file diff --git a/FusionIIIT/templates/complaintModule/supervisor1.html b/FusionIIIT/templates/complaintModule/supervisor1.html index 145ad4aee..918dda471 100644 --- a/FusionIIIT/templates/complaintModule/supervisor1.html +++ b/FusionIIIT/templates/complaintModule/supervisor1.html @@ -50,22 +50,22 @@ - + - + Redirected Complaints - + @@ -110,7 +110,7 @@

{% comment %}The ... ends here!{% endcomment %} {% comment %}The ... start here!{% endcomment %} -
+
{% block managecaretakers %} {% include 'complaintModule/manage_caretakers.html' %} {% endblock %} @@ -124,7 +124,7 @@
{% comment %}The ... end here!{% endcomment %} {% comment %}The ... start here!{% endcomment %} -
+
{% block unresolvedsuper %} {% include 'complaintModule/unresolved_super.html' %} {% endblock %} diff --git a/FusionIIIT/templates/complaintModule/unresolvecomplaint.html b/FusionIIIT/templates/complaintModule/unresolvecomplaint.html index 08f55a24e..b002df023 100644 --- a/FusionIIIT/templates/complaintModule/unresolvecomplaint.html +++ b/FusionIIIT/templates/complaintModule/unresolvecomplaint.html @@ -19,7 +19,7 @@
- @@ -132,7 +138,7 @@

{% endif %} {% endfor %}

+ {% if a.status == 0 %}
+ {%elif a.status == 1 %} +
+

Redirected

+
+ {% endif %}
- +
@@ -270,5 +276,9 @@

- + {% endblock %} \ No newline at end of file diff --git a/FusionIIIT/templates/complaintModule/unresolved_super.html b/FusionIIIT/templates/complaintModule/unresolved_super.html index d8d5a82ac..5db957cb1 100644 --- a/FusionIIIT/templates/complaintModule/unresolved_super.html +++ b/FusionIIIT/templates/complaintModule/unresolved_super.html @@ -1,43 +1,41 @@ {% load static %} {% block unresolvedsuper %} - {% comment %}The tab menu starts here!{% endcomment %} -
- - Redirected Complaints - - -
+
-
-
- Location of all these complaint is : {{ area }} - +
+
- - + + - + - - - + + + - - {% for a in history %} - {% if a.status == 0 %} - + + {% for a in history %} + {% if a.status == 1 %} + - - - + - - {% endif %} - {% endfor %} -
Name - Date + Date - Type + Type @@ -54,24 +52,24 @@ Change status

- {{ a.complainer.user }} + {{ a.complainer.user }}
@@ -88,9 +86,11 @@

{{ a.location }}

- +
-
- +
+ - -
-
+ + +
-
-
+ + {% endif %} + {% endfor %} + + +
+
-
-
+
+
@@ -133,23 +133,22 @@

-
- Location of all these complaint is : {{ area }} - + Location of all these complaint is : {{ area }} +
- - + + - - - + + + - - {% for a in history %} - {% if a.status == 1 %} - + + {% for a in history %} + {% if a.status == 1 %} + - + - - + - - {% endif %} - {% endfor %} -
- Name + Name - Date + Date @@ -161,30 +160,30 @@

- Specific
Location + Specific
Location 		- Details + Details - Worker
Name + Worker
Name

- {{ a.complainer.user }} + {{ a.complainer.user }}
@@ -203,37 +202,40 @@

{{ a.specific_location }}

- + {% if a.remarks != 'Pending' %} - ( {{ a.remarks }} ) + ( {{ a.remarks }} ) {% endif %} {{ a.worker_id }}
-
-
+ + {% endif %} + {% endfor %} + +
+
- -
-
- : These Complaints have been ASSIGNED to Workers! Please wait until the assigned worker informs the Caretaker!       -
-
+ +
+
+ : These Complaints have been ASSIGNED to Workers! Please wait + until the assigned worker informs the Caretaker!       +
+
+
@@ -242,11 +244,15 @@

- + {% endblock %} \ No newline at end of file From bf8f36c0ccc966164bb3c8be8ef1a8ec6ebc72f8 Mon Sep 17 00:00:00 2001 From: nidhibarapatre Date: Fri, 8 Mar 2024 23:20:45 +0530 Subject: [PATCH 18/34] Fixation of a error --- FusionIIIT/applications/filetracking/sdk/methods.py | 1 + 1 file changed, 1 insertion(+) diff --git a/FusionIIIT/applications/filetracking/sdk/methods.py b/FusionIIIT/applications/filetracking/sdk/methods.py index d85bc4755..c663adc38 100644 --- a/FusionIIIT/applications/filetracking/sdk/methods.py +++ b/FusionIIIT/applications/filetracking/sdk/methods.py @@ -4,6 +4,7 @@ from applications.filetracking.api.serializers import FileSerializer, FileHeaderSerializer, TrackingSerializer from django.core.exceptions import ValidationError from typing import Any +from amqp import NotFound def create_file( From 0dfdd3f99182a22a60723801d69599b5b448cba0 Mon Sep 17 00:00:00 2001 From: aish0749 Date: Sun, 10 Mar 2024 17:40:41 +0530 Subject: [PATCH 19/34] update the views --- .../applications/filetracking/api/urls.py | 2 + .../applications/filetracking/api/views.py | 51 ++++++++++++++----- 2 files changed, 41 insertions(+), 12 deletions(-) diff --git a/FusionIIIT/applications/filetracking/api/urls.py b/FusionIIIT/applications/filetracking/api/urls.py index f63f45ff3..139f965ff 100644 --- a/FusionIIIT/applications/filetracking/api/urls.py +++ b/FusionIIIT/applications/filetracking/api/urls.py @@ -7,6 +7,7 @@ ViewHistoryView, ForwardFileView, DraftFileView, + CreateDraftFile, GetDesignationsView, ) @@ -18,5 +19,6 @@ url(r'^history/(?P\d+)/$', ViewHistoryView.as_view(), name='view_history'), url(r'^forwardfile/(?P\d+)/$', ForwardFileView.as_view(), name='forward_file'), url(r'^draft/$', DraftFileView.as_view(), name='view_drafts'), + url(r'^createdraft/$', CreateDraftFile.as_view(), name='create_draft'), 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 145ccac5d..5f395ab41 100644 --- a/FusionIIIT/applications/filetracking/api/views.py +++ b/FusionIIIT/applications/filetracking/api/views.py @@ -6,7 +6,7 @@ from rest_framework import status, permissions from rest_framework.authentication import TokenAuthentication from ..models import File, Tracking -from ..sdk.methods import create_file, view_drafts, view_file, delete_file, view_inbox, view_outbox, view_history, forward_file, get_designations +from ..sdk.methods import create_draft, create_file, view_drafts, view_file, delete_file, view_inbox, view_outbox, view_history, forward_file, get_designations class CreateFileView(APIView): authentication_classes = [TokenAuthentication] @@ -89,12 +89,13 @@ def get(self, request): JSON response containing a list of serialized file data, including sender information. """ - username = request.data.get('username') - designation = request.data.get('designation') - src_module = request.data.get('src_module') + username = request.query_params.get('username') + designation = request.query_params.get('designation') + src_module = request.query_params.get('src_module') - if not username or not src_module: - return Response({'error': 'Missing required query parameters: username and src_module.'}, status=400) + + # if not username or not src_module: + # return Response({'error': 'Missing required query parameters: username and src_module.'}, status=400) inbox_files = view_inbox(username, designation, src_module) return Response(inbox_files) @@ -117,9 +118,10 @@ def get(self, request): JSON response containing a paginated list of serialized file data. """ - username = request.data.get('username') - designation = request.data.get('designation') - src_module = request.data.get('src_module') + username = request.query_params.get('username') + designation = request.query_params.get('designation') + src_module = request.query_params.get('src_module') + if not username or not src_module: return Response({'error': 'Missing required query parameters: username and src_module.'}, status=400) @@ -192,15 +194,40 @@ def post(self, request, file_id): # Return response return Response({'tracking_id': new_tracking_id}, status=status.HTTP_201_CREATED) + +class CreateDraftFile(APIView): + authentication_classes = [TokenAuthentication] + permission_classes = [permissions.IsAuthenticated] + + def post(self, request): + uploader = request.data.get('uploader') + uploader_designation = request.data.get('uploader_designation') + src_module = request.data.get('src_module', 'filetracking') + src_object_id = request.data.get('src_object_id', '') + file_extra_JSON = request.data.get('file_extra_JSON', {}) + attached_file = request.FILES.get('attached_file', None) + + try: + file_id = create_draft( + uploader=uploader, + uploader_designation=uploader_designation, + src_module=src_module, + src_object_id=src_object_id, + file_extra_JSON=file_extra_JSON, + attached_file=attached_file + ) + return Response({'file_id': file_id}, status=status.HTTP_201_CREATED) + except Exception as e: + return Response({'error': str(e)}, status=status.HTTP_500_INTERNAL_SERVER_ERROR) class DraftFileView(APIView): authentication_classes = [TokenAuthentication] permission_classes = [permissions.IsAuthenticated] def get(self, request): - username = request.data.get('username') - designation = request.data.get('designation') - src_module = request.data.get('src_module') + username = request.query_params.get('username') + designation = request.query_params.get('designation') + src_module = request.query_params.get('src_module') try: draft_files = view_drafts(username, designation, src_module) From e6afdd73586d3695b3ec246b24f55ece5623f25b Mon Sep 17 00:00:00 2001 From: nidhibarapatre Date: Mon, 11 Mar 2024 17:16:39 +0530 Subject: [PATCH 20/34] Completion of module --- .../applications/complaint_system/views.py | 95 +++++++++++++------ 1 file changed, 65 insertions(+), 30 deletions(-) diff --git a/FusionIIIT/applications/complaint_system/views.py b/FusionIIIT/applications/complaint_system/views.py index 52349b139..436c14398 100644 --- a/FusionIIIT/applications/complaint_system/views.py +++ b/FusionIIIT/applications/complaint_system/views.py @@ -133,17 +133,20 @@ def assign_worker(request, comp_id1): # y1 = ExtraInfo.objects.all().select_related('user','department').filter(id=c2[0].sup_id.id).first() complaint_details = StudentComplain.objects.all().filter(id=comp_id1) # update(complaint_details[0].status=1) - StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(id=comp_id1).\ - update(status=1) + print(complaint_details) complaint_type=complaint_details[0].complaint_type print(complaint_type) supervisor=Supervisor.objects.all().filter(type=complaint_type) + if not supervisor.exists(): + return HttpResponse("

Supervisor does not exist of this complaint type

") print("----------") - print(supervisor[0].sup_id.id) + print(supervisor[0]) print("----------") supervisor_details=ExtraInfo.objects.all().filter(id=supervisor[0].sup_id.id) print(supervisor_details[0].user_id) + StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(id=comp_id1).\ + update(status=1) # supervisor_id=ExtraInfo.objects.all().filter(id=supervisor) # student=0 # message = "Your Complaint has been redirected to supervisor" @@ -518,26 +521,35 @@ def user(request): designation=c1[0].designation, src_module="complaint" ) + print(outbox_files) outbox=[] comp_list=set() for i in outbox_files: outbox.append(i) - + print(outbox) for i in outbox: file_history = view_history(file_id=i['id']) + print(i['id']) + comp=File.objects.filter(id=i['id']) + print(comp[0].src_object_id) + complaint=StudentComplain.objects.all().filter(id=comp[0].src_object_id) + print(complaint) + comp_list.add(complaint) + # file_history = view_history(file_id=i['id']) - comp=File.objects.filter(uploader=file_history[0]['current_id']) - for j in comp: - c=StudentComplain.objects.all().filter(id=j.src_object_id) - comp_list.add(c) - print(c[0]) + # comp=File.objects.filter(uploader=file_history[0]['current_id']) + # for j in comp: + # c=StudentComplain.objects.all().filter(id=j.src_object_id) + # comp_list.add(c) + # print(c[0]) - break + # break complaint_final_list=[] for i in comp_list: complaint_final_list.append(i[0]) + print(complaint_final_list) return render(request, "complaintModule/complaint_user.html", {'history': complaint_final_list,'notification':notification, 'comp_id': y.id, 'outbox':outbox}) @@ -885,14 +897,21 @@ def caretaker(request): for i in outbox: file_history = view_history(file_id=i['id']) + print(i['id']) + comp=File.objects.filter(id=i['id']) + print(comp[0].src_object_id) + complaint=StudentComplain.objects.all().filter(id=comp[0].src_object_id) + print(complaint) + comp_list.add(complaint) + # file_history = view_history(file_id=i['id']) - comp=File.objects.filter(uploader=file_history[0]['current_id']) - for j in comp: - c=StudentComplain.objects.all().filter(id=j.src_object_id) - comp_list.add(c) - # print(c[0]) + # comp=File.objects.filter(uploader=file_history[0]['current_id']) + # for j in comp: + # c=StudentComplain.objects.all().filter(id=j.src_object_id) + # comp_list.add(c) + # # print(c[0]) - break + # break complaint_final_list=[] for i in comp_list: complaint_final_list.append(i[0]) @@ -913,14 +932,21 @@ def caretaker(request): file_history_list=[] for i in inbox: file_history = view_history(file_id=i['id']) + print(i['id']) + comp=File.objects.filter(id=i['id']) + print(comp[0].src_object_id) + complaint=StudentComplain.objects.all().filter(id=comp[0].src_object_id) + print(complaint) + comp_list_in.add(complaint) + # file_history = view_history(file_id=i['id']) # print(file_history[0]) - file_history_list.append(file_history[0]) + # file_history_list.append(file_history[0]) # print(file_history[0]['file_id']) - comp=File.objects.filter(id=file_history[0]['file_id']) - print(comp[0].src_object_id) - for j in comp: - c=StudentComplain.objects.all().filter(id=j.src_object_id) - comp_list_in.add(c) + # comp=File.objects.filter(id=file_history[0]['file_id']) + # print(comp[0].src_object_id) + # for j in comp: + # c=StudentComplain.objects.all().filter(id=j.src_object_id) + # comp_list_in.add(c) # print(c[0]) # break @@ -1124,6 +1150,8 @@ def supervisor(request): """ # print("--------------------------") # testEntry() + # print(request.type) + location = request.POST.get('Location', '') current_user = get_object_or_404(User, username=request.user.username) y = ExtraInfo.objects.all().select_related('user','department').filter(user=current_user).first() comp_id = y.id @@ -1134,13 +1162,13 @@ def supervisor(request): except Exception as e: a = None y = None - all_caretaker = Caretaker.objects.select_related('staff_id','staff_id__user','staff_id__department').filter(area=a.area).order_by('-id') + all_caretaker = Caretaker.objects.select_related('staff_id','staff_id__user','staff_id__department').filter(area=location).order_by('-id') area = all_caretaker[0].area # ExtraInfo.objects.get(id=sup_id) all_complaint = [] numtemp = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(location = area).filter(status = 0).count() num = int(numtemp/2+0.5) - all_complainttemp = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(location=a.area).order_by('-id') + all_complainttemp = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(location=location).order_by('-id') j = 1 for i in all_complainttemp: all_complaint.append(i) @@ -1249,7 +1277,7 @@ def supervisor(request): dsgn = "rewacaretaker" caretaker_name = HoldsDesignation.objects.select_related('user','working','designation').get(designation__name = dsgn) user_details=User.objects.get(id=y.user_id) - c2=Supervisor.objects.all().filter(area=area) + # c2=Supervisor.objects.all().filter(area=location) print(caretaker_name.user.username) print(user_details.username) print(caretaker_name.designation) @@ -1362,14 +1390,21 @@ def supervisor(request): for i in outbox: file_history = view_history(file_id=i['id']) + print(i['id']) + comp=File.objects.filter(id=i['id']) + print(comp[0].src_object_id) + complaint=StudentComplain.objects.all().filter(id=comp[0].src_object_id) + print(complaint) + comp_list.add(complaint) + # file_history = view_history(file_id=i['id']) - comp=File.objects.filter(uploader=file_history[0]['current_id']) - for j in comp: - c=StudentComplain.objects.all().filter(id=j.src_object_id) - comp_list.add(c) + # comp=File.objects.filter(uploader=file_history[0]['current_id']) + # for j in comp: + # c=StudentComplain.objects.all().filter(id=j.src_object_id) + # comp_list.add(c) # print(c[0]) - break + # break complaint_final_list=[] for i in comp_list: complaint_final_list.append(i[0]) From 7f33e90a6418084d6c99139791b8f946d2724ef9 Mon Sep 17 00:00:00 2001 From: Divyansh Tripathi <55395696+theoden42@users.noreply.github.com> Date: Tue, 19 Mar 2024 23:46:53 +0530 Subject: [PATCH 21/34] fix file sending and forwarding template to include designation automatically --- FusionIIIT/applications/filetracking/views.py | 22 +++++++++++++------ .../templates/filetracking/composefile.html | 17 +++----------- 2 files changed, 18 insertions(+), 21 deletions(-) diff --git a/FusionIIIT/applications/filetracking/views.py b/FusionIIIT/applications/filetracking/views.py index 397045b39..20c86d6c6 100644 --- a/FusionIIIT/applications/filetracking/views.py +++ b/FusionIIIT/applications/filetracking/views.py @@ -16,6 +16,7 @@ from .sdk.methods import * from .decorators import * + @login_required(login_url="/accounts/login/") @user_is_student def filetracking(request): @@ -39,7 +40,7 @@ def filetracking(request): holdsdesignations - The HoldsDesignation object. context - Holds data needed to make necessary changes in the template. """ - print(request.POST) + if request.method == "POST": try: if 'save' in request.POST: @@ -47,6 +48,7 @@ def filetracking(request): subject = request.POST.get('title') description = request.POST.get('desc') design = request.POST.get('design') + print("design=", design) designation = Designation.objects.get(id=HoldsDesignation.objects.select_related( 'user', 'working', 'designation').get(id=design).designation_id) upload_file = request.FILES.get('myfile') @@ -102,7 +104,6 @@ def filetracking(request): return redirect('/filetracking/') receive = request.POST.get('receive') try: - print(receive) receive_design = Designation.objects.get(name=receive) except Exception as e: messages.error(request, 'Enter a valid Designation') @@ -132,13 +133,18 @@ def filetracking(request): extrainfo = ExtraInfo.objects.select_related('user', 'department').all() holdsdesignations = HoldsDesignation.objects.select_related( 'user', 'working', 'designation').all() - designations = get_designation(request.user) + + designation_name = request.session.get('currentDesignationSelected', 'default_value') + username = request.user + designation_id = get_HoldsDesignation_obj( + username, designation_name).id context = { 'file': file, 'extrainfo': extrainfo, 'holdsdesignations': holdsdesignations, - 'designations': designations, + 'designation_name': designation_name, + 'designation_id': designation_id } return render(request, 'filetracking/composefile.html', context) @@ -513,11 +519,13 @@ def forward(request, id): ) messages.success(request, 'File sent successfully') - designations = get_designation(request.user) + designation_name = request.session.get('currentDesignationSelected', 'default_value') + dropdown_HoldsDesignation_obj = get_HoldsDesignation_obj( + designation_name) context = { - - 'designations': designations, + 'designation_name': designation_name, + 'designation_id': designation_id, 'file': file, 'track': track, } diff --git a/FusionIIIT/templates/filetracking/composefile.html b/FusionIIIT/templates/filetracking/composefile.html index f42e55f92..1b0d2ee33 100644 --- a/FusionIIIT/templates/filetracking/composefile.html +++ b/FusionIIIT/templates/filetracking/composefile.html @@ -50,21 +50,10 @@

-
- +
+ +

From 2f8813cfe24c927205a1ac8b26bd5e8aa9317f45 Mon Sep 17 00:00:00 2001 From: Divyansh Tripathi <55395696+theoden42@users.noreply.github.com> Date: Wed, 20 Mar 2024 00:03:59 +0530 Subject: [PATCH 22/34] fix forward file view to include designations automatically --- FusionIIIT/applications/filetracking/views.py | 6 +++--- FusionIIIT/templates/filetracking/forward.html | 12 ++---------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/FusionIIIT/applications/filetracking/views.py b/FusionIIIT/applications/filetracking/views.py index 20c86d6c6..e1c1ca25d 100644 --- a/FusionIIIT/applications/filetracking/views.py +++ b/FusionIIIT/applications/filetracking/views.py @@ -48,7 +48,6 @@ def filetracking(request): subject = request.POST.get('title') description = request.POST.get('desc') design = request.POST.get('design') - print("design=", design) designation = Designation.objects.get(id=HoldsDesignation.objects.select_related( 'user', 'working', 'designation').get(id=design).designation_id) upload_file = request.FILES.get('myfile') @@ -520,8 +519,9 @@ def forward(request, id): messages.success(request, 'File sent successfully') designation_name = request.session.get('currentDesignationSelected', 'default_value') - dropdown_HoldsDesignation_obj = get_HoldsDesignation_obj( - designation_name) + username = request.user + designation_id = get_HoldsDesignation_obj( + username, designation_name).id context = { 'designation_name': designation_name, diff --git a/FusionIIIT/templates/filetracking/forward.html b/FusionIIIT/templates/filetracking/forward.html index 09106054a..b7d62ce6b 100644 --- a/FusionIIIT/templates/filetracking/forward.html +++ b/FusionIIIT/templates/filetracking/forward.html @@ -82,16 +82,8 @@
- + +

From 9ea22d7940f6280bb7299641a5380a3b484c6c8f Mon Sep 17 00:00:00 2001 From: nidhibarapatre Date: Wed, 20 Mar 2024 11:53:59 +0530 Subject: [PATCH 23/34] Integrated dashborad --- .../migrations/0002_auto_20240304_1820.py | 38 +++++++++++++ .../migrations/0002_auto_20240218_1321.py | 18 +++++++ .../migrations/0003_auto_20240306_1839.py | 22 ++++++++ .../eis/migrations/0002_auto_20240304_1820.py | 53 +++++++++++++++++++ .../filetracking/migrations/0001_initial.py | 53 +++++++++++++++++++ .../migrations/0002_auto_20240218_1321.py | 33 ++++++++++++ .../filetracking/migrations/__init__.py | 0 .../migrations/0002_auto_20240304_1820.py | 18 +++++++ .../migrations/0003_auto_20240306_1839.py | 18 +++++++ .../migrations/0002_auto_20240304_1820.py | 23 ++++++++ .../migrations/0002_auto_20240304_1820.py | 18 +++++++ .../complaintModule/complaint_caretaker.html | 12 ++++- .../complaintModule/complaint_user.html | 6 ++- .../complaintModule/supervisor1.html | 8 ++- FusionIIIT/templates/dashboard/modules.html | 7 +-- 15 files changed, 318 insertions(+), 9 deletions(-) create mode 100644 FusionIIIT/applications/academic_procedures/migrations/0002_auto_20240304_1820.py create mode 100644 FusionIIIT/applications/complaint_system/migrations/0002_auto_20240218_1321.py create mode 100644 FusionIIIT/applications/complaint_system/migrations/0003_auto_20240306_1839.py create mode 100644 FusionIIIT/applications/eis/migrations/0002_auto_20240304_1820.py create mode 100644 FusionIIIT/applications/filetracking/migrations/0001_initial.py create mode 100644 FusionIIIT/applications/filetracking/migrations/0002_auto_20240218_1321.py create mode 100644 FusionIIIT/applications/filetracking/migrations/__init__.py create mode 100644 FusionIIIT/applications/globals/migrations/0002_auto_20240304_1820.py create mode 100644 FusionIIIT/applications/globals/migrations/0003_auto_20240306_1839.py create mode 100644 FusionIIIT/applications/programme_curriculum/migrations/0002_auto_20240304_1820.py create mode 100644 FusionIIIT/applications/scholarships/migrations/0002_auto_20240304_1820.py diff --git a/FusionIIIT/applications/academic_procedures/migrations/0002_auto_20240304_1820.py b/FusionIIIT/applications/academic_procedures/migrations/0002_auto_20240304_1820.py new file mode 100644 index 000000000..cfa105410 --- /dev/null +++ b/FusionIIIT/applications/academic_procedures/migrations/0002_auto_20240304_1820.py @@ -0,0 +1,38 @@ +# Generated by Django 3.1.5 on 2024-03-04 18:20 + +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/complaint_system/migrations/0002_auto_20240218_1321.py b/FusionIIIT/applications/complaint_system/migrations/0002_auto_20240218_1321.py new file mode 100644 index 000000000..c77b65aa0 --- /dev/null +++ b/FusionIIIT/applications/complaint_system/migrations/0002_auto_20240218_1321.py @@ -0,0 +1,18 @@ +# Generated by Django 3.1.5 on 2024-02-18 13:21 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('complaint_system', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='supervisor', + name='area', + field=models.CharField(choices=[('hall-1', 'hall-1'), ('hall-3', 'hall-3'), ('hall-4', 'hall-4'), ('CC1', 'CC1'), ('CC2', 'CC2'), ('core_lab', 'core_lab'), ('LHTC', 'LHTC'), ('NR2', 'NR2'), ('Rewa_Residency', 'Rewa_Residency'), ('Maa Saraswati Hostel', 'Maa Saraswati Hostel'), ('Nagarjun Hostel', 'Nagarjun Hostel'), ('Panini Hostel', 'Panini Hostel')], default='hall-3', max_length=20), + ), + ] diff --git a/FusionIIIT/applications/complaint_system/migrations/0003_auto_20240306_1839.py b/FusionIIIT/applications/complaint_system/migrations/0003_auto_20240306_1839.py new file mode 100644 index 000000000..8a1c33559 --- /dev/null +++ b/FusionIIIT/applications/complaint_system/migrations/0003_auto_20240306_1839.py @@ -0,0 +1,22 @@ +# Generated by Django 3.1.5 on 2024-03-06 18:39 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('complaint_system', '0002_auto_20240218_1321'), + ] + + operations = [ + migrations.RemoveField( + model_name='supervisor', + name='area', + ), + migrations.AddField( + model_name='supervisor', + name='type', + field=models.CharField(choices=[('Electricity', 'Electricity'), ('carpenter', 'carpenter'), ('plumber', 'plumber'), ('garbage', 'garbage'), ('dustbin', 'dustbin'), ('internet', 'internet'), ('other', 'other')], default='Electricity', max_length=30), + ), + ] diff --git a/FusionIIIT/applications/eis/migrations/0002_auto_20240304_1820.py b/FusionIIIT/applications/eis/migrations/0002_auto_20240304_1820.py new file mode 100644 index 000000000..24a757751 --- /dev/null +++ b/FusionIIIT/applications/eis/migrations/0002_auto_20240304_1820.py @@ -0,0 +1,53 @@ +# Generated by Django 3.1.5 on 2024-03-04 18:20 + +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/0001_initial.py b/FusionIIIT/applications/filetracking/migrations/0001_initial.py new file mode 100644 index 000000000..6924ae1ff --- /dev/null +++ b/FusionIIIT/applications/filetracking/migrations/0001_initial.py @@ -0,0 +1,53 @@ +# Generated by Django 3.1.5 on 2023-03-15 18:53 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('globals', '0001_initial'), + ] + + operations = [ + migrations.CreateModel( + name='File', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('subject', models.CharField(blank=True, max_length=100, null=True)), + ('description', models.CharField(blank=True, max_length=400, null=True)), + ('upload_date', models.DateTimeField(auto_now_add=True)), + ('upload_file', models.FileField(blank=True, upload_to='')), + ('is_read', models.BooleanField(default=False)), + ('designation', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='upload_designation', to='globals.designation')), + ('uploader', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='uploaded_files', to='globals.extrainfo')), + ], + options={ + 'db_table': 'File', + }, + ), + migrations.CreateModel( + name='Tracking', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('receive_date', models.DateTimeField(auto_now_add=True)), + ('forward_date', models.DateTimeField(auto_now_add=True)), + ('remarks', models.CharField(blank=True, max_length=250, null=True)), + ('upload_file', models.FileField(blank=True, upload_to='')), + ('is_read', models.BooleanField(default=False)), + ('current_design', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='globals.holdsdesignation')), + ('current_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')), + ('file_id', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='filetracking.file')), + ('receive_design', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='rec_design', to='globals.designation')), + ('receiver_id', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='receiver_id', to=settings.AUTH_USER_MODEL)), + ], + options={ + 'db_table': 'Tracking', + }, + ), + ] diff --git a/FusionIIIT/applications/filetracking/migrations/0002_auto_20240218_1321.py b/FusionIIIT/applications/filetracking/migrations/0002_auto_20240218_1321.py new file mode 100644 index 000000000..7344b8c37 --- /dev/null +++ b/FusionIIIT/applications/filetracking/migrations/0002_auto_20240218_1321.py @@ -0,0 +1,33 @@ +# Generated by Django 3.1.5 on 2024-02-18 13:21 + +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/migrations/__init__.py b/FusionIIIT/applications/filetracking/migrations/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/FusionIIIT/applications/globals/migrations/0002_auto_20240304_1820.py b/FusionIIIT/applications/globals/migrations/0002_auto_20240304_1820.py new file mode 100644 index 000000000..44de00043 --- /dev/null +++ b/FusionIIIT/applications/globals/migrations/0002_auto_20240304_1820.py @@ -0,0 +1,18 @@ +# Generated by Django 3.1.5 on 2024-03-04 18:20 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('globals', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='extrainfo', + name='user_status', + field=models.CharField(choices=[('NEW', 'NEW'), ('PRESENT', 'PRESENT')], default='PRESENT', max_length=50), + ), + ] diff --git a/FusionIIIT/applications/globals/migrations/0003_auto_20240306_1839.py b/FusionIIIT/applications/globals/migrations/0003_auto_20240306_1839.py new file mode 100644 index 000000000..5c76dbd81 --- /dev/null +++ b/FusionIIIT/applications/globals/migrations/0003_auto_20240306_1839.py @@ -0,0 +1,18 @@ +# Generated by Django 3.1.5 on 2024-03-06 18:39 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('globals', '0002_auto_20240304_1820'), + ] + + operations = [ + migrations.AlterField( + model_name='extrainfo', + name='user_status', + field=models.CharField(choices=[('PRESENT', 'PRESENT'), ('NEW', 'NEW')], default='PRESENT', max_length=50), + ), + ] diff --git a/FusionIIIT/applications/programme_curriculum/migrations/0002_auto_20240304_1820.py b/FusionIIIT/applications/programme_curriculum/migrations/0002_auto_20240304_1820.py new file mode 100644 index 000000000..c9b1e842c --- /dev/null +++ b/FusionIIIT/applications/programme_curriculum/migrations/0002_auto_20240304_1820.py @@ -0,0 +1,23 @@ +# Generated by Django 3.1.5 on 2024-03-04 18:20 + +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_20240304_1820.py b/FusionIIIT/applications/scholarships/migrations/0002_auto_20240304_1820.py new file mode 100644 index 000000000..da87fa019 --- /dev/null +++ b/FusionIIIT/applications/scholarships/migrations/0002_auto_20240304_1820.py @@ -0,0 +1,18 @@ +# Generated by Django 3.1.5 on 2024-03-04 18:20 + +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), + ), + ] diff --git a/FusionIIIT/templates/complaintModule/complaint_caretaker.html b/FusionIIIT/templates/complaintModule/complaint_caretaker.html index cdbbb98a9..4db5b1127 100644 --- a/FusionIIIT/templates/complaintModule/complaint_caretaker.html +++ b/FusionIIIT/templates/complaintModule/complaint_caretaker.html @@ -58,6 +58,10 @@ {% endif %}
{% comment %}The Tab-Menu starts here!{% endcomment %} + {% comment %}A single modules row starts here!{% endcomment %} + + {% if request.user.extrainfo.user_type == "staff" %} +
@@ -74,8 +78,11 @@ Feedback - - + {% endif %} + + {% comment %}A single modules row ends here!{% endcomment %} + + {% if global_var == "hall4caretaker" or global_var == "hall3caretaker" or global_var == "shyams" %} Resolved Complaints @@ -89,6 +96,7 @@ Overdue Complaints --> + {% endif %}
{% comment %}The Tab-Menu ends here!{% endcomment %} diff --git a/FusionIIIT/templates/complaintModule/complaint_user.html b/FusionIIIT/templates/complaintModule/complaint_user.html index c02e17d4a..d0f0a990d 100644 --- a/FusionIIIT/templates/complaintModule/complaint_user.html +++ b/FusionIIIT/templates/complaintModule/complaint_user.html @@ -31,8 +31,9 @@ {% comment %}The user image card ends here!{% endcomment %}
- + {% comment %}The Tab-Menu starts here!{% endcomment %} +
@@ -51,7 +52,8 @@ - + + {% comment %}A single modules row ends here!{% endcomment %}
{% comment %}The Tab-Menu ends here!{% endcomment %} diff --git a/FusionIIIT/templates/complaintModule/supervisor1.html b/FusionIIIT/templates/complaintModule/supervisor1.html index 918dda471..252175c89 100644 --- a/FusionIIIT/templates/complaintModule/supervisor1.html +++ b/FusionIIIT/templates/complaintModule/supervisor1.html @@ -32,6 +32,8 @@
{% comment %}The Tab-Menu starts here!{% endcomment %} + + {% if request.user.extrainfo.user_type == "faculty" %}
@@ -49,19 +51,21 @@ Feedback - + {% endif %} + {% if global_var == "ccsupervisor" %} Redirected Complaints + {% endif %} {% comment %}The Modules End here!{% endcomment %} {% endblock %} \ No newline at end of file From 7a169934c9beb7eba0eabe057552e075b518f0cf Mon Sep 17 00:00:00 2001 From: nidhibarapatre Date: Wed, 20 Mar 2024 12:37:07 +0530 Subject: [PATCH 24/34] creating new branch --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 3801de163..efb1b2f2a 100644 --- a/.gitignore +++ b/.gitignore @@ -74,4 +74,4 @@ FusionIIIT/static/ package-lock.json # migrations -migrations/ \ No newline at end of file +*/migrations/ \ No newline at end of file From a54deb19cc41f88c49c7d72b401962f069c09d3a Mon Sep 17 00:00:00 2001 From: nidhibarapatre Date: Wed, 20 Mar 2024 17:05:44 +0530 Subject: [PATCH 25/34] disallowing migrations --- .gitignore | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index efb1b2f2a..0f310c34e 100644 --- a/.gitignore +++ b/.gitignore @@ -74,4 +74,8 @@ FusionIIIT/static/ package-lock.json # migrations -*/migrations/ \ No newline at end of file +*/migrations/ + +# Disallow migration files +**/migrations/* +!**/migrations/__init__.py \ No newline at end of file From 61a875a15c6fa90f00d0338ea20039e726701960 Mon Sep 17 00:00:00 2001 From: nidhibarapatre Date: Thu, 21 Mar 2024 15:54:17 +0530 Subject: [PATCH 26/34] removing migration files --- .../migrations/0001_initial.py | 182 ------- .../migrations/__init__.py | 0 .../migrations/0001_initial.py | 405 -------------- .../migrations/0002_auto_20240304_1820.py | 38 -- .../migrations/__init__.py | 0 .../central_mess/migrations/0001_initial.py | 186 ------- .../central_mess/migrations/__init__.py | 0 .../migrations/0001_initial.py | 67 --- .../migrations/0002_auto_20230321_0050.py | 47 -- .../migrations/0002_auto_20240218_1321.py | 18 - .../migrations/0003_auto_20240306_1839.py | 22 - .../complaint_system/migrations/__init__.py | 0 .../migrations/0001_initial.py | 111 ---- .../counselling_cell/migrations/__init__.py | 0 .../department/migrations/0001_initial.py | 44 -- .../department/migrations/__init__.py | 0 .../eis/migrations/0001_initial.py | 280 ---------- .../eis/migrations/0002_auto_20240304_1820.py | 53 -- .../applications/eis/migrations/__init__.py | 0 .../establishment/migrations/0001_initial.py | 284 ---------- .../establishment/migrations/__init__.py | 0 .../estate_module/migrations/0001_initial.py | 126 ----- .../estate_module/migrations/__init__.py | 0 .../feeds/migrations/0001_initial.py | 148 ------ .../applications/feeds/migrations/__init__.py | 0 .../filetracking/migrations/0001_initial.py | 53 -- .../migrations/0002_auto_20240218_1321.py | 33 -- .../filetracking/migrations/__init__.py | 0 .../migrations/0001_initial.py | 100 ---- .../finance_accounts/migrations/__init__.py | 0 .../globals/migrations/0001_initial.py | 112 ---- .../migrations/0002_auto_20240304_1820.py | 18 - .../migrations/0003_auto_20240306_1839.py | 18 - .../globals/migrations/__init__.py | 0 .../gymkhana/migrations/0001_initial.py | 243 --------- .../gymkhana/migrations/__init__.py | 0 .../health_center/migrations/0001_initial.py | 168 ------ .../health_center/migrations/__init__.py | 0 .../migrations/0001_initial.py | 137 ----- .../hostel_management/migrations/__init__.py | 0 .../hr2/migrations/0001_initial.py | 91 ---- .../applications/hr2/migrations/__init__.py | 0 .../migrations/0001_initial.py | 80 --- .../income_expenditure/migrations/__init__.py | 0 .../iwdModuleV2/migrations/0001_initial.py | 226 -------- .../iwdModuleV2/migrations/__init__.py | 0 .../leave/migrations/0001_initial.py | 169 ------ .../applications/leave/migrations/__init__.py | 0 .../migrations/__init__.py | 0 .../office_module/migrations/0001_initial.py | 492 ------------------ .../office_module/migrations/__init__.py | 0 .../online_cms/migrations/0001_initial.py | 196 ------- .../online_cms/migrations/__init__.py | 0 .../placement_cell/migrations/0001_initial.py | 289 ---------- .../placement_cell/migrations/__init__.py | 0 .../migrations/0001_initial.py | 142 ----- .../migrations/0002_auto_20240304_1820.py | 23 - .../migrations/__init__.py | 0 .../ps1/migrations/0001_initial.py | 58 --- .../applications/ps1/migrations/__init__.py | 0 .../recruitment/migrations/0001_initial.py | 311 ----------- .../recruitment/migrations/__init__.py | 0 .../migrations/0001_initial.py | 91 ---- .../migrations/__init__.py | 0 .../scholarships/migrations/0001_initial.py | 233 --------- .../migrations/0002_auto_20240304_1820.py | 18 - .../scholarships/migrations/__init__.py | 0 .../visitor_hostel/migrations/0001_initial.py | 134 ----- .../visitor_hostel/migrations/__init__.py | 0 69 files changed, 5446 deletions(-) delete mode 100644 FusionIIIT/applications/academic_information/migrations/0001_initial.py delete mode 100644 FusionIIIT/applications/academic_information/migrations/__init__.py delete mode 100644 FusionIIIT/applications/academic_procedures/migrations/0001_initial.py delete mode 100644 FusionIIIT/applications/academic_procedures/migrations/0002_auto_20240304_1820.py delete mode 100644 FusionIIIT/applications/academic_procedures/migrations/__init__.py delete mode 100644 FusionIIIT/applications/central_mess/migrations/0001_initial.py delete mode 100644 FusionIIIT/applications/central_mess/migrations/__init__.py delete mode 100644 FusionIIIT/applications/complaint_system/migrations/0001_initial.py delete mode 100644 FusionIIIT/applications/complaint_system/migrations/0002_auto_20230321_0050.py delete mode 100644 FusionIIIT/applications/complaint_system/migrations/0002_auto_20240218_1321.py delete mode 100644 FusionIIIT/applications/complaint_system/migrations/0003_auto_20240306_1839.py delete mode 100644 FusionIIIT/applications/complaint_system/migrations/__init__.py delete mode 100644 FusionIIIT/applications/counselling_cell/migrations/0001_initial.py delete mode 100644 FusionIIIT/applications/counselling_cell/migrations/__init__.py delete mode 100644 FusionIIIT/applications/department/migrations/0001_initial.py delete mode 100644 FusionIIIT/applications/department/migrations/__init__.py delete mode 100644 FusionIIIT/applications/eis/migrations/0001_initial.py delete mode 100644 FusionIIIT/applications/eis/migrations/0002_auto_20240304_1820.py delete mode 100644 FusionIIIT/applications/eis/migrations/__init__.py delete mode 100644 FusionIIIT/applications/establishment/migrations/0001_initial.py delete mode 100644 FusionIIIT/applications/establishment/migrations/__init__.py delete mode 100644 FusionIIIT/applications/estate_module/migrations/0001_initial.py delete mode 100644 FusionIIIT/applications/estate_module/migrations/__init__.py delete mode 100644 FusionIIIT/applications/feeds/migrations/0001_initial.py delete mode 100644 FusionIIIT/applications/feeds/migrations/__init__.py delete mode 100644 FusionIIIT/applications/filetracking/migrations/0001_initial.py delete mode 100644 FusionIIIT/applications/filetracking/migrations/0002_auto_20240218_1321.py delete mode 100644 FusionIIIT/applications/filetracking/migrations/__init__.py delete mode 100644 FusionIIIT/applications/finance_accounts/migrations/0001_initial.py delete mode 100644 FusionIIIT/applications/finance_accounts/migrations/__init__.py delete mode 100644 FusionIIIT/applications/globals/migrations/0001_initial.py delete mode 100644 FusionIIIT/applications/globals/migrations/0002_auto_20240304_1820.py delete mode 100644 FusionIIIT/applications/globals/migrations/0003_auto_20240306_1839.py delete mode 100644 FusionIIIT/applications/globals/migrations/__init__.py delete mode 100644 FusionIIIT/applications/gymkhana/migrations/0001_initial.py delete mode 100644 FusionIIIT/applications/gymkhana/migrations/__init__.py delete mode 100644 FusionIIIT/applications/health_center/migrations/0001_initial.py delete mode 100644 FusionIIIT/applications/health_center/migrations/__init__.py delete mode 100644 FusionIIIT/applications/hostel_management/migrations/0001_initial.py delete mode 100644 FusionIIIT/applications/hostel_management/migrations/__init__.py delete mode 100644 FusionIIIT/applications/hr2/migrations/0001_initial.py delete mode 100644 FusionIIIT/applications/hr2/migrations/__init__.py delete mode 100644 FusionIIIT/applications/income_expenditure/migrations/0001_initial.py delete mode 100644 FusionIIIT/applications/income_expenditure/migrations/__init__.py delete mode 100644 FusionIIIT/applications/iwdModuleV2/migrations/0001_initial.py delete mode 100644 FusionIIIT/applications/iwdModuleV2/migrations/__init__.py delete mode 100644 FusionIIIT/applications/leave/migrations/0001_initial.py delete mode 100644 FusionIIIT/applications/leave/migrations/__init__.py delete mode 100644 FusionIIIT/applications/notifications_extension/migrations/__init__.py delete mode 100644 FusionIIIT/applications/office_module/migrations/0001_initial.py delete mode 100644 FusionIIIT/applications/office_module/migrations/__init__.py delete mode 100644 FusionIIIT/applications/online_cms/migrations/0001_initial.py delete mode 100644 FusionIIIT/applications/online_cms/migrations/__init__.py delete mode 100644 FusionIIIT/applications/placement_cell/migrations/0001_initial.py delete mode 100644 FusionIIIT/applications/placement_cell/migrations/__init__.py delete mode 100644 FusionIIIT/applications/programme_curriculum/migrations/0001_initial.py delete mode 100644 FusionIIIT/applications/programme_curriculum/migrations/0002_auto_20240304_1820.py delete mode 100644 FusionIIIT/applications/programme_curriculum/migrations/__init__.py delete mode 100644 FusionIIIT/applications/ps1/migrations/0001_initial.py delete mode 100644 FusionIIIT/applications/ps1/migrations/__init__.py delete mode 100644 FusionIIIT/applications/recruitment/migrations/0001_initial.py delete mode 100644 FusionIIIT/applications/recruitment/migrations/__init__.py delete mode 100644 FusionIIIT/applications/research_procedures/migrations/0001_initial.py delete mode 100644 FusionIIIT/applications/research_procedures/migrations/__init__.py delete mode 100644 FusionIIIT/applications/scholarships/migrations/0001_initial.py delete mode 100644 FusionIIIT/applications/scholarships/migrations/0002_auto_20240304_1820.py delete mode 100644 FusionIIIT/applications/scholarships/migrations/__init__.py delete mode 100644 FusionIIIT/applications/visitor_hostel/migrations/0001_initial.py delete mode 100644 FusionIIIT/applications/visitor_hostel/migrations/__init__.py diff --git a/FusionIIIT/applications/academic_information/migrations/0001_initial.py b/FusionIIIT/applications/academic_information/migrations/0001_initial.py deleted file mode 100644 index f75d3119c..000000000 --- a/FusionIIIT/applications/academic_information/migrations/0001_initial.py +++ /dev/null @@ -1,182 +0,0 @@ -# Generated by Django 3.1.5 on 2023-03-15 18:53 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('programme_curriculum', '0001_initial'), - ('globals', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='Calendar', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('from_date', models.DateField()), - ('to_date', models.DateField()), - ('description', models.CharField(max_length=40)), - ], - options={ - 'db_table': 'Calendar', - }, - ), - migrations.CreateModel( - name='Course', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('course_name', models.CharField(max_length=600)), - ('course_details', models.TextField(max_length=500)), - ], - options={ - 'db_table': 'Course', - }, - ), - migrations.CreateModel( - name='Curriculum', - fields=[ - ('curriculum_id', models.AutoField(primary_key=True, serialize=False)), - ('course_code', models.CharField(max_length=20)), - ('credits', models.IntegerField()), - ('course_type', models.CharField(choices=[('Professional Core', 'Professional Core'), ('Professional Elective', 'Professional Elective'), ('Professional Lab', 'Professional Lab'), ('Engineering Science', 'Engineering Science'), ('Natural Science', 'Natural Science'), ('Humanities', 'Humanities'), ('Design', 'Design'), ('Manufacturing', 'Manufacturing'), ('Management Science', 'Management Science')], max_length=25)), - ('programme', models.CharField(choices=[('B.Tech', 'B.Tech'), ('B.Des', 'B.Des'), ('M.Tech', 'M.Tech'), ('M.Des', 'M.Des'), ('PhD', 'PhD')], max_length=10)), - ('branch', models.CharField(choices=[('CSE', 'CSE'), ('ECE', 'ECE'), ('ME', 'ME'), ('DESIGN', 'DESIGN'), ('Common', 'Common')], default='Common', max_length=10)), - ('batch', models.IntegerField()), - ('sem', models.IntegerField()), - ('optional', models.BooleanField(default=False)), - ('floated', models.BooleanField(default=False)), - ('course_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.course')), - ], - options={ - 'db_table': 'Curriculum', - 'unique_together': {('course_code', 'batch', 'programme')}, - }, - ), - migrations.CreateModel( - name='Curriculum_Instructor', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('chief_inst', models.BooleanField(default=False)), - ('curriculum_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.curriculum')), - ('instructor_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')), - ], - options={ - 'db_table': 'Curriculum_Instructor', - 'unique_together': {('curriculum_id', 'instructor_id')}, - }, - ), - migrations.CreateModel( - name='Exam_timetable', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('upload_date', models.DateField(auto_now_add=True)), - ('exam_time_table', models.FileField(upload_to='Administrator/academic_information/')), - ('batch', models.IntegerField(default='2016')), - ('programme', models.CharField(choices=[('B.Tech', 'B.Tech'), ('B.Des', 'B.Des'), ('M.Tech', 'M.Tech'), ('M.Des', 'M.Des'), ('PhD', 'PhD')], max_length=10)), - ], - options={ - 'db_table': 'Exam_Timetable', - }, - ), - migrations.CreateModel( - name='Holiday', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('holiday_date', models.DateField()), - ('holiday_name', models.CharField(max_length=40)), - ('holiday_type', models.CharField(choices=[('restricted', 'restricted'), ('closed', 'closed'), ('vacation', 'vacation')], default='restricted', max_length=30)), - ], - options={ - 'db_table': 'Holiday', - }, - ), - migrations.CreateModel( - name='Meeting', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('venue', models.CharField(max_length=50)), - ('date', models.DateField()), - ('time', models.CharField(max_length=20)), - ('agenda', models.TextField()), - ('minutes_file', models.CharField(max_length=40)), - ], - options={ - 'db_table': 'Meeting', - }, - ), - migrations.CreateModel( - name='Student', - fields=[ - ('id', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False, to='globals.extrainfo')), - ('programme', models.CharField(choices=[('B.Tech', 'B.Tech'), ('B.Des', 'B.Des'), ('M.Tech', 'M.Tech'), ('M.Des', 'M.Des'), ('PhD', 'PhD')], max_length=10)), - ('batch', models.IntegerField(default=2016)), - ('cpi', models.FloatField(default=0)), - ('category', models.CharField(choices=[('GEN', 'General'), ('SC', 'Scheduled Castes'), ('ST', 'Scheduled Tribes'), ('OBC', 'Other Backward Classes')], max_length=10)), - ('father_name', models.CharField(default='', max_length=40)), - ('mother_name', models.CharField(default='', max_length=40)), - ('hall_no', models.IntegerField(default=0)), - ('room_no', models.CharField(blank=True, max_length=10, null=True)), - ('specialization', models.CharField(choices=[('Power and Control', 'Power and Control'), ('Microwave and Communication Engineering', 'Microwave and Communication Engineering'), ('Micro-nano Electronics', 'Micro-nano Electronics'), ('CAD/CAM', 'CAD/CAM'), ('Design', 'Design'), ('Manufacturing', 'Manufacturing'), ('CSE', 'CSE'), ('Mechatronics', 'Mechatronics'), ('MDes', 'MDes'), ('None', 'None')], default='', max_length=40, null=True)), - ('curr_semester_no', models.IntegerField(default=1)), - ('batch_id', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.batch')), - ], - ), - migrations.CreateModel( - name='Timetable', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('upload_date', models.DateTimeField(auto_now_add=True)), - ('time_table', models.FileField(upload_to='Administrator/academic_information/')), - ('batch', models.IntegerField(default='2016')), - ('programme', models.CharField(choices=[('B.Tech', 'B.Tech'), ('B.Des', 'B.Des'), ('M.Tech', 'M.Tech'), ('M.Des', 'M.Des'), ('PhD', 'PhD')], max_length=10)), - ('branch', models.CharField(choices=[('CSE', 'CSE'), ('ECE', 'ECE'), ('ME', 'ME'), ('DESIGN', 'DESIGN'), ('Common', 'Common')], default='Common', max_length=10)), - ], - options={ - 'db_table': 'Timetable', - }, - ), - migrations.CreateModel( - name='Student_attendance', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('date', models.DateField()), - ('present', models.BooleanField(default=False)), - ('instructor_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.curriculum_instructor')), - ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - options={ - 'db_table': 'Student_attendance', - }, - ), - migrations.CreateModel( - name='Grades', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('grade', models.CharField(max_length=4)), - ('verify', models.BooleanField(default=False)), - ('curriculum_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.curriculum')), - ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - options={ - 'db_table': 'Grades', - }, - ), - migrations.CreateModel( - name='Spi', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('sem', models.IntegerField()), - ('spi', models.FloatField(default=0)), - ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - options={ - 'db_table': 'Spi', - 'unique_together': {('student_id', 'sem')}, - }, - ), - ] diff --git a/FusionIIIT/applications/academic_information/migrations/__init__.py b/FusionIIIT/applications/academic_information/migrations/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/FusionIIIT/applications/academic_procedures/migrations/0001_initial.py b/FusionIIIT/applications/academic_procedures/migrations/0001_initial.py deleted file mode 100644 index b873390df..000000000 --- a/FusionIIIT/applications/academic_procedures/migrations/0001_initial.py +++ /dev/null @@ -1,405 +0,0 @@ -# Generated by Django 3.1.5 on 2023-03-15 18:53 - -import datetime -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('academic_information', '0001_initial'), - ('programme_curriculum', '0001_initial'), - ('globals', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='Assistantship_status', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('student_status', models.BooleanField()), - ('hod_status', models.BooleanField()), - ('account_status', models.BooleanField()), - ], - ), - migrations.CreateModel( - name='MinimumCredits', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('semester', models.IntegerField()), - ('credits', models.IntegerField()), - ], - ), - migrations.CreateModel( - name='ThesisTopicProcess', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('research_area', models.CharField(max_length=50)), - ('thesis_topic', models.CharField(max_length=1000)), - ('submission_by_student', models.BooleanField(default=False)), - ('pending_supervisor', models.BooleanField(default=True)), - ('approval_supervisor', models.BooleanField(default=False)), - ('forwarded_to_hod', models.BooleanField(default=False)), - ('pending_hod', models.BooleanField(default=True)), - ('approval_by_hod', models.BooleanField(default=False)), - ('date', models.DateField(default=datetime.datetime.now)), - ('co_supervisor_id', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='thesistopicprocess_co_supervisor', to='globals.faculty')), - ('curr_id', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='academic_information.curriculum')), - ('member1', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='thesistopicprocess_member1', to='globals.faculty')), - ('member2', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='thesistopicprocess_member2', to='globals.faculty')), - ('member3', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='thesistopicprocess_member3', to='globals.faculty')), - ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ('supervisor_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='thesistopicprocess_supervisor', to='globals.faculty')), - ], - options={ - 'db_table': 'ThesisTopicProcess', - }, - ), - migrations.CreateModel( - name='Thesis', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('topic', models.CharField(max_length=1000)), - ('reg_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')), - ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ('supervisor_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.faculty')), - ], - options={ - 'db_table': 'Thesis', - }, - ), - migrations.CreateModel( - name='TeachingCreditRegistration', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('req_pending', models.BooleanField(default=True)), - ('course_completion', models.BooleanField(default=False)), - ('approved_course', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='teachingcreditregistration_approved_course', to='academic_information.curriculum')), - ('curr_1', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='teachingcreditregistration_curr1', to='academic_information.curriculum')), - ('curr_2', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='teachingcreditregistration_curr2', to='academic_information.curriculum')), - ('curr_3', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='teachingcreditregistration_curr3', to='academic_information.curriculum')), - ('curr_4', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='teachingcreditregistration_curr4', to='academic_information.curriculum')), - ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ('supervisor_id', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='teachingcreditregistration_supervisor_id', to='globals.faculty')), - ], - options={ - 'db_table': 'TeachingCreditRegistration', - }, - ), - migrations.CreateModel( - name='StudentRegistrationChecks', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('pre_registration_flag', models.BooleanField(default=False)), - ('final_registration_flag', models.BooleanField(default=False)), - ('semester_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.semester')), - ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - options={ - 'db_table': 'StudentRegistrationChecks', - }, - ), - migrations.CreateModel( - name='StudentRegistrationCheck', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('pre_registration_flag', models.BooleanField(default=False)), - ('final_registration_flag', models.BooleanField(default=False)), - ('semester', models.IntegerField(default=1)), - ('student', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - options={ - 'db_table': 'StudentRegistrationCheck', - }, - ), - migrations.CreateModel( - name='SemesterMarks', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('q1', models.FloatField(default=None)), - ('mid_term', models.FloatField(default=None)), - ('q2', models.FloatField(default=None)), - ('end_term', models.FloatField(default=None)), - ('other', models.FloatField(default=None)), - ('grade', models.CharField(choices=[('O', 'O'), ('A+', 'A+'), ('A', 'A'), ('B+', 'B+'), ('B', 'B'), ('C+', 'C+'), ('C', 'C'), ('D+', 'D+'), ('D', 'D'), ('F', 'F'), ('S', 'S'), ('X', 'X')], max_length=5, null=True)), - ('curr_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.course')), - ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - options={ - 'db_table': 'SemesterMarks', - }, - ), - migrations.CreateModel( - name='PhDProgressExamination', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('theme', models.CharField(max_length=50)), - ('seminar_date_time', models.DateTimeField()), - ('place', models.CharField(max_length=30)), - ('work_done', models.TextField()), - ('specific_contri_curr_semester', models.TextField()), - ('future_plan', models.TextField()), - ('details', models.FileField(upload_to='academic_procedure/Uploaded_document/PhdProgressDetails/')), - ('papers_published', models.IntegerField()), - ('presented_papers', models.IntegerField()), - ('papers_submitted', models.IntegerField()), - ('quality_of_work', models.CharField(choices=[('Excellent', 'Excellent'), ('Good', 'Good'), ('Satisfactory', 'Satisfactory'), ('Unsatisfactory', 'Unsatisfactory')], max_length=20)), - ('quantity_of_work', models.CharField(choices=[('Enough', 'Enough'), ('Just Sufficient', 'Just Sufficient'), ('Insufficient', 'Insufficient')], max_length=15)), - ('Overall_grade', models.CharField(choices=[('A+', 'A+'), ('A', 'A'), ('B+', 'B+'), ('B', 'B'), ('C+', 'C+'), ('C', 'C'), ('D+', 'D'), ('D', 'D'), ('F', 'F')], max_length=2)), - ('completion_period', models.IntegerField(null=True)), - ('panel_report', models.TextField(null=True)), - ('continuation_enhancement_assistantship', models.CharField(choices=[('yes', 'yes'), ('no', 'no'), ('not applicable', 'not applicable')], max_length=20, null=True)), - ('enhancement_assistantship', models.CharField(choices=[('yes', 'yes'), ('no', 'no'), ('not applicable', 'not applicable')], max_length=15, null=True)), - ('annual_progress_seminar', models.CharField(choices=[('Give again', 'Give again'), ('Not Applicable', 'Not Applicable'), ('Approved', 'Approved')], max_length=20, null=True)), - ('commments', models.TextField(null=True)), - ('student', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - ), - migrations.CreateModel( - name='MTechGraduateSeminarReport', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('theme_of_work', models.TextField()), - ('date', models.DateField()), - ('place', models.CharField(max_length=30)), - ('time', models.TimeField()), - ('work_done_till_previous_sem', models.TextField()), - ('specific_contri_in_cur_sem', models.TextField()), - ('future_plan', models.TextField()), - ('brief_report', models.FileField(upload_to='academic_procedure/Uploaded_document/GraduateSeminarReport/')), - ('publication_submitted', models.IntegerField()), - ('publication_accepted', models.IntegerField()), - ('paper_presented', models.IntegerField()), - ('papers_under_review', models.IntegerField()), - ('quality_of_work', models.CharField(choices=[('Excellent', 'Excellent'), ('Good', 'Good'), ('Satisfactory', 'Satisfactory'), ('Unsatisfactory', 'Unsatisfactory')], max_length=20)), - ('quantity_of_work', models.CharField(choices=[('Enough', 'Enough'), ('Just Sufficient', 'Just Sufficient'), ('Insufficient', 'Insufficient')], max_length=15)), - ('Overall_grade', models.CharField(choices=[('A+', 'A+'), ('A', 'A'), ('B+', 'B+'), ('B', 'B'), ('C+', 'C+'), ('C', 'C'), ('D+', 'D'), ('D', 'D'), ('F', 'F')], max_length=2)), - ('panel_report', models.CharField(choices=[('Give again', 'Give again'), ('Not Applicable', 'Not Applicable'), ('Approved', 'Approved')], max_length=15)), - ('suggestion', models.TextField(null=True)), - ('student', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - ), - migrations.CreateModel( - name='MessDue', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('month', models.CharField(choices=[('Jan', 'January'), ('Feb', 'Febuary'), ('Mar', 'March'), ('Apr', 'April'), ('May', 'May'), ('Jun', 'June'), ('Jul', 'July'), ('Aug', 'August'), ('Sep', 'September'), ('Oct', 'October'), ('Nov', 'November'), ('Dec', 'December')], max_length=10)), - ('year', models.IntegerField(choices=[(2023, 2023), (2022, 2022)])), - ('description', models.CharField(choices=[('Stu_paid', 'Paid'), ('Stu_due', 'Due')], max_length=15)), - ('amount', models.IntegerField()), - ('remaining_amount', models.IntegerField()), - ('student', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - ), - migrations.CreateModel( - name='MarkSubmissionCheck', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('verified', models.BooleanField(default=False)), - ('submitted', models.BooleanField(default=False)), - ('announced', models.BooleanField(default=False)), - ('curr_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.course')), - ], - options={ - 'db_table': 'MarkSubmissionCheck', - }, - ), - migrations.CreateModel( - name='InitialRegistrations', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('timestamp', models.DateTimeField(default=django.utils.timezone.now)), - ('priority', models.IntegerField(blank=True, null=True)), - ('course_id', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.course')), - ('course_slot_id', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='programme_curriculum.courseslot')), - ('semester_id', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.semester')), - ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - options={ - 'db_table': 'InitialRegistrations', - }, - ), - migrations.CreateModel( - name='InitialRegistration', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('timestamp', models.DateTimeField(default=django.utils.timezone.now)), - ('priority', models.IntegerField(blank=True, null=True)), - ('course_id', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.course')), - ('course_slot_id', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='programme_curriculum.courseslot')), - ('semester_id', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.semester')), - ('student_id', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - options={ - 'db_table': 'InitialRegistration', - }, - ), - migrations.CreateModel( - name='FinalRegistrations', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('semester', models.IntegerField()), - ('batch', models.IntegerField(default=2023)), - ('verified', models.BooleanField(default=False)), - ('curr_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.curriculum')), - ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - options={ - 'db_table': 'FinalRegistrations', - }, - ), - migrations.CreateModel( - name='FinalRegistration', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('verified', models.BooleanField(default=False)), - ('course_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.course')), - ('course_slot_id', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='programme_curriculum.courseslot')), - ('semester_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.semester')), - ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - options={ - 'db_table': 'FinalRegistration', - }, - ), - migrations.CreateModel( - name='FeePayments', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('mode', models.CharField(choices=[('Axis Easypay', 'Axis Easypay'), ('Subpaisa', 'Subpaisa'), ('NEFT', 'NEFT'), ('RTGS', 'RTGS'), ('Bank Challan', 'Bank Challan'), ('Edu Loan', 'Edu Loan')], max_length=20)), - ('transaction_id', models.CharField(max_length=40)), - ('fee_receipt', models.FileField(null=True, upload_to='fee_receipt/')), - ('deposit_date', models.DateField(default=datetime.date.today)), - ('utr_number', models.CharField(max_length=40, null=True)), - ('fee_paid', models.IntegerField(default=0)), - ('reason', models.CharField(max_length=20, null=True)), - ('actual_fee', models.IntegerField(default=0)), - ('semester_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.semester')), - ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - options={ - 'db_table': 'FeePayments', - }, - ), - migrations.CreateModel( - name='FeePayment', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('semester', models.IntegerField(default=1)), - ('batch', models.IntegerField(default=2016)), - ('mode', models.CharField(choices=[('Axis Easypay', 'Axis Easypay'), ('Subpaisa', 'Subpaisa'), ('NEFT', 'NEFT'), ('RTGS', 'RTGS'), ('Bank Challan', 'Bank Challan'), ('Edu Loan', 'Edu Loan')], max_length=20)), - ('transaction_id', models.CharField(max_length=40)), - ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - ), - migrations.CreateModel( - name='Dues', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('mess_due', models.IntegerField()), - ('hostel_due', models.IntegerField()), - ('library_due', models.IntegerField()), - ('placement_cell_due', models.IntegerField()), - ('academic_due', models.IntegerField()), - ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - options={ - 'db_table': 'Dues', - }, - ), - migrations.CreateModel( - name='CoursesMtech', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('specialization', models.CharField(choices=[('Power and Control', 'Power and Control'), ('Microwave and Communication Engineering', 'Microwave and Communication Engineering'), ('Micro-nano Electronics', 'Micro-nano Electronics'), ('CAD/CAM', 'CAD/CAM'), ('Design', 'Design'), ('Manufacturing', 'Manufacturing'), ('CSE', 'CSE'), ('Mechatronics', 'Mechatronics'), ('MDes', 'MDes'), ('all', 'all')], max_length=40)), - ('c_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.course')), - ], - ), - migrations.CreateModel( - name='CourseRequested', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('course_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.course')), - ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - options={ - 'db_table': 'CourseRequested', - }, - ), - migrations.CreateModel( - name='course_registration', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('working_year', models.IntegerField(blank=True, choices=[(2023, 2023), (2022, 2022)], null=True)), - ('course_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.course')), - ('course_slot_id', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='programme_curriculum.courseslot')), - ('semester_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.semester')), - ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - options={ - 'db_table': 'course_registration', - }, - ), - migrations.CreateModel( - name='BranchChange', - fields=[ - ('c_id', models.AutoField(primary_key=True, serialize=False)), - ('applied_date', models.DateField(default=datetime.datetime.now)), - ('branches', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.departmentinfo')), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - ), - migrations.CreateModel( - name='Bonafide', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('student_name', models.CharField(max_length=50)), - ('purpose', models.CharField(max_length=100)), - ('academic_year', models.CharField(max_length=15)), - ('enrolled_course', models.CharField(max_length=10)), - ('complaint_date', models.DateTimeField(default=django.utils.timezone.now)), - ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - options={ - 'db_table': 'Bonafide', - }, - ), - migrations.CreateModel( - name='AssistantshipClaim', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('date', models.DateTimeField(auto_now_add=True)), - ('month', models.CharField(choices=[('Jan', 'January'), ('Feb', 'Febuary'), ('Mar', 'March'), ('Apr', 'April'), ('May', 'May'), ('Jun', 'June'), ('Jul', 'July'), ('Aug', 'August'), ('Sep', 'September'), ('Oct', 'October'), ('Nov', 'November'), ('Dec', 'December')], max_length=10)), - ('year', models.IntegerField(choices=[(2023, 2023), (2022, 2022)])), - ('bank_account', models.CharField(max_length=11)), - ('applicability', models.CharField(choices=[('GATE', 'GATE'), ('NET', 'NET'), ('CEED', 'CEED')], max_length=5)), - ('ta_supervisor_remark', models.BooleanField(default=False)), - ('thesis_supervisor_remark', models.BooleanField(default=False)), - ('hod_approval', models.BooleanField(default=False)), - ('acad_approval', models.BooleanField(default=False)), - ('account_approval', models.BooleanField(default=False)), - ('stipend', models.IntegerField(default=0)), - ('student', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ('ta_supervisor', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='TA_SUPERVISOR', to='globals.faculty')), - ('thesis_supervisor', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='THESIS_SUPERVISOR', to='globals.faculty')), - ], - ), - migrations.CreateModel( - name='Register', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('year', models.IntegerField(default=2023)), - ('semester', models.IntegerField()), - ('curr_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.curriculum')), - ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - options={ - 'db_table': 'Register', - 'unique_together': {('curr_id', 'student_id')}, - }, - ), - ] diff --git a/FusionIIIT/applications/academic_procedures/migrations/0002_auto_20240304_1820.py b/FusionIIIT/applications/academic_procedures/migrations/0002_auto_20240304_1820.py deleted file mode 100644 index cfa105410..000000000 --- a/FusionIIIT/applications/academic_procedures/migrations/0002_auto_20240304_1820.py +++ /dev/null @@ -1,38 +0,0 @@ -# Generated by Django 3.1.5 on 2024-03-04 18:20 - -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/academic_procedures/migrations/__init__.py b/FusionIIIT/applications/academic_procedures/migrations/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/FusionIIIT/applications/central_mess/migrations/0001_initial.py b/FusionIIIT/applications/central_mess/migrations/0001_initial.py deleted file mode 100644 index 2a5bce41c..000000000 --- a/FusionIIIT/applications/central_mess/migrations/0001_initial.py +++ /dev/null @@ -1,186 +0,0 @@ -# Generated by Django 3.1.5 on 2023-03-15 18:53 - -import applications.central_mess.models -import datetime -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('academic_information', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='Menu', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('mess_option', models.CharField(choices=[('mess1', 'Veg_mess'), ('mess2', 'Non_veg_mess')], default='mess2', max_length=20)), - ('meal_time', models.CharField(choices=[('MB', 'Monday Breakfast'), ('ML', 'Monday Lunch'), ('MD', 'Monday Dinner'), ('TB', 'Tuesday Breakfast'), ('TL', 'Tuesday Lunch'), ('TD', 'Tuesday Dinner'), ('WB', 'Wednesday Breakfast'), ('WL', 'Wednesday Lunch'), ('WD', 'Wednesday Dinner'), ('THB', 'Thursday Breakfast'), ('THL', 'Thursday Lunch'), ('THD', 'Thursday Dinner'), ('FB', 'Friday Breakfast'), ('FL', 'Friday Lunch'), ('FD', 'Friday Dinner'), ('SB', 'Saturday Breakfast'), ('SL', 'Saturday Lunch'), ('SD', 'Saturday Dinner'), ('SUB', 'Sunday Breakfast'), ('SUL', 'Sunday Lunch'), ('SUD', 'Sunday Dinner')], max_length=20)), - ('dish', models.CharField(max_length=200)), - ], - ), - migrations.CreateModel( - name='Mess_meeting', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('meet_date', models.DateField()), - ('agenda', models.TextField()), - ('venue', models.TextField()), - ('meeting_time', models.CharField(choices=[('10', '10 a.m.'), ('11', '11 a.m.'), ('12', '12 p.m.'), ('13', '1 p.m.'), ('14', '2 p.m.'), ('15', '3 p.m.'), ('16', '4 p.m.'), ('17', '5 p.m.'), ('18', '6 p.m.'), ('19', '7 p.m.'), ('20', '8 p.m.'), ('21', '9 p.m.')], max_length=20)), - ], - ), - migrations.CreateModel( - name='Mess_reg', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('sem', models.IntegerField(default='1')), - ('start_reg', models.DateField(default=datetime.date.today)), - ('end_reg', models.DateField(default=datetime.date.today)), - ], - ), - migrations.CreateModel( - name='MessBillBase', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('bill_amount', models.PositiveIntegerField(default=0)), - ('timestamp', models.DateTimeField(auto_now_add=True)), - ], - ), - migrations.CreateModel( - name='Nonveg_menu', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('dish', models.CharField(max_length=20)), - ('price', models.IntegerField()), - ('order_interval', models.CharField(choices=[('Breakfast', 'Breakfast'), ('Lunch', 'Lunch'), ('Dinner', 'Dinner')], default='Breakfast', max_length=20)), - ], - ), - migrations.CreateModel( - name='Vacation_food', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('start_date', models.DateField(default=datetime.date.today)), - ('end_date', models.DateField(default=datetime.date.today)), - ('purpose', models.TextField()), - ('status', models.CharField(choices=[('0', 'rejected'), ('1', 'pending'), ('2', 'accepted')], default='1', max_length=20)), - ('app_date', models.DateField(default=datetime.date.today)), - ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - ), - migrations.CreateModel( - name='Special_request', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('start_date', models.DateField(default=datetime.date.today)), - ('end_date', models.DateField(default=datetime.date.today)), - ('request', models.TextField()), - ('status', models.CharField(choices=[('0', 'rejected'), ('1', 'pending'), ('2', 'accepted')], default='1', max_length=20)), - ('item1', models.CharField(max_length=50)), - ('item2', models.CharField(max_length=50)), - ('app_date', models.DateField(default=datetime.date.today)), - ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - ), - migrations.CreateModel( - name='Rebate', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('start_date', models.DateField(default=datetime.date.today)), - ('end_date', models.DateField(default=datetime.date.today)), - ('purpose', models.TextField()), - ('status', models.CharField(choices=[('0', 'rejected'), ('1', 'pending'), ('2', 'accepted')], default='1', max_length=20)), - ('app_date', models.DateField(default=datetime.date.today)), - ('leave_type', models.CharField(choices=[('casual', 'Casual'), ('vacation', 'Vacation')], default='casual', max_length=20)), - ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - ), - migrations.CreateModel( - name='Nonveg_data', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('order_date', models.DateField(default=datetime.date.today)), - ('order_interval', models.CharField(choices=[('Breakfast', 'Breakfast'), ('Lunch', 'Lunch'), ('Dinner', 'Dinner')], default='Breakfast', max_length=20)), - ('app_date', models.DateField(default=datetime.date.today)), - ('dish', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='central_mess.nonveg_menu')), - ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - ), - migrations.CreateModel( - name='Mess_minutes', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('mess_minutes', models.FileField(upload_to='central_mess/')), - ('meeting_date', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='central_mess.mess_meeting')), - ], - ), - migrations.CreateModel( - name='Menu_change_request', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('reason', models.TextField()), - ('request', models.CharField(max_length=100)), - ('status', models.CharField(choices=[('0', 'rejected'), ('1', 'pending'), ('2', 'accepted')], default='1', max_length=20)), - ('app_date', models.DateField(default=datetime.date.today)), - ('dish', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='central_mess.menu')), - ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - ), - migrations.CreateModel( - name='Feedback', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('mess', models.CharField(choices=[('mess1', 'Veg_mess'), ('mess2', 'Non_veg_mess')], default='mess1', max_length=10)), - ('mess_rating', models.PositiveSmallIntegerField(default='5')), - ('fdate', models.DateField(default=datetime.date.today)), - ('description', models.TextField()), - ('feedback_type', models.CharField(choices=[('maintenance', 'Maintenance'), ('food', 'Food'), ('cleanliness', 'Cleanliness & Hygiene'), ('others', 'Others')], max_length=20)), - ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - ), - migrations.CreateModel( - name='Payments', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('sem', models.IntegerField()), - ('year', models.IntegerField(default=applications.central_mess.models.current_year)), - ('amount_paid', models.IntegerField(default=0)), - ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - options={ - 'unique_together': {('student_id', 'sem', 'year')}, - }, - ), - migrations.CreateModel( - name='Monthly_bill', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('month', models.CharField(default=applications.central_mess.models.current_month, max_length=20)), - ('year', models.IntegerField(default=applications.central_mess.models.current_year)), - ('amount', models.IntegerField(default=0)), - ('rebate_count', models.IntegerField(default=0)), - ('rebate_amount', models.IntegerField(default=0)), - ('nonveg_total_bill', models.IntegerField(default=0)), - ('total_bill', models.IntegerField(default=0)), - ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - options={ - 'unique_together': {('student_id', 'month', 'year')}, - }, - ), - migrations.CreateModel( - name='Messinfo', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('mess_option', models.CharField(choices=[('mess1', 'Veg_mess'), ('mess2', 'Non_veg_mess')], default='mess2', max_length=20)), - ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - options={ - 'unique_together': {('student_id', 'mess_option')}, - }, - ), - ] diff --git a/FusionIIIT/applications/central_mess/migrations/__init__.py b/FusionIIIT/applications/central_mess/migrations/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/FusionIIIT/applications/complaint_system/migrations/0001_initial.py b/FusionIIIT/applications/complaint_system/migrations/0001_initial.py deleted file mode 100644 index db74dd14d..000000000 --- a/FusionIIIT/applications/complaint_system/migrations/0001_initial.py +++ /dev/null @@ -1,67 +0,0 @@ -# Generated by Django 3.1.5 on 2023-03-15 18:53 - -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('globals', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='Caretaker', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('area', models.CharField(choices=[('hall-1', 'hall-1'), ('hall-3', 'hall-3'), ('hall-4', 'hall-4'), ('CC1', 'CC1'), ('CC2', 'CC2'), ('core_lab', 'core_lab'), ('LHTC', 'LHTC'), ('NR2', 'NR2'), ('Rewa_Residency', 'Rewa_Residency'), ('Maa Saraswati Hostel', 'Maa Saraswati Hostel'), ('Nagarjun Hostel', 'Nagarjun Hostel'), ('Panini Hostel', 'Panini Hostel')], default='hall-3', max_length=20)), - ('rating', models.IntegerField(default=0)), - ('myfeedback', models.CharField(default='this is my feedback', max_length=400)), - ('staff_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')), - ], - ), - migrations.CreateModel( - name='Workers', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=50)), - ('age', models.CharField(max_length=10)), - ('phone', models.BigIntegerField(blank=True)), - ('worker_type', models.CharField(choices=[('Electricity', 'Electricity'), ('carpenter', 'carpenter'), ('plumber', 'plumber'), ('garbage', 'garbage'), ('dustbin', 'dustbin'), ('internet', 'internet'), ('other', 'other')], default='internet', max_length=20)), - ('caretaker_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='complaint_system.caretaker')), - ], - ), - migrations.CreateModel( - name='Supervisor', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('area', models.CharField(choices=[('hall-1', 'hall-1'), ('hall-3', 'hall-3'), ('hall-4', 'hall-4'), ('CC1', 'CC1'), ('CC2', 'CC2'), ('core_lab', 'core_lab'), ('LHTC', 'LHTC'), ('NR2', 'NR2'), ('Rewa_Residency', 'Rewa_Residency'), ('Maa Saraswati Hostel', 'Maa Saraswati Hostel'), ('Nagarjun Hostel', 'Nagarjun Hostel'), ('Panini Hostel', 'Panini Hostel')], max_length=20)), - ('sup_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')), - ], - ), - migrations.CreateModel( - name='StudentComplain', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('complaint_date', models.DateTimeField(default=django.utils.timezone.now)), - ('complaint_finish', models.DateField(blank=True, null=True)), - ('complaint_type', models.CharField(choices=[('Electricity', 'Electricity'), ('carpenter', 'carpenter'), ('plumber', 'plumber'), ('garbage', 'garbage'), ('dustbin', 'dustbin'), ('internet', 'internet'), ('other', 'other')], default='internet', max_length=20)), - ('location', models.CharField(choices=[('hall-1', 'hall-1'), ('hall-3', 'hall-3'), ('hall-4', 'hall-4'), ('CC1', 'CC1'), ('CC2', 'CC2'), ('core_lab', 'core_lab'), ('LHTC', 'LHTC'), ('NR2', 'NR2'), ('Rewa_Residency', 'Rewa_Residency'), ('Maa Saraswati Hostel', 'Maa Saraswati Hostel'), ('Nagarjun Hostel', 'Nagarjun Hostel'), ('Panini Hostel', 'Panini Hostel')], max_length=20)), - ('specific_location', models.CharField(blank=True, max_length=50)), - ('details', models.CharField(max_length=100)), - ('status', models.IntegerField(default='0')), - ('remarks', models.CharField(default='Pending', max_length=300)), - ('flag', models.IntegerField(default='0')), - ('reason', models.CharField(blank=True, default='None', max_length=100)), - ('feedback', models.CharField(blank=True, max_length=500)), - ('upload_complaint', models.FileField(blank=True, upload_to='')), - ('comment', models.CharField(default='None', max_length=100)), - ('complainer', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')), - ('worker_id', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='complaint_system.workers')), - ], - ), - ] diff --git a/FusionIIIT/applications/complaint_system/migrations/0002_auto_20230321_0050.py b/FusionIIIT/applications/complaint_system/migrations/0002_auto_20230321_0050.py deleted file mode 100644 index 224e44cb5..000000000 --- a/FusionIIIT/applications/complaint_system/migrations/0002_auto_20230321_0050.py +++ /dev/null @@ -1,47 +0,0 @@ -# Generated by Django 3.1.5 on 2023-03-21 00:50 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('globals', '0001_initial'), - ('complaint_system', '0001_initial'), - ] - - operations = [ - migrations.RemoveField( - model_name='workers', - name='caretaker_id', - ), - migrations.AlterField( - model_name='caretaker', - name='area', - field=models.CharField(choices=[('hall-1', 'hall-1'), ('hall-3', 'hall-3'), ('hall-4', 'hall-4'), ('library', 'CC1'), ('computer center', 'CC2'), ('core_lab', 'core_lab'), ('LHTC', 'LHTC'), ('NR2', 'NR2'), ('NR3', 'NR3'), ('Admin building', 'Admin building'), ('Rewa_Residency', 'Rewa_Residency'), ('Maa Saraswati Hostel', 'Maa Saraswati Hostel'), ('Nagarjun Hostel', 'Nagarjun Hostel'), ('Panini Hostel', 'Panini Hostel')], default='hall-3', max_length=20), - ), - migrations.AlterField( - model_name='studentcomplain', - name='location', - field=models.CharField(choices=[('hall-1', 'hall-1'), ('hall-3', 'hall-3'), ('hall-4', 'hall-4'), ('library', 'CC1'), ('computer center', 'CC2'), ('core_lab', 'core_lab'), ('LHTC', 'LHTC'), ('NR2', 'NR2'), ('NR3', 'NR3'), ('Admin building', 'Admin building'), ('Rewa_Residency', 'Rewa_Residency'), ('Maa Saraswati Hostel', 'Maa Saraswati Hostel'), ('Nagarjun Hostel', 'Nagarjun Hostel'), ('Panini Hostel', 'Panini Hostel')], max_length=20), - ), - migrations.AlterField( - model_name='supervisor', - name='area', - field=models.CharField(choices=[('hall-1', 'hall-1'), ('hall-3', 'hall-3'), ('hall-4', 'hall-4'), ('library', 'CC1'), ('computer center', 'CC2'), ('core_lab', 'core_lab'), ('LHTC', 'LHTC'), ('NR2', 'NR2'), ('NR3', 'NR3'), ('Admin building', 'Admin building'), ('Rewa_Residency', 'Rewa_Residency'), ('Maa Saraswati Hostel', 'Maa Saraswati Hostel'), ('Nagarjun Hostel', 'Nagarjun Hostel'), ('Panini Hostel', 'Panini Hostel')], max_length=20), - ), - migrations.CreateModel( - name='SectionIncharge', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('work_type', models.CharField(choices=[('Electricity', 'Electricity'), ('carpenter', 'carpenter'), ('plumber', 'plumber'), ('garbage', 'garbage'), ('dustbin', 'dustbin'), ('internet', 'internet'), ('other', 'other')], default='Electricity', max_length=20)), - ('staff_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')), - ], - ), - migrations.AddField( - model_name='workers', - name='secincharge_id', - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='complaint_system.sectionincharge'), - ), - ] diff --git a/FusionIIIT/applications/complaint_system/migrations/0002_auto_20240218_1321.py b/FusionIIIT/applications/complaint_system/migrations/0002_auto_20240218_1321.py deleted file mode 100644 index c77b65aa0..000000000 --- a/FusionIIIT/applications/complaint_system/migrations/0002_auto_20240218_1321.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.1.5 on 2024-02-18 13:21 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('complaint_system', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='supervisor', - name='area', - field=models.CharField(choices=[('hall-1', 'hall-1'), ('hall-3', 'hall-3'), ('hall-4', 'hall-4'), ('CC1', 'CC1'), ('CC2', 'CC2'), ('core_lab', 'core_lab'), ('LHTC', 'LHTC'), ('NR2', 'NR2'), ('Rewa_Residency', 'Rewa_Residency'), ('Maa Saraswati Hostel', 'Maa Saraswati Hostel'), ('Nagarjun Hostel', 'Nagarjun Hostel'), ('Panini Hostel', 'Panini Hostel')], default='hall-3', max_length=20), - ), - ] diff --git a/FusionIIIT/applications/complaint_system/migrations/0003_auto_20240306_1839.py b/FusionIIIT/applications/complaint_system/migrations/0003_auto_20240306_1839.py deleted file mode 100644 index 8a1c33559..000000000 --- a/FusionIIIT/applications/complaint_system/migrations/0003_auto_20240306_1839.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 3.1.5 on 2024-03-06 18:39 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('complaint_system', '0002_auto_20240218_1321'), - ] - - operations = [ - migrations.RemoveField( - model_name='supervisor', - name='area', - ), - migrations.AddField( - model_name='supervisor', - name='type', - field=models.CharField(choices=[('Electricity', 'Electricity'), ('carpenter', 'carpenter'), ('plumber', 'plumber'), ('garbage', 'garbage'), ('dustbin', 'dustbin'), ('internet', 'internet'), ('other', 'other')], default='Electricity', max_length=30), - ), - ] diff --git a/FusionIIIT/applications/complaint_system/migrations/__init__.py b/FusionIIIT/applications/complaint_system/migrations/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/FusionIIIT/applications/counselling_cell/migrations/0001_initial.py b/FusionIIIT/applications/counselling_cell/migrations/0001_initial.py deleted file mode 100644 index b87618488..000000000 --- a/FusionIIIT/applications/counselling_cell/migrations/0001_initial.py +++ /dev/null @@ -1,111 +0,0 @@ -# Generated by Django 3.1.5 on 2023-03-15 18:53 - -import datetime -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('academic_information', '0001_initial'), - ('globals', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='CounsellingIssueCategory', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('category_id', models.CharField(max_length=40, unique=True)), - ('category', models.CharField(max_length=40)), - ], - ), - migrations.CreateModel( - name='CounsellingMeeting', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('meeting_date', models.DateField(default=datetime.date.today)), - ('meeting_time', models.CharField(choices=[('10', '10 a.m.'), ('11', '11 a.m.'), ('12', '12 p.m.'), ('13', '1 p.m.'), ('14', '2 p.m.'), ('15', '3 p.m.'), ('16', '4 p.m.'), ('17', '5 p.m.'), ('18', '6 p.m.'), ('19', '7 p.m.'), ('20', '8 p.m.'), ('21', '9 p.m.')], max_length=20)), - ('agenda', models.TextField()), - ('venue', models.CharField(max_length=20)), - ('student_invities', models.TextField(default=None, max_length=500)), - ('meeting_host', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')), - ], - ), - migrations.CreateModel( - name='FacultyCounsellingTeam', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('faculty_position', models.CharField(choices=[('head_counsellor', 'Head Counsellor'), ('faculty_counsellor', 'Faculty Counsellor')], max_length=50)), - ('faculty', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.faculty')), - ], - options={ - 'unique_together': {('faculty', 'faculty_position')}, - }, - ), - migrations.CreateModel( - name='StudentCounsellingTeam', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('student_position', models.CharField(choices=[('student_guide', 'Student Guide'), ('student_coordinator', 'Student Coordinator')], max_length=50)), - ('student', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - options={ - 'unique_together': {('student_id', 'student_position')}, - }, - ), - migrations.CreateModel( - name='StudentMeetingRequest', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('requested_time', models.DateTimeField()), - ('description', models.TextField(max_length=1000)), - ('requested_meeting_status', models.CharField(choices=[('status_accepted', 'Accepted'), ('status_pending', 'Pending')], default='status_pending', max_length=20)), - ('recipient_reply', models.TextField(max_length=1000)), - ('requested_faculty_invitee', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='counselling_cell.facultycounsellingteam')), - ('requested_student_invitee', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='counselling_cell.studentcounsellingteam')), - ('student', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - ), - migrations.CreateModel( - name='StudentCounsellingInfo', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('student', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ('student_guide', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='counselling_cell.studentcounsellingteam')), - ], - ), - migrations.CreateModel( - name='CounsellingMinutes', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('counselling_minutes', models.FileField(upload_to='counselling_cell/')), - ('counselling_meeting', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='counselling_cell.counsellingmeeting')), - ], - ), - migrations.CreateModel( - name='CounsellingIssue', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('issue_raised_date', models.DateTimeField(default=datetime.datetime.now)), - ('issue', models.TextField(max_length=500)), - ('issue_status', models.CharField(choices=[('status_unresolved', 'Unresolved'), ('status_resolved', 'Resolved'), ('status_inprogress', 'InProgress')], default='status_unresolved', max_length=20)), - ('response_remark', models.TextField(max_length=500, null=True)), - ('issue_category', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='counselling_cell.counsellingissuecategory')), - ('resolved_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')), - ('student', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - ), - migrations.CreateModel( - name='CounsellingFAQ', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('counselling_question', models.TextField(max_length=1000)), - ('counselling_answer', models.TextField(max_length=5000)), - ('counselling_category', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='counselling_cell.counsellingissuecategory')), - ], - ), - ] diff --git a/FusionIIIT/applications/counselling_cell/migrations/__init__.py b/FusionIIIT/applications/counselling_cell/migrations/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/FusionIIIT/applications/department/migrations/0001_initial.py b/FusionIIIT/applications/department/migrations/0001_initial.py deleted file mode 100644 index fc8a34834..000000000 --- a/FusionIIIT/applications/department/migrations/0001_initial.py +++ /dev/null @@ -1,44 +0,0 @@ -# Generated by Django 3.1.5 on 2023-03-15 18:53 - -import datetime -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('globals', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='SpecialRequest', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('request_date', models.DateTimeField(default=datetime.date.today)), - ('brief', models.CharField(default='--', max_length=20)), - ('request_details', models.CharField(max_length=200)), - ('upload_request', models.FileField(blank=True, upload_to='')), - ('status', models.CharField(default='Pending', max_length=50)), - ('remarks', models.CharField(default='--', max_length=300)), - ('request_receiver', models.CharField(default='--', max_length=30)), - ('request_maker', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')), - ], - ), - migrations.CreateModel( - name='Announcements', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('ann_date', models.DateTimeField(default='04-04-2021')), - ('message', models.CharField(max_length=200)), - ('batch', models.CharField(default='Year-1', max_length=40)), - ('department', models.CharField(default='ALL', max_length=40)), - ('programme', models.CharField(max_length=10)), - ('upload_announcement', models.FileField(default=' ', null=True, upload_to='department/upload_announcement')), - ('maker_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')), - ], - ), - ] diff --git a/FusionIIIT/applications/department/migrations/__init__.py b/FusionIIIT/applications/department/migrations/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/FusionIIIT/applications/eis/migrations/0001_initial.py b/FusionIIIT/applications/eis/migrations/0001_initial.py deleted file mode 100644 index 2fd2e65d3..000000000 --- a/FusionIIIT/applications/eis/migrations/0001_initial.py +++ /dev/null @@ -1,280 +0,0 @@ -# Generated by Django 3.1.5 on 2023-03-15 18:53 - -import datetime -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('auth', '0012_alter_user_first_name_max_length'), - ] - - operations = [ - migrations.CreateModel( - name='faculty_about', - fields=[ - ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False, to='auth.user')), - ('about', models.TextField(max_length=1000)), - ('doj', models.DateField(default=datetime.datetime.now)), - ('education', models.TextField(max_length=500)), - ('interest', models.TextField(max_length=500)), - ('contact', models.CharField(blank=True, max_length=10, null=True)), - ('github', models.CharField(blank=True, max_length=100, null=True)), - ('linkedin', models.CharField(blank=True, max_length=100, null=True)), - ], - ), - migrations.CreateModel( - name='emp_visits', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('pf_no', models.CharField(max_length=20)), - ('v_type', models.IntegerField(default=1)), - ('country', models.CharField(default=' ', max_length=500)), - ('place', models.CharField(default=' ', max_length=500)), - ('purpose', models.CharField(default=' ', max_length=500)), - ('v_date', models.DateField(blank=True, null=True)), - ('start_date', models.DateField(blank=True, null=True)), - ('end_date', models.DateField(blank=True, null=True)), - ('entry_date', models.DateField(blank=True, default=datetime.datetime.now, null=True)), - ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='emp_techtransfer', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('pf_no', models.IntegerField()), - ('details', models.CharField(default=' ', max_length=500)), - ('date_entry', models.DateField(blank=True, default=datetime.datetime.now, null=True)), - ('start_date', models.DateField(blank=True, null=True)), - ('end_date', models.DateField(blank=True, null=True)), - ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='emp_session_chair', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('pf_no', models.IntegerField()), - ('name', models.CharField(default=' ', max_length=500)), - ('event', models.TextField(default=' ', max_length=2500)), - ('s_year', 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)], null=True, verbose_name='year')), - ('a_month', models.IntegerField(blank=True, choices=[(1, 1), (2, 2), (3, 3), (4, 4), (5, 5), (6, 6), (7, 7), (8, 8), (9, 9), (10, 10), (11, 11), (12, 12)], default=1, null=True, verbose_name='Month')), - ('start_date', models.DateField(blank=True, null=True)), - ('end_date', models.DateField(blank=True, null=True)), - ('date_entry', models.DateField(blank=True, default=datetime.datetime.now, null=True)), - ('remarks', models.CharField(default=' ', max_length=1000)), - ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='emp_research_projects', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('pf_no', models.IntegerField()), - ('ptype', models.CharField(default='Research', max_length=100)), - ('pi', models.CharField(default=' ', max_length=1000)), - ('co_pi', models.CharField(default=' ', max_length=1500)), - ('title', models.TextField(default=' ', max_length=5000)), - ('funding_agency', models.CharField(default=' ', max_length=250, null=True)), - ('financial_outlay', models.CharField(default=' ', max_length=150, null=True)), - ('status', models.CharField(choices=[('Awarded', 'Awarded'), ('Submitted', 'Submitted'), ('Ongoing', 'Ongoing'), ('Completed', 'Completed')], max_length=10)), - ('start_date', models.DateField(blank=True, null=True)), - ('finish_date', models.DateField(blank=True, null=True)), - ('date_submission', models.DateField(blank=True, null=True)), - ('date_entry', models.DateField(blank=True, default=datetime.datetime.now, null=True)), - ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='emp_research_papers', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('pf_no', models.IntegerField()), - ('rtype', models.CharField(choices=[('Journal', 'Journal'), ('Conference', 'Conference')], default='Conference', max_length=500)), - ('authors', models.CharField(blank=True, max_length=2500, null=True)), - ('co_authors', models.CharField(blank=True, max_length=2500, null=True)), - ('title_paper', models.CharField(blank=True, max_length=2500, null=True)), - ('name', models.CharField(blank=True, max_length=2500, null=True)), - ('paper', models.CharField(blank=True, max_length=1000, null=True)), - ('venue', models.CharField(blank=True, max_length=2500, null=True)), - ('volume_no', models.CharField(blank=True, max_length=500, null=True)), - ('page_no', models.CharField(blank=True, max_length=500, null=True)), - ('is_sci', models.CharField(blank=True, choices=[('SCI', 'SCI'), ('SCIE', 'SCIE')], max_length=6, null=True)), - ('isbn_no', models.CharField(blank=True, max_length=250, null=True)), - ('doi', models.CharField(blank=True, max_length=1000, null=True)), - ('start_date', models.DateField(blank=True, null=True)), - ('end_date', models.DateField(blank=True, null=True)), - ('date_acceptance', models.DateField(blank=True, null=True)), - ('date_publication', models.DateField(blank=True, null=True)), - ('year', 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)], max_length=10, null=True)), - ('a_month', models.CharField(blank=True, choices=[(1, 1), (2, 2), (3, 3), (4, 4), (5, 5), (6, 6), (7, 7), (8, 8), (9, 9), (10, 10), (11, 11), (12, 12)], default=1, max_length=500, null=True)), - ('doc_id', models.CharField(blank=True, max_length=50, null=True)), - ('doc_description', models.CharField(blank=True, max_length=1000, null=True)), - ('date_entry', models.DateField(blank=True, default=datetime.datetime.now, null=True)), - ('status', models.CharField(blank=True, choices=[('Published', 'Published'), ('Accepted', 'Accepted'), ('Communicated', 'Communicated')], max_length=15, null=True)), - ('date_submission', models.DateTimeField(blank=True, null=True)), - ('reference_number', models.CharField(blank=True, max_length=100, null=True)), - ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='emp_published_books', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('pf_no', models.IntegerField()), - ('p_type', models.CharField(choices=[('Book', 'Book'), ('Monograph', 'Monograph'), ('Book Chapter', 'Book Chapter'), ('Handbook', 'Handbook'), ('Technical Report', 'Technical Report')], max_length=16)), - ('title', models.CharField(default=' ', max_length=2500)), - ('publisher', models.CharField(default=' ', max_length=2500)), - ('pyear', 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)], null=True, verbose_name='year')), - ('authors', models.CharField(default=' ', max_length=250)), - ('date_entry', models.DateField(blank=True, default=datetime.datetime.now, null=True)), - ('publication_date', models.DateField(blank=True, null=True)), - ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='emp_patents', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('pf_no', models.IntegerField()), - ('p_no', models.CharField(max_length=150)), - ('title', models.CharField(max_length=1500)), - ('earnings', models.IntegerField(default=0)), - ('status', models.CharField(choices=[('Filed', 'Filed'), ('Granted', 'Granted'), ('Published', 'Published'), ('Owned', 'Owned')], max_length=15)), - ('p_year', 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)], null=True, verbose_name='year')), - ('a_month', models.IntegerField(blank=True, choices=[(1, 1), (2, 2), (3, 3), (4, 4), (5, 5), (6, 6), (7, 7), (8, 8), (9, 9), (10, 10), (11, 11), (12, 12)], default=1, null=True, verbose_name='Month')), - ('date_entry', models.DateField(blank=True, default=datetime.datetime.now, null=True)), - ('start_date', models.DateField(blank=True, null=True)), - ('end_date', models.DateField(blank=True, null=True)), - ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='emp_mtechphd_thesis', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('pf_no', models.IntegerField()), - ('degree_type', models.IntegerField(default=1)), - ('title', models.CharField(max_length=250)), - ('supervisors', models.CharField(max_length=250)), - ('co_supervisors', models.CharField(blank=True, max_length=250, null=True)), - ('rollno', models.CharField(max_length=200)), - ('s_name', models.CharField(max_length=5000)), - ('s_year', 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)], null=True, verbose_name='year')), - ('a_month', models.IntegerField(blank=True, choices=[(1, 1), (2, 2), (3, 3), (4, 4), (5, 5), (6, 6), (7, 7), (8, 8), (9, 9), (10, 10), (11, 11), (12, 12)], default=1, null=True, verbose_name='Month')), - ('date_entry', models.DateField(blank=True, default=datetime.datetime.now, null=True)), - ('start_date', models.DateField(blank=True, null=True)), - ('end_date', models.DateField(blank=True, null=True)), - ('semester', models.IntegerField(blank=True, default=1, null=True)), - ('status', models.CharField(blank=True, choices=[('Awarded', 'Awarded'), ('Submitted', 'Submitted'), ('Ongoing', 'Ongoing'), ('Completed', 'Completed')], max_length=10, null=True)), - ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='emp_keynote_address', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('pf_no', models.IntegerField()), - ('type', models.CharField(choices=[('Keynote', 'Keynote'), ('Plenary Address', 'Plenary Address')], default='Keynote', max_length=140)), - ('title', models.CharField(max_length=1000)), - ('name', models.CharField(max_length=1000)), - ('venue', models.CharField(max_length=1000)), - ('page_no', models.CharField(max_length=100)), - ('isbn_no', models.CharField(max_length=200)), - ('k_year', 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)], null=True, verbose_name='year')), - ('a_month', models.IntegerField(blank=True, choices=[(1, 1), (2, 2), (3, 3), (4, 4), (5, 5), (6, 6), (7, 7), (8, 8), (9, 9), (10, 10), (11, 11), (12, 12)], default=1, null=True, verbose_name='Month')), - ('start_date', models.DateField(blank=True, null=True)), - ('end_date', models.DateField(blank=True, null=True)), - ('date_entry', models.DateField(blank=True, default=datetime.datetime.now, null=True)), - ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='emp_expert_lectures', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('pf_no', models.IntegerField()), - ('l_type', models.CharField(choices=[('Expert Lecture', 'Expert Lecture'), ('Invited Talk', 'Invited Talk')], default='Expert Lecture', max_length=14)), - ('title', models.CharField(max_length=1000)), - ('place', models.CharField(max_length=1000)), - ('l_date', models.DateField(blank=True, null=True)), - ('l_year', 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)], null=True, verbose_name='year')), - ('a_month', models.IntegerField(blank=True, choices=[(1, 1), (2, 2), (3, 3), (4, 4), (5, 5), (6, 6), (7, 7), (8, 8), (9, 9), (10, 10), (11, 11), (12, 12)], default=1, null=True, verbose_name='Month')), - ('date_entry', models.DateField(blank=True, default=datetime.datetime.now, null=True)), - ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='emp_event_organized', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('pf_no', models.IntegerField()), - ('type', models.CharField(choices=[('Training Program', 'Training Program'), ('Seminar', 'Seminar'), ('Short Term Program', 'Short Term Program'), ('Workshop', 'Workshop'), ('Any Other', 'Any Other')], max_length=180)), - ('name', models.CharField(max_length=1000)), - ('sponsoring_agency', models.CharField(max_length=150)), - ('venue', models.CharField(max_length=100)), - ('role', models.CharField(choices=[('Convener', 'Convener'), ('Coordinator', 'Coordinator'), ('Co-Convener', 'Co-Convener')], max_length=11)), - ('start_date', models.DateField(blank=True, null=True)), - ('end_date', models.DateField(blank=True, null=True)), - ('date_entry', models.DateField(blank=True, default=datetime.datetime.now, null=True)), - ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='emp_consultancy_projects', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('pf_no', models.IntegerField()), - ('consultants', models.CharField(max_length=150)), - ('title', models.CharField(max_length=1000)), - ('client', models.CharField(max_length=1000)), - ('financial_outlay', models.IntegerField()), - ('start_date', models.DateField(blank=True, null=True)), - ('end_date', models.DateField(blank=True, null=True)), - ('duration', models.CharField(blank=True, max_length=500, null=True)), - ('date_entry', models.DateField(blank=True, default=datetime.datetime.now, null=True)), - ('status', models.CharField(blank=True, choices=[('Completed', 'Completed'), ('Submitted', 'Submitted'), ('Ongoing', 'Ongoing')], default='Ongoing', max_length=10, null=True)), - ('remarks', models.CharField(blank=True, max_length=1000, null=True)), - ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='emp_confrence_organised', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('pf_no', models.IntegerField()), - ('name', models.CharField(max_length=500)), - ('venue', models.CharField(max_length=500)), - ('k_year', 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)], null=True, verbose_name='year')), - ('a_month', models.IntegerField(blank=True, choices=[(1, 1), (2, 2), (3, 3), (4, 4), (5, 5), (6, 6), (7, 7), (8, 8), (9, 9), (10, 10), (11, 11), (12, 12)], default=1, null=True, verbose_name='Month')), - ('start_date', models.DateField(blank=True, null=True)), - ('end_date', models.DateField(blank=True, null=True)), - ('date_entry', models.DateField(blank=True, default=datetime.datetime.now, null=True)), - ('role1', models.CharField(blank=True, choices=[('Advisary Committee', 'Advisary Committee'), ('Program Committee', 'Program Committee'), ('Organised', 'Organised'), ('Conference Chair', 'Conference Chair'), ('Any Other', 'Any Other')], default='Any Other', max_length=200, null=True)), - ('role2', models.CharField(blank=True, max_length=200, null=True)), - ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='emp_achievement', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('pf_no', models.IntegerField()), - ('a_type', models.CharField(choices=[('Award', 'Award'), ('Honour', 'Honour'), ('Prize', 'Prize'), ('Other', 'Other')], default='Other', max_length=180)), - ('details', models.TextField(default=' ', max_length=1550)), - ('a_day', models.IntegerField(blank=True, choices=[(1, 1), (2, 2), (3, 3), (4, 4), (5, 5), (6, 6), (7, 7), (8, 8), (9, 9), (10, 10), (11, 11), (12, 12), (13, 13), (14, 14), (15, 15), (16, 16), (17, 17), (18, 18), (19, 19), (20, 20), (21, 21), (22, 22), (23, 23), (24, 24), (25, 25), (26, 26), (27, 27), (28, 28), (29, 29), (30, 30), (31, 31)], null=True, verbose_name='Day')), - ('a_month', models.IntegerField(blank=True, choices=[(1, 1), (2, 2), (3, 3), (4, 4), (5, 5), (6, 6), (7, 7), (8, 8), (9, 9), (10, 10), (11, 11), (12, 12)], null=True, verbose_name='Month')), - ('a_year', 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)], null=True, verbose_name='year')), - ('date_entry', models.DateField(default=datetime.datetime.now)), - ('achievment_date', models.DateField(blank=True, null=True)), - ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - ] diff --git a/FusionIIIT/applications/eis/migrations/0002_auto_20240304_1820.py b/FusionIIIT/applications/eis/migrations/0002_auto_20240304_1820.py deleted file mode 100644 index 24a757751..000000000 --- a/FusionIIIT/applications/eis/migrations/0002_auto_20240304_1820.py +++ /dev/null @@ -1,53 +0,0 @@ -# Generated by Django 3.1.5 on 2024-03-04 18:20 - -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/eis/migrations/__init__.py b/FusionIIIT/applications/eis/migrations/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/FusionIIIT/applications/establishment/migrations/0001_initial.py b/FusionIIIT/applications/establishment/migrations/0001_initial.py deleted file mode 100644 index e1449d3b3..000000000 --- a/FusionIIIT/applications/establishment/migrations/0001_initial.py +++ /dev/null @@ -1,284 +0,0 @@ -# Generated by Django 3.1.5 on 2023-03-15 18:53 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('globals', '0001_initial'), - ('auth', '0012_alter_user_first_name_max_length'), - ] - - operations = [ - migrations.CreateModel( - name='Appraisal', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('discipline', models.CharField(max_length=30, null=True)), - ('knowledge_field', models.CharField(max_length=30, null=True)), - ('research_interest', models.CharField(max_length=60, null=True)), - ('status', models.CharField(choices=[('pending', 'Pending'), ('accepted', 'Accepted'), ('rejected', 'Rejected'), ('forwarded', 'Forwarded'), ('auto rejected', 'Auto Rejected'), ('outstanding', 'Outstanding'), ('excellant', 'Excellent'), ('very good', 'Very Good'), ('good', 'Good'), ('poor', 'Poor')], default='pending', max_length=20)), - ('timestamp', models.DateTimeField(auto_now=True, null=True)), - ('other_research_element', models.CharField(blank=True, default='', max_length=200, null=True)), - ('publications', models.CharField(blank=True, default='', max_length=200, null=True)), - ('conferences_meeting_attended', models.CharField(blank=True, default='', max_length=200, null=True)), - ('conferences_meeting_organized', models.CharField(blank=True, default='', max_length=200, null=True)), - ('admin_assign', models.CharField(blank=True, default='', max_length=200, null=True)), - ('sevice_to_ins', models.CharField(blank=True, default='', max_length=200, null=True)), - ('extra_info', models.CharField(blank=True, default='', max_length=200, null=True)), - ('faculty_comments', models.CharField(blank=True, default='', max_length=200, null=True)), - ('start_date', models.DateField(blank=True, null=True)), - ('end_date', models.DateField(blank=True, null=True)), - ('applicant', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='all_appraisals', to=settings.AUTH_USER_MODEL)), - ('designation', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='desig', to='globals.designation')), - ], - ), - migrations.CreateModel( - name='Cpda_application', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('status', models.CharField(choices=[('requested', 'Requested'), ('approved', 'Approved'), ('rejected', 'Rejected'), ('adjustments_pending', 'Adjustments Pending'), ('finished', 'Finished')], max_length=20, null=True)), - ('pf_number', models.CharField(default='1', max_length=50, null=True)), - ('purpose', models.CharField(blank=True, default='', max_length=500)), - ('requested_advance', models.IntegerField(blank=True)), - ('request_timestamp', models.DateTimeField(auto_now=True, null=True)), - ('adjustment_amount', models.IntegerField(blank=True, default='0', null=True)), - ('bills_attached', models.IntegerField(blank=True, default='-1', null=True)), - ('total_bills_amount', models.IntegerField(blank=True, default='0', null=True)), - ('ppa_register_page_no', models.IntegerField(blank=True, default='-1', null=True)), - ('adjustment_timestamp', models.DateTimeField(auto_now=True, null=True)), - ('applicant', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - options={ - 'db_table': 'Cpda Application', - }, - ), - migrations.CreateModel( - name='CpdaBalance', - fields=[ - ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False, to='auth.user')), - ('cpda_balance', models.PositiveIntegerField(default=300000)), - ], - ), - migrations.CreateModel( - name='Ltc_application', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('status', models.CharField(choices=[('requested', 'Requested'), ('approved', 'Approved'), ('rejected', 'Rejected')], max_length=20, null=True)), - ('pf_number', models.CharField(default='', max_length=50)), - ('basic_pay', models.IntegerField(blank=True)), - ('leave_start', models.DateField(null=True)), - ('leave_end', models.DateField()), - ('family_departure_date', models.DateField()), - ('leave_nature', models.CharField(default='', max_length=50)), - ('purpose', models.CharField(blank=True, default='', max_length=500)), - ('is_hometown_or_elsewhere', models.CharField(choices=[('hometown', 'Home Town'), ('elsewhere', 'Elsewhere')], max_length=50)), - ('phone_number', models.CharField(default='', max_length=13)), - ('address_during_leave', models.CharField(blank=True, default='', max_length=500)), - ('travel_mode', models.CharField(choices=[('rail', 'Rail'), ('road', 'Road')], max_length=50)), - ('ltc_availed', models.CharField(blank=True, default='', max_length=100)), - ('ltc_to_avail', models.CharField(blank=True, default='', max_length=200)), - ('dependents', models.CharField(blank=True, default='', max_length=500)), - ('requested_advance', models.IntegerField(blank=True)), - ('request_timestamp', models.DateTimeField(auto_now=True, null=True)), - ('review_timestamp', models.DateTimeField(auto_now=True, null=True)), - ('applicant', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - options={ - 'db_table': 'Ltc Application', - }, - ), - migrations.CreateModel( - name='Ltc_eligible_user', - fields=[ - ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False, to='auth.user')), - ('date_of_joining', models.DateField(default='2005-04-01')), - ('current_block_size', models.IntegerField(default=4)), - ('total_ltc_allowed', models.IntegerField(default=2)), - ('hometown_ltc_allowed', models.IntegerField(default=2)), - ('elsewhere_ltc_allowed', models.IntegerField(default=1)), - ('hometown_ltc_availed', models.IntegerField(default=0)), - ('elsewhere_ltc_availed', models.IntegerField(default=0)), - ], - ), - migrations.CreateModel( - name='ThesisResearchSupervision', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('stud_name', models.CharField(max_length=30)), - ('thesis_title', models.CharField(blank=True, max_length=30, null=True)), - ('year', models.IntegerField(blank=True, null=True)), - ('semester', models.IntegerField()), - ('status', models.CharField(max_length=30)), - ('appraisal', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='applicants_supervised_stud', to='establishment.appraisal')), - ('co_supervisors', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='all_supervisors', to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='SponsoredProjects', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('project_title', models.CharField(max_length=30)), - ('sponsoring_agency', models.CharField(max_length=30)), - ('funding', models.IntegerField()), - ('duration', models.IntegerField()), - ('status', models.CharField(max_length=30)), - ('remarks', models.CharField(max_length=30)), - ('appraisal', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='applicant_sponsored_projects', to='establishment.appraisal')), - ('co_investigators', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='all_co_investigators', to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='NewCoursesOffered', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('course_name', models.CharField(max_length=30)), - ('course_num', models.IntegerField(blank=True, null=True)), - ('ug_or_pg', models.CharField(blank=True, max_length=2, null=True)), - ('tutorial_hrs_wk', models.FloatField(blank=True, null=True)), - ('year', models.IntegerField(blank=True, null=True)), - ('semester', models.IntegerField()), - ('appraisal', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='applicants_offered_new_courses', to='establishment.appraisal')), - ], - ), - migrations.CreateModel( - name='NewCourseMaterial', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('course_name', models.CharField(max_length=30)), - ('course_num', models.IntegerField(blank=True, null=True)), - ('ug_or_pg', models.CharField(blank=True, max_length=2, null=True)), - ('activity_type', models.CharField(blank=True, max_length=10, null=True)), - ('availiability', models.CharField(blank=True, max_length=10, null=True)), - ('appraisal', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='applicant_new_courses_material', to='establishment.appraisal')), - ], - ), - migrations.CreateModel( - name='Ltc_to_avail', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=30)), - ('age', models.IntegerField(blank=True, null=True)), - ('ltc', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='ltcToAvail', to='establishment.ltc_application')), - ], - ), - migrations.CreateModel( - name='Ltc_availed', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=30)), - ('age', models.IntegerField(blank=True, null=True)), - ('ltc', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='ltcAvailed', to='establishment.ltc_application')), - ], - ), - migrations.CreateModel( - name='Establishment_variables', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('est_admin', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='Dependent', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=30)), - ('age', models.IntegerField(blank=True, null=True)), - ('depend', models.CharField(max_length=30)), - ('ltc', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='Dependent', to='establishment.ltc_application')), - ], - ), - migrations.CreateModel( - name='Cpda_bill', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('bill', models.FileField(blank=True, upload_to='')), - ('application', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='establishment.cpda_application')), - ], - options={ - 'db_table': 'Cpda Bills', - }, - ), - migrations.CreateModel( - name='CoursesInstructed', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('semester', models.IntegerField(blank=True, null=True)), - ('course_name', models.CharField(max_length=30)), - ('course_num', models.IntegerField(blank=True, null=True)), - ('lecture_hrs_wk', models.FloatField(blank=True, null=True)), - ('tutorial_hrs_wk', models.FloatField(blank=True, null=True)), - ('lab_hrs_wk', models.FloatField(blank=True, null=True)), - ('reg_students', models.IntegerField(blank=True, null=True)), - ('co_instructor', models.CharField(blank=True, max_length=250, null=True)), - ('appraisal', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='applicant_courses', to='establishment.appraisal')), - ], - ), - migrations.CreateModel( - name='AppraisalRequest', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('remark_hod', models.CharField(blank=True, max_length=50, null=True)), - ('remark_director', models.CharField(blank=True, max_length=50, null=True)), - ('status_hod', models.CharField(choices=[('pending', 'Pending'), ('accepted', 'Accepted'), ('rejected', 'Rejected'), ('forwarded', 'Forwarded'), ('auto rejected', 'Auto Rejected'), ('outstanding', 'Outstanding'), ('excellant', 'Excellent'), ('very good', 'Very Good'), ('good', 'Good'), ('poor', 'Poor')], default='pending', max_length=20)), - ('status_director', models.CharField(choices=[('pending', 'Pending'), ('accepted', 'Accepted'), ('rejected', 'Rejected'), ('forwarded', 'Forwarded'), ('auto rejected', 'Auto Rejected'), ('outstanding', 'Outstanding'), ('excellant', 'Excellent'), ('very good', 'Very Good'), ('good', 'Good'), ('poor', 'Poor')], default='pending', max_length=20)), - ('permission', models.CharField(blank=True, choices=[('intermediary', 'Intermediary Staff'), ('sanc_auth', 'Appraisal Sanctioning Authority'), ('sanc_off', 'Appraisal Sanctioning Officer')], default='sanc_auth', max_length=20, null=True)), - ('request_timestamp', models.DateTimeField(auto_now=True, null=True)), - ('appraisal', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='appraisal_tracking', to='establishment.appraisal')), - ('director', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='director', to=settings.AUTH_USER_MODEL)), - ('hod', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='hod', to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='AppraisalAdministrators', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('authority', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='sanc_authority_of_ap', to='globals.designation')), - ('officer', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='sanc_officer_of_ap', to='globals.designation')), - ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='apprasial_admins', to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='Ltc_tracking', - fields=[ - ('application', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, related_name='tracking_info', serialize=False, to='establishment.ltc_application')), - ('designations', models.CharField(blank=True, max_length=350, null=True)), - ('remarks', models.CharField(blank=True, max_length=350, null=True)), - ('review_status', models.CharField(choices=[('to_assign', 'To Assign'), ('under_review', 'Under Review'), ('reviewed', 'Reviewed')], max_length=20, null=True)), - ('admin_remarks', models.CharField(blank=True, max_length=200, null=True)), - ('reviewer_design', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='globals.designation')), - ('reviewer_id', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - options={ - 'db_table': 'Ltc Tracking', - }, - ), - migrations.CreateModel( - name='Cpda_tracking', - fields=[ - ('application', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, related_name='tracking_info', serialize=False, to='establishment.cpda_application')), - ('current_reviewer_id', models.IntegerField(blank=True, default=1)), - ('remarks', models.CharField(blank=True, max_length=250, null=True)), - ('remarks_rev1', models.CharField(blank=True, max_length=250, null=True)), - ('remarks_rev2', models.CharField(blank=True, max_length=250, null=True)), - ('remarks_rev3', models.CharField(blank=True, max_length=250, null=True)), - ('review_status', models.CharField(choices=[('to_assign', 'To Assign'), ('under_review', 'Under Review'), ('reviewed', 'Reviewed')], max_length=20, null=True)), - ('bill', models.FileField(blank=True, null=True, upload_to='')), - ('reviewer_design', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='desig1', to='globals.designation')), - ('reviewer_design2', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='desig2', to='globals.designation')), - ('reviewer_design3', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='desig3', to='globals.designation')), - ('reviewer_id', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='reviewer1', to=settings.AUTH_USER_MODEL)), - ('reviewer_id2', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='reviewer2', to=settings.AUTH_USER_MODEL)), - ('reviewer_id3', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='reviewer3', to=settings.AUTH_USER_MODEL)), - ], - options={ - 'db_table': 'Cpda Tracking', - }, - ), - ] diff --git a/FusionIIIT/applications/establishment/migrations/__init__.py b/FusionIIIT/applications/establishment/migrations/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/FusionIIIT/applications/estate_module/migrations/0001_initial.py b/FusionIIIT/applications/estate_module/migrations/0001_initial.py deleted file mode 100644 index 478a93b83..000000000 --- a/FusionIIIT/applications/estate_module/migrations/0001_initial.py +++ /dev/null @@ -1,126 +0,0 @@ -# Generated by Django 3.1.5 on 2023-03-15 18:53 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ] - - operations = [ - migrations.CreateModel( - name='Building', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('dateIssued', models.DateField()), - ('dateConstructionStarted', models.DateField(blank=True, null=True)), - ('dateConstructionCompleted', models.DateField(blank=True, null=True)), - ('dateOperational', models.DateField(blank=True, null=True)), - ('status', models.CharField(choices=[('OS', 'On Schedule'), ('DL', 'Delayed')], default='OS', max_length=2)), - ('area', models.IntegerField(blank=True, null=True)), - ('constructionCostEstimated', models.IntegerField(blank=True, null=True)), - ('constructionCostActual', models.IntegerField(blank=True, null=True)), - ('numRooms', models.IntegerField(blank=True, null=True)), - ('numWashrooms', models.IntegerField(blank=True, null=True)), - ('remarks', models.TextField(blank=True, null=True)), - ('verified', models.BooleanField(default=False)), - ], - options={ - 'ordering': ['-id'], - }, - ), - migrations.CreateModel( - name='InventoryType', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('rate', models.IntegerField()), - ('manufacturer', models.CharField(blank=True, max_length=100, null=True)), - ('model', models.CharField(blank=True, max_length=100, null=True)), - ('remarks', models.TextField(blank=True, null=True)), - ], - ), - migrations.CreateModel( - name='Work', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('workType', models.CharField(choices=[('CW', 'Construction'), ('MW', 'Maintenance')], default='MW', max_length=2)), - ('contractorName', models.CharField(max_length=100)), - ('status', models.CharField(choices=[('OS', 'On Schedule'), ('DL', 'Delayed')], default='OS', max_length=2)), - ('dateIssued', models.DateField()), - ('dateStarted', models.DateField(blank=True, null=True)), - ('dateCompleted', models.DateField(blank=True, null=True)), - ('costEstimated', models.IntegerField(blank=True, null=True)), - ('costActual', models.IntegerField(blank=True, null=True)), - ('remarks', models.TextField(blank=True, null=True)), - ('verified', models.BooleanField(default=False)), - ('building', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='estate_module.building')), - ], - options={ - 'ordering': ['-id'], - }, - ), - migrations.CreateModel( - name='SubWork', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('dateIssued', models.DateField()), - ('dateStarted', models.DateField(blank=True, null=True)), - ('dateCompleted', models.DateField(blank=True, null=True)), - ('costEstimated', models.IntegerField(blank=True, null=True)), - ('costActual', models.IntegerField(blank=True, null=True)), - ('remarks', models.TextField(blank=True, null=True)), - ('work', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='estate_module.work')), - ], - options={ - 'ordering': ['-id'], - }, - ), - migrations.CreateModel( - name='InventoryNonConsumable', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('quantity', models.IntegerField()), - ('dateOrdered', models.DateField()), - ('dateReceived', models.DateField(blank=True, null=True)), - ('remarks', models.TextField(blank=True, null=True)), - ('serial_no', models.CharField(max_length=20)), - ('dateLastVerified', models.DateField()), - ('building', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='estate_module.building')), - ('inventoryType', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='estate_module.inventorytype')), - ('issued_to', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL)), - ('work', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='estate_module.work')), - ], - options={ - 'ordering': ['-id'], - 'abstract': False, - }, - ), - migrations.CreateModel( - name='InventoryConsumable', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('quantity', models.IntegerField()), - ('dateOrdered', models.DateField()), - ('dateReceived', models.DateField(blank=True, null=True)), - ('remarks', models.TextField(blank=True, null=True)), - ('presentQuantity', models.IntegerField()), - ('building', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='estate_module.building')), - ('inventoryType', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='estate_module.inventorytype')), - ('work', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='estate_module.work')), - ], - options={ - 'ordering': ['-id'], - 'abstract': False, - }, - ), - ] diff --git a/FusionIIIT/applications/estate_module/migrations/__init__.py b/FusionIIIT/applications/estate_module/migrations/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/FusionIIIT/applications/feeds/migrations/0001_initial.py b/FusionIIIT/applications/feeds/migrations/0001_initial.py deleted file mode 100644 index 30ae94c92..000000000 --- a/FusionIIIT/applications/feeds/migrations/0001_initial.py +++ /dev/null @@ -1,148 +0,0 @@ -# Generated by Django 3.1.5 on 2023-03-15 18:53 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ] - - operations = [ - migrations.CreateModel( - name='AllTags', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('tag', models.CharField(choices=[('CSE', 'CSE'), ('ECE', 'ECE'), ('Mechanical', 'Mechanical'), ('Technical-Clubs', 'Technical Clubs'), ('Cultural-Clubs', 'Cultural Clubs'), ('Sports-Clubs', 'Sports Clubs'), ('Business-and-Career', 'Business and Career'), ('Entertainment', 'Entertainment'), ('IIITDMJ-Campus', 'IIITDMJ Campus'), ('Jabalpur-city', 'Jabalpur city'), ('IIITDMJ-Rules-and-Regulations', 'IIITDMJ rules and regulations'), ('Academics', 'Academics'), ('IIITDMJ', 'IIITDMJ'), ('Life-Relationship-and-Self', 'Life Relationship and Self'), ('Technology-and-Education', 'Technology and Education'), ('Programmes', 'Programmes'), ('Others', 'Others'), ('Design', 'Design')], default='CSE', max_length=100)), - ('subtag', models.CharField(choices=[('Web-Development', 'Web Development'), ('Competitive-Programming', 'Competitive Programming'), ('Programming-Languages', 'Programming-Languages'), ('Data-Science', 'Data-Science'), ('Ethical-Hacking-and-Cyber-Security', 'Ethical hacking and cyber security'), ('Cryptography-and-Network-Security', 'cryptography and network security'), ('Software-Engineering', 'Software-Engineering'), ('Algorithm', 'Algorithm'), ('Mobile-Development', 'Mobile-Development'), ('Game-Development', 'Game-Development'), ('Artificial-Intelligence', 'Artificial Intelligence'), ('Electronics-Circuit-Design', 'Electronics Circuit Design'), ('Wireless-Communication', 'Wireless Communication'), ('Embedded-System', 'Embedded Systems'), ('VLSI', 'VLSI'), ('Control-System', 'Control Systems'), ('Robotics-and-others', 'Robotics and Others'), ('Microcontrollers', 'Microcontrollers'), ('IOT', 'IOT'), ('Robotics', 'Robotics'), ('Thermodynamics', 'Thermodynamics'), ('Nanatechnology', 'Nanatechnology'), ('Manufacturing', 'Manufacturing'), ('Programming-and-Webix-Club', 'Programming and Webix Club'), ('Electronics-Club', 'Electronics Club'), ('Business-and-Management-Club', 'Business and Management Club'), ('Robotics-Club', 'Robotics Club'), ('CAD-Club', 'CAD Club'), ('Astronomy-and-Physics-Society', 'ASTRONOMY AND PHYSICS SOCIETY'), ('Aakriti-The-Film-Making-and-Photography-Club', 'AAKRITI-THE FILM MAKING AND PHOTOGRAPHY CLUB'), ('AUTOMOTIVE-AND-FABRICATION-CLUB', 'AUTOMOTIVE AND FABRICATION CLUB'), ('RACING-CLUB', 'RACING CLUB'), ('SAAZ-MUSIC-CLUB', 'SAAZ-MUSIC CLUB'), ('SAMVAAD-THE-LITERATURE-AND-QUIZZING-SOCIETY', 'SAMVAAD-THE LITERATURE AND QUIZZING SOCIETY'), ('ABHIVYAKTI-ARTS-CLUB', 'ABHIVYAKTI-ARTS CLUB'), ('JAZBAAT-THE-DRAMATICS-SOCIETY', 'JAZBAAT-THE DRAMATICS SOCIETY'), ('AAVARTAN-DANCE-CLUB', 'AAVARTAN-DANCE CLUB'), ('BADMINTON-CLUB', 'BADMINTON CLUB'), ('LAWN-TENNIS-&-BASKETBALL-CLUB', 'LAWN TENNIS&BASKETBALL CLUB'), ('TABLE-TENNIS', 'TABLE TENNIS'), ('CHESS-&-CARROM-CLUB', 'CHESS & CARROM CLUB'), ('CRICKET-CLUB', 'CRICKET CLUB'), ('FOOTBALL-CLUB', 'FOOTBALL CLUB'), ('VOLLEYBALL-CLUB', 'VOLLEYBALL CLUB'), ('ATHLETICS-CLUB', 'ATHLETICS CLUB'), ('Business-Models-and-Strategies', 'Business Models and strategies'), ('Startups-and-Stratup-Strategies', 'Startups and Stratup Strategies'), ('Entrepreneurship', 'Entrepreneurship'), ('Finance', 'Finance'), ('Marketing', 'Marketing'), ('Stock-Market', 'Stock market'), ('Career-Advice', 'Career Advice'), ('Job-Interviews', 'Job Interviews'), ('Journalism', 'Journalism'), ('Entertainment', 'Entertainment'), ('Hollywood-and-Movies', 'Hollywood and Movies'), ('Music', 'Music'), ('Fashion-and-Style', 'Fashion and Style'), ('IIITDMJ-Campus', 'IIITDMJ-Campus'), ('Jabalpur-City', 'Jabalpur City'), ('IIITDMJ-rules-and-Regulations', 'IIITDMJ rules and regulations'), ('Academic-Office-Stuffs', 'Academic office stuffs'), ('Academic-Courses', 'Academic courses'), ('Central-Mess', 'Central Mess'), ('Alumni', 'Alumni'), ('Hostels', 'Hostels'), ('PHC', 'PHC'), ('Activities', 'Activities'), ('Counselling', 'Counselling'), ('Achievments', 'Achievments'), ('Library', 'Library'), ('Faculty', 'Faculty'), ('Staff', 'Staff'), ('College-Fest', 'College Fest'), ('Workshops', 'Workshops'), ('Campus-Recruitments', 'Campus Recruitments'), ('Jagrati', 'Jagrati'), ('Self-Improvement', 'Self Improvement'), ('Friendship', 'Friendship'), ('Experiences', 'Experiences'), ('Dating-and-Relationships', 'Dating and Relationships'), ('Interpersonal-Interactions', 'Interpersonal Interactions'), ('Life-and-Social-Advice', 'Life and Social Advice'), ('Philosophy', 'Philosophy'), ('Technology-Trends', 'Technology Trends'), ('TED', 'TED'), ('Higher-Education', 'Higher Education'), ('Science-and-Universe', 'Science and Universe'), ('Social-Media', 'Social-Media'), ('Toron', 'Toron'), ('Jobs-and-Internships', 'Jobs and Internships'), ('Btech', 'Btech'), ('Mtech', 'Mtech'), ('Bdes', 'Bdes'), ('Mdes', 'Mdes'), ('Phd', 'Phd'), ('Mechatronics', 'Mechatronics'), ('others', 'others')], default='Web-Development', max_length=100, unique=True)), - ], - ), - migrations.CreateModel( - name='AskaQuestion', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('can_delete', models.BooleanField(default=False)), - ('can_update', models.BooleanField(default=False)), - ('subject', models.CharField(max_length=100)), - ('description', models.CharField(blank=True, default='', max_length=500, null=True)), - ('file', models.FileField(blank=True, null=True, upload_to='feeds/files')), - ('uploaded_at', models.DateTimeField(default=django.utils.timezone.now)), - ('is_liked', models.BooleanField(default=False)), - ('is_requested', models.BooleanField(default=False)), - ('request', models.IntegerField(default=0)), - ('anonymous_ask', models.BooleanField(default=False)), - ('dislikes', models.ManyToManyField(blank=True, default=1, related_name='dislikes', to=settings.AUTH_USER_MODEL)), - ('likes', models.ManyToManyField(blank=True, default=1, related_name='likes', to=settings.AUTH_USER_MODEL)), - ('requests', models.ManyToManyField(blank=True, default=1, related_name='requests', to=settings.AUTH_USER_MODEL)), - ('select_tag', models.ManyToManyField(to='feeds.AllTags')), - ('user', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='Comments', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('comment_text', models.CharField(max_length=5000)), - ('commented_at', models.DateTimeField(default=django.utils.timezone.now)), - ('is_liked', models.BooleanField(default=False)), - ('likes_comment', models.ManyToManyField(blank=True, default=1, related_name='likes_comment', to=settings.AUTH_USER_MODEL)), - ('question', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='feeds.askaquestion')), - ('user', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='Roles', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('role', models.CharField(max_length=100)), - ('active', models.BooleanField(default=True)), - ('user', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='report', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('report_msg', models.CharField(default='', max_length=1000)), - ('question', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='feeds.askaquestion')), - ('user', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='Reply', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('msg', models.CharField(max_length=1000)), - ('content', models.CharField(default='', max_length=5000)), - ('replied_at', models.DateTimeField(default=django.utils.timezone.now)), - ('comment', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='feeds.comments')), - ('replies', models.ManyToManyField(blank=True, default=1, related_name='replies', to=settings.AUTH_USER_MODEL)), - ('user', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='QuestionAccessControl', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('canVote', models.BooleanField()), - ('canAnswer', models.BooleanField()), - ('canComment', models.BooleanField()), - ('created_at', models.DateTimeField(default=django.utils.timezone.now)), - ('posted_by', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='feeds.roles')), - ('question', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, related_name='question_list', to='feeds.askaquestion')), - ], - ), - migrations.CreateModel( - name='Profile', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('bio', models.CharField(blank=True, max_length=250)), - ('profile_picture', models.ImageField(blank=True, null=True, upload_to='feeds/profile_pictures')), - ('profile_view', models.IntegerField(default=0)), - ('user', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='AnsweraQuestion', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('content', models.TextField(max_length=1000)), - ('uploaded_at', models.DateTimeField(default=django.utils.timezone.now)), - ('is_liked', models.BooleanField(default=False)), - ('answers', models.ManyToManyField(blank=True, default=1, related_name='answers', to=settings.AUTH_USER_MODEL)), - ('dislikes', models.ManyToManyField(blank=True, default=1, related_name='answer_dislikes', to=settings.AUTH_USER_MODEL)), - ('likes', models.ManyToManyField(blank=True, default=1, related_name='answer_likes', to=settings.AUTH_USER_MODEL)), - ('question', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='feeds.askaquestion')), - ('user', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='tags', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('my_tag', models.CharField(choices=[('CSE', 'CSE'), ('ECE', 'ECE'), ('Mechanical', 'Mechanical'), ('Technical-Clubs', 'Technical Clubs'), ('Cultural-Clubs', 'Cultural Clubs'), ('Sports-Clubs', 'Sports Clubs'), ('Business-and-Career', 'Business and Career'), ('Entertainment', 'Entertainment'), ('IIITDMJ-Campus', 'IIITDMJ Campus'), ('Jabalpur-city', 'Jabalpur city'), ('IIITDMJ-Rules-and-Regulations', 'IIITDMJ rules and regulations'), ('Academics', 'Academics'), ('IIITDMJ', 'IIITDMJ'), ('Life-Relationship-and-Self', 'Life Relationship and Self'), ('Technology-and-Education', 'Technology and Education'), ('Programmes', 'Programmes'), ('Others', 'Others'), ('Design', 'Design')], default=1, max_length=100)), - ('my_subtag', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='feeds.alltags')), - ('user', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - options={ - 'unique_together': {('user', 'my_subtag')}, - }, - ), - migrations.CreateModel( - name='hidden', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('question', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='feeds.askaquestion')), - ('user', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - options={ - 'unique_together': {('user', 'question')}, - }, - ), - ] diff --git a/FusionIIIT/applications/feeds/migrations/__init__.py b/FusionIIIT/applications/feeds/migrations/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/FusionIIIT/applications/filetracking/migrations/0001_initial.py b/FusionIIIT/applications/filetracking/migrations/0001_initial.py deleted file mode 100644 index 6924ae1ff..000000000 --- a/FusionIIIT/applications/filetracking/migrations/0001_initial.py +++ /dev/null @@ -1,53 +0,0 @@ -# Generated by Django 3.1.5 on 2023-03-15 18:53 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('globals', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='File', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('subject', models.CharField(blank=True, max_length=100, null=True)), - ('description', models.CharField(blank=True, max_length=400, null=True)), - ('upload_date', models.DateTimeField(auto_now_add=True)), - ('upload_file', models.FileField(blank=True, upload_to='')), - ('is_read', models.BooleanField(default=False)), - ('designation', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='upload_designation', to='globals.designation')), - ('uploader', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='uploaded_files', to='globals.extrainfo')), - ], - options={ - 'db_table': 'File', - }, - ), - migrations.CreateModel( - name='Tracking', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('receive_date', models.DateTimeField(auto_now_add=True)), - ('forward_date', models.DateTimeField(auto_now_add=True)), - ('remarks', models.CharField(blank=True, max_length=250, null=True)), - ('upload_file', models.FileField(blank=True, upload_to='')), - ('is_read', models.BooleanField(default=False)), - ('current_design', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='globals.holdsdesignation')), - ('current_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')), - ('file_id', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='filetracking.file')), - ('receive_design', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='rec_design', to='globals.designation')), - ('receiver_id', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='receiver_id', to=settings.AUTH_USER_MODEL)), - ], - options={ - 'db_table': 'Tracking', - }, - ), - ] diff --git a/FusionIIIT/applications/filetracking/migrations/0002_auto_20240218_1321.py b/FusionIIIT/applications/filetracking/migrations/0002_auto_20240218_1321.py deleted file mode 100644 index 7344b8c37..000000000 --- a/FusionIIIT/applications/filetracking/migrations/0002_auto_20240218_1321.py +++ /dev/null @@ -1,33 +0,0 @@ -# Generated by Django 3.1.5 on 2024-02-18 13:21 - -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/migrations/__init__.py b/FusionIIIT/applications/filetracking/migrations/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/FusionIIIT/applications/finance_accounts/migrations/0001_initial.py b/FusionIIIT/applications/finance_accounts/migrations/0001_initial.py deleted file mode 100644 index 4dfa8fed7..000000000 --- a/FusionIIIT/applications/finance_accounts/migrations/0001_initial.py +++ /dev/null @@ -1,100 +0,0 @@ -# Generated by Django 3.1.5 on 2023-03-15 18:53 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ] - - operations = [ - migrations.CreateModel( - name='Bank', - fields=[ - ('bank_id', models.AutoField(primary_key=True, serialize=False)), - ('Account_no', models.IntegerField(default=0, unique=True)), - ('Bank_Name', models.CharField(max_length=50)), - ('IFSC_Code', models.CharField(max_length=20, unique=True)), - ('Branch_Name', models.CharField(max_length=80)), - ], - ), - migrations.CreateModel( - name='Company', - fields=[ - ('company_id', models.AutoField(primary_key=True, serialize=False)), - ('Company_Name', models.CharField(max_length=20, unique=True)), - ('Start_Date', models.DateField()), - ('End_Date', models.DateField(blank=True, null=True)), - ('Description', models.CharField(max_length=200)), - ('Status', models.CharField(max_length=200)), - ], - ), - migrations.CreateModel( - name='Payments', - fields=[ - ('payment_id', models.AutoField(primary_key=True, serialize=False)), - ('TransactionId', models.IntegerField(default=0, unique=True)), - ('ToWhom', models.CharField(max_length=80)), - ('FromWhom', models.CharField(max_length=80)), - ('Purpose', models.CharField(max_length=20)), - ('Date', models.DateField()), - ], - ), - migrations.CreateModel( - name='Paymentscheme', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('month', models.CharField(max_length=70, null=True)), - ('year', models.IntegerField(null=True)), - ('pf', models.IntegerField(null=True)), - ('name', models.CharField(max_length=70)), - ('designation', models.CharField(max_length=50)), - ('pay', models.IntegerField()), - ('gr_pay', models.IntegerField()), - ('da', models.IntegerField()), - ('ta', models.IntegerField()), - ('hra', models.IntegerField()), - ('fpa', models.IntegerField()), - ('special_allow', models.IntegerField()), - ('nps', models.IntegerField()), - ('gpf', models.IntegerField()), - ('income_tax', models.IntegerField()), - ('p_tax', models.IntegerField()), - ('gslis', models.IntegerField()), - ('gis', models.IntegerField()), - ('license_fee', models.IntegerField()), - ('electricity_charges', models.IntegerField()), - ('others', models.IntegerField()), - ('gr_reduction', models.IntegerField(default=0)), - ('net_payment', models.IntegerField(default=0)), - ('senior_verify', models.BooleanField(default=False)), - ('ass_registrar_verify', models.BooleanField(default=False)), - ('ass_registrar_aud_verify', models.BooleanField(default=False)), - ('registrar_director_verify', models.BooleanField(default=False)), - ('runpayroll', models.BooleanField(default=False)), - ('view', models.BooleanField(default=True)), - ], - ), - migrations.CreateModel( - name='Receipts', - fields=[ - ('receipt_id', models.AutoField(primary_key=True, serialize=False)), - ('TransactionId', models.IntegerField(default=0, unique=True)), - ('ToWhom', models.CharField(max_length=80)), - ('FromWhom', models.CharField(max_length=80)), - ('Purpose', models.CharField(max_length=20)), - ('Date', models.DateField()), - ], - ), - migrations.AddConstraint( - model_name='paymentscheme', - constraint=models.UniqueConstraint(fields=('month', 'year', 'pf'), name='Unique Contraint 1'), - ), - migrations.AddConstraint( - model_name='bank', - constraint=models.UniqueConstraint(fields=('Bank_Name', 'Branch_Name'), name='Unique Contraint 2'), - ), - ] diff --git a/FusionIIIT/applications/finance_accounts/migrations/__init__.py b/FusionIIIT/applications/finance_accounts/migrations/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/FusionIIIT/applications/globals/migrations/0001_initial.py b/FusionIIIT/applications/globals/migrations/0001_initial.py deleted file mode 100644 index 1fc3a8925..000000000 --- a/FusionIIIT/applications/globals/migrations/0001_initial.py +++ /dev/null @@ -1,112 +0,0 @@ -# Generated by Django 3.1.5 on 2023-03-15 18:53 - -import applications.globals.models -import datetime -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ] - - operations = [ - migrations.CreateModel( - name='DepartmentInfo', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100, unique=True)), - ], - ), - migrations.CreateModel( - name='Designation', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(default='student', max_length=50, unique=True)), - ('full_name', models.CharField(default='Computer Science and Engineering', max_length=100)), - ('type', models.CharField(choices=[('academic', 'Academic Designation'), ('administrative', 'Administrative Designation')], default='academic', max_length=30)), - ], - ), - migrations.CreateModel( - name='ExtraInfo', - fields=[ - ('id', models.CharField(max_length=20, primary_key=True, serialize=False)), - ('title', models.CharField(choices=[('Mr.', 'Mr.'), ('Mrs.', 'Mrs.'), ('Ms.', 'Ms.'), ('Dr.', 'Dr.'), ('Professor', 'Prof.'), ('Shreemati', 'Shreemati'), ('Shree', 'Shree')], default='Dr.', max_length=20)), - ('sex', models.CharField(choices=[('M', 'Male'), ('F', 'Female'), ('O', 'Other')], default='M', max_length=2)), - ('date_of_birth', models.DateField(default=datetime.date(1970, 1, 1))), - ('user_status', models.CharField(choices=[('PRESENT', 'PRESENT'), ('NEW', 'NEW')], default='PRESENT', max_length=50)), - ('address', models.TextField(default='', max_length=1000)), - ('phone_no', models.BigIntegerField(default=9999999999, null=True)), - ('user_type', models.CharField(choices=[('student', 'student'), ('staff', 'staff'), ('compounder', 'compounder'), ('faculty', 'faculty')], max_length=20)), - ('profile_picture', models.ImageField(blank=True, null=True, upload_to='globals/profile_pictures')), - ('about_me', models.TextField(blank=True, default='NA', max_length=1000)), - ('date_modified', models.DateTimeField(blank=True, null=True, verbose_name='date_updated')), - ('department', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='globals.departmentinfo')), - ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='Faculty', - fields=[ - ('id', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False, to='globals.extrainfo')), - ], - ), - migrations.CreateModel( - name='Staff', - fields=[ - ('id', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False, to='globals.extrainfo')), - ], - ), - migrations.CreateModel( - name='IssueImage', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('image', models.ImageField(upload_to=applications.globals.models.Issue_image_directory)), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='Issue', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('report_type', models.CharField(choices=[('feature_request', 'Feature Request'), ('bug_report', 'Bug Report'), ('security_issue', 'Security Issue'), ('ui_issue', 'User Interface Issue'), ('other', 'Other than the ones listed')], max_length=63)), - ('module', models.CharField(choices=[('academic_information', 'Academic'), ('central_mess', 'Central Mess'), ('complaint_system', 'Complaint System'), ('eis', 'Employee Imformation System'), ('file_tracking', 'File Tracking System'), ('health_center', 'Health Center'), ('leave', 'Leave'), ('online_cms', 'Online Course Management System'), ('placement_cell', 'Placement Cell'), ('scholarships', 'Scholarships'), ('visitor_hostel', 'Visitor Hostel'), ('other', 'Other')], max_length=63)), - ('closed', models.BooleanField(default=False)), - ('text', models.TextField()), - ('title', models.CharField(max_length=255)), - ('timestamp', models.DateTimeField(auto_now=True)), - ('added_on', models.DateTimeField(auto_now_add=True)), - ('images', models.ManyToManyField(blank=True, to='globals.IssueImage')), - ('support', models.ManyToManyField(blank=True, to=settings.AUTH_USER_MODEL)), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='reported_issues', to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='Feedback', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('rating', models.IntegerField(choices=[(1, 1), (2, 2), (3, 3), (4, 4), (5, 5)])), - ('feedback', models.TextField(blank=True)), - ('timestamp', models.DateTimeField(auto_now=True)), - ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='fusion_feedback', to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='HoldsDesignation', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('held_at', models.DateTimeField(auto_now=True)), - ('designation', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='designees', to='globals.designation')), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='holds_designations', to=settings.AUTH_USER_MODEL)), - ('working', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='current_designation', to=settings.AUTH_USER_MODEL)), - ], - options={ - 'unique_together': {('user', 'designation'), ('working', 'designation')}, - }, - ), - ] diff --git a/FusionIIIT/applications/globals/migrations/0002_auto_20240304_1820.py b/FusionIIIT/applications/globals/migrations/0002_auto_20240304_1820.py deleted file mode 100644 index 44de00043..000000000 --- a/FusionIIIT/applications/globals/migrations/0002_auto_20240304_1820.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.1.5 on 2024-03-04 18:20 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('globals', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='extrainfo', - name='user_status', - field=models.CharField(choices=[('NEW', 'NEW'), ('PRESENT', 'PRESENT')], default='PRESENT', max_length=50), - ), - ] diff --git a/FusionIIIT/applications/globals/migrations/0003_auto_20240306_1839.py b/FusionIIIT/applications/globals/migrations/0003_auto_20240306_1839.py deleted file mode 100644 index 5c76dbd81..000000000 --- a/FusionIIIT/applications/globals/migrations/0003_auto_20240306_1839.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.1.5 on 2024-03-06 18:39 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('globals', '0002_auto_20240304_1820'), - ] - - operations = [ - migrations.AlterField( - model_name='extrainfo', - name='user_status', - field=models.CharField(choices=[('PRESENT', 'PRESENT'), ('NEW', 'NEW')], default='PRESENT', max_length=50), - ), - ] diff --git a/FusionIIIT/applications/globals/migrations/__init__.py b/FusionIIIT/applications/globals/migrations/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/FusionIIIT/applications/gymkhana/migrations/0001_initial.py b/FusionIIIT/applications/gymkhana/migrations/0001_initial.py deleted file mode 100644 index e140005a1..000000000 --- a/FusionIIIT/applications/gymkhana/migrations/0001_initial.py +++ /dev/null @@ -1,243 +0,0 @@ -# Generated by Django 3.1.5 on 2023-03-15 18:53 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('academic_information', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('globals', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='Club_info', - fields=[ - ('club_name', models.CharField(max_length=50, primary_key=True, serialize=False)), - ('club_website', models.CharField(default='hello', max_length=150, null=True)), - ('category', models.CharField(choices=[('Technical', 'Technical'), ('Sports', 'Sports'), ('Cultural', 'Cultural')], max_length=50)), - ('club_file', models.FileField(null=True, upload_to='gymkhana/club_poster')), - ('activity_calender', models.FileField(default=' ', null=True, upload_to='gymkhana/activity_calender')), - ('description', models.TextField(max_length=256, null=True)), - ('alloted_budget', models.IntegerField(default=0, null=True)), - ('spent_budget', models.IntegerField(default=0, null=True)), - ('avail_budget', models.IntegerField(default=0, null=True)), - ('status', models.CharField(choices=[('open', 'Open'), ('confirmed', 'Confirmed'), ('rejected', 'Rejected')], default='open', max_length=50)), - ('co_coordinator', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='coco_of', to='academic_information.student')), - ('co_ordinator', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='co_of', to='academic_information.student')), - ('faculty_incharge', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='faculty_incharge_of', to='globals.faculty')), - ], - options={ - 'db_table': 'Club_info', - }, - ), - migrations.CreateModel( - name='Fest_budget', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('fest', models.CharField(choices=[('Abhikalpan', 'Abhikalpan'), ('Gusto', 'Gusto'), ('Tarang', 'Tarang')], max_length=50)), - ('budget_amt', models.IntegerField(default=0)), - ('budget_file', models.FileField(upload_to='uploads/')), - ('year', models.CharField(max_length=10, null=True)), - ('description', models.TextField(max_length=256)), - ('status', models.CharField(choices=[('open', 'Open'), ('confirmed', 'Confirmed'), ('rejected', 'Rejected')], default='open', max_length=50)), - ('remarks', models.CharField(max_length=256, null=True)), - ], - options={ - 'db_table': 'Fest_budget', - }, - ), - migrations.CreateModel( - name='Form_available', - fields=[ - ('roll', models.CharField(default=2016001, max_length=7, primary_key=True, serialize=False)), - ('status', models.BooleanField(default=True, max_length=5)), - ('form_name', models.CharField(default='senate_registration', max_length=30)), - ], - options={ - 'db_table': 'Form_available', - }, - ), - migrations.CreateModel( - name='Registration_form', - fields=[ - ('roll', models.CharField(default='2016001', max_length=7, primary_key=True, serialize=False)), - ('user_name', models.CharField(default='Student', max_length=40)), - ('branch', models.CharField(default='open', max_length=20)), - ('cpi', models.FloatField(default=6.0, max_length=3)), - ('programme', models.CharField(default='B.tech', max_length=20)), - ], - options={ - 'db_table': 'Registration_form', - }, - ), - migrations.CreateModel( - name='Voting_polls', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('title', models.CharField(max_length=200)), - ('description', models.CharField(max_length=5000)), - ('pub_date', models.DateTimeField(default=django.utils.timezone.now)), - ('exp_date', models.DateTimeField(default=django.utils.timezone.now)), - ('created_by', models.CharField(max_length=100, null=True)), - ('groups', models.CharField(default='{}', max_length=500)), - ], - options={ - 'ordering': ['-pub_date'], - }, - ), - migrations.CreateModel( - name='Voting_voters', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('student_id', models.CharField(max_length=50)), - ('poll_event', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='gymkhana.voting_polls')), - ], - ), - migrations.CreateModel( - name='Voting_choices', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('title', models.CharField(max_length=200)), - ('description', models.CharField(default='', max_length=500)), - ('votes', models.IntegerField(default=0)), - ('poll_event', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='gymkhana.voting_polls')), - ], - options={ - 'get_latest_by': 'votes', - }, - ), - migrations.CreateModel( - name='Session_info', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('venue', models.CharField(choices=[('Classroom', (('CR101', 'CR101'), ('CR102', 'CR102'))), ('Lecturehall', (('L101', 'L101'), ('L102', 'L102')))], max_length=50)), - ('date', models.DateField(default=None)), - ('start_time', models.TimeField(default=None)), - ('end_time', models.TimeField(default=None, null=True)), - ('session_poster', models.ImageField(null=True, upload_to='gymkhana/session_poster')), - ('details', models.TextField(max_length=256, null=True)), - ('status', models.CharField(choices=[('open', 'Open'), ('confirmed', 'Confirmed'), ('rejected', 'Rejected')], default='open', max_length=50)), - ('club', models.ForeignKey(max_length=50, null=True, on_delete=django.db.models.deletion.CASCADE, to='gymkhana.club_info')), - ], - options={ - 'db_table': 'Session_info', - }, - ), - migrations.CreateModel( - name='Other_report', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('event_name', models.CharField(max_length=50)), - ('date', models.DateTimeField(blank=True, default=django.utils.timezone.now, max_length=50)), - ('event_details', models.FileField(upload_to='uploads/')), - ('description', models.TextField(max_length=256, null=True)), - ('incharge', models.ForeignKey(max_length=256, on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')), - ], - options={ - 'db_table': 'Other_report', - }, - ), - migrations.CreateModel( - name='Event_info', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('event_name', models.CharField(max_length=256)), - ('venue', models.CharField(choices=[('Classroom', (('CR101', 'CR101'), ('CR102', 'CR102'))), ('Lecturehall', (('L101', 'L101'), ('L102', 'L102')))], max_length=50)), - ('incharge', models.CharField(max_length=256)), - ('date', models.DateField(default=None)), - ('start_time', models.TimeField(default=None)), - ('end_time', models.TimeField(default=None, null=True)), - ('event_poster', models.FileField(blank=True, upload_to='gymkhana/event_poster')), - ('details', models.TextField(max_length=256, null=True)), - ('status', models.CharField(choices=[('open', 'Open'), ('confirmed', 'Confirmed'), ('rejected', 'Rejected')], default='open', max_length=50)), - ('club', models.ForeignKey(max_length=50, null=True, on_delete=django.db.models.deletion.CASCADE, to='gymkhana.club_info')), - ], - options={ - 'db_table': 'Event_info', - }, - ), - migrations.CreateModel( - name='Core_team', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('team', models.CharField(max_length=50)), - ('year', models.DateTimeField(max_length=6, null=True)), - ('fest_name', models.CharField(choices=[('Abhikalpan', 'Abhikalpan'), ('Gusto', 'Gusto'), ('Tarang', 'Tarang')], max_length=256)), - ('pda', models.TextField(max_length=256)), - ('remarks', models.CharField(max_length=256, null=True)), - ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='applied_for', to='academic_information.student')), - ], - options={ - 'db_table': 'Core_team', - }, - ), - migrations.CreateModel( - name='Club_report', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('event_name', models.CharField(max_length=50)), - ('date', models.DateTimeField(blank=True, default=django.utils.timezone.now, max_length=50)), - ('event_details', models.FileField(upload_to='uploads/')), - ('description', models.TextField(max_length=256, null=True)), - ('club', models.ForeignKey(max_length=50, on_delete=django.db.models.deletion.CASCADE, to='gymkhana.club_info')), - ('incharge', models.ForeignKey(max_length=256, on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')), - ], - options={ - 'db_table': 'Club_report', - }, - ), - migrations.CreateModel( - name='Club_member', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('description', models.TextField(max_length=256, null=True)), - ('status', models.CharField(choices=[('open', 'Open'), ('confirmed', 'Confirmed'), ('rejected', 'Rejected')], default='open', max_length=50)), - ('remarks', models.CharField(max_length=256, null=True)), - ('club', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='this_club', to='gymkhana.club_info')), - ('member', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='member_of', to='academic_information.student')), - ], - options={ - 'db_table': 'Club_member', - }, - ), - migrations.CreateModel( - name='Club_budget', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('budget_for', models.CharField(max_length=256)), - ('budget_amt', models.IntegerField(default=0)), - ('budget_file', models.FileField(upload_to='uploads/')), - ('description', models.TextField(max_length=256)), - ('status', models.CharField(choices=[('open', 'Open'), ('confirmed', 'Confirmed'), ('rejected', 'Rejected')], default='open', max_length=50)), - ('remarks', models.CharField(max_length=256, null=True)), - ('club', models.ForeignKey(max_length=50, on_delete=django.db.models.deletion.CASCADE, to='gymkhana.club_info')), - ], - options={ - 'db_table': 'Club_budget', - }, - ), - migrations.CreateModel( - name='Change_office', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('status', models.CharField(choices=[('open', 'Open'), ('confirmed', 'Confirmed'), ('rejected', 'Rejected')], default='open', max_length=50)), - ('date_request', models.DateTimeField(blank=True, default=django.utils.timezone.now, max_length=50)), - ('date_approve', models.DateTimeField(blank=True, max_length=50)), - ('remarks', models.CharField(max_length=256, null=True)), - ('club', models.ForeignKey(max_length=50, on_delete=django.db.models.deletion.CASCADE, to='gymkhana.club_info')), - ('co_coordinator', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='coco_of', to=settings.AUTH_USER_MODEL)), - ('co_ordinator', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='co_of', to=settings.AUTH_USER_MODEL)), - ], - options={ - 'db_table': 'Change_office', - }, - ), - ] diff --git a/FusionIIIT/applications/gymkhana/migrations/__init__.py b/FusionIIIT/applications/gymkhana/migrations/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/FusionIIIT/applications/health_center/migrations/0001_initial.py b/FusionIIIT/applications/health_center/migrations/0001_initial.py deleted file mode 100644 index ee068099e..000000000 --- a/FusionIIIT/applications/health_center/migrations/0001_initial.py +++ /dev/null @@ -1,168 +0,0 @@ -# Generated by Django 3.1.5 on 2023-03-15 18:53 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('globals', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='Appointment', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('description', models.CharField(max_length=50)), - ('date', models.DateField()), - ], - ), - migrations.CreateModel( - name='Counter', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('count', models.IntegerField(default=0)), - ('fine', models.IntegerField(default=0)), - ('doc_count', models.IntegerField(default=0)), - ], - ), - migrations.CreateModel( - name='Doctor', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('doctor_name', models.IntegerField(choices=[(0, 'Dr.Sharma'), (1, 'Dr.Vinay')])), - ('doctor_phone', models.CharField(max_length=10)), - ('specialization', models.CharField(max_length=100)), - ('active', models.BooleanField(default=True)), - ], - ), - migrations.CreateModel( - name='Hospital', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('hospital_name', models.CharField(max_length=100)), - ('phone', models.CharField(max_length=10)), - ], - ), - migrations.CreateModel( - name='Stock', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('medicine_name', models.CharField(max_length=100)), - ('quantity', models.IntegerField(default=0)), - ('threshold', models.IntegerField(default=10)), - ], - ), - migrations.CreateModel( - name='Schedule', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('day', models.IntegerField(choices=[(0, 'Monday'), (1, 'Tuesday'), (2, 'Wednesday'), (3, 'Thursday'), (4, 'Friday'), (5, 'Saturday'), (6, 'Sunday')])), - ('from_time', models.TimeField(blank=True, null=True)), - ('to_time', models.TimeField(blank=True, null=True)), - ('room', models.IntegerField()), - ('date', models.DateField(auto_now=True)), - ('doctor_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='health_center.doctor')), - ], - ), - migrations.CreateModel( - name='Prescription', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('details', models.CharField(max_length=100)), - ('date', models.DateField()), - ('test', models.CharField(blank=True, max_length=200, null=True)), - ('appointment', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='health_center.appointment')), - ('doctor_id', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='health_center.doctor')), - ('user_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')), - ], - ), - migrations.CreateModel( - name='Prescribed_medicine', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('quantity', models.IntegerField(default=0)), - ('days', models.IntegerField(default=0)), - ('times', models.IntegerField(default=0)), - ('medicine_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='health_center.stock')), - ('prescription_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='health_center.prescription')), - ], - ), - migrations.CreateModel( - name='Medicine', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('quantity', models.IntegerField(default=0)), - ('days', models.IntegerField(default=0)), - ('times', models.IntegerField(default=0)), - ('medicine_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='health_center.stock')), - ('patient', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')), - ], - ), - migrations.CreateModel( - name='Hospital_admit', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('hospital_doctor', models.CharField(max_length=100)), - ('admission_date', models.DateField()), - ('discharge_date', models.DateField(blank=True, null=True)), - ('reason', models.CharField(max_length=50)), - ('doctor_id', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='health_center.doctor')), - ('hospital_name', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='health_center.hospital')), - ('user_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')), - ], - ), - migrations.CreateModel( - name='Expiry', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('quantity', models.IntegerField(default=0)), - ('supplier', models.CharField(max_length=50)), - ('expiry_date', models.DateField()), - ('returned', models.BooleanField(default=False)), - ('return_date', models.DateField(blank=True, null=True)), - ('date', models.DateField(auto_now=True)), - ('medicine_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='health_center.stock')), - ], - ), - migrations.CreateModel( - name='Complaint', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('feedback', models.CharField(max_length=100, null=True)), - ('complaint', models.CharField(max_length=100, null=True)), - ('date', models.DateField(auto_now=True)), - ('user_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')), - ], - ), - migrations.AddField( - model_name='appointment', - name='doctor_id', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='health_center.doctor'), - ), - migrations.AddField( - model_name='appointment', - name='schedule', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='health_center.schedule'), - ), - migrations.AddField( - model_name='appointment', - name='user_id', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo'), - ), - migrations.CreateModel( - name='Ambulance_request', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('date_request', models.DateTimeField()), - ('start_date', models.DateField()), - ('end_date', models.DateField(blank=True, null=True)), - ('reason', models.CharField(max_length=50)), - ('user_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')), - ], - ), - ] diff --git a/FusionIIIT/applications/health_center/migrations/__init__.py b/FusionIIIT/applications/health_center/migrations/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/FusionIIIT/applications/hostel_management/migrations/0001_initial.py b/FusionIIIT/applications/hostel_management/migrations/0001_initial.py deleted file mode 100644 index ef1639d4c..000000000 --- a/FusionIIIT/applications/hostel_management/migrations/0001_initial.py +++ /dev/null @@ -1,137 +0,0 @@ -# Generated by Django 3.1.5 on 2023-03-15 18:53 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion -import django.db.models.fields.related -import django.utils.timezone - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('academic_information', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('globals', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='Hall', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('hall_id', models.CharField(max_length=10)), - ('hall_name', models.CharField(max_length=50)), - ('max_accomodation', models.IntegerField(default=0)), - ('number_students', models.PositiveIntegerField(default=0)), - ], - ), - migrations.CreateModel( - name='WorkerReport', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('worker_id', models.CharField(max_length=10)), - ('worker_name', models.CharField(max_length=50)), - ('year', models.IntegerField(default=2020)), - ('month', models.IntegerField(default=1)), - ('absent', models.IntegerField(default=0)), - ('total_day', models.IntegerField(default=31)), - ('remark', models.CharField(max_length=100)), - ('hall', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='hostel_management.hall')), - ], - ), - migrations.CreateModel( - name='StaffSchedule', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('staff_type', models.CharField(default='Caretaker', max_length=100)), - ('day', models.CharField(choices=[('Monday', 'Monday'), ('Tuesday', 'Tuesday'), ('Wednesday', 'Wednesday'), ('Thursday', 'Thursday'), ('Friday', 'Friday'), ('Saturday', 'Saturday'), ('Sunday', 'Sunday')], max_length=15)), - ('start_time', models.TimeField(blank=True, null=True)), - ('end_time', models.TimeField(blank=True, null=True)), - ('hall', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='hostel_management.hall')), - ('staff_id', models.ForeignKey(on_delete=django.db.models.fields.related.ForeignKey, to='globals.staff')), - ], - ), - migrations.CreateModel( - name='HostelStudentAttendence', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('date', models.DateField()), - ('present', models.BooleanField()), - ('hall', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='hostel_management.hall')), - ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - ), - migrations.CreateModel( - name='HostelNoticeBoard', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('head_line', models.CharField(max_length=100)), - ('content', models.FileField(blank=True, null=True, upload_to='hostel_management/')), - ('description', models.TextField(blank=True)), - ('hall', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='hostel_management.hall')), - ('posted_by', models.ForeignKey(on_delete=django.db.models.fields.related.ForeignKey, to='globals.extrainfo')), - ], - ), - migrations.CreateModel( - name='HallWarden', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('faculty', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.faculty')), - ('hall', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='hostel_management.hall')), - ], - ), - migrations.CreateModel( - name='HallRoom', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('room_no', models.CharField(max_length=4)), - ('block_no', models.CharField(max_length=1)), - ('room_cap', models.IntegerField(default=3)), - ('room_occupied', models.IntegerField(default=0)), - ('hall', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='hostel_management.hall')), - ], - ), - migrations.CreateModel( - name='HallCaretaker', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('hall', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='hostel_management.hall')), - ('staff', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.staff')), - ], - ), - migrations.CreateModel( - name='GuestRoomDetail', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('room_no', models.CharField(max_length=4, unique=True)), - ('room_status', models.CharField(choices=[('Booked', 'Booked'), ('CheckedIn', 'Checked In'), ('Available', 'Available'), ('UnderMaintenance', 'Under Maintenance')], default='Available', max_length=20)), - ('hall', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='hostel_management.hall')), - ], - ), - migrations.CreateModel( - name='GuestRoomBooking', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('guest_name', models.CharField(max_length=100)), - ('guest_phone', models.CharField(max_length=15)), - ('guest_email', models.CharField(blank=True, max_length=40)), - ('guest_address', models.TextField(blank=True)), - ('rooms_required', models.IntegerField(blank=True, default=1, null=True)), - ('total_guest', models.IntegerField(default=1)), - ('purpose', models.TextField()), - ('arrival_date', models.DateField()), - ('arrival_time', models.TimeField()), - ('departure_date', models.DateField()), - ('departure_time', models.TimeField()), - ('status', models.CharField(choices=[('Confirmed', 'Confirmed'), ('Pending', 'Pending'), ('Rejected', 'Rejected'), ('Canceled', 'Canceled'), ('CancelRequested', 'Cancel Requested'), ('CheckedIn', 'Checked In'), ('Complete', 'Complete'), ('Forward', 'Forward')], default='Pending', max_length=15)), - ('booking_date', models.DateField(default=django.utils.timezone.now)), - ('nationality', models.CharField(blank=True, max_length=20)), - ('guest_room_id', models.ManyToManyField(to='hostel_management.GuestRoomDetail')), - ('hall', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='hostel_management.hall')), - ('intender', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - ] diff --git a/FusionIIIT/applications/hostel_management/migrations/__init__.py b/FusionIIIT/applications/hostel_management/migrations/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/FusionIIIT/applications/hr2/migrations/0001_initial.py b/FusionIIIT/applications/hr2/migrations/0001_initial.py deleted file mode 100644 index 83b197c8f..000000000 --- a/FusionIIIT/applications/hr2/migrations/0001_initial.py +++ /dev/null @@ -1,91 +0,0 @@ -# Generated by Django 3.1.5 on 2023-03-15 18:53 - -import django.core.validators -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('globals', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='WorkAssignemnt', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('start_date', models.DateField(blank=True, max_length=6, null=True)), - ('end_date', models.DateField(blank=True, max_length=6, null=True)), - ('job_title', models.CharField(default='', max_length=50)), - ('orders_copy', models.FileField(blank=True, null=True, upload_to='')), - ('extra_info', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')), - ], - ), - migrations.CreateModel( - name='ForeignService', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('start_date', models.DateField(blank=True, max_length=6, null=True)), - ('end_date', models.DateField(blank=True, max_length=6, null=True)), - ('job_title', models.CharField(default='', max_length=50)), - ('organisation', models.CharField(default='', max_length=100)), - ('description', models.CharField(default='', max_length=300)), - ('salary_source', models.CharField(default='', max_length=100)), - ('designation', models.CharField(default='', max_length=100)), - ('service_type', models.CharField(choices=[('LIEN', 'LIEN'), ('DEPUTATION', 'DEPUTATION'), ('OTHER', 'OTHER')], max_length=100)), - ('extra_info', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')), - ], - ), - migrations.CreateModel( - name='Employee', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('father_name', models.CharField(default='', max_length=40)), - ('mother_name', models.CharField(default='', max_length=40)), - ('religion', models.CharField(default='', max_length=40)), - ('category', models.CharField(choices=[('SC', 'SC'), ('ST', 'ST'), ('OBC', 'OBC'), ('GENERAL', 'GENERAL'), ('PWD', 'PWD')], max_length=50)), - ('cast', models.CharField(default='', max_length=40)), - ('home_state', models.CharField(default='', max_length=40)), - ('home_district', models.CharField(default='', max_length=40)), - ('date_of_joining', models.DateField(blank=True, null=True)), - ('designation', models.CharField(default='', max_length=40)), - ('blood_group', models.CharField(choices=[('AB+', 'AB+'), ('O+', 'O+'), ('AB-', 'AB-'), ('B+', 'B+'), ('B-', 'B-'), ('O-', 'O-'), ('A+', 'A+'), ('A-', 'A-')], max_length=50)), - ('extra_info', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')), - ], - ), - migrations.CreateModel( - name='EmpDependents', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(default='', max_length=100)), - ('gender', models.CharField(choices=[('M', 'Male'), ('F', 'Female'), ('O', 'Other')], max_length=50)), - ('dob', models.DateField(max_length=6, null=True)), - ('relationship', models.CharField(default='', max_length=40)), - ('extra_info', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')), - ], - ), - migrations.CreateModel( - name='EmpConfidentialDetails', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('aadhar_no', models.BigIntegerField(default=0, max_length=12, validators=[django.core.validators.MaxValueValidator(999999999999), django.core.validators.MinValueValidator(99999999999)])), - ('maritial_status', models.CharField(choices=[('MARRIED', 'MARRIED'), ('UN-MARRIED', 'UN-MARRIED'), ('WIDOW', 'WIDOW')], max_length=50)), - ('bank_account_no', models.IntegerField(default=0)), - ('salary', models.IntegerField(default=0)), - ('extra_info', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')), - ], - ), - migrations.CreateModel( - name='EmpAppraisalForm', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('year', models.DateField(blank=True, max_length=6, null=True)), - ('appraisal_form', models.FileField(default=' ', null=True, upload_to='Hr2/appraisal_form')), - ('extra_info', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')), - ], - ), - ] diff --git a/FusionIIIT/applications/hr2/migrations/__init__.py b/FusionIIIT/applications/hr2/migrations/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/FusionIIIT/applications/income_expenditure/migrations/0001_initial.py b/FusionIIIT/applications/income_expenditure/migrations/0001_initial.py deleted file mode 100644 index 1501efdb9..000000000 --- a/FusionIIIT/applications/income_expenditure/migrations/0001_initial.py +++ /dev/null @@ -1,80 +0,0 @@ -# Generated by Django 3.1.5 on 2023-03-15 18:53 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ] - - operations = [ - migrations.CreateModel( - name='BalanceSheet', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('balanceSheet', models.FileField(upload_to='')), - ('date_added', models.CharField(max_length=10)), - ], - ), - migrations.CreateModel( - name='ExpenditureType', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('expenditure_type', models.CharField(max_length=100)), - ], - ), - migrations.CreateModel( - name='FixedAttributes', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('attribute', models.CharField(max_length=100)), - ('value', models.IntegerField(default=0)), - ], - ), - migrations.CreateModel( - name='IncomeSource', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('income_source', models.CharField(max_length=100)), - ], - ), - migrations.CreateModel( - name='otherExpense', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('spent_on', models.CharField(max_length=100)), - ('status', models.CharField(max_length=20)), - ('name', models.CharField(max_length=30)), - ('userid', models.CharField(max_length=10)), - ('amount', models.IntegerField()), - ('date_added', models.DateField()), - ('remarks', models.CharField(blank=True, max_length=100)), - ], - ), - migrations.CreateModel( - name='Income', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('amount', models.IntegerField()), - ('date_added', models.DateField()), - ('remarks', models.CharField(blank=True, max_length=100)), - ('receipt', models.FileField(blank=True, upload_to='iemodule/income_receipts')), - ('source', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='incomeSource', to='income_expenditure.incomesource')), - ], - ), - migrations.CreateModel( - name='Expenditure', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('amount', models.IntegerField()), - ('date_added', models.DateField()), - ('remarks', models.CharField(max_length=100)), - ('expenditure_receipt', models.FileField(upload_to='iemodule/expenditure_receipts')), - ('spent_on', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='expenditureType', to='income_expenditure.expendituretype')), - ], - ), - ] diff --git a/FusionIIIT/applications/income_expenditure/migrations/__init__.py b/FusionIIIT/applications/income_expenditure/migrations/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/FusionIIIT/applications/iwdModuleV2/migrations/0001_initial.py b/FusionIIIT/applications/iwdModuleV2/migrations/0001_initial.py deleted file mode 100644 index bbde8386c..000000000 --- a/FusionIIIT/applications/iwdModuleV2/migrations/0001_initial.py +++ /dev/null @@ -1,226 +0,0 @@ -# Generated by Django 3.1.5 on 2023-03-15 18:53 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ] - - operations = [ - migrations.CreateModel( - name='FinancialBidDetails', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('sNo', models.CharField(max_length=200)), - ('description', models.CharField(max_length=200)), - ], - ), - migrations.CreateModel( - name='Projects', - fields=[ - ('id', models.CharField(max_length=200, primary_key=True, serialize=False)), - ], - ), - migrations.CreateModel( - name='PageOneDetails', - fields=[ - ('id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False, to='iwdModuleV2.projects')), - ('aESFile', models.FileField(null=True, upload_to='')), - ('dASA', models.DateField(null=True)), - ('nitNiqNo', models.IntegerField(null=True)), - ('proTh', models.CharField(max_length=200, null=True)), - ('emdDetails', models.CharField(max_length=200, null=True)), - ('preBidDate', models.DateField(max_length=200, null=True)), - ('technicalBidDate', models.DateField(null=True)), - ('financialBidDate', models.DateField(null=True)), - ], - ), - migrations.CreateModel( - name='PageThreeDetails', - fields=[ - ('id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False, to='iwdModuleV2.projects')), - ('extensionOfTime', models.FileField(upload_to='')), - ('actualCostOfBuilding', models.IntegerField()), - ], - ), - migrations.CreateModel( - name='PageTwoDetails', - fields=[ - ('id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False, to='iwdModuleV2.projects')), - ('corrigendum', models.FileField(null=True, upload_to='')), - ('addendum', models.FileField(null=True, upload_to='')), - ('preBidMeetingDetails', models.FileField(null=True, upload_to='')), - ('technicalBidMeetingDetails', models.FileField(null=True, upload_to='')), - ('technicallyQualifiedAgencies', models.CharField(max_length=200, null=True)), - ('financialBidMeetingDetails', models.FileField(null=True, upload_to='')), - ('nameOfLowestAgency', models.CharField(max_length=200, null=True)), - ('letterOfIntent', models.FileField(null=True, upload_to='')), - ('workOrder', models.FileField(null=True, upload_to='')), - ('agreementLetter', models.FileField(null=True, upload_to='')), - ('milestones', models.FileField(null=True, upload_to='')), - ], - ), - migrations.CreateModel( - name='WorkOrderForm', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('issueDate', models.DateField()), - ('nitNiqNo', models.IntegerField()), - ('agency', models.CharField(max_length=200)), - ('name', models.CharField(max_length=200)), - ('amount', models.IntegerField()), - ('time', models.IntegerField()), - ('monthDay', models.IntegerField()), - ('startDate', models.DateField()), - ('completionDate', models.DateField()), - ('deposit', models.IntegerField()), - ('contractDay', models.IntegerField()), - ('key', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='iwdModuleV2.projects', unique=True)), - ], - ), - migrations.CreateModel( - name='TechnicalBidDetails', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('sNo', models.CharField(max_length=200)), - ('requirements', models.CharField(max_length=200)), - ('key', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='iwdModuleV2.projects', unique=True)), - ], - ), - migrations.CreateModel( - name='TechnicalBidContractorDetails', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=200)), - ('description', models.CharField(max_length=200)), - ('key', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='iwdModuleV2.technicalbiddetails')), - ], - ), - migrations.CreateModel( - name='PreBidDetails', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('sNo', models.CharField(max_length=200)), - ('nameOfParticipants', models.CharField(max_length=200)), - ('issuesRaised', models.CharField(max_length=200)), - ('responseDecision', models.CharField(max_length=200)), - ('key', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='iwdModuleV2.projects', unique=True)), - ], - ), - migrations.CreateModel( - name='NoOfTechnicalBidTimes', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('number', models.IntegerField()), - ('key', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='iwdModuleV2.projects', unique=True)), - ], - ), - migrations.CreateModel( - name='Milestones', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('sNo', models.CharField(max_length=200)), - ('description', models.CharField(max_length=200)), - ('timeAllowed', models.IntegerField()), - ('amountWithheld', models.IntegerField()), - ('key', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='iwdModuleV2.projects')), - ], - ), - migrations.CreateModel( - name='LetterOfIntentDetails', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('nitNiqNo', models.IntegerField()), - ('dateOfOpening', models.DateField()), - ('agency', models.CharField(max_length=200)), - ('name', models.CharField(max_length=200)), - ('tenderValue', models.IntegerField()), - ('key', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='iwdModuleV2.projects', unique=True)), - ], - ), - migrations.CreateModel( - name='FinancialContractorDetails', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=200)), - ('estimatedCost', models.IntegerField()), - ('percentageRelCost', models.IntegerField()), - ('perFigures', models.IntegerField()), - ('totalCost', models.IntegerField()), - ('key', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='iwdModuleV2.financialbiddetails')), - ], - ), - migrations.AddField( - model_name='financialbiddetails', - name='key', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='iwdModuleV2.projects', unique=True), - ), - migrations.CreateModel( - name='ExtensionOfTimeDetails', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('sNo', models.CharField(max_length=200)), - ('hindrance', models.CharField(max_length=200)), - ('periodOfHindrance', models.IntegerField()), - ('periodOfExtension', models.IntegerField()), - ('key', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='iwdModuleV2.projects')), - ], - ), - migrations.CreateModel( - name='CorrigendumTable', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('issueDate', models.DateField()), - ('nitNo', models.IntegerField()), - ('name', models.CharField(max_length=200)), - ('lastDate', models.DateField(null=True)), - ('lastTime', models.TimeField()), - ('env1BidOpeningDate', models.DateField()), - ('env1BidOpeningTime', models.TimeField()), - ('env2BidOpeningDate', models.DateField()), - ('env2BidOpeningTime', models.TimeField()), - ('key', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='iwdModuleV2.projects', unique=True)), - ], - ), - migrations.CreateModel( - name='Agreement', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('date', models.DateField()), - ('agencyName', models.CharField(max_length=200)), - ('workName', models.CharField(max_length=200)), - ('fdrSum', models.IntegerField()), - ('key', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='iwdModuleV2.projects', unique=True)), - ], - ), - migrations.CreateModel( - name='AESDetails', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('sNo', models.CharField(max_length=100)), - ('descOfItems', models.CharField(max_length=200)), - ('unit', models.CharField(max_length=200)), - ('quantity', models.IntegerField()), - ('rate', models.IntegerField()), - ('amount', models.IntegerField()), - ('key', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='iwdModuleV2.projects')), - ], - ), - migrations.CreateModel( - name='Addendum', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('issueDate', models.DateField()), - ('nitNiqNo', models.IntegerField()), - ('name', models.CharField(max_length=200)), - ('openDate', models.DateField()), - ('openTime', models.TimeField()), - ('key', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='iwdModuleV2.projects', unique=True)), - ], - ), - ] diff --git a/FusionIIIT/applications/iwdModuleV2/migrations/__init__.py b/FusionIIIT/applications/iwdModuleV2/migrations/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/FusionIIIT/applications/leave/migrations/0001_initial.py b/FusionIIIT/applications/leave/migrations/0001_initial.py deleted file mode 100644 index d9ce4e044..000000000 --- a/FusionIIIT/applications/leave/migrations/0001_initial.py +++ /dev/null @@ -1,169 +0,0 @@ -# Generated by Django 3.1.5 on 2023-03-15 18:53 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('globals', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='ClosedHoliday', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('date', models.DateField()), - ], - ), - migrations.CreateModel( - name='Leave', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('purpose', models.CharField(blank=True, default='', max_length=500)), - ('status', models.CharField(choices=[('pending', 'Pending'), ('accepted', 'Accepted'), ('rejected', 'Rejected'), ('forwarded', 'Forwarded'), ('auto rejected', 'Auto Rejected')], default='pending', max_length=20)), - ('timestamp', models.DateTimeField(auto_now=True, null=True)), - ('extra_info', models.CharField(blank=True, default='', max_length=200, null=True)), - ('applicant', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='all_leaves', to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='LeaveOffline', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('purpose', models.CharField(blank=True, default='', max_length=500)), - ('timestamp', models.DateTimeField(auto_now=True, null=True)), - ('application_date', models.DateField()), - ('applicant', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='all_leaves_offline', to=settings.AUTH_USER_MODEL)), - ('leave_user_select', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='LeaveType', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=40)), - ('max_in_year', models.IntegerField(default=2)), - ('requires_proof', models.BooleanField(default=False)), - ('authority_forwardable', models.BooleanField(default=False)), - ('for_faculty', models.BooleanField(default=True)), - ('for_staff', models.BooleanField(default=True)), - ('for_student', models.BooleanField(default=False)), - ('requires_address', models.BooleanField(default=False)), - ], - ), - migrations.CreateModel( - name='RestrictedHoliday', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('date', models.DateField()), - ], - ), - migrations.CreateModel( - name='VacationHoliday', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('date', models.DateField()), - ], - ), - migrations.CreateModel( - name='ReplacementSegmentOffline', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('replacement_type', models.CharField(choices=[('academic', 'Academic Replacement'), ('administrative', 'Administrative Replacement')], default='academic', max_length=20)), - ('start_date', models.DateField()), - ('end_date', models.DateField()), - ('leave', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='replace_segments_offline', to='leave.leaveoffline')), - ('replacer', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='rep_requests_offline', to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='ReplacementSegment', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('replacement_type', models.CharField(choices=[('academic', 'Academic Replacement'), ('administrative', 'Administrative Replacement')], default='academic', max_length=20)), - ('start_date', models.DateField()), - ('end_date', models.DateField()), - ('status', models.CharField(choices=[('pending', 'Pending'), ('accepted', 'Accepted'), ('rejected', 'Rejected'), ('forwarded', 'Forwarded'), ('auto rejected', 'Auto Rejected')], default='pending', max_length=20)), - ('remark', models.CharField(blank=True, default='', max_length=50, null=True)), - ('leave', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='replace_segments', to='leave.leave')), - ('replacer', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='rep_requests', to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='LeaveSegmentOffline', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('document', models.FileField(null=True, upload_to='leave/leave_documents/')), - ('start_date', models.DateField()), - ('start_half', models.BooleanField(default=False)), - ('end_date', models.DateField()), - ('end_half', models.BooleanField(default=False)), - ('address', models.CharField(blank=True, default='', max_length=500, null=True)), - ('leave', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='segments_offline', to='leave.leaveoffline')), - ('leave_type', models.ForeignKey(default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, to='leave.leavetype')), - ], - ), - migrations.CreateModel( - name='LeaveSegment', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('document', models.FileField(null=True, upload_to='leave/leave_documents/')), - ('start_date', models.DateField()), - ('start_half', models.BooleanField(default=False)), - ('end_date', models.DateField()), - ('end_half', models.BooleanField(default=False)), - ('address', models.CharField(blank=True, default='', max_length=500, null=True)), - ('leave', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='segments', to='leave.leave')), - ('leave_type', models.ForeignKey(default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, to='leave.leavetype')), - ], - ), - migrations.CreateModel( - name='LeavesCount', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('year', models.IntegerField(default=2019)), - ('remaining_leaves', models.FloatField(default=2.0)), - ('leave_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='leave.leavetype')), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='leave_balance', to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='LeaveRequest', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('remark', models.CharField(blank=True, max_length=50, null=True)), - ('permission', models.CharField(choices=[('intermediary', 'Intermediary Staff'), ('sanc_auth', 'Leave Sanctioning Authority'), ('sanc_off', 'Leave Sanctioning Officer')], default='sanc_auth', max_length=20)), - ('status', models.CharField(choices=[('pending', 'Pending'), ('accepted', 'Accepted'), ('rejected', 'Rejected'), ('forwarded', 'Forwarded'), ('auto rejected', 'Auto Rejected')], default='pending', max_length=20)), - ('leave', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='leave_requests', to='leave.leave')), - ('requested_from', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='all_leave_requests', to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='LeaveMigration', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('type_migration', models.CharField(choices=[('revert', 'Revert Responsibilities'), ('transfer', 'Transfer Responsibilities')], default='transfer', max_length=10)), - ('on_date', models.DateField()), - ('replacement_type', models.CharField(choices=[('academic', 'Academic Replacement'), ('administrative', 'Administrative Replacement')], default='academic', max_length=20)), - ('leave', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='all_migrations', to='leave.leave')), - ('replacee', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='replacee_migrations', to=settings.AUTH_USER_MODEL)), - ('replacer', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='replacer_migrations', to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='LeaveAdministrators', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('authority', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='sanc_authority_of', to='globals.designation')), - ('officer', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='sanc_officer_of', to='globals.designation')), - ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='leave_admins', to=settings.AUTH_USER_MODEL)), - ], - ), - ] diff --git a/FusionIIIT/applications/leave/migrations/__init__.py b/FusionIIIT/applications/leave/migrations/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/FusionIIIT/applications/notifications_extension/migrations/__init__.py b/FusionIIIT/applications/notifications_extension/migrations/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/FusionIIIT/applications/office_module/migrations/0001_initial.py b/FusionIIIT/applications/office_module/migrations/0001_initial.py deleted file mode 100644 index 521c8e886..000000000 --- a/FusionIIIT/applications/office_module/migrations/0001_initial.py +++ /dev/null @@ -1,492 +0,0 @@ -# Generated by Django 3.1.5 on 2023-03-15 18:53 - -import datetime -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('academic_information', '0001_initial'), - ('filetracking', '0001_initial'), - ('leave', '0001_initial'), - ('globals', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='Budget', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('budget_type', models.CharField(max_length=20)), - ('club_type', models.CharField(choices=[('TECHNICAL', 'technical'), ('CULTURAL', 'cultural'), ('SPORTS', 'sports')], default='', max_length=20)), - ('budget_allocated', models.PositiveIntegerField(default=0)), - ('budget_expenditure', models.PositiveIntegerField(default=0)), - ('budget_available', models.PositiveIntegerField(default=0)), - ], - ), - migrations.CreateModel( - name='hostel_allotment', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('program', models.CharField(choices=[('BTECH', 'btech'), ('BDES', 'bdes'), ('MTECH', 'mtech'), ('MDES', 'mdes'), ('PHD', 'phd')], default='', max_length=30)), - ('year', models.IntegerField(default=2016)), - ('gender', models.CharField(choices=[('MALE', 'male'), ('FEMALE', 'female')], default='', max_length=10)), - ('hall_no', models.CharField(choices=[('HALL-1-BOYS', 'hall-1-boys'), ('HALL-1-GIRLS', 'hall-1-girls'), ('HALL-3', 'hall-3'), ('HALL-4', 'hall-4')], default='', max_length=15)), - ('number_students', models.PositiveIntegerField(default=0)), - ('remark', models.CharField(max_length=200)), - ], - options={ - 'db_table': 'hostel_allotment', - }, - ), - migrations.CreateModel( - name='hostel_capacity', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('name', models.CharField(choices=[('HALL-1-BOYS', 'hall-1-boys'), ('HALL-1-GIRLS', 'hall-1-girls'), ('HALL-3', 'hall-3'), ('HALL-4', 'hall-4')], default='', max_length=15)), - ('current_capacity', models.PositiveIntegerField(default=0)), - ('total_capacity', models.PositiveIntegerField(default=0)), - ], - options={ - 'db_table': 'hostel_capacity', - }, - ), - migrations.CreateModel( - name='Lab', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('lab', models.CharField(max_length=10)), - ('lab_instructor', models.CharField(max_length=30)), - ('day', models.CharField(choices=[('Monday', 'Monday'), ('Tuesday', 'Tuesday'), ('Wednesday', 'Wednesday'), ('Thursday', 'Thursday'), ('Friday', 'Friday')], default='Monday', max_length=10)), - ('s_time', models.CharField(default='0:00', max_length=6)), - ('e_time', models.CharField(default='0:00', max_length=6)), - ], - options={ - 'db_table': 'Lab', - }, - ), - migrations.CreateModel( - name='quotations', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('quotation1', models.FileField(upload_to='')), - ('quotation2', models.FileField(upload_to='')), - ('quotation3', models.FileField(upload_to='')), - ], - options={ - 'db_table': 'quotations', - }, - ), - migrations.CreateModel( - name='Registrar', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('file_name', models.CharField(max_length=50)), - ('date', models.DateField()), - ('purpose', models.CharField(max_length=100)), - ('status', models.CharField(choices=[('0', 'unseen'), ('1', 'seen')], default=0, max_length=1)), - ('file', models.FileField(upload_to='')), - ], - ), - migrations.CreateModel( - name='registrar_create_doc', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('file_name', models.CharField(max_length=50)), - ('purpose', models.CharField(max_length=100)), - ('Description', models.CharField(max_length=200)), - ('file', models.FileField(upload_to='')), - ], - ), - migrations.CreateModel( - name='registrar_director_section', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('file_name', models.CharField(max_length=50)), - ('date', models.DateField()), - ('purpose', models.CharField(max_length=100)), - ('status', models.CharField(choices=[('0', 'unseen'), ('1', 'seen')], default=0, max_length=1)), - ], - ), - migrations.CreateModel( - name='registrar_establishment_section', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('person_name', models.CharField(max_length=50)), - ('person_mail_id', models.CharField(default='xyz', max_length=50)), - ('date', models.DateField()), - ('duration', models.IntegerField()), - ('post', models.CharField(max_length=100)), - ('file', models.FileField(upload_to='')), - ], - ), - migrations.CreateModel( - name='registrar_finance_section', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('file_name', models.CharField(max_length=50)), - ('date', models.DateField()), - ('purpose', models.CharField(max_length=100)), - ('status', models.IntegerField(choices=[('0', 'unseen'), ('1', 'seen')])), - ('file', models.FileField(upload_to='')), - ], - ), - migrations.CreateModel( - name='registrar_purchase_sales_section', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('file_name', models.CharField(max_length=50)), - ('member1', models.CharField(max_length=50)), - ('member2', models.CharField(max_length=50)), - ('member3', models.CharField(max_length=50)), - ('date', models.DateField()), - ('purpose', models.CharField(max_length=100)), - ('status', models.IntegerField(choices=[('0', 'unseen'), ('1', 'seen')], default=0)), - ('file', models.FileField(upload_to='')), - ], - ), - migrations.CreateModel( - name='stock', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('item_name', models.CharField(max_length=100)), - ('quantity', models.IntegerField(default='0')), - ('item_type', models.IntegerField(choices=[('0', 'Non-consumable'), ('1', 'Consumable')], default='0')), - ], - options={ - 'db_table': 'stock', - }, - ), - migrations.CreateModel( - name='Teaching_credits1', - fields=[ - ('roll_no', models.CharField(max_length=100, primary_key=True, serialize=False)), - ('name', models.CharField(max_length=100)), - ('programme', models.CharField(max_length=100)), - ('branch', models.CharField(max_length=100)), - ('course1', models.CharField(choices=[('Computer Graphics', 'Computer Graphics'), ('Machine Learning', 'Machine Learning'), ('Image Processing', 'Image Processing'), ('Data Structure', 'Data Structure')], default='NO', max_length=100)), - ('course2', models.CharField(choices=[('Computer Graphics', 'Computer Graphics'), ('Machine Learning', 'Machine Learning'), ('Image Processing', 'Image Processing'), ('Data Structure', 'Data Structure')], default='NO', max_length=100)), - ('course3', models.CharField(choices=[('Computer Graphics', 'Computer Graphics'), ('Machine Learning', 'Machine Learning'), ('Image Processing', 'Image Processing'), ('Data Structure', 'Data Structure')], default='NO', max_length=100)), - ('tag', models.IntegerField(default=0)), - ], - options={ - 'db_table': 'Teaching_credits1', - }, - ), - migrations.CreateModel( - name='vendor', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('vendor_name', models.CharField(max_length=100)), - ('vendor_address', models.CharField(max_length=200)), - ('vendor_item', models.CharField(max_length=200)), - ], - options={ - 'db_table': 'vendor', - }, - ), - migrations.CreateModel( - name='TA_assign', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('balance', models.IntegerField(default=2)), - ('lab', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='office_module.lab')), - ('roll_no', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='TA_id', to='globals.extrainfo')), - ], - options={ - 'db_table': 'TA_assign', - }, - ), - migrations.CreateModel( - name='Requisitions', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('req_date', models.DateTimeField(auto_now_add=True)), - ('title', models.CharField(max_length=50)), - ('department', models.CharField(choices=[('civil', 'civil'), ('electrical', 'electrical')], max_length=50)), - ('building', models.CharField(choices=[('corelab', 'corelab'), ('computer center', 'computer center'), ('hostel', 'hostel'), ('mess', 'mess'), ('library', 'library'), ('cc', 'cc')], max_length=50)), - ('description', models.CharField(max_length=200)), - ('tag', models.IntegerField(default=0)), - ('assign_file', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='filetracking.file')), - ('userid', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')), - ], - ), - migrations.CreateModel( - name='Registrar_response', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('remark', models.CharField(default='', max_length=50)), - ('status', models.CharField(default='', max_length=20)), - ('track_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='t_id', to='filetracking.tracking')), - ], - options={ - 'db_table': 'Registrar_response', - }, - ), - migrations.CreateModel( - name='registrar_general_section', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('file_name', models.CharField(max_length=50)), - ('date', models.DateField()), - ('amount', models.IntegerField()), - ('status', models.IntegerField(choices=[('0', 'unseen'), ('1', 'seen')], default=0)), - ('file', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='office_module.registrar_create_doc')), - ], - ), - migrations.CreateModel( - name='Registrar_File', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('status', models.IntegerField(choices=[('0', 'unseen'), ('1', 'seen')], default=0)), - ('approval', models.IntegerField(choices=[('0', 'reject'), ('1', 'accept')], default=0)), - ('section_name', models.CharField(max_length=50)), - ('section_type', models.CharField(max_length=20)), - ('file_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='filetracking.tracking')), - ], - ), - migrations.CreateModel( - name='purchase_commitee', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('approve_mem1', models.IntegerField(choices=[('0', 'Pending'), ('1', 'Approve'), ('-1', 'Rejected')], default='0')), - ('approve_mem2', models.IntegerField(choices=[('0', 'Pending'), ('1', 'Approve'), ('-1', 'Rejected')], default='0')), - ('approve_mem3', models.IntegerField(choices=[('0', 'Pending'), ('1', 'Approve'), ('-1', 'Rejected')], default='0')), - ('local_comm_mem1', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='local_comm_mem1', to='globals.extrainfo')), - ('local_comm_mem2', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='local_comm_mem2', to='globals.extrainfo')), - ('local_comm_mem3', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='local_comm_mem3', to='globals.extrainfo')), - ], - options={ - 'db_table': 'purchase_commitee', - }, - ), - migrations.CreateModel( - name='Project_Registration', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('project_title', models.CharField(max_length=200)), - ('sponsored_agency', models.CharField(max_length=100)), - ('CO_PI', models.CharField(max_length=100, null=True)), - ('start_date', models.DateField(blank=True, null=True)), - ('duration', models.IntegerField(default=0)), - ('agreement', models.CharField(choices=[('Computer Graphics', 'Computer Graphics'), ('Machine Learning', 'Machine Learning'), ('Image Processing', 'Image Processing'), ('Data Structure', 'Data Structure')], default='NO', max_length=20)), - ('amount_sanctioned', models.IntegerField(default=0)), - ('project_type', models.CharField(choices=[('SRes', 'Sponsored Research'), ('Consultancy', 'Consultancy'), ('fig', 'Faculty Initiation Grant'), ('Testing', 'Testing')], max_length=25)), - ('project_operated', models.CharField(choices=[('PI', 'Only by PI'), ('any', 'Either PI or CO-PI')], default='me', max_length=50)), - ('remarks', models.CharField(max_length=200)), - ('fund_recieved_date', models.DateField(blank=True, null=True)), - ('HOD_response', models.CharField(choices=[('Forwarded', 'Forwarded'), ('Pending', 'Pending')], default='Pending', max_length=10)), - ('DRSPC_response', models.CharField(choices=[('Approve', 'Approve'), ('Disapprove', 'Disapprove'), ('Pending', 'Pending')], default='Pending', max_length=10)), - ('applied_date', models.DateField(blank=True, null=True)), - ('description', models.CharField(max_length=200, null=True)), - ('file', models.FileField(blank=True, null=True, upload_to='documents/')), - ('PI_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')), - ], - ), - migrations.CreateModel( - name='Project_Reallocation', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('date', models.DateField(blank=True, null=True)), - ('previous_budget_head', models.CharField(max_length=300)), - ('previous_amount', models.IntegerField(default=0)), - ('pf_no', models.CharField(max_length=100, null=True)), - ('new_budget_head', models.CharField(max_length=300)), - ('new_amount', models.IntegerField(default=0)), - ('transfer_reason', models.CharField(max_length=300)), - ('HOD_response', models.CharField(choices=[('Forwarded', 'Forwarded'), ('Pending', 'Pending')], default='Pending', max_length=10)), - ('DRSPC_response', models.CharField(choices=[('Approve', 'Approve'), ('Disapprove', 'Disapprove'), ('Pending', 'Pending')], default='Pending', max_length=10)), - ('project_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='office_module.project_registration')), - ], - ), - migrations.CreateModel( - name='Project_Extension', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('date', models.DateField(blank=True, null=True)), - ('extended_duration', models.IntegerField(default=0)), - ('extension_details', models.CharField(max_length=300)), - ('HOD_response', models.CharField(choices=[('Forwarded', 'Forwarded'), ('Pending', 'Pending')], default='Pending', max_length=10)), - ('DRSPC_response', models.CharField(choices=[('Approve', 'Approve'), ('Disapprove', 'Disapprove'), ('Pending', 'Pending')], default='Pending', max_length=10)), - ('file', models.FileField(blank=True, null=True, upload_to='documents/')), - ('project_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='office_module.project_registration')), - ], - ), - migrations.CreateModel( - name='Project_Closure', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('completion_date', models.DateField(blank=True, null=True)), - ('date', models.DateField(blank=True, null=True)), - ('expenses_dues', models.CharField(choices=[('Computer Graphics', 'Computer Graphics'), ('Machine Learning', 'Machine Learning'), ('Image Processing', 'Image Processing'), ('Data Structure', 'Data Structure')], default='Pending', max_length=20)), - ('expenses_dues_description', models.CharField(blank=True, max_length=200, null=True)), - ('payment_dues', models.CharField(choices=[('Computer Graphics', 'Computer Graphics'), ('Machine Learning', 'Machine Learning'), ('Image Processing', 'Image Processing'), ('Data Structure', 'Data Structure')], default='Pending', max_length=20)), - ('payment_dues_description', models.CharField(blank=True, max_length=200, null=True)), - ('salary_dues', models.CharField(choices=[('Computer Graphics', 'Computer Graphics'), ('Machine Learning', 'Machine Learning'), ('Image Processing', 'Image Processing'), ('Data Structure', 'Data Structure')], default='Pending', max_length=20)), - ('salary_dues_description', models.CharField(blank=True, max_length=200, null=True)), - ('advances_dues', models.CharField(choices=[('Computer Graphics', 'Computer Graphics'), ('Machine Learning', 'Machine Learning'), ('Image Processing', 'Image Processing'), ('Data Structure', 'Data Structure')], default='Pending', max_length=20)), - ('advances_description', models.CharField(blank=True, max_length=200, null=True)), - ('others_dues', models.CharField(choices=[('Computer Graphics', 'Computer Graphics'), ('Machine Learning', 'Machine Learning'), ('Image Processing', 'Image Processing'), ('Data Structure', 'Data Structure')], default='Pending', max_length=20)), - ('other_dues_description', models.CharField(blank=True, max_length=200, null=True)), - ('overhead_deducted', models.CharField(choices=[('Computer Graphics', 'Computer Graphics'), ('Machine Learning', 'Machine Learning'), ('Image Processing', 'Image Processing'), ('Data Structure', 'Data Structure')], default='Pending', max_length=20)), - ('overhead_description', models.CharField(blank=True, max_length=200, null=True)), - ('HOD_response', models.CharField(choices=[('Forwarded', 'Forwarded'), ('Pending', 'Pending')], default='Pending', max_length=10)), - ('DRSPC_response', models.CharField(choices=[('Approve', 'Approve'), ('Disapprove', 'Disapprove'), ('Pending', 'Pending')], default='Pending', max_length=10)), - ('remarks', models.CharField(max_length=300, null=True)), - ('extended_duration', models.CharField(default='0', max_length=100, null=True)), - ('project_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='office_module.project_registration')), - ], - ), - migrations.CreateModel( - name='LTC', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('date_request', models.DateField()), - ('travel_mode', models.CharField(choices=[('road', 'ROAD'), ('rail', 'RAIL')], default='ROAD', max_length=10)), - ('advance', models.IntegerField(default=0)), - ('family_details', models.TextField(max_length=500)), - ('department', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.departmentinfo')), - ('designation', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.designation')), - ('leave', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='leave.leave')), - ('name', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')), - ], - options={ - 'db_table': 'LTC', - }, - ), - migrations.CreateModel( - name='hostel_guestroom_approval', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('hall_no', models.CharField(choices=[('HALL-1-BOYS', 'hall-1-boys'), ('HALL-1-GIRLS', 'hall-1-girls'), ('HALL-3', 'hall-3'), ('HALL-4', 'hall-4')], default='', max_length=16)), - ('arrival_date', models.DateField(default=datetime.date.today, verbose_name='Date')), - ('departure_date', models.DateField(blank=True, null=True)), - ('status', models.CharField(choices=[('APPROVED', 'Approved'), ('PENDING', 'Pending')], default='Pending', max_length=20)), - ('intender', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')), - ], - ), - migrations.CreateModel( - name='Filemovement', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('date', models.DateTimeField(auto_now_add=True)), - ('remarks', models.CharField(max_length=200, null=True)), - ('actionby_receiver', models.CharField(choices=[('forward', 'forwarded'), ('revert', 'revert'), ('accept', 'accept'), ('reject', 'reject')], max_length=50)), - ('receivedby', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='received_by', to='globals.holdsdesignation')), - ('rid', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='office_module.requisitions')), - ('sentby', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='sent_by', to='globals.holdsdesignation')), - ], - ), - migrations.CreateModel( - name='DeanS_approve_committes', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('date_approved', models.DateField(blank=True, null=True)), - ('description', models.CharField(max_length=200)), - ('convener', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='convener', to='globals.extrainfo')), - ('faculty_incharge', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='facultyincharge', to='globals.extrainfo')), - ], - ), - migrations.CreateModel( - name='CPDA', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('PF_no', models.CharField(max_length=100)), - ('purpose', models.CharField(max_length=100)), - ('amoutn', models.IntegerField(default=0)), - ('designation', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.designation')), - ('name', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')), - ], - options={ - 'db_table': 'CPDA', - }, - ), - migrations.CreateModel( - name='Auto_fair_claim', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('purpose', models.CharField(max_length=100)), - ('amount', models.IntegerField(default=0)), - ('auto_reg_no', models.CharField(max_length=50)), - ('auto_contact', models.IntegerField(default=0)), - ('bill', models.FileField(upload_to='hod/')), - ('date', models.DateField()), - ('name', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')), - ], - options={ - 'db_table': 'auto_fair_claim', - }, - ), - migrations.CreateModel( - name='Assigned_Teaching_credits', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('assigned_course', models.CharField(default='NO', max_length=100)), - ('roll_no', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='office_module.teaching_credits1')), - ], - options={ - 'db_table': 'Assigned_Teaching_credits', - }, - ), - migrations.CreateModel( - name='apply_for_purchase', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('inspecting_authority', models.CharField(default='0', max_length=200)), - ('expected_purchase_date', models.DateField()), - ('order_date', models.DateField(default=datetime.date.today)), - ('purchase_status', models.IntegerField(choices=[('0', 'Pending'), ('1', 'Approve'), ('2', 'Items Ordered'), ('3', 'Items Puchased'), ('4', 'Items Delivered')], default=0)), - ('amount', models.IntegerField(default='0')), - ('purchase_date', models.DateField(default='2018-06-01')), - ('registrar_approve_tag', models.IntegerField(choices=[('0', 'Pending'), ('1', 'Approve'), ('-1', 'Rejected')], default=0)), - ('director_approve_tag', models.IntegerField(choices=[('0', 'Pending'), ('1', 'Approve'), ('-1', 'Rejected')], default=0)), - ('HOD_approve_tag', models.IntegerField(choices=[('0', 'Pending'), ('1', 'Approve'), ('-1', 'Rejected')], default=0)), - ('accounts_approve_tag', models.IntegerField(choices=[('0', 'Pending'), ('1', 'Approve'), ('-1', 'Rejected')], default=0)), - ('gem_tag', models.IntegerField(choices=[('0', 'Pending'), ('1', 'Approve'), ('-1', 'Rejected')], default=0)), - ('purchase_type', models.IntegerField(choices=[('0', 'Amount < 25000'), ('1', '250002500000')], default=0)), - ('purpose', models.CharField(default=0, max_length=200)), - ('budgetary_head', models.CharField(default=0, max_length=200)), - ('invoice', models.FileField(default=0, upload_to='')), - ('nature_of_item1', models.IntegerField(choices=[('0', 'Non-consumable'), ('1', 'Consumable')], default=0)), - ('nature_of_item2', models.IntegerField(choices=[('0', 'Equipment'), ('1', 'Machinery'), ('2', 'Furniture'), ('3', 'Fixture')], default=0)), - ('item_name', models.CharField(default=0, max_length=100)), - ('expected_cost', models.IntegerField(default=0)), - ('quantity', models.IntegerField(default=0)), - ('indentor_name', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='indentor_name', to='globals.extrainfo')), - ], - options={ - 'db_table': 'apply_for_purchase', - }, - ), - migrations.CreateModel( - name='Member', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('meeting_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.meeting')), - ('member_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.faculty')), - ], - options={ - 'db_table': 'Member', - 'unique_together': {('member_id', 'meeting_id')}, - }, - ), - migrations.CreateModel( - name='Assistantship', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('file', models.FileField(blank=True, null=True, upload_to='documents/')), - ('action', models.IntegerField(default=0)), - ('comments', models.CharField(blank=True, max_length=150, null=True)), - ('instructor_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.curriculum_instructor')), - ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - options={ - 'db_table': 'Assistantship', - 'unique_together': {('student_id', 'instructor_id')}, - }, - ), - ] diff --git a/FusionIIIT/applications/office_module/migrations/__init__.py b/FusionIIIT/applications/office_module/migrations/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/FusionIIIT/applications/online_cms/migrations/0001_initial.py b/FusionIIIT/applications/online_cms/migrations/0001_initial.py deleted file mode 100644 index 4e3377ab7..000000000 --- a/FusionIIIT/applications/online_cms/migrations/0001_initial.py +++ /dev/null @@ -1,196 +0,0 @@ -# Generated by Django 3.1.5 on 2023-03-15 18:53 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('academic_information', '0001_initial'), - ('globals', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='Assignment', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('upload_time', models.DateTimeField(auto_now=True)), - ('submit_date', models.DateTimeField()), - ('assignment_name', models.CharField(max_length=100)), - ('assignment_url', models.CharField(max_length=100, null=True)), - ('course_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.course')), - ], - ), - migrations.CreateModel( - name='Forum', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('comment_time', models.DateTimeField(auto_now=True)), - ('comment', models.TextField(max_length=2000)), - ('commenter_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')), - ('course_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.course')), - ], - ), - migrations.CreateModel( - name='Practice', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('prac_quiz_name', models.CharField(max_length=20)), - ('negative_marks', models.FloatField(default=0)), - ('number_of_question', models.IntegerField(default=0)), - ('description', models.TextField(max_length=1000)), - ('total_score', models.IntegerField(default=0)), - ('course_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.course')), - ], - ), - migrations.CreateModel( - name='Question', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('question', models.TextField(max_length=1000)), - ('options1', models.CharField(max_length=100, null=True)), - ('options2', models.CharField(max_length=100, null=True)), - ('options3', models.CharField(max_length=100, null=True)), - ('options4', models.CharField(max_length=100, null=True)), - ('options5', models.CharField(max_length=100, null=True)), - ('answer', models.IntegerField()), - ('image', models.TextField(max_length=1000, null=True)), - ('marks', models.IntegerField()), - ], - ), - migrations.CreateModel( - name='Quiz', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('quiz_name', models.CharField(max_length=20)), - ('end_time', models.DateTimeField()), - ('start_time', models.DateTimeField()), - ('d_day', models.CharField(max_length=2)), - ('d_hour', models.CharField(max_length=2)), - ('d_minute', models.CharField(max_length=2)), - ('negative_marks', models.FloatField(default=0)), - ('number_of_question', models.IntegerField(default=0)), - ('description', models.TextField(max_length=1000)), - ('rules', models.TextField(max_length=2000)), - ('total_score', models.IntegerField(default=0)), - ('course_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.course')), - ], - ), - migrations.CreateModel( - name='QuizQuestion', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('question', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='online_cms.question')), - ('quiz_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='online_cms.quiz')), - ], - ), - migrations.CreateModel( - name='Topics', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('topic_name', models.TextField(max_length=200)), - ('course_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.course')), - ], - ), - migrations.CreateModel( - name='StudentAssignment', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('upload_time', models.DateTimeField(auto_now=True)), - ('upload_url', models.TextField(max_length=200)), - ('score', models.IntegerField(null=True)), - ('feedback', models.CharField(max_length=100, null=True)), - ('assign_name', models.CharField(max_length=100)), - ('assignment_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='online_cms.assignment')), - ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - ), - migrations.CreateModel( - name='StudentAnswer', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('choice', models.IntegerField()), - ('question_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='online_cms.quizquestion')), - ('quiz_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='online_cms.quiz')), - ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - ), - migrations.CreateModel( - name='QuizResult', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('score', models.IntegerField()), - ('finished', models.BooleanField(default=False)), - ('quiz_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='online_cms.quiz')), - ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - ), - migrations.CreateModel( - name='QuestionBank', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('course_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.course')), - ('instructor_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')), - ], - ), - migrations.AddField( - model_name='question', - name='question_bank', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='online_cms.questionbank'), - ), - migrations.AddField( - model_name='question', - name='topic', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='online_cms.topics'), - ), - migrations.CreateModel( - name='PracticeQuestion', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('question', models.TextField(max_length=1000)), - ('options1', models.CharField(max_length=100, null=True)), - ('options2', models.CharField(max_length=100, null=True)), - ('options3', models.CharField(max_length=100, null=True)), - ('options4', models.CharField(max_length=100, null=True)), - ('options5', models.CharField(max_length=100, null=True)), - ('answer', models.IntegerField()), - ('image', models.TextField(max_length=1000, null=True)), - ('prac_quiz_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='online_cms.practice')), - ], - ), - migrations.CreateModel( - name='ForumReply', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('forum_ques', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='forum_ques', to='online_cms.forum')), - ('forum_reply', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='forum_reply', to='online_cms.forum')), - ], - ), - migrations.CreateModel( - name='CourseVideo', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('upload_time', models.DateTimeField(auto_now=True)), - ('description', models.CharField(max_length=100)), - ('video_name', models.CharField(max_length=40)), - ('video_url', models.CharField(max_length=100, null=True)), - ('course_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.course')), - ], - ), - migrations.CreateModel( - name='CourseDocuments', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('upload_time', models.DateTimeField(auto_now=True)), - ('description', models.CharField(max_length=100)), - ('document_name', models.CharField(max_length=40)), - ('document_url', models.CharField(max_length=100, null=True)), - ('course_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.course')), - ], - ), - ] diff --git a/FusionIIIT/applications/online_cms/migrations/__init__.py b/FusionIIIT/applications/online_cms/migrations/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/FusionIIIT/applications/placement_cell/migrations/0001_initial.py b/FusionIIIT/applications/placement_cell/migrations/0001_initial.py deleted file mode 100644 index 257c98609..000000000 --- a/FusionIIIT/applications/placement_cell/migrations/0001_initial.py +++ /dev/null @@ -1,289 +0,0 @@ -# Generated by Django 3.1.5 on 2023-03-15 18:53 - -import datetime -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('academic_information', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='ChairmanVisit', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('company_name', models.CharField(default='', max_length=100)), - ('location', models.CharField(default='', max_length=100)), - ('visiting_date', models.DateField(default=datetime.date.today, verbose_name='Date')), - ('description', models.TextField(blank=True, default='', max_length=1000, null=True)), - ('timestamp', models.DateTimeField(auto_now=True)), - ], - ), - migrations.CreateModel( - name='CompanyDetails', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('company_name', models.CharField(blank=True, max_length=100, null=True)), - ], - ), - migrations.CreateModel( - name='MessageOfficer', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('message', models.CharField(default='', max_length=100)), - ('timestamp', models.DateTimeField(auto_now=True)), - ], - ), - migrations.CreateModel( - name='NotifyStudent', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('placement_type', models.CharField(choices=[('PLACEMENT', 'Placement'), ('PBI', 'PBI'), ('HIGHER STUDIES', 'Higher Studies'), ('OTHER', 'Other')], default='PLACEMENT', max_length=20)), - ('company_name', models.CharField(default='', max_length=100)), - ('ctc', models.DecimalField(decimal_places=4, max_digits=10)), - ('description', models.TextField(blank=True, default='', max_length=1000, null=True)), - ('timestamp', models.DateTimeField(auto_now=True)), - ], - ), - migrations.CreateModel( - name='PlacementRecord', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('placement_type', models.CharField(choices=[('PLACEMENT', 'Placement'), ('PBI', 'PBI'), ('HIGHER STUDIES', 'Higher Studies'), ('OTHER', 'Other')], default='PLACEMENT', max_length=20)), - ('name', models.CharField(default='', max_length=100)), - ('ctc', models.DecimalField(decimal_places=2, default=0, max_digits=5)), - ('year', models.IntegerField(default=0)), - ('test_score', models.IntegerField(blank=True, default=0, null=True)), - ('test_type', models.CharField(blank=True, default='', max_length=30, null=True)), - ], - ), - migrations.CreateModel( - name='Role', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('role', models.CharField(blank=True, max_length=100, null=True)), - ], - ), - migrations.CreateModel( - name='Skill', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('skill', models.CharField(default='', max_length=30)), - ], - ), - migrations.CreateModel( - name='StudentPlacement', - fields=[ - ('unique_id', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False, to='academic_information.student')), - ('debar', models.CharField(choices=[('NOT DEBAR', 'Not Debar'), ('DEBAR', 'Debar')], default='NOT DEBAR', max_length=20)), - ('future_aspect', models.CharField(choices=[('PLACEMENT', 'Placement'), ('PBI', 'PBI'), ('HIGHER STUDIES', 'Higher Studies'), ('OTHER', 'Other')], default='PLACEMENT', max_length=20)), - ('placed_type', models.CharField(choices=[('NOT PLACED', 'Not Placed'), ('PLACED', 'Placed')], default='NOT PLACED', max_length=20)), - ('placement_date', models.DateField(blank=True, default=datetime.date.today, null=True, verbose_name='Date')), - ('package', models.DecimalField(blank=True, decimal_places=2, max_digits=5, null=True)), - ], - ), - migrations.CreateModel( - name='Reference', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('reference_name', models.CharField(default='', max_length=100)), - ('post', models.CharField(blank=True, default='', max_length=100, null=True)), - ('email', models.CharField(default='', max_length=50)), - ('mobile_number', models.CharField(blank=True, max_length=15, null=True)), - ('unique_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - ), - migrations.CreateModel( - name='Publication', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('publication_title', models.CharField(default='', max_length=100)), - ('description', models.TextField(blank=True, default='', max_length=250, null=True)), - ('publisher', models.TextField(default='', max_length=250)), - ('publication_date', models.DateField(default=datetime.date.today, verbose_name='Date')), - ('unique_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - ), - migrations.CreateModel( - name='Project', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('project_name', models.CharField(default='', max_length=50)), - ('project_status', models.CharField(choices=[('ONGOING', 'Ongoing'), ('COMPLETED', 'Completed')], default='COMPLETED', max_length=20)), - ('summary', models.TextField(blank=True, default='', max_length=1000, null=True)), - ('project_link', models.CharField(blank=True, default='', max_length=200, null=True)), - ('sdate', models.DateField(default=datetime.date.today, verbose_name='Date')), - ('edate', models.DateField(blank=True, null=True)), - ('unique_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - ), - migrations.CreateModel( - name='PlacementSchedule', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('title', models.CharField(default='', max_length=100)), - ('placement_date', models.DateField(default=datetime.date.today, verbose_name='Date')), - ('location', models.CharField(default='', max_length=100)), - ('description', models.TextField(blank=True, default='', max_length=500, null=True)), - ('time', models.TimeField()), - ('attached_file', models.FileField(blank=True, null=True, upload_to='documents/placement/schedule')), - ('schedule_at', models.DateTimeField(blank=True, default=django.utils.timezone.now, null=True)), - ('notify_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='placement_cell.notifystudent')), - ('role', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='placement_cell.role')), - ], - ), - migrations.CreateModel( - name='Patent', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('patent_name', models.CharField(default='', max_length=100)), - ('description', models.TextField(blank=True, default='', max_length=250, null=True)), - ('patent_office', models.TextField(default='', max_length=250)), - ('patent_date', models.DateField()), - ('unique_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - ), - migrations.CreateModel( - name='Interest', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('interest', models.CharField(default='', max_length=100)), - ('unique_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - ), - migrations.CreateModel( - name='Extracurricular', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('event_name', models.CharField(default='', max_length=100)), - ('event_type', models.CharField(choices=[('SOCIAL', 'Social'), ('CULTURE', 'Culture'), ('SPORT', 'Sport'), ('OTHER', 'Other')], default='OTHER', max_length=20)), - ('description', models.TextField(blank=True, default='', max_length=1000, null=True)), - ('name_of_position', models.CharField(default='', max_length=200)), - ('date_earned', models.DateField(default=datetime.date.today, verbose_name='Date')), - ('unique_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - ), - migrations.CreateModel( - name='Experience', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('title', models.CharField(default='', max_length=100)), - ('status', models.CharField(choices=[('ONGOING', 'Ongoing'), ('COMPLETED', 'Completed')], default='COMPLETED', max_length=20)), - ('description', models.TextField(blank=True, default='', max_length=500, null=True)), - ('company', models.CharField(default='', max_length=200)), - ('location', models.CharField(default='', max_length=200)), - ('sdate', models.DateField(default=datetime.date.today, verbose_name='Date')), - ('edate', models.DateField(blank=True, null=True)), - ('unique_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - ), - migrations.CreateModel( - name='Education', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('degree', models.CharField(default='', max_length=40)), - ('grade', models.CharField(default='', max_length=10)), - ('institute', models.TextField(default='', max_length=250)), - ('stream', models.CharField(blank=True, default='', max_length=150, null=True)), - ('sdate', models.DateField(default=datetime.date.today, verbose_name='Date')), - ('edate', models.DateField(blank=True, null=True)), - ('unique_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - ), - migrations.CreateModel( - name='Course', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('course_name', models.CharField(default='', max_length=100)), - ('description', models.TextField(blank=True, default='', max_length=250, null=True)), - ('license_no', models.CharField(blank=True, default='', max_length=100, null=True)), - ('sdate', models.DateField(default=datetime.date.today, verbose_name='Date')), - ('edate', models.DateField(blank=True, null=True)), - ('unique_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - ), - migrations.CreateModel( - name='Conference', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('conference_name', models.CharField(default='', max_length=100)), - ('description', models.TextField(blank=True, default='', max_length=250, null=True)), - ('sdate', models.DateField(default=datetime.date.today, verbose_name='Date')), - ('edate', models.DateField(blank=True, null=True)), - ('unique_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - ), - migrations.CreateModel( - name='Coinventor', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('coinventor_name', models.CharField(default='', max_length=100)), - ('patent_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='placement_cell.patent')), - ], - ), - migrations.CreateModel( - name='Coauthor', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('coauthor_name', models.CharField(default='', max_length=100)), - ('publication_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='placement_cell.publication')), - ], - ), - migrations.CreateModel( - name='Achievement', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('achievement', models.CharField(default='', max_length=100)), - ('achievement_type', models.CharField(choices=[('EDUCATIONAL', 'Educational'), ('OTHER', 'Other')], default='OTHER', max_length=20)), - ('description', models.TextField(blank=True, default='', max_length=1000, null=True)), - ('issuer', models.CharField(default='', max_length=200)), - ('date_earned', models.DateField(default=datetime.date.today, verbose_name='Date')), - ('unique_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - ), - migrations.CreateModel( - name='StudentRecord', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('record_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='placement_cell.placementrecord')), - ('unique_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - options={ - 'unique_together': {('record_id', 'unique_id')}, - }, - ), - migrations.CreateModel( - name='PlacementStatus', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('invitation', models.CharField(choices=[('ACCEPTED', 'Accepted'), ('REJECTED', 'Rejected'), ('PENDING', 'Pending'), ('IGNORE', 'IGNORE')], default='PENDING', max_length=20)), - ('placed', models.CharField(choices=[('NOT PLACED', 'Not Placed'), ('PLACED', 'Placed')], default='NOT PLACED', max_length=20)), - ('timestamp', models.DateTimeField(auto_now=True)), - ('no_of_days', models.IntegerField(blank=True, default=10, null=True)), - ('notify_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='placement_cell.notifystudent')), - ('unique_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - options={ - 'unique_together': {('notify_id', 'unique_id')}, - }, - ), - migrations.CreateModel( - name='Has', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('skill_rating', models.IntegerField(default=80)), - ('skill_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='placement_cell.skill')), - ('unique_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - options={ - 'unique_together': {('skill_id', 'unique_id')}, - }, - ), - ] diff --git a/FusionIIIT/applications/placement_cell/migrations/__init__.py b/FusionIIIT/applications/placement_cell/migrations/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/FusionIIIT/applications/programme_curriculum/migrations/0001_initial.py b/FusionIIIT/applications/programme_curriculum/migrations/0001_initial.py deleted file mode 100644 index b01ec58a7..000000000 --- a/FusionIIIT/applications/programme_curriculum/migrations/0001_initial.py +++ /dev/null @@ -1,142 +0,0 @@ -# Generated by Django 3.1.5 on 2023-03-15 18:53 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('globals', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='Curriculum', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('version', models.PositiveIntegerField(default=1)), - ('working_curriculum', models.BooleanField(default=True)), - ('no_of_semester', models.PositiveIntegerField(default=1)), - ('min_credit', models.PositiveIntegerField(default=0)), - ], - ), - migrations.CreateModel( - name='Programme', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('category', models.CharField(choices=[('UG', 'Undergraduate'), ('PG', 'Postgraduate'), ('PHD', 'Doctor of Philosophy')], max_length=3)), - ('name', models.CharField(max_length=70, unique=True)), - ('programme_begin_year', models.PositiveIntegerField(default=2023)), - ], - ), - migrations.CreateModel( - name='Semester', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('semester_no', models.PositiveIntegerField()), - ('instigate_semester', models.BooleanField(default=False, null=True)), - ('start_semester', models.DateField(blank=True, null=True)), - ('end_semester', models.DateField(blank=True, null=True)), - ('semester_info', models.TextField(blank=True, null=True)), - ('curriculum', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.curriculum')), - ], - options={ - 'unique_together': {('curriculum', 'semester_no')}, - }, - ), - migrations.CreateModel( - name='Discipline', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100, unique=True)), - ('acronym', models.CharField(default='', max_length=10)), - ('programmes', models.ManyToManyField(blank=True, to='programme_curriculum.Programme')), - ], - ), - migrations.AddField( - model_name='curriculum', - name='programme', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.programme'), - ), - migrations.CreateModel( - name='Course', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('code', models.CharField(max_length=10, unique=True)), - ('name', models.CharField(max_length=100, unique=True)), - ('credit', models.PositiveIntegerField(default=0)), - ('lecture_hours', models.PositiveIntegerField(null=True)), - ('tutorial_hours', models.PositiveIntegerField(null=True)), - ('pratical_hours', models.PositiveIntegerField(null=True)), - ('discussion_hours', models.PositiveIntegerField(null=True)), - ('project_hours', models.PositiveIntegerField(null=True)), - ('pre_requisits', models.TextField(blank=True, null=True)), - ('syllabus', models.TextField()), - ('percent_quiz_1', models.PositiveIntegerField(default=10)), - ('percent_midsem', models.PositiveIntegerField(default=20)), - ('percent_quiz_2', models.PositiveIntegerField(default=10)), - ('percent_endsem', models.PositiveIntegerField(default=30)), - ('percent_project', models.PositiveIntegerField(default=15)), - ('percent_lab_evaluation', models.PositiveIntegerField(default=10)), - ('percent_course_attendance', models.PositiveIntegerField(default=5)), - ('ref_books', models.TextField()), - ('working_course', models.BooleanField(default=True)), - ('disciplines', models.ManyToManyField(blank=True, to='programme_curriculum.Discipline')), - ('pre_requisit_courses', models.ManyToManyField(blank=True, related_name='_course_pre_requisit_courses_+', to='programme_curriculum.Course')), - ], - options={ - 'unique_together': {('code', 'name')}, - }, - ), - migrations.CreateModel( - name='Batch', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(choices=[('B.Tech', 'B.Tech'), ('M.Tech', 'M.Tech'), ('B.Des', 'B.Des'), ('M.Des', 'M.Des'), ('Phd', 'Phd')], max_length=50)), - ('year', models.PositiveIntegerField(default=2023)), - ('running_batch', models.BooleanField(default=True)), - ('curriculum', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='programme_curriculum.curriculum')), - ('discipline', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.discipline')), - ], - options={ - 'unique_together': {('name', 'discipline', 'year')}, - }, - ), - migrations.AlterUniqueTogether( - name='curriculum', - unique_together={('name', 'version')}, - ), - migrations.CreateModel( - name='CourseSlot', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('type', models.CharField(choices=[('Professional Core', 'Professional Core'), ('Professional Elective', 'Professional Elective'), ('Professional Lab', 'Professional Lab'), ('Engineering Science', 'Engineering Science'), ('Natural Science', 'Natural Science'), ('Humanities', 'Humanities'), ('Design', 'Design'), ('Manufacturing', 'Manufacturing'), ('Management Science', 'Management Science'), ('Optional Elective', 'Optional Elective'), ('Project', 'Project'), ('Optional', 'Optional'), ('Others', 'Others')], max_length=70)), - ('course_slot_info', models.TextField(null=True)), - ('duration', models.PositiveIntegerField(default=1)), - ('min_registration_limit', models.PositiveIntegerField(default=0)), - ('max_registration_limit', models.PositiveIntegerField(default=1000)), - ('courses', models.ManyToManyField(blank=True, to='programme_curriculum.Course')), - ('semester', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.semester')), - ], - options={ - 'unique_together': {('semester', 'name', 'type')}, - }, - ), - migrations.CreateModel( - name='CourseInstructor', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('batch_id', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.batch')), - ('course_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='programme_curriculum.course')), - ('instructor_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')), - ], - options={ - 'unique_together': {('course_id', 'instructor_id', 'batch_id')}, - }, - ), - ] diff --git a/FusionIIIT/applications/programme_curriculum/migrations/0002_auto_20240304_1820.py b/FusionIIIT/applications/programme_curriculum/migrations/0002_auto_20240304_1820.py deleted file mode 100644 index c9b1e842c..000000000 --- a/FusionIIIT/applications/programme_curriculum/migrations/0002_auto_20240304_1820.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 3.1.5 on 2024-03-04 18:20 - -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/programme_curriculum/migrations/__init__.py b/FusionIIIT/applications/programme_curriculum/migrations/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/FusionIIIT/applications/ps1/migrations/0001_initial.py b/FusionIIIT/applications/ps1/migrations/0001_initial.py deleted file mode 100644 index 4cd74fe33..000000000 --- a/FusionIIIT/applications/ps1/migrations/0001_initial.py +++ /dev/null @@ -1,58 +0,0 @@ -# Generated by Django 3.1.5 on 2023-03-15 18:53 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('filetracking', '0001_initial'), - ('globals', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='IndentFile', - fields=[ - ('file_info', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False, to='filetracking.file')), - ('item_name', models.CharField(max_length=250)), - ('quantity', models.IntegerField()), - ('present_stock', models.IntegerField()), - ('estimated_cost', models.IntegerField(null=True)), - ('purpose', models.CharField(max_length=250)), - ('specification', models.CharField(max_length=250)), - ('indent_type', models.CharField(max_length=250)), - ('nature', models.BooleanField(default=False)), - ('indigenous', models.BooleanField(default=False)), - ('replaced', models.BooleanField(default=False)), - ('budgetary_head', models.CharField(max_length=250)), - ('expected_delivery', models.DateField()), - ('sources_of_supply', models.CharField(max_length=250)), - ('head_approval', models.BooleanField(default=False)), - ('director_approval', models.BooleanField(default=False)), - ('financial_approval', models.BooleanField(default=False)), - ('purchased', models.BooleanField(default=False)), - ], - options={ - 'db_table': 'IndentFile', - }, - ), - migrations.CreateModel( - name='StockEntry', - fields=[ - ('item_id', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False, to='ps1.indentfile')), - ('vendor', models.CharField(max_length=250)), - ('item_name', models.CharField(max_length=250)), - ('current_stock', models.IntegerField()), - ('recieved_date', models.DateField()), - ('bill', models.FileField(upload_to='')), - ('dealing_assistant_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')), - ], - options={ - 'db_table': 'StockEntry', - }, - ), - ] diff --git a/FusionIIIT/applications/ps1/migrations/__init__.py b/FusionIIIT/applications/ps1/migrations/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/FusionIIIT/applications/recruitment/migrations/0001_initial.py b/FusionIIIT/applications/recruitment/migrations/0001_initial.py deleted file mode 100644 index 9cf2d3a77..000000000 --- a/FusionIIIT/applications/recruitment/migrations/0001_initial.py +++ /dev/null @@ -1,311 +0,0 @@ -# Generated by Django 3.1.5 on 2023-03-15 18:53 - -import datetime -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ] - - operations = [ - migrations.CreateModel( - name='EducationalDetails', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('university', models.CharField(max_length=200)), - ('board', models.CharField(max_length=200)), - ('year_of_passing', models.IntegerField()), - ('division', models.CharField(max_length=6)), - ], - ), - migrations.CreateModel( - name='Experience', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('duration', models.IntegerField(null=True)), - ('organization', models.CharField(max_length=100, null=True)), - ('area', models.CharField(max_length=200, null=True)), - ], - ), - migrations.CreateModel( - name='Vacancy', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('advertisement_number', models.IntegerField()), - ('job_description', models.TextField()), - ('job_notification', models.FileField(upload_to='')), - ('number_of_vacancy', models.IntegerField(default=1)), - ('job_type', models.CharField(choices=[('T', 'Teaching'), ('NT', 'Non-Teaching')], max_length=15)), - ('last_date', models.DateField()), - ], - ), - migrations.CreateModel( - name='ThesisSupervision', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name_of_student', models.CharField(max_length=200)), - ('masters_or_phd', models.CharField(choices=[('Masters', 'Masters'), ('PhD', 'PhD')], max_length=20)), - ('year_of_completion', models.IntegerField()), - ('title_of_thesis', models.CharField(max_length=100)), - ('co_guides', models.CharField(max_length=200, null=True)), - ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='TeachingExperience', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('teaching_experience', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='recruitment.experience')), - ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='SponsoredProjects', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('period', models.CharField(max_length=10)), - ('sponsoring_organisation', models.CharField(max_length=200)), - ('title_of_project', models.CharField(max_length=200)), - ('grant_amount', models.IntegerField(null=True)), - ('co_investigators', models.CharField(max_length=200, null=True)), - ('status', models.CharField(choices=[('Ongoing', 'Ongoing'), ('Completed', 'Completed')], max_length=20)), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='ResearchExperience', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('research_experience', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='recruitment.experience')), - ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='References', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100)), - ('address', models.TextField(null=True)), - ('email', models.EmailField(max_length=254)), - ('mobile_number', models.BigIntegerField()), - ('department', models.CharField(max_length=50)), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='QualifiedExams', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('net', models.BooleanField()), - ('gate', models.BooleanField()), - ('jrf', models.BooleanField()), - ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='Publications', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('referred_journal', models.CharField(max_length=100)), - ('sci_index_journal', models.CharField(max_length=100)), - ('international_conferences', models.CharField(max_length=100, null=True)), - ('national_conferences', models.CharField(max_length=100, null=True)), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='PersonalDetails', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('title', models.CharField(default='Dr.', max_length=20)), - ('sex', models.CharField(choices=[('M', 'Male'), ('F', 'Female'), ('O', 'Other')], default='M', max_length=2)), - ('profile_picture', models.ImageField(blank=True, null=True, upload_to='')), - ('marital_status', models.CharField(choices=[('M', 'Married'), ('U', 'Unmarried')], max_length=10)), - ('discipline', models.CharField(max_length=50)), - ('specialization', models.CharField(choices=[('MA', 'Major'), ('MI', 'Minor')], max_length=10)), - ('category', models.CharField(choices=[('PH', 'Physically Handicapped'), ('UR', 'Unreserved'), ('OBC', 'Other Backward Classes'), ('SC', 'Scheduled Castes'), ('ST', 'Scheduled Tribes'), ('EWS', 'Economic Weaker Section')], max_length=20)), - ('father_name', models.CharField(default='', max_length=40)), - ('address_correspondence', models.TextField(max_length=1000)), - ('address_permanent', models.TextField(default='', max_length=1000)), - ('email_alternate', models.EmailField(default='', max_length=50, null=True)), - ('phone_no', models.BigIntegerField(default=9999999999, null=True)), - ('mobile_no_first', models.BigIntegerField(default=9999999999)), - ('mobile_no_second', models.BigIntegerField(default=9999999999, null=True)), - ('date_of_birth', models.DateField(default=datetime.date(1970, 1, 1))), - ('nationality', models.CharField(max_length=30)), - ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='Patent', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('filed_national', models.CharField(max_length=200, null=True)), - ('filed_international', models.CharField(max_length=200, null=True)), - ('award_national', models.CharField(max_length=200, null=True)), - ('award_international', models.CharField(max_length=200, null=True)), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='PapersInReferredJournal', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('author', models.CharField(max_length=100)), - ('year', models.IntegerField()), - ('published', models.BooleanField()), - ('accepted', models.BooleanField()), - ('title', models.CharField(max_length=100)), - ('reference_of_journal', models.CharField(max_length=100)), - ('impact_factor', models.CharField(max_length=100)), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='NationalConference', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('author', models.CharField(max_length=100)), - ('year', models.IntegerField()), - ('title', models.CharField(max_length=100)), - ('name_and_place_of_conference', models.CharField(max_length=200)), - ('presented', models.BooleanField()), - ('published', models.BooleanField()), - ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='InternationalConference', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('author', models.CharField(max_length=100)), - ('year', models.IntegerField()), - ('title', models.CharField(max_length=100)), - ('name_and_place_of_conference', models.CharField(max_length=200)), - ('presented', models.BooleanField()), - ('published', models.BooleanField()), - ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='IndustrialExperience', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('period', models.IntegerField(null=True)), - ('organization', models.CharField(max_length=200, null=True)), - ('title_of_post', models.CharField(max_length=200, null=True)), - ('nature_of_work', models.TextField(null=True)), - ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='ExperienceDetails', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('total_experience_months', models.IntegerField(null=True)), - ('member_of_professional_body', models.CharField(max_length=200, null=True)), - ('employer', models.CharField(max_length=100, null=True)), - ('position_held', models.CharField(max_length=100, null=True)), - ('date_of_joining', models.DateField(null=True)), - ('date_of_leaving', models.DateField(null=True)), - ('pay_in_payband', models.CharField(max_length=20, null=True)), - ('payband', models.CharField(max_length=20, null=True)), - ('AGP', models.CharField(max_length=20, null=True)), - ('reasons_for_leaving', models.TextField(null=True)), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='CoursesTaught', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('title', models.CharField(max_length=100, null=True)), - ('level', models.CharField(choices=[('UG', 'UnderGraduate'), ('PG', 'PostGraduate')], max_length=20, null=True)), - ('number_of_times', models.IntegerField(null=True)), - ('developed_by_you', models.BooleanField(null=True)), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='Consultancy', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('period', models.CharField(max_length=10)), - ('sponsoring_organisation', models.CharField(max_length=200)), - ('title_of_project', models.CharField(max_length=200)), - ('grant_amount', models.IntegerField(null=True)), - ('co_investigators', models.CharField(max_length=200, null=True)), - ('status', models.CharField(choices=[('Ongoing', 'Ongoing'), ('Completed', 'Completed')], max_length=20)), - ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='Books', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name_of_book', models.CharField(max_length=100)), - ('year', models.IntegerField()), - ('published', models.BooleanField()), - ('title', models.CharField(max_length=100)), - ('publisher', models.CharField(max_length=200)), - ('co_author', models.CharField(max_length=100, null=True)), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='BankDetails', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('payment_reference_number', models.CharField(max_length=20)), - ('payment_date', models.DateField()), - ('bank_name', models.CharField(max_length=100)), - ('bank_branch', models.CharField(max_length=200)), - ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='applied', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('date', models.DateField(default=django.utils.timezone.now)), - ('advertisement_number', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='recruitment.vacancy')), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='AdministrativeExperience', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('period', models.IntegerField(null=True)), - ('organization', models.CharField(max_length=200, null=True)), - ('title_of_post', models.CharField(max_length=200, null=True)), - ('nature_of_work', models.TextField(null=True)), - ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='AcademicDetails', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('area_of_specialization', models.TextField()), - ('current_area_of_research', models.TextField()), - ('date_of_enrollment_in_phd', models.DateField()), - ('date_of_phd_defence', models.DateField()), - ('date_of_award_of_phd', models.DateField()), - ('XIIth', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='XIIth_details', to='recruitment.educationaldetails')), - ('Xth', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='Xth_details', to='recruitment.educationaldetails')), - ('graduation', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='graduation_details', to='recruitment.educationaldetails')), - ('phd', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='phd_details', to='recruitment.educationaldetails')), - ('post_graduation', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='post_graduations_details', to='recruitment.educationaldetails')), - ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - ] diff --git a/FusionIIIT/applications/recruitment/migrations/__init__.py b/FusionIIIT/applications/recruitment/migrations/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/FusionIIIT/applications/research_procedures/migrations/0001_initial.py b/FusionIIIT/applications/research_procedures/migrations/0001_initial.py deleted file mode 100644 index ec4b77a48..000000000 --- a/FusionIIIT/applications/research_procedures/migrations/0001_initial.py +++ /dev/null @@ -1,91 +0,0 @@ -# Generated by Django 3.1.5 on 2023-03-15 18:53 - -import datetime -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('globals', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='TechTransfer', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('pf_no', models.IntegerField()), - ('details', models.CharField(default=' ', max_length=500)), - ('date_entry', models.DateField(blank=True, default=datetime.datetime.now, null=True)), - ('start_date', models.DateField(blank=True, null=True)), - ('end_date', models.DateField(blank=True, null=True)), - ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='ResearchProject', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('pf_no', models.IntegerField()), - ('ptype', models.CharField(default='Research', max_length=100)), - ('pi', models.CharField(default=' ', max_length=1000)), - ('co_pi', models.CharField(default=' ', max_length=1500)), - ('title', models.TextField(default=' ', max_length=5000)), - ('funding_agency', models.CharField(default=' ', max_length=250, null=True)), - ('financial_outlay', models.CharField(default=' ', max_length=150, null=True)), - ('status', models.CharField(choices=[('Awarded', 'Awarded'), ('Submitted', 'Submitted'), ('Ongoing', 'Ongoing'), ('Completed', 'Completed')], max_length=10)), - ('start_date', models.DateField(blank=True, null=True)), - ('finish_date', models.DateField(blank=True, null=True)), - ('date_submission', models.DateField(blank=True, null=True)), - ('date_entry', models.DateField(blank=True, default=datetime.datetime.now, null=True)), - ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='ResearchGroup', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=120)), - ('description', models.TextField()), - ('faculty_under_group', models.ManyToManyField(related_name='allfaculty', to=settings.AUTH_USER_MODEL)), - ('students_under_group', models.ManyToManyField(related_name='allstudents', to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='Patent', - fields=[ - ('application_id', models.AutoField(primary_key=True, serialize=False)), - ('title', models.CharField(max_length=120)), - ('ipd_form', models.FileField(blank=True, null=True, upload_to='')), - ('project_details', models.FileField(blank=True, null=True, upload_to='')), - ('ipd_form_file', models.TextField(blank=True, null=True)), - ('project_details_file', models.TextField(blank=True, null=True)), - ('status', models.CharField(choices=[('Approved', 'Approved'), ('Disapproved', 'Disapproved'), ('Pending', 'Pending')], default='Pending', max_length=20)), - ('faculty_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')), - ], - ), - migrations.CreateModel( - name='ConsultancyProject', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('pf_no', models.IntegerField()), - ('consultants', models.CharField(max_length=150)), - ('title', models.CharField(max_length=1000)), - ('client', models.CharField(max_length=1000)), - ('financial_outlay', models.IntegerField()), - ('start_date', models.DateField(blank=True, null=True)), - ('end_date', models.DateField(blank=True, null=True)), - ('duration', models.CharField(blank=True, max_length=500, null=True)), - ('date_entry', models.DateField(blank=True, default=datetime.datetime.now, null=True)), - ('status', models.CharField(blank=True, choices=[('Completed', 'Completed'), ('Submitted', 'Submitted'), ('Ongoing', 'Ongoing')], default='Ongoing', max_length=10, null=True)), - ('remarks', models.CharField(blank=True, max_length=1000, null=True)), - ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - ] diff --git a/FusionIIIT/applications/research_procedures/migrations/__init__.py b/FusionIIIT/applications/research_procedures/migrations/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/FusionIIIT/applications/scholarships/migrations/0001_initial.py b/FusionIIIT/applications/scholarships/migrations/0001_initial.py deleted file mode 100644 index 176422fd9..000000000 --- a/FusionIIIT/applications/scholarships/migrations/0001_initial.py +++ /dev/null @@ -1,233 +0,0 @@ -# Generated by Django 3.1.5 on 2023-03-15 18:53 - -import datetime -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('academic_information', '0001_initial'), - ('globals', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='Award_and_scholarship', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('award_name', models.CharField(default='', max_length=100)), - ('catalog', models.TextField(max_length=5000)), - ], - options={ - 'db_table': 'Award_and_scholarship', - }, - ), - migrations.CreateModel( - name='Release', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('date_time', models.DateTimeField(blank=True, default=datetime.datetime.now)), - ('programme', models.CharField(default='B.Tech', max_length=10)), - ('startdate', models.DateField(default=datetime.date.today)), - ('enddate', models.DateField()), - ('award', models.CharField(default='', max_length=50)), - ('remarks', models.TextField(default='', max_length=500)), - ('batch', models.TextField(default='all')), - ('notif_visible', models.IntegerField(default=1)), - ], - options={ - 'db_table': 'Release', - }, - ), - migrations.CreateModel( - name='Proficiency_dm', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('relevant_document', models.FileField(blank=True, null=True, upload_to='')), - ('title_name', models.CharField(max_length=30, null=True)), - ('award_type', models.CharField(max_length=50, null=True)), - ('status', models.CharField(choices=[('Complete', 'COMPLETE'), ('Incomplete', 'INCOMPLETE'), ('Reject', 'REJECT'), ('Accept', 'ACCEPT')], default='INCOMPLETE', max_length=10)), - ('no_of_students', models.IntegerField(default=1)), - ('date', models.DateField(default=datetime.date.today)), - ('roll_no1', models.IntegerField(default=0)), - ('roll_no2', models.IntegerField(default=0)), - ('roll_no3', models.IntegerField(default=0)), - ('roll_no4', models.IntegerField(default=0)), - ('roll_no5', models.IntegerField(default=0)), - ('brief_description', models.TextField(max_length=1000, null=True)), - ('justification', models.TextField(max_length=1000, null=True)), - ('ece_topic', models.CharField(max_length=25, null=True)), - ('cse_topic', models.CharField(max_length=25, null=True)), - ('mech_topic', models.CharField(max_length=25, null=True)), - ('design_topic', models.CharField(max_length=25, null=True)), - ('ece_percentage', models.IntegerField(null=True)), - ('cse_percentage', models.IntegerField(null=True)), - ('mech_percentage', models.IntegerField(null=True)), - ('design_percentage', models.IntegerField(null=True)), - ('correspondence_address', models.CharField(max_length=100, null=True)), - ('financial_assistance', models.TextField(max_length=1000, null=True)), - ('grand_total', models.IntegerField(null=True)), - ('nearest_policestation', models.CharField(max_length=25, null=True)), - ('nearest_railwaystation', models.CharField(max_length=25, null=True)), - ('award_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='scholarships.award_and_scholarship')), - ('student', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - options={ - 'db_table': 'Proficiency_dm', - }, - ), - migrations.CreateModel( - name='Previous_winner', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('programme', models.CharField(default='B.Tech', max_length=10)), - ('year', models.IntegerField(default=2023)), - ('award_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='scholarships.award_and_scholarship')), - ('student', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - options={ - 'db_table': 'Previous_winner', - }, - ), - migrations.CreateModel( - name='Notional_prize', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('spi', models.FloatField()), - ('cpi', models.FloatField()), - ('year', models.CharField(choices=[('UG1', 'UG1'), ('UG2', 'UG2'), ('UG3', 'UG3'), ('UG4', 'UG4'), ('PG1', 'PG1'), ('PG2', 'PG2')], max_length=10)), - ('award_id', models.ForeignKey(default=4, on_delete=django.db.models.deletion.CASCADE, to='scholarships.award_and_scholarship')), - ], - options={ - 'db_table': 'Notional_prize', - }, - ), - migrations.CreateModel( - name='Notification', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('notification_mcm_flag', models.BooleanField(default=False)), - ('notification_convocation_flag', models.BooleanField(default=False)), - ('invite_mcm_accept_flag', models.BooleanField(default=False)), - ('invite_convocation_accept_flag', models.BooleanField(default=False)), - ('release_id', models.ForeignKey(default=None, on_delete=django.db.models.deletion.CASCADE, to='scholarships.release')), - ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - options={ - 'db_table': 'Notification', - }, - ), - migrations.CreateModel( - name='Mcm', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('brother_name', models.CharField(max_length=30, null=True)), - ('brother_occupation', models.TextField(max_length=100, null=True)), - ('sister_name', models.CharField(max_length=30, null=True)), - ('sister_occupation', models.TextField(max_length=100, null=True)), - ('income_father', models.IntegerField(default=0)), - ('income_mother', models.IntegerField(default=0)), - ('income_other', models.IntegerField(default=0)), - ('father_occ', models.CharField(choices=[('government', 'Government'), ('private', 'Private'), ('public', 'Public'), ('business', 'Business'), ('medical', 'Medical'), ('consultant', 'Consultant'), ('pensioners', 'Pensioners')], default='', max_length=10)), - ('mother_occ', models.CharField(choices=[('EMPLOYED', 'EMPLOYED'), ('HOUSE_WIFE', 'HOUSE_WIFE')], default='', max_length=10)), - ('father_occ_desc', models.CharField(max_length=30, null=True)), - ('mother_occ_desc', models.CharField(max_length=30, null=True)), - ('four_wheeler', models.IntegerField(blank=True, null=True)), - ('four_wheeler_desc', models.CharField(max_length=30, null=True)), - ('two_wheeler', models.IntegerField(blank=True, null=True)), - ('two_wheeler_desc', models.CharField(max_length=30, null=True)), - ('house', models.CharField(max_length=10, null=True)), - ('plot_area', models.IntegerField(blank=True, null=True)), - ('constructed_area', models.IntegerField(blank=True, null=True)), - ('school_fee', models.IntegerField(blank=True, null=True)), - ('school_name', models.CharField(max_length=30, null=True)), - ('bank_name', models.CharField(max_length=100, null=True)), - ('loan_amount', models.IntegerField(blank=True, null=True)), - ('college_fee', models.IntegerField(blank=True, null=True)), - ('college_name', models.CharField(max_length=30, null=True)), - ('income_certificate', models.FileField(blank=True, null=True, upload_to='')), - ('forms', models.FileField(blank=True, null=True, upload_to='')), - ('status', models.CharField(choices=[('Complete', 'COMPLETE'), ('Incomplete', 'INCOMPLETE'), ('Reject', 'REJECT'), ('Accept', 'ACCEPT')], default='INCOMPLETE', max_length=10)), - ('annual_income', models.IntegerField(default=0)), - ('date', models.DateField(default=datetime.date.today)), - ('award_id', models.ForeignKey(default=4, on_delete=django.db.models.deletion.CASCADE, to='scholarships.award_and_scholarship')), - ('student', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='mcm_info', to='academic_information.student')), - ], - options={ - 'db_table': 'Mcm', - }, - ), - migrations.CreateModel( - name='Director_silver', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('nearest_policestation', models.TextField(default='station', max_length=30)), - ('nearest_railwaystation', models.TextField(default='station', max_length=30)), - ('correspondence_address', models.TextField(max_length=150, null=True)), - ('award_type', models.CharField(max_length=50, null=True)), - ('status', models.CharField(choices=[('Complete', 'COMPLETE'), ('Incomplete', 'INCOMPLETE'), ('Reject', 'REJECT'), ('Accept', 'ACCEPT')], default='INCOMPLETE', max_length=10)), - ('relevant_document', models.FileField(blank=True, null=True, upload_to='')), - ('date', models.DateField(default=datetime.date.today)), - ('financial_assistance', models.TextField(max_length=1000, null=True)), - ('grand_total', models.IntegerField(null=True)), - ('inside_achievements', models.TextField(max_length=1000, null=True)), - ('justification', models.TextField(max_length=1000, null=True)), - ('outside_achievements', models.TextField(max_length=1000, null=True)), - ('award_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='scholarships.award_and_scholarship')), - ('student', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - options={ - 'db_table': 'Director_silver', - }, - ), - migrations.CreateModel( - name='Director_gold', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('status', models.CharField(choices=[('Complete', 'COMPLETE'), ('Incomplete', 'INCOMPLETE'), ('Reject', 'REJECT'), ('Accept', 'ACCEPT')], default='INCOMPLETE', max_length=10)), - ('relevant_document', models.FileField(blank=True, null=True, upload_to='')), - ('date', models.DateField(default=datetime.date.today)), - ('academic_achievements', models.TextField(max_length=1000, null=True)), - ('science_inside', models.TextField(max_length=1000, null=True)), - ('science_outside', models.TextField(max_length=1000, null=True)), - ('games_inside', models.TextField(max_length=1000, null=True)), - ('games_outside', models.TextField(max_length=1000, null=True)), - ('cultural_inside', models.TextField(max_length=1000, null=True)), - ('cultural_outside', models.TextField(max_length=1000, null=True)), - ('social', models.TextField(max_length=1000, null=True)), - ('corporate', models.TextField(max_length=1000, null=True)), - ('hall_activities', models.TextField(max_length=1000, null=True)), - ('gymkhana_activities', models.TextField(max_length=1000, null=True)), - ('institute_activities', models.TextField(max_length=1000, null=True)), - ('counselling_activities', models.TextField(max_length=1000, null=True)), - ('other_activities', models.TextField(max_length=1000, null=True)), - ('justification', models.TextField(max_length=1000, null=True)), - ('correspondence_address', models.CharField(max_length=100, null=True)), - ('financial_assistance', models.TextField(max_length=1000, null=True)), - ('grand_total', models.IntegerField(null=True)), - ('nearest_policestation', models.CharField(max_length=25, null=True)), - ('nearest_railwaystation', models.CharField(max_length=25, null=True)), - ('award_id', models.ForeignKey(default=4, on_delete=django.db.models.deletion.CASCADE, to='scholarships.award_and_scholarship')), - ('student', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='academic_information.student')), - ], - options={ - 'db_table': 'Director_gold', - }, - ), - migrations.CreateModel( - name='Application', - fields=[ - ('application_id', models.CharField(max_length=100, primary_key=True, serialize=False)), - ('applied_flag', models.BooleanField(default=False)), - ('award', models.CharField(max_length=30)), - ('student_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='globals.extrainfo')), - ], - options={ - 'db_table': 'Application', - }, - ), - ] diff --git a/FusionIIIT/applications/scholarships/migrations/0002_auto_20240304_1820.py b/FusionIIIT/applications/scholarships/migrations/0002_auto_20240304_1820.py deleted file mode 100644 index da87fa019..000000000 --- a/FusionIIIT/applications/scholarships/migrations/0002_auto_20240304_1820.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.1.5 on 2024-03-04 18:20 - -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), - ), - ] diff --git a/FusionIIIT/applications/scholarships/migrations/__init__.py b/FusionIIIT/applications/scholarships/migrations/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/FusionIIIT/applications/visitor_hostel/migrations/0001_initial.py b/FusionIIIT/applications/visitor_hostel/migrations/0001_initial.py deleted file mode 100644 index f4229feb2..000000000 --- a/FusionIIIT/applications/visitor_hostel/migrations/0001_initial.py +++ /dev/null @@ -1,134 +0,0 @@ -# Generated by Django 3.1.5 on 2023-03-15 18:53 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ] - - operations = [ - migrations.CreateModel( - name='BookingDetail', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('visitor_category', models.CharField(choices=[('A', 'A'), ('B', 'B'), ('C', 'C'), ('D', 'D')], default='C', max_length=1)), - ('modified_visitor_category', models.CharField(choices=[('A', 'A'), ('B', 'B'), ('C', 'C'), ('D', 'D')], default='C', max_length=1)), - ('person_count', models.IntegerField(default=1)), - ('purpose', models.TextField(default='Hi!')), - ('booking_from', models.DateField()), - ('booking_to', models.DateField()), - ('arrival_time', models.TextField(blank=True, null=True)), - ('departure_time', models.TextField(blank=True, null=True)), - ('forwarded_date', models.DateField(blank=True, null=True)), - ('confirmed_date', models.DateField(blank=True, null=True)), - ('check_in', models.DateField(blank=True, null=True)), - ('check_out', models.DateField(blank=True, null=True)), - ('check_in_time', models.TimeField(blank=True, null=True)), - ('check_out_time', models.TimeField(blank=True, null=True)), - ('status', models.CharField(choices=[('Confirmed', 'Confirmed'), ('Pending', 'Pending'), ('Rejected', 'Rejected'), ('Canceled', 'Canceled'), ('CancelRequested', 'CancelRequested'), ('CheckedIn', 'CheckedIn'), ('Complete', 'Complete'), ('Forward', 'Forward')], default='Pending', max_length=15)), - ('remark', models.CharField(blank=True, max_length=40, null=True)), - ('image', models.FileField(blank=True, null=True, upload_to='VhImage/')), - ('number_of_rooms', models.IntegerField(blank=True, default=1, null=True)), - ('number_of_rooms_alloted', models.IntegerField(blank=True, default=1, null=True)), - ('booking_date', models.DateField(default=django.utils.timezone.now)), - ('bill_to_be_settled_by', models.CharField(choices=[('Intender', 'Intender'), ('Visitor', 'Visitor'), ('ProjectNo', 'ProjectNo'), ('Institute', 'Institute')], default='Intender', max_length=15)), - ('caretaker', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, related_name='caretaker', to=settings.AUTH_USER_MODEL)), - ('intender', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='intender', to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.CreateModel( - name='Inventory', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('item_name', models.CharField(max_length=20)), - ('quantity', models.IntegerField(default=0)), - ('consumable', models.BooleanField(default=False)), - ('opening_stock', models.IntegerField(default=0)), - ('addition_stock', models.IntegerField(default=0)), - ('total_stock', models.IntegerField(default=0)), - ('serviceable', models.IntegerField(default=0)), - ('non_serviceable', models.IntegerField(default=0)), - ('inuse', models.IntegerField(default=0)), - ('total_usable', models.IntegerField(default=0)), - ('remark', models.TextField(blank=True)), - ], - ), - migrations.CreateModel( - name='VisitorDetail', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('visitor_phone', models.CharField(max_length=15)), - ('visitor_name', models.CharField(max_length=40)), - ('visitor_email', models.CharField(blank=True, max_length=40)), - ('visitor_organization', models.CharField(blank=True, max_length=100)), - ('visitor_address', models.TextField(blank=True)), - ('nationality', models.CharField(blank=True, max_length=20)), - ], - ), - migrations.CreateModel( - name='RoomDetail', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('room_number', models.CharField(max_length=4, unique=True)), - ('room_type', models.CharField(choices=[('SingleBed', 'SingleBed'), ('DoubleBed', 'DoubleBed'), ('VIP', 'VIP')], max_length=12)), - ('room_floor', models.CharField(choices=[('GroundFloor', 'GroundFloor'), ('FirstFloor', 'FirstFloor'), ('SecondFloor', 'SecondFloor'), ('ThirdFloor', 'ThirdFloor')], max_length=12)), - ('room_status', models.CharField(choices=[('Booked', 'Booked'), ('CheckedIn', 'CheckedIn'), ('Available', 'Available'), ('UnderMaintenance', 'UnderMaintenance')], default='Available', max_length=20)), - ('visitor', models.ManyToManyField(blank=True, to='visitor_hostel.VisitorDetail')), - ], - ), - migrations.CreateModel( - name='MealRecord', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('meal_date', models.DateField()), - ('morning_tea', models.BooleanField(default=False)), - ('eve_tea', models.BooleanField(default=False)), - ('breakfast', models.BooleanField(default=False)), - ('lunch', models.BooleanField(default=False)), - ('dinner', models.BooleanField(default=False)), - ('persons', models.IntegerField(default=0)), - ('booking', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='visitor_hostel.bookingdetail')), - ('room', models.ForeignKey(default=0, on_delete=django.db.models.deletion.CASCADE, to='visitor_hostel.roomdetail')), - ('visitor', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='visitor_hostel.visitordetail')), - ], - ), - migrations.CreateModel( - name='InventoryBill', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('bill_number', models.CharField(max_length=40)), - ('cost', models.IntegerField(default=0)), - ('item_name', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='visitor_hostel.inventory')), - ], - ), - migrations.AddField( - model_name='bookingdetail', - name='rooms', - field=models.ManyToManyField(to='visitor_hostel.RoomDetail'), - ), - migrations.AddField( - model_name='bookingdetail', - name='visitor', - field=models.ManyToManyField(to='visitor_hostel.VisitorDetail'), - ), - migrations.CreateModel( - name='Bill', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('meal_bill', models.IntegerField(default=0)), - ('room_bill', models.IntegerField(default=0)), - ('payment_status', models.BooleanField(default=False)), - ('booking', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='visitor_hostel.bookingdetail')), - ('caretaker', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ('room', models.ManyToManyField(to='visitor_hostel.RoomDetail')), - ], - ), - ] diff --git a/FusionIIIT/applications/visitor_hostel/migrations/__init__.py b/FusionIIIT/applications/visitor_hostel/migrations/__init__.py deleted file mode 100644 index e69de29bb..000000000 From 56918b4d6e6530ac4b25f97ed0ccb2699256771f Mon Sep 17 00:00:00 2001 From: nidhibarapatre Date: Tue, 26 Mar 2024 18:28:06 +0530 Subject: [PATCH 27/34] resolved errors --- .../applications/complaint_system/urls.py | 6 +- .../applications/complaint_system/views.py | 532 ++++++------------ .../complaintModule/assignworker.html | 130 +---- .../complaintModule/carefeedback.html | 4 +- .../complaintModule/complaint_caretaker.html | 2 +- .../complainthistory_care_final.html | 6 +- .../complainthistory_user_final.html | 12 +- .../templates/complaintModule/feedback.html | 2 +- FusionIIIT/templates/dashboard/modules.html | 14 +- 9 files changed, 207 insertions(+), 501 deletions(-) diff --git a/FusionIIIT/applications/complaint_system/urls.py b/FusionIIIT/applications/complaint_system/urls.py index 7e96bf066..2bd0c87e0 100644 --- a/FusionIIIT/applications/complaint_system/urls.py +++ b/FusionIIIT/applications/complaint_system/urls.py @@ -19,7 +19,7 @@ url(r'^caretaker/$', views.caretaker, name='caretaker'), url(r'^caretaker/feedback/(?P[0-9]+)/$', views.feedback_care), url(r'^caretaker/pending/(?P[0-9]+)/$', views.resolvepending), - url(r'^caretaker/detail/(?P[0-9]+)/$', views.detail), + url(r'^caretaker/detail2/(?P[0-9]+)/$', views.detail), url(r'^caretaker/search_complaint$', views.search_complaint), url(r'^caretaker/(?P[0-9]+)/feedback/$', views.submitfeedbackcaretaker), @@ -29,8 +29,8 @@ url(r'^supervisor/$', views.supervisor), url(r'^supervisor/feedback/(?P[0-9]+)/$', views.feedback_super), url(r'^supervisor/caretaker_id_know_more/(?P[0-9]+)/$', views.caretaker_id_know_more), - url(r'^supervisor/caretaker_id_know_more/(?P[0-9]+)/complaint_reassign_super/(?P[0-9]+)/$', views.complaint_reassign_super, name = 'complaint_reassign_super'), - url(r'^supervisor/detail3/(?P[0-9]+)/$', views.detail3, name = 'detail3'), + # url(r'^supervisor/caretaker_id_know_more/(?P[0-9]+)/complaint_reassign_super/(?P[0-9]+)/$', views.complaint_reassign_super, name = 'complaint_reassign_super'), + url(r'^supervisor/detail/(?P[0-9]+)/$', views.detail3, name = 'detail3'), url(r'^supervisor/pending/(?P[0-9]+)/$', views.resolvependingsuper), url(r'^supervisor/(?P[0-9]+)/$', views.submitfeedbacksuper), diff --git a/FusionIIIT/applications/complaint_system/views.py b/FusionIIIT/applications/complaint_system/views.py index 1410ea846..501c22995 100644 --- a/FusionIIIT/applications/complaint_system/views.py +++ b/FusionIIIT/applications/complaint_system/views.py @@ -19,73 +19,73 @@ #function for reassign to another worker -@login_required -def complaint_reassign(request,wid,iid): - current_user = get_object_or_404(User, username=request.user.username) - y = ExtraInfo.objects.all().select_related('user','department').filter(user=current_user).first() - if request.method == 'POST': - type = request.POST.get('submit', '') - a = get_object_or_404(User, username=request.user.username) - y = ExtraInfo.objects.all().select_related('user','department').filter(user=a).first() - comp_id = y.id - if type == 'assign': - - complaint_finish = request.POST.get('complaint_finish', '') - worker_id = request.POST.get('assign_worker', '') - w = Workers.objects.select_related('secincharge_id','secincharge_id__staff_id','secincharge_id__staff_id__user','secincharge_id__staff_id__department').get(id=worker_id) - StudentComplain.objects.select_for_update().filter(id=iid).\ - update(worker_id=w, status=1) - url = '/complaint/secincharge/worker_id_know_more/'+wid; - complainer_details = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__secincharge_id__staff_id','worker_id__secincharge_id__staff_id__user','worker_id__secincharge_id__staff_id__department').get(id=iid) - student=0 - message = "Your complaint has been re-assigned" - complaint_system_notif(request.user, complainer_details.complainer.user ,'reassign_worker_alert',complainer_details.id,student,message) - return HttpResponseRedirect(url) +# @login_required +# def complaint_reassign(request,wid,iid): + # current_user = get_object_or_404(User, username=request.user.username) + # y = ExtraInfo.objects.all().select_related('user','department').filter(user=current_user).first() + # if request.method == 'POST': + # type = request.POST.get('submit', '') + # a = get_object_or_404(User, username=request.user.username) + # y = ExtraInfo.objects.all().select_related('user','department').filter(user=a).first() + # comp_id = y.id + # if type == 'assign': + + # complaint_finish = request.POST.get('complaint_finish', '') + # worker_id = request.POST.get('assign_worker', '') + # w = Workers.objects.select_related('secincharge_id','secincharge_id__staff_id','secincharge_id__staff_id__user','secincharge_id__staff_id__department').get(id=worker_id) + # StudentComplain.objects.select_for_update().filter(id=iid).\ + # update(worker_id=w, status=1) + # url = '/complaint/secincharge/worker_id_know_more/'+wid; + # complainer_details = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department').get(id=iid) + # student=0 + # message = "Your complaint has been re-assigned" + # complaint_system_notif(request.user, complainer_details.complainer.user ,'reassign_worker_alert',complainer_details.id,student,message) + # return HttpResponseRedirect(url) - else: - y = ExtraInfo.objects.all().select_related('user','department').get(id=y.id) - a = SectionIncharge.objects.select_related('staff_id','staff_id__user','staff_id__department').get(staff_id=y) - b = a.work_type - comp_id = y.id - try: - detail = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__secincharge_id__staff_id','worker_id__secincharge_id__staff_id__user','worker_id__secincharge_id__staff_id__department').filter(id=iid).first() - total_secincharge = SectionIncharge.objects.select_related('staff_id','staff_id__user','staff_id__department').all() - total_secincharges_in_area = SectionIncharge.objects.select_related('staff_id','staff_id__user','staff_id__department').filter(work_type=b) - worker = [] - workertemp = [] - flag = '' - temp = detail.location - try: + # else: + # y = ExtraInfo.objects.all().select_related('user','department').get(id=y.id) + # a = SectionIncharge.objects.select_related('staff_id','staff_id__user','staff_id__department').get(staff_id=y) + # b = a.work_type + # comp_id = y.id + # try: + # detail = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department').filter(id=iid).first() + # total_secincharge = SectionIncharge.objects.select_related('staff_id','staff_id__user','staff_id__department').all() + # total_secincharges_in_area = SectionIncharge.objects.select_related('staff_id','staff_id__user','staff_id__department').filter(work_type=b) + # worker = [] + # workertemp = [] + # flag = '' + # temp = detail.location + # try: - if Workers.objects.select_related('secincharge_id','secincharge_id__staff_id','secincharge_id__staff_id__user','secincharge_id__staff_id__department').filter(secincharge_id=a).count() == 0: - flag = 'no_worker' - else: - workertemp = Workers.objects.select_related('secincharge_id','secincharge_id__staff_id','secincharge_id__staff_id__user','secincharge_id__staff_id__department').filter(secincharge_id=a) - j = 1 - for i in workertemp: - worker.append(i) + # if Workers.objects.select_related('secincharge_id','secincharge_id__staff_id','secincharge_id__staff_id__user','secincharge_id__staff_id__department').filter(secincharge_id=a).count() == 0: + # flag = 'no_worker' + # else: + # workertemp = Workers.objects.select_related('secincharge_id','secincharge_id__staff_id','secincharge_id__staff_id__user','secincharge_id__staff_id__department').filter(secincharge_id=a) + # j = 1 + # for i in workertemp: + # worker.append(i) - except SectionIncharge.DoesNotExist: - flag = 'no_worker' + # except SectionIncharge.DoesNotExist: + # flag = 'no_worker' - except StudentComplain.DoesNotExist: - return HttpResponse("

Not a valid complaint

") - return render(request, "complaintModule/reassignworker.html", - {'detail': detail, 'worker': worker, 'flag': - flag, 'total_secincharge': total_secincharge,'a':a, 'wid':wid, 'total_secincharges_in_area':total_secincharges_in_area}) + # except StudentComplain.DoesNotExist: + # return HttpResponse("

Not a valid complaint

") + # return render(request, "complaintModule/reassignworker.html", + # {'detail': detail, 'worker': worker, 'flag': + # flag, 'total_secincharge': total_secincharge,'a':a, 'wid':wid, 'total_secincharges_in_area':total_secincharges_in_area}) -@login_required -def complaint_reassign_super(request,caretaker_id,iid): - current_user = get_object_or_404(User, username=request.user.username) - y = ExtraInfo.objects.all().select_related('user','department').filter(user=current_user).first() - sup = Supervisor.objects.select_related('sup_id','sup_id__user','sup_id__department').get(sup_id = y) - this_area = sup.area - if request.method == 'POST': - a = get_object_or_404(User, username=request.user.username) - y = ExtraInfo.objects.all().select_related('user','department').filter(user=a).first() - comp_id = y.id +# @login_required +# def complaint_reassign_super(request,caretaker_id,iid): + # current_user = get_object_or_404(User, username=request.user.username) + # y = ExtraInfo.objects.all().select_related('user','department').filter(user=current_user).first() + # sup = Supervisor.objects.select_related('sup_id','sup_id__user','sup_id__department').get(sup_id = y) + # this_area = sup.area + # if request.method == 'POST': + # a = get_object_or_404(User, username=request.user.username) + # y = ExtraInfo.objects.all().select_related('user','department').filter(user=a).first() + # comp_id = y.id #for SectionIncharge @@ -110,38 +110,28 @@ def assign_worker(request, comp_id1): a = get_object_or_404(User, username=request.user.username) y = ExtraInfo.objects.all().select_related('user','department').filter(user=a).first() comp_id = y.id - assign_caretaker = request.POST.get('assign_caretaker', '') - c1 = Caretaker.objects.select_related('staff_id','staff_id__user','staff_id__department').get(staff_id=comp_id) - # c2=Supervisor.objects.all().filter(area=c1.area) - # y1 = ExtraInfo.objects.all().select_related('user','department').filter(id=c2[0].sup_id.id).first() + + complaint_details = StudentComplain.objects.all().filter(id=comp_id1) - # update(complaint_details[0].status=1) - print(complaint_details) + + complaint_type=complaint_details[0].complaint_type - print(complaint_type) + supervisor=Supervisor.objects.all().filter(type=complaint_type) if not supervisor.exists(): return HttpResponse("

Supervisor does not exist of this complaint type

") - print("----------") - print(supervisor[0]) - print("----------") + supervisor_details=ExtraInfo.objects.all().filter(id=supervisor[0].sup_id.id) - print(supervisor_details[0].user_id) + StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(id=comp_id1).\ update(status=1) - # supervisor_id=ExtraInfo.objects.all().filter(id=supervisor) - # student=0 - # message = "Your Complaint has been redirected to supervisor" - # complaint_system_notif(request.user, complainer_details.complainer.user ,'comp_redirect_alert',complainer_details.id,student,message) + sup = HoldsDesignation.objects.select_related('user','working','designation').filter(user = supervisor_details[0].user_id) - print(sup[0].designation) - # print(sup.designation) + + files=File.objects.all().filter(src_object_id=comp_id1) - # print("----------") - # print(files.first().id) - # user_details=User.objects.get(id=y.user_id) - # des=HoldsDesignation.objects.filter(user=user_details).all() + supervisor_username=User.objects.all().filter(id=supervisor_details[0].user_id) file=forward_file(file_id= files.first().id, receiver=supervisor_username[0].username, @@ -155,37 +145,36 @@ def assign_worker(request, comp_id1): return HttpResponseRedirect('/complaint/caretaker/') else: y = ExtraInfo.objects.all().select_related('user','department').get(id=y.id) - a = SectionIncharge.objects.select_related('staff_id','staff_id__user','staff_id__department').get(staff_id=y) - b = a.work_type + # a = SectionIncharge.objects.select_related('staff_id','staff_id__user','staff_id__department').get(staff_id=y) + comp_id = y.id try: - detail = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(id=comp_id1).first() - total_caretaker = Caretaker.objects.select_related('staff_id','staff_id__user','staff_id__department').all() - total_caretakers_in_area = Supervisor.objects.select_related('sup_id') + detail = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department').filter(id=comp_id1).first() + # total_caretaker = Caretaker.objects.select_related('staff_id','staff_id__user','staff_id__department').all() + # total_caretakers_in_area = Supervisor.objects.select_related('sup_id') # supervisors_in_area= HoldsDesignation.objects.select_related('user','working','designation').get(total_caretakers_in_area = dsgn) - workertemp = [] - worker = [] - flag = '' - temp = detail.location - try: - if Workers.objects.select_related('secincharge_id','secincharge_id__staff_id','secincharge_id__staff_id__user','secincharge_id__staff_id__department').filter(secincharge_id=a).count() == 0: - flag = 'no_worker' - else: - workertemp1 = Workers.objects.select_related('secincharge_id','secincharge_id__staff_id','secincharge_id__staff_id__user','secincharge_id__staff_id__department').filter(secincharge_id=a) - workertemp = workertemp1.filter(worker_type=detail.complaint_type) - j = 1 - for i in workertemp: - worker.append(i) + # workertemp = [] + # worker = [] + # flag = '' + # temp = detail.location + # try: + # if Workers.objects.select_related('secincharge_id','secincharge_id__staff_id','secincharge_id__staff_id__user','secincharge_id__staff_id__department').filter(secincharge_id=a).count() == 0: + # flag = 'no_worker' + # else: + # workertemp1 = Workers.objects.select_related('secincharge_id','secincharge_id__staff_id','secincharge_id__staff_id__user','secincharge_id__staff_id__department').filter(secincharge_id=a) + # workertemp = workertemp1.filter(worker_type=detail.complaint_type) + # j = 1 + # for i in workertemp: + # worker.append(i) - except SectionIncharge.DoesNotExist: - flag = 'no_worker' + # except SectionIncharge.DoesNotExist: + # flag = 'no_worker' except StudentComplain.DoesNotExist: return HttpResponse("

Not a valid complaint

") return render(request, "complaintModule/assignworker.html", - {'detail': detail, 'worker': worker, 'flag': - flag, 'total_secincharge': total_secincharge,'a':a, 'total_secincharges_in_area':total_secincharges_in_area}) - + {'detail': detail}) + #for SectionIncharge @login_required @@ -194,7 +183,7 @@ def discharge_worker(request,wid,cid): y = ExtraInfo.objects.all().select_related('user','department').filter(user=current_user).first() this_worker = Workers.objects.select_related('secincharge_id','secincharge_id__staff_id','secincharge_id__staff_id__user','secincharge_id__staff_id__department').get(id=wid) - com_in_concern= StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__secincharge_id__staff_id','worker_id__secincharge_id__staff_id__user','worker_id__secincharge_id__staff_id__department').get(id=cid); + com_in_concern= StudentComplain.objects.select_related('complainer','complainer__user','complainer__department').get(id=cid); com_in_concern.worker_id=None; com_in_concern.status=0; StudentComplain.objects.select_for_update().filter(id=cid).\ @@ -242,8 +231,8 @@ def worker_id_know_more(request, work_id): function to know pending complaints assigned to the worker """ this_worker = Workers.objects.select_related('secincharge_id','secincharge_id__staff_id','secincharge_id__staff_id__user','secincharge_id__staff_id__department').get(id=work_id) - num = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__secincharge_id__staff_id','worker_id__secincharge_id__staff_id__user','worker_id__secincharge_id__staff_id__department').filter(worker_id=this_worker).count(); - complaints_list = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__secincharge_id__staff_id','worker_id__secincharge_id__staff_id__user','worker_id__secincharge_id__staff_id__department').filter(worker_id=this_worker); + num = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department').filter(worker_id=this_worker).count(); + complaints_list = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department').filter(worker_id=this_worker); complaints_list_onhold = [] for i in complaints_list: if i.status == 1: @@ -358,20 +347,9 @@ def user(request): complaint_finish = datetime.now() + timedelta(days=4) elif comp_type == 'other': complaint_finish = datetime.now() + timedelta(days=3) - # y = ExtraInfo.objects.all().get(id=comp_id) - #check if location given + if location!="": - # x = StudentComplain(complainer=y, - # complaint_type=comp_type, - # location=location, - # specific_location=specific_location, - # details=details, - # status=status, - # complaint_finish=complaint_finish, - # upload_complaint=comp_file) - - - # x.save() + user_details=User.objects.get(id=y.user_id) obj1, created = StudentComplain.objects.get_or_create(complainer=y, @@ -385,16 +363,8 @@ def user(request): - historytemp = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(complainer=y).order_by('-id') - history = [] - j = 1 - k = 1 - for i in historytemp: - history.append(i) - for h in history: - h.serial_no = k - k = k+1 + if location == "hall-1": dsgn ="hall1caretaker" @@ -440,7 +410,7 @@ def user(request): student = 0 message = "A New Complaint has been lodged" complaint_system_notif(request.user, caretaker_name.user,'lodge_comp_alert',obj1.id,student,message) - complaint_system_notif(request.user, secincharge_name.staff_id.user,'lodge_comp_alert',obj1.id,1,message) + # complaint_system_notif(request.user, secincharge_name.staff_id.user,'lodge_comp_alert',obj1.id,1,message) messages.success(request,message) @@ -451,8 +421,7 @@ def user(request): else: a = get_object_or_404(User, username=request.user.username) y = ExtraInfo.objects.all().select_related('user','department').filter(user=a).first() - historytemp = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__secincharge_id__staff_id','worker_id__secincharge_id__staff_id__user','worker_id__secincharge_id__staff_id__department').filter(complainer=y).order_by('-id') - history=[] + user_details=User.objects.get(id=y.user_id) @@ -470,13 +439,7 @@ def user(request): print(c1[0].designation) # c2=Designation.objects.filter(i) - j = 1 - for i in historytemp: - history.append(i) - # # if j%2 != 0: - # # history.append(i) - # # j = j+1 - + outbox_files = view_outbox( @@ -499,7 +462,8 @@ def user(request): print(comp[0].src_object_id) complaint=StudentComplain.objects.all().filter(id=comp[0].src_object_id) print(complaint) - comp_list.add(complaint) + if complaint[0].complainer.user.username == user_details.username : + comp_list.add(complaint) # file_history = view_history(file_id=i['id']) # comp=File.objects.filter(uploader=file_history[0]['current_id']) @@ -514,7 +478,7 @@ def user(request): complaint_final_list.append(i[0]) print(complaint_final_list) return render(request, "complaintModule/complaint_user.html", - {'history': complaint_final_list,'notification':notification, 'comp_id': y.id, 'outbox':outbox}) + {'outbox': complaint_final_list,'notification':notification, 'comp_id': y.id, 'history':outbox}) @login_required @@ -687,26 +651,7 @@ def caretaker(request): complaint_finish=complaint_finish, upload_complaint=comp_file) - historytemp = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(complainer=y).order_by('-id') - history = [] - j = 1 - k = 1 - for i in historytemp: - history.append(i) - # if j%2 != 0: - # history.append(i) - # j = j+1 - - - for h in history: - h.serial_no = k - k = k+1 - # if location == "hall1": - # dsgn = "hall1caretaker" - # elif location == "hall3": - # dsgn = "hall3caretaker" - # else : - # dsgn = "hall4caretaker" + if location == "hall-1": dsgn ="hall1caretaker" elif location =="hall-3": @@ -769,8 +714,8 @@ def caretaker(request): notification = Notification.objects.filter(recipient=current_user.id) notification = notification.filter(data__exact={'url':'complaint:detail2','module':'Complaint System'}) - return render(request, "complaintModule/complaint_secincharge.html", - {'history': history, 'comp_id': y.id, + return render(request, "complaintModule/complaint_caretaker.html", + { 'comp_id': y.id, 'notification': notification, 'complaint_assign_no': complaint_assign_no}) @@ -781,70 +726,21 @@ def caretaker(request): a = Caretaker.objects.select_related('staff_id','staff_id__user','staff_id__department').get(staff_id=y.id) b = a.area history = [] - historytemp = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(location=b).order_by('-id') - # total_worker = [] - # total_workertemp = Workers.objects.select_related('caretaker_id','caretaker_id__staff_id','caretaker_id__staff_id__user','caretaker_id__staff_id__department').filter(caretaker_id=a) - # j = 1 - # for i in total_workertemp: - # total_worker.append(i) - - # complaint_assign_no = [] + + complaint_assign_no = [] user_details=User.objects.get(id=y.user_id) - # if user_details.username=="shyams": - # desgn="hall3caretaker" - # if user_details.username=="hall4caretaker": - # desgn="hall4caretaker" - # a = get_object_or_404(User, username=request.user.username) - # y = ExtraInfo.objects.all().select_related('user','department').filter(user=a).first() - carehistorytemp = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(complainer=y).order_by('-id') - carehistory=[] - j = 1 - for i in carehistorytemp: - carehistory.append(i) - # if j%2 != 0: - # history.append(i) - # j = j+1 - - for i in carehistory: - i.serial_no = j - j = j+1 - # for x in total_worker: - # worker = Workers.objects.select_related('caretaker_id','caretaker_id__staff_id','caretaker_id__staff_id__user','caretaker_id__staff_id__department').get(id=x.id) - # temp = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(worker_id=worker).count() - # worker.total_complaint = temp - # complaint_assign_no.append(worker) - - overduecomplaint = [] - j = 1 - k = 1 - for i in historytemp: - history.append(i) - - for i in history: - i.serial_no = k - k = k + 1 - - if i.status != 2 and i.status !=3: - if i.complaint_finish < date.today(): - i.delay = date.today() - i.complaint_finish - overduecomplaint.append(i) notification = Notification.objects.filter(recipient=current_user.id) notification = notification.filter(data__exact={'url':'complaint:detail2','module':'Complaint System'}) user_details=User.objects.get(id=y.user_id) - # print(y.user_type) - # print(user_details.username) - # print(user_details) + des=HoldsDesignation.objects.filter(user=user_details).all() - # print(y.user_id) - # print(user_details) - # print(des[0].designation) - user_object = get_user_object_from_username(y.user.username) - user_des=HoldsDesignation.objects.filter(user=user_details).all() - # print(user_object) - # print(user_des) + print("######") + print(user_details.username) + print(des[0].designation) + print("&&&&&") outbox_files = view_outbox( username=user_details.username, designation=des[0].designation, @@ -860,19 +756,17 @@ def caretaker(request): for i in outbox: file_history = view_history(file_id=i['id']) print(i['id']) + print("********") comp=File.objects.filter(id=i['id']) print(comp[0].src_object_id) + print("------") complaint=StudentComplain.objects.all().filter(id=comp[0].src_object_id) - print(complaint) - comp_list.add(complaint) - # file_history = view_history(file_id=i['id']) + print(complaint[0].complainer.user.username) - # comp=File.objects.filter(uploader=file_history[0]['current_id']) - # for j in comp: - # c=StudentComplain.objects.all().filter(id=j.src_object_id) - # comp_list.add(c) - # # print(c[0]) - + print("......") + if complaint[0].complainer.user.username== user_details.username : + comp_list.add(complaint) + # break complaint_final_list=[] for i in comp_list: @@ -900,20 +794,7 @@ def caretaker(request): complaint=StudentComplain.objects.all().filter(id=comp[0].src_object_id) print(complaint) comp_list_in.add(complaint) - # file_history = view_history(file_id=i['id']) - # print(file_history[0]) - # file_history_list.append(file_history[0]) - # print(file_history[0]['file_id']) - # comp=File.objects.filter(id=file_history[0]['file_id']) - # print(comp[0].src_object_id) - # for j in comp: - # c=StudentComplain.objects.all().filter(id=j.src_object_id) - # comp_list_in.add(c) - # print(c[0]) - - # break - # file_history_list_final=uniqueList(file_history_list) - # print(file_history_list) + complaint_final_list_in=[] for i in comp_list_in: complaint_final_list_in.append(i[0]) @@ -924,8 +805,7 @@ def caretaker(request): { 'history': complaint_final_list_in, 'comp_id': y.id, 'carehistory':complaint_final_list, - 'notification':notification, - 'overduecomplaint': overduecomplaint, + 'notification':notification, 'care_id': a}) @login_required @@ -937,7 +817,7 @@ def remove_worker_from_complaint(request,complaint_id): request - trivial complaint_id - used to get complaint_id registered """ - complaint = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__secincharge_id__staff_id','worker_id__secincharge_id__staff_id__user','worker_id__secincharge_id__staff_id__department').filter(complaint_id=complaint_id).update(worker_id='') + complaint = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department').filter(complaint_id=complaint_id).update(worker_id='') return HttpResponseRedirect('/complaint/caretaker/') @@ -959,15 +839,15 @@ def changestatus(request, complaint_id, status): context - Holds data needed to make necessary changes in the template. """ if status == '3': - StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__secincharge_id__staff_id','worker_id__secincharge_id__staff_id__user','worker_id__secincharge_id__staff_id__department').filter(id=complaint_id).\ + StudentComplain.objects.select_related('complainer','complainer__user','complainer__department').filter(id=complaint_id).\ update(status=status, worker_id='') return HttpResponseRedirect('/complaint/caretaker/') elif status == '2': - StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__secincharge_id__staff_id','worker_id__secincharge_id__staff_id__user','worker_id__secincharge_id__staff_id__department').filter(id=complaint_id).\ + StudentComplain.objects.select_related('complainer','complainer__user','complainer__department').filter(id=complaint_id).\ update(status=status, worker_id='') return HttpResponseRedirect('/complaint/caretaker/') else: - StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__secincharge_id__staff_id','worker_id__secincharge_id__staff_id__user','worker_id__secincharge_id__staff_id__department').filter(id=complaint_id).\ + StudentComplain.objects.select_related('complainer','complainer__user','complainer__department').filter(id=complaint_id).\ update(status=status) return HttpResponseRedirect('/complaint/caretaker/') @@ -1018,7 +898,7 @@ def removew(request, work_id): context - Holds data needed to make necessary changes in the template. """ worker = Workers.objects.select_related('secincharge_id','secincharge_id__staff_id','secincharge_id__staff_id__user','secincharge_id__staff_id__department').get(id=work_id) - temp = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__secincharge_id__staff_id','worker_id__secincharge_id__staff_id__user','worker_id__secincharge_id__staff_id__department').filter(worker_id=worker).count() + temp = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department').filter(worker_id=worker).count() if temp == 0: worker.delete() return HttpResponseRedirect('/complaint/secincharge/') @@ -1026,6 +906,9 @@ def removew(request, work_id): return HttpResponse('

Worker is assign some complaint

') + + + @login_required def submitfeedback(request, complaint_id): """ @@ -1044,9 +927,9 @@ def submitfeedback(request, complaint_id): if request.method == 'POST': feedback = request.POST.get('feedback', '') rating = request.POST.get('rating', '') - StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__secincharge_id__staff_id','worker_id__secincharge_id__staff_id__user','worker_id__secincharge_id__staff_id__department').filter(id=complaint_id).\ + StudentComplain.objects.select_related('complainer','complainer__user','complainer__department').filter(id=complaint_id).\ update(feedback=feedback, flag=rating) - a = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__secincharge_id__staff_id','worker_id__secincharge_id__staff_id__user','worker_id__secincharge_id__staff_id__department').filter(id=complaint_id).first() + a = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department').filter(id=complaint_id).first() care = Caretaker.objects.select_related('staff_id','staff_id__user','staff_id__department').filter(area=a.location).first() rate = care.rating newrate = 0 @@ -1062,7 +945,7 @@ def submitfeedback(request, complaint_id): return HttpResponseRedirect('/complaint/user/') else: - a = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__secincharge_id__staff_id','worker_id__secincharge_id__staff_id__user','worker_id__secincharge_id__staff_id__department').get(id=complaint_id) + a = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department').get(id=complaint_id) return render(request, "complaintModule/submit_feedback.html", {'a': a}) @@ -1127,23 +1010,13 @@ def supervisor(request): area = all_caretaker[0].area # ExtraInfo.objects.get(id=sup_id) all_complaint = [] - numtemp = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__secincharge_id__staff_id','worker_id__secincharge_id__staff_id__user','worker_id__secincharge_id__staff_id__department').filter(location = area).filter(status = 0).count() + numtemp = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department').filter(location = area).filter(status = 0).count() num = int(numtemp/2+0.5) - all_complainttemp = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(location=location).order_by('-id') - j = 1 - for i in all_complainttemp: - all_complaint.append(i) - # if j%2 != 0: - # all_complaint.append(i) - # j = j + 1 + + - overduecomplaint = [] - for i in all_complaint: - if i.status != 2 and i.status != 3: - if i.complaint_finish < date.today(): - i.delay = date.today() - i.complaint_finish - overduecomplaint.append(i) + comp_type = request.POST.get('complaint_type', '') location = request.POST.get('Location', '') @@ -1192,26 +1065,7 @@ def supervisor(request): upload_complaint=comp_file) - historytemp = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(complainer=y).order_by('-id') - history = [] - j = 1 - k = 1 - for i in historytemp: - history.append(i) - # if j%2 != 0: - # history.append(i) - # j = j+1 - - - for h in history: - h.serial_no = k - k = k+1 - # if location == "hall1": - # dsgn = "hall1caretaker" - # elif location == "hall3": - # dsgn = "hall3caretaker" - # else : - # dsgn = "hall4caretaker" + if location == "hall-1": dsgn ="hall1caretaker" elif location =="hall-3": @@ -1273,61 +1127,20 @@ def supervisor(request): # return HttpResponseRedirect('/complaint/user') return render(request, "complaintModule/supervisor1.html", - {'all_caretaker': all_caretaker, 'all_complaint': all_complaint, - 'overduecomplaint': overduecomplaint, 'area': area,'num':num}) + {'all_caretaker': all_caretaker, 'all_complaint': all_complaint}) else: - # y = ExtraInfo.objects.all().select_related('user','department').get(id=y.id).fi - # try: - # a = get_object_or_404(Supervisor, sup_id=y) - # except : - # return HttpResponseRedirect('/') - - #print(a) - # if(len(a)==0) : - # return render('../dashboard/') - a = get_object_or_404(User, username=request.user.username) - # y = ExtraInfo.objects.all().select_related('user','department').filter(user=a).first() - historytemp = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(complainer=y).order_by('-id') - history=[] - j = 1 - for i in historytemp: - history.append(i) - # if j%2 != 0: - # history.append(i) - # j = j+1 - - for i in history: - i.serial_no = j - j = j+1 - a = Supervisor.objects.select_related('sup_id','sup_id__user','sup_id__department').get(sup_id=y) + + all_caretaker = Caretaker.objects.select_related('staff_id','staff_id__user','staff_id__department').order_by('-id') area = all_caretaker[0].area - # desgn=HoldsDesignation.objects.select_related('user','working','designation').get(user = y.id) - # desgn="hall3supervisor" + numtemp = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(location = area).filter(status = 0).count() num = int(numtemp/2+0.5) all_complaint = [] user_details=User.objects.get(id=y.user_id) - all_complainttemp = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').order_by('-id') - j = 1 - for i in all_complainttemp: - all_complaint.append(i) - # if j%2 != 0: - # all_complaint.append(i) - # j = j + 1 - overduecomplaint = [] - for i in all_complaint: - if i.status != 2 and i.status != 3: - if i.complaint_finish < date.today(): - i.delay = date.today() - i.complaint_finish - overduecomplaint.append(i) + - # print(y.user_id) - # print(des[0].designation) - # u=ExtraInfo.objects.filter(user=y.user_id).all() - # print(u) - # des=HoldsDesignation.objects.filter(user=u[0].id).all() - # print(des[0].designation.name) + current_user = get_object_or_404(User, username=request.user.username) @@ -1405,15 +1218,14 @@ def supervisor(request): print(complaint_final_list_in) return render(request, "complaintModule/supervisor1.html", - {'history':complaint_final_list_in,'all_caretaker': all_caretaker, 'all_complaint': all_complaint,'outbox':complaint_final_list, - 'overduecomplaint': overduecomplaint, 'area': area, 'num' : num}) + {'history':complaint_final_list_in,'all_caretaker': all_caretaker, 'all_complaint': all_complaint,'outbox':complaint_final_list}) @login_required def caretaker_id_know_more(request,caretaker_id): this_caretaker = Caretaker.objects.select_related('staff_id','staff_id__user','staff_id__department').get(id = caretaker_id) this_caretaker_area = this_caretaker.area list_pending_complaints = [] - list_pending_complaintstemp = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__secincharge_id__staff_id','worker_id__secincharge_id__staff_id__user','worker_id__secincharge_id__staff_id__department').filter(location = this_caretaker_area).filter(status = 0) + list_pending_complaintstemp = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department').filter(location = this_caretaker_area).filter(status = 0) j = 1 for i in list_pending_complaintstemp: list_pending_complaints.append(i) @@ -1430,7 +1242,7 @@ def search_complaint(request): def resolvepending(request, cid): a = get_object_or_404(User, username=request.user.username) y = ExtraInfo.objects.all().select_related('user','department').filter(user=a).first() - thiscomplaint = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__secincharge_id__staff_id','worker_id__secincharge_id__staff_id__user','worker_id__secincharge_id__staff_id__department').get(id=cid) + thiscomplaint = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department').get(id=cid) if request.method == 'POST': newstatus = request.POST.get('yesorno','') comment = request.POST.get('comment') @@ -1439,11 +1251,11 @@ def resolvepending(request, cid): intstatus = 2 else: intstatus = 3 - StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__secincharge_id__staff_id','worker_id__secincharge_id__staff_id__user','worker_id__secincharge_id__staff_id__department').filter(id=cid).\ + StudentComplain.objects.select_related('complainer','complainer__user','complainer__department').filter(id=cid).\ update(status=intstatus) - StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__secincharge_id__staff_id','worker_id__secincharge_id__staff_id__user','worker_id__secincharge_id__staff_id__department').filter(id=cid).\ + StudentComplain.objects.select_related('complainer','complainer__user','complainer__department').filter(id=cid).\ update(comment=comment) - complainer_details = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__secincharge_id__staff_id','worker_id__secincharge_id__staff_id__user','worker_id__secincharge_id__staff_id__department').get(id=cid) + complainer_details = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department').get(id=cid) student=0 message = "Congrats! Your complaint has been resolved" complaint_system_notif(request.user, complainer_details.complainer.user ,'comp_resolved_alert',complainer_details.id,student,message) @@ -1490,7 +1302,7 @@ def resolvependingsuper(request, cid): def resolvependingsuper(request, cid): a = get_object_or_404(User, username=request.user.username) y = ExtraInfo.objects.all().select_related('user','department').filter(user=a).first() - thiscomplaint = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').get(id=cid) + thiscomplaint = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department').get(id=cid) if request.method == 'POST': newstatus = request.POST.get('yesorno','') comment = request.POST.get('comment') @@ -1499,11 +1311,11 @@ def resolvependingsuper(request, cid): intstatus = 2 else: intstatus = 3 - StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(id=cid).\ + StudentComplain.objects.select_related('complainer','complainer__user','complainer__department').filter(id=cid).\ update(status=intstatus) - StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(id=cid).\ + StudentComplain.objects.select_related('complainer','complainer__user','complainer__department').filter(id=cid).\ update(comment=comment) - complainer_details = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').get(id=cid) + complainer_details = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department').get(id=cid) student=0 message = "Congrats! Your complaint has been resolved" complaint_system_notif(request.user, complainer_details.complainer.user ,'comp_resolved_alert',complainer_details.id,student,message) @@ -1534,10 +1346,10 @@ def login1(request): @login_required def feedback_super(request, feedcomp_id): - detail3 = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__secincharge_id__staff_id','worker_id__secincharge_id__staff_id__user','worker_id__secincharge_id__staff_id__department').get(id=feedcomp_id) + detail3 = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department').get(id=feedcomp_id) a=User.objects.get(username=detail3.complainer.user.username) y=ExtraInfo.objects.all().select_related('user','department').get(user=a) - temp=StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__secincharge_id__staff_id','worker_id__secincharge_id__staff_id__user','worker_id__secincharge_id__staff_id__department').filter(complainer=y).first() + temp=StudentComplain.objects.select_related('complainer','complainer__user','complainer__department').filter(complainer=y).first() comp_id=temp.id loc = detail3.location care = Caretaker.objects.select_related('staff_id','staff_id__user','staff_id__department').filter(area=loc).first() @@ -1546,10 +1358,10 @@ def feedback_super(request, feedcomp_id): @login_required def feedback_care(request, feedcomp_id): - detail2 = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__secincharge_id__staff_id','worker_id__secincharge_id__staff_id__user','worker_id__secincharge_id__staff_id__department').get(id=feedcomp_id) + detail2 = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department').get(id=feedcomp_id) a=User.objects.get(username=detail2.complainer.user.username) y=ExtraInfo.objects.all().select_related('user','department').get(user=a) - temp=StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__secincharge_id__staff_id','worker_id__secincharge_id__staff_id__user','worker_id__secincharge_id__staff_id__department').filter(complainer=y).first() + temp=StudentComplain.objects.select_related('complainer','complainer__user','complainer__department').filter(complainer=y).first() comp_id=temp.id return render(request, "complaintModule/feedback_care.html", {"detail2": detail2,"comp_id":comp_id}) @@ -1560,7 +1372,7 @@ def detail(request, detailcomp_id1): """ function that shows detail about complaint """ - detail = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__secincharge_id__staff_id','worker_id__secincharge_id__staff_id__user','worker_id__secincharge_id__staff_id__department').get(id=detailcomp_id1) + detail = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department').get(id=detailcomp_id1) if(detail.worker_id is None): worker_name = None worker_id = detail.worker_id @@ -1573,7 +1385,7 @@ def detail(request, detailcomp_id1): num=0 if detail.upload_complaint != "": num = 1 - temp=StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__secincharge_id__staff_id','worker_id__secincharge_id__staff_id__user','worker_id__secincharge_id__staff_id__department').filter(complainer=y).first() + temp=StudentComplain.objects.select_related('complainer','complainer__user','complainer__department').filter(complainer=y).first() comp_id=temp.id return render(request, "complaintModule/complaint_user_detail.html", {"detail": detail, "comp_id":detail.id,"num":num,"worker_name":worker_name}) @@ -1582,7 +1394,7 @@ def detail(request, detailcomp_id1): #for SectionIncharge @login_required def detail2(request, detailcomp_id1): - detail2 = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__secincharge_id__staff_id','worker_id__secincharge_id__staff_id__user','worker_id__secincharge_id__staff_id__department').get(id=detailcomp_id1) + detail2 = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department').get(id=detailcomp_id1) if(detail2.worker_id is None): worker_name = None worker_id = detail2.worker_id @@ -1596,20 +1408,20 @@ def detail2(request, detailcomp_id1): if detail2.upload_complaint != "": num = 1 - temp=StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__secincharge_id__staff_id','worker_id__secincharge_id__staff_id__user','worker_id__secincharge_id__staff_id__department').filter(complainer=y).first() + temp=StudentComplain.objects.select_related('complainer','complainer__user','complainer__department').filter(complainer=y).first() comp_id=temp.id return render(request, "complaintModule/complaint_secincharge_detail.html", {"detail2": detail2, "comp_id":detail2.id,"num":num,"worker_name":worker_name,"wid":worker_id}) @login_required def detail3(request, detailcomp_id1): - detail3 = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__secincharge_id__staff_id','worker_id__secincharge_id__staff_id__user','worker_id__secincharge_id__staff_id__department').get(id=detailcomp_id1) + detail3 = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department').get(id=detailcomp_id1) a=User.objects.get(username=detail3.complainer.user.username) y=ExtraInfo.objects.all().select_related('user','department').get(user=a) num=0 if detail3.upload_complaint != "": num = 1 - temp=StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__secincharge_id__staff_id','worker_id__secincharge_id__staff_id__user','worker_id__secincharge_id__staff_id__department').filter(complainer=y).first() + temp=StudentComplain.objects.select_related('complainer','complainer__user','complainer__department').filter(complainer=y).first() comp_id=temp.id loc = detail3.location care = Caretaker.objects.select_related('staff_id','staff_id__user','staff_id__department').filter(area=loc).first() @@ -1821,9 +1633,9 @@ def submitfeedbacksuper(request, complaint_id): if request.method == 'POST': feedback = request.POST.get('feedback', '') rating = request.POST.get('rating', '') - StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(id=complaint_id).\ + StudentComplain.objects.select_related('complainer','complainer__user','complainer__department').filter(id=complaint_id).\ update(feedback=feedback, flag=rating) - a = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(id=complaint_id).first() + a = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department').filter(id=complaint_id).first() care = Caretaker.objects.select_related('staff_id','staff_id__user','staff_id__department').filter(area=a.location).first() rate = care.rating newrate = 0 @@ -1840,7 +1652,7 @@ def submitfeedbacksuper(request, complaint_id): return render(request,"complaintModule/feedback.html",{'a' : a}) else: - a = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').get(id=complaint_id) + a = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department').get(id=complaint_id) return render(request, "complaintModule/submit_feedback.html", {'a': a}) @@ -2046,9 +1858,9 @@ def submitfeedbackcaretaker(request, complaint_id): if request.method == 'POST': feedback = request.POST.get('feedback', '') rating = request.POST.get('rating', '') - StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(id=complaint_id).\ + StudentComplain.objects.select_related('complainer','complainer__user','complainer__department').filter(id=complaint_id).\ update(feedback=feedback, flag=rating) - a = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(id=complaint_id).first() + a = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department').filter(id=complaint_id).first() care = Caretaker.objects.select_related('staff_id','staff_id__user','staff_id__department').filter(area=a.location).first() rate = care.rating newrate = 0 @@ -2065,5 +1877,5 @@ def submitfeedbackcaretaker(request, complaint_id): return render(request,"complaintModule/feedback.html",{'a' : a}) else: - a = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').get(id=complaint_id) + a = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department').get(id=complaint_id) return render(request, "complaintModule/submit_feedback.html", {'a': a}) \ No newline at end of file diff --git a/FusionIIIT/templates/complaintModule/assignworker.html b/FusionIIIT/templates/complaintModule/assignworker.html index 455815d9f..47eb65201 100644 --- a/FusionIIIT/templates/complaintModule/assignworker.html +++ b/FusionIIIT/templates/complaintModule/assignworker.html @@ -60,104 +60,7 @@
- +
@@ -196,38 +99,27 @@

If you want to redirect this complaint ,
- {% if detail.status != 0 %} + - - - + {% else %} --> + - {% if total_caretakers_in_area %} - - {% endif %} - {% endif %} + + + +

diff --git a/FusionIIIT/templates/complaintModule/carefeedback.html b/FusionIIIT/templates/complaintModule/carefeedback.html index 10b02b975..2168a65f2 100644 --- a/FusionIIIT/templates/complaintModule/carefeedback.html +++ b/FusionIIIT/templates/complaintModule/carefeedback.html @@ -80,7 +80,7 @@ - + @@ -127,7 +127,7 @@

{% endblock %} \ No newline at end of file diff --git a/FusionIIIT/templates/complaintModule/complaint_caretaker.html b/FusionIIIT/templates/complaintModule/complaint_caretaker.html index 9c3fba87b..4db5b1127 100644 --- a/FusionIIIT/templates/complaintModule/complaint_caretaker.html +++ b/FusionIIIT/templates/complaintModule/complaint_caretaker.html @@ -122,7 +122,7 @@ {% comment %}The ... end here!{% endcomment %} {% comment %}The ... starts here!{% endcomment %} -
+
{% block complainthistory %} {% include 'complaintModule/complainthistory_care_final.html' %} {% endblock %} diff --git a/FusionIIIT/templates/complaintModule/complainthistory_care_final.html b/FusionIIIT/templates/complaintModule/complainthistory_care_final.html index 0228465a2..32f4cd5a9 100644 --- a/FusionIIIT/templates/complaintModule/complainthistory_care_final.html +++ b/FusionIIIT/templates/complaintModule/complainthistory_care_final.html @@ -323,13 +323,13 @@

{% endblock%} \ No newline at end of file diff --git a/FusionIIIT/templates/complaintModule/complainthistory_user_final.html b/FusionIIIT/templates/complaintModule/complainthistory_user_final.html index 7de22f17a..e54c02f43 100644 --- a/FusionIIIT/templates/complaintModule/complainthistory_user_final.html +++ b/FusionIIIT/templates/complaintModule/complainthistory_user_final.html @@ -72,7 +72,7 @@ - {% for a in history %} + {% for a in outbox %} {% if a.status == 0 %} @@ -196,7 +196,7 @@

- {% for a in history %} + {% for a in outbox %} {% if a.status == 2 %} @@ -310,7 +310,7 @@

- {% for a in history %} + {% for a in outbox %} {% if a.status == 3 %} @@ -360,13 +360,13 @@

{% endblock%} \ No newline at end of file diff --git a/FusionIIIT/templates/complaintModule/feedback.html b/FusionIIIT/templates/complaintModule/feedback.html index 11933c4f4..98e586258 100644 --- a/FusionIIIT/templates/complaintModule/feedback.html +++ b/FusionIIIT/templates/complaintModule/feedback.html @@ -59,7 +59,7 @@ - {% for a in history %} + {% for a in outbox %} {% if a.status == 2 %} diff --git a/FusionIIIT/templates/dashboard/modules.html b/FusionIIIT/templates/dashboard/modules.html index 80b7c3121..ddb516907 100755 --- a/FusionIIIT/templates/dashboard/modules.html +++ b/FusionIIIT/templates/dashboard/modules.html @@ -133,8 +133,7 @@ {% comment %}A single modules row starts here!{% endcomment %} - {% if request.user.extrainfo.user_type == "student" or request.user.extrainfo.user_type == "staff" or request.user.extrainfo.user_type == "faculty" or "spacsconvenor" == global_var or "spacsassistant" == global_var or "hall1caretaker" == global_var or "hall4caretaker" == global_var or "shyams" == global_var or "ccsupervisor" == global_var%} -

- -
- + + {% if request.user.extrainfo.user_type == "student" or request.user.extrainfo.user_type == "staff" or request.user.extrainfo.user_type == "faculty" or "spacsconvenor" == global_var or "spacsassistant" == global_var or "hall1caretaker" == global_var or "hall4caretaker" == global_var or "shyams" == global_var or "ccsupervisor" == global_var%} +
+
From 808b4cf7c515e161dae92aa7c11b9ea9d8a625f0 Mon Sep 17 00:00:00 2001 From: Armin Patel <72291325+arminpatel@users.noreply.github.com> Date: Tue, 2 Apr 2024 14:28:21 +0530 Subject: [PATCH 28/34] support file uploading and other minor fixes --- .../complaint_system/api/serializers.py | 10 +++++- .../complaint_system/api/views.py | 35 +++++++++++++------ 2 files changed, 33 insertions(+), 12 deletions(-) diff --git a/FusionIIIT/applications/complaint_system/api/serializers.py b/FusionIIIT/applications/complaint_system/api/serializers.py index 8a2b97439..f8683d62b 100644 --- a/FusionIIIT/applications/complaint_system/api/serializers.py +++ b/FusionIIIT/applications/complaint_system/api/serializers.py @@ -20,6 +20,14 @@ class CaretakerSerializers(serializers.ModelSerializer): class Meta: model = Caretaker fields=('__all__') + depth=2 + + def to_representation(self, instance): + response = super().to_representation(instance) + # get caretaker complaints and filter by status = 0 + complaints = StudentComplain.objects.filter(location = instance.area, status = 0) + response['complaints'] = StudentComplainSerializers(complaints, many=True).data + return response class SupervisorSerializers(serializers.ModelSerializer): class Meta: @@ -34,4 +42,4 @@ class Meta: class UserSerializers(serializers.ModelSerializer): class Meta: model=User - fields=('__all__') \ No newline at end of file + fields=('__all__') diff --git a/FusionIIIT/applications/complaint_system/api/views.py b/FusionIIIT/applications/complaint_system/api/views.py index 612c6573c..2283a0184 100644 --- a/FusionIIIT/applications/complaint_system/api/views.py +++ b/FusionIIIT/applications/complaint_system/api/views.py @@ -43,19 +43,23 @@ def complaint_details_api(request,detailcomp_id1): def student_complain_api(request): user = get_object_or_404(User,username = request.user.username) user = ExtraInfo.objects.all().filter(user = user).first() - if user.user_type == 'student': + + user_type = 'student' + extra_info_id = ExtraInfo.objects.get(id=user.id) + caretaker = Caretaker.objects.filter(staff_id=extra_info_id) + supervisor = Supervisor.objects.filter(sup_id=extra_info_id) + if caretaker.exists(): + complain = StudentComplain.objects.filter(location = caretaker.first().area) + user_type = 'caretaker' + elif supervisor.exists(): + complain = StudentComplain.objects.filter(location = supervisor.first().area) + user_type = 'supervisor' + else: complain = StudentComplain.objects.filter(complainer = user) - elif user.user_type == 'staff': - staff = ExtraInfo.objects.get(id=user.id) - staff = Caretaker.objects.get(staff_id=staff) - complain = StudentComplain.objects.filter(location = staff.area) - elif user.user_type == 'faculty': - faculty = ExtraInfo.objects.get(id=user.id) - faculty = Supervisor.objects.get(sup_id=faculty) - complain = StudentComplain.objects.filter(location = faculty.area) complains = serializers.StudentComplainSerializers(complain,many=True).data resp = { 'student_complain' : complains, + 'user_type': user_type, } return Response(data=resp,status=status.HTTP_200_OK) @@ -63,6 +67,8 @@ def student_complain_api(request): @permission_classes([IsAuthenticated]) @authentication_classes([TokenAuthentication]) def create_complain_api(request): + print(request.FILES) + print(request.data) serializer = serializers.StudentComplainSerializers(data=request.data) if serializer.is_valid(): serializer.save() @@ -141,9 +147,16 @@ def edit_worker_api(request,w_id): @permission_classes([IsAuthenticated]) @authentication_classes([TokenAuthentication]) def caretaker_api(request): - if request.method == 'GET': - caretaker = Caretaker.objects.all() + caretakers = None + user = get_object_or_404(User,username = request.user.username) + user = ExtraInfo.objects.get(user = user) + extra_info_id = ExtraInfo.objects.get(id=user.id) + supervisor = Supervisor.objects.filter(sup_id=extra_info_id) + if supervisor.exists(): + caretaker = Caretaker.objects.filter(area = supervisor.first().area) + else: + caretaker = Caretaker.objects.all() caretakers = serializers.CaretakerSerializers(caretaker,many=True).data resp = { 'caretakers' : caretakers, From 21f44115fa0e3c0c984fd8fe14057a82e14046e7 Mon Sep 17 00:00:00 2001 From: Armin Patel <72291325+arminpatel@users.noreply.github.com> Date: Tue, 2 Apr 2024 16:26:36 +0530 Subject: [PATCH 29/34] change docker and req --- docker-compose.yml | 2 +- requirements.txt | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index e353d1423..47e4e3489 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 + - /usr/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..ef3571d1a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,4 @@ amqp==5.0.2 -arabic-reshaper==2.1.1 asgiref==3.3.1 attrs==20.3.0 beautifulsoup4==4.9.3 @@ -71,4 +70,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 2a8dd80b5784564a565cf6183c3250275ce989dc Mon Sep 17 00:00:00 2001 From: nidhibarapatre Date: Tue, 2 Apr 2024 16:47:52 +0530 Subject: [PATCH 30/34] resolved error --- .../static/complaint_system/js/rating.js | 87 ++++++++++ .../applications/complaint_system/views.py | 162 ++---------------- .../complaintModule/complaint_caretaker.html | 2 +- .../complainthistory_super_final.html | 9 +- .../complainthistory_user_final.html | 4 - .../templates/complaintModule/feedback.html | 2 +- .../lodgecomplaint_caretaker.html | 160 +++++++++++++++++ .../complaintModule/lodgecomplaint_super.html | 160 +++++++++++++++++ .../complaintModule/resolve_caretaker.html | 4 +- .../complaintModule/supervisor1.html | 2 +- .../complaintModule/unresolvecomplaint.html | 2 +- .../complaintModule/unresolved_super.html | 2 +- 12 files changed, 436 insertions(+), 160 deletions(-) create mode 100644 FusionIIIT/templates/complaintModule/lodgecomplaint_caretaker.html create mode 100644 FusionIIIT/templates/complaintModule/lodgecomplaint_super.html diff --git a/FusionIIIT/applications/complaint_system/static/complaint_system/js/rating.js b/FusionIIIT/applications/complaint_system/static/complaint_system/js/rating.js index 926158007..825fe759d 100644 --- a/FusionIIIT/applications/complaint_system/static/complaint_system/js/rating.js +++ b/FusionIIIT/applications/complaint_system/static/complaint_system/js/rating.js @@ -58,6 +58,93 @@ $(document).ready(function(){ } }; + function sub2(event) + { + var specific_location= $('input[name="specific_location"]').val(); + var Location = $('input[name="Location"]').val(); + var complaint_type = $('input[name="complaint_type"]').val() ; + var details =$('input[name="details"]').val() ; + var myfile = $('input[name="myfile"]').val(); + if(specific_location=="" || Location=="" || details=="" || complaint_type=="") + { + alert("Please fill all the details!"); + return; + } + else + { + event.preventDefault(); + $.ajax({ + type : 'POST', + url : '.', + data : { + 'specific_location' : specific_location, + 'Location' : Location, + 'complaint_type' : complaint_type, + 'details' : details, + 'myfile' : myfile, + + }, + success : function (data){ + + // alert("Complaint successfully lodged"); + setTimeout(function() { + window.location.replace('http://localhost:8000/complaint/caretaker'); + }, 1500); + + + }, + error : function (data,err){ + alert('Complaint successfully lodged ... '); + + } + }); + } + }; + function sub3(event) + { + var specific_location= $('input[name="specific_location"]').val(); + var Location = $('input[name="Location"]').val(); + var complaint_type = $('input[name="complaint_type"]').val() ; + var details =$('input[name="details"]').val() ; + var myfile = $('input[name="myfile"]').val(); + if(specific_location=="" || Location=="" || details=="" || complaint_type=="") + { + alert("Please fill all the details!"); + return; + } + else + { + event.preventDefault(); + $.ajax({ + type : 'POST', + url : '.', + data : { + 'specific_location' : specific_location, + 'Location' : Location, + 'complaint_type' : complaint_type, + 'details' : details, + 'myfile' : myfile, + + }, + success : function (data){ + + // alert("Complaint successfully lodged"); + setTimeout(function() { + window.location.replace('http://localhost:8000/complaint/supervisor'); + }, 1500); + + + }, + error : function (data,err){ + alert('Complaint successfully lodged ... '); + + } + }); + } + }; + + + diff --git a/FusionIIIT/applications/complaint_system/views.py b/FusionIIIT/applications/complaint_system/views.py index e0a4bbb0f..9d3dd7316 100644 --- a/FusionIIIT/applications/complaint_system/views.py +++ b/FusionIIIT/applications/complaint_system/views.py @@ -16,7 +16,7 @@ from applications.filetracking.sdk.methods import * from applications.filetracking.models import * - +from operator import attrgetter #function for reassign to another worker # @login_required @@ -476,9 +476,11 @@ def user(request): complaint_final_list=[] for i in comp_list: complaint_final_list.append(i[0]) + + sorted_history = sorted(complaint_final_list, key=attrgetter('complaint_date'), reverse=True) print(complaint_final_list) return render(request, "complaintModule/complaint_user.html", - {'outbox': complaint_final_list,'notification':notification, 'comp_id': y.id, 'history':outbox}) + {'outbox': sorted_history,'notification':notification, 'comp_id': y.id, 'history':outbox}) @login_required @@ -714,9 +716,8 @@ def caretaker(request): notification = Notification.objects.filter(recipient=current_user.id) notification = notification.filter(data__exact={'url':'complaint:detail2','module':'Complaint System'}) - return render(request, "complaintModule/complaint_caretaker.html", - { 'comp_id': y.id, - 'notification': notification, 'complaint_assign_no': complaint_assign_no}) + + return HttpResponseRedirect('/complaint/caretaker') @@ -771,8 +772,9 @@ def caretaker(request): complaint_final_list=[] for i in comp_list: complaint_final_list.append(i[0]) - print(user_details.username) - print(des[0].designation) + + sorted_history_out = sorted(complaint_final_list, key=attrgetter('complaint_date'), reverse=True) + inbox_files = view_inbox( username=user_details.username, designation=des[0].designation, @@ -800,11 +802,12 @@ def caretaker(request): complaint_final_list_in.append(i[0]) # print(complaint_final_list_in) + sorted_history = sorted(complaint_final_list_in, key=attrgetter('complaint_date'), reverse=True) return render(request, "complaintModule/complaint_caretaker.html", - { 'history': complaint_final_list_in, + { 'history': sorted_history, 'comp_id': y.id, - 'carehistory':complaint_final_list, + 'carehistory':sorted_history_out, 'notification':notification, 'care_id': a}) @@ -1065,134 +1068,7 @@ def supervisor(request): upload_complaint=comp_file) - - if location == "hall-1": - dsgn ="hall1caretaker" - elif location =="hall-3": - dsgn ="hall3caretaker" - elif location =="hall-4": - dsgn ="hall4caretaker" - elif location =="CC1": - dsgn ="cc1convener" - elif location =="CC2": - dsgn ="CC2 convener" - elif location == "core_lab": - dsgn = "corelabcaretaker" - elif location =="LHTC": - dsgn ="lhtccaretaker" - elif location =="NR2": - dsgn ="nr2caretaker" - elif location =="Maa Saraswati Hostel": - dsgn ="mshcaretaker" - elif location =="Nagarjun Hostel": - dsgn ="nhcaretaker" - elif location =="Panini Hostel": - dsgn ="phcaretaker" - else: - dsgn = "rewacaretaker" - caretaker_name = HoldsDesignation.objects.select_related('user','working','designation').get(designation__name = dsgn) - user_details=User.objects.get(id=y.user_id) - # c2=Supervisor.objects.all().filter(area=location) - print(caretaker_name.user.username) - print(user_details.username) - print(caretaker_name.designation) - - # sup = HoldsDesignation.objects.select_related('user','working','designation').get(user = y.id) - # print(sup.designation) - - user_details=User.objects.get(id=y.user_id) - des=HoldsDesignation.objects.filter(user=user_details).all() - - file_id = create_file(uploader=user_details.username, - uploader_designation=des[0].designation, - receiver=caretaker_name.user.username, - receiver_designation=str(caretaker_name.designation), - src_module="complaint", - src_object_id= str(obj1.id), - file_extra_JSON= {}, - attached_file = None) - - - # This is to allow the student - student = 1 - message = "A New Complaint has been lodged" - complaint_system_notif(request.user, caretaker_name.user,'lodge_comp_alert',obj1.id,student,message) - - # return render(request, "complaintModule/complaint_user.html", - # {'history': history, 'comp_id': comp_id }) - # next = request.POST.get('next', '/') - - messages.success(request,message) - # return HttpResponseRedirect('/complaint/user') - - comp_type = request.POST.get('complaint_type', '') - location = request.POST.get('Location', '') - specific_location = request.POST.get('specific_location', '') - comp_file = request.FILES.get('myfile') - - details = request.POST.get('details', '') - status = 0 - # finish time is according to complaint type - complaint_finish = datetime.now() + timedelta(days=2) - if comp_type == 'Electricity': - complaint_finish = datetime.now() + timedelta(days=2) - elif comp_type == 'carpenter': - complaint_finish = datetime.now() + timedelta(days=2) - elif comp_type == 'plumber': - complaint_finish = datetime.now() + timedelta(days=2) - elif comp_type == 'garbage': - complaint_finish = datetime.now() + timedelta(days=1) - elif comp_type == 'dustbin': - complaint_finish = datetime.now() + timedelta(days=1) - elif comp_type == 'internet': - complaint_finish = datetime.now() + timedelta(days=4) - elif comp_type == 'other': - complaint_finish = datetime.now() + timedelta(days=3) - y = ExtraInfo.objects.all().select_related('user','department').get(id=comp_id) - #check if location given - if location!="": - # x = StudentComplain(complainer=y, - # complaint_type=comp_type, - # location=location, - # specific_location=specific_location, - # details=details, - # status=status, - # complaint_finish=complaint_finish, - # upload_complaint=comp_file) - - - # x.save() - obj1, created = StudentComplain.objects.get_or_create(complainer=y, - complaint_type=comp_type, - location=location, - specific_location=specific_location, - details=details, - status=status, - complaint_finish=complaint_finish, - upload_complaint=comp_file) - - - historytemp = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(complainer=y).order_by('-id') - history = [] - j = 1 - k = 1 - for i in historytemp: - history.append(i) - # if j%2 != 0: - # history.append(i) - # j = j+1 - - - for h in history: - h.serial_no = k - k = k+1 - # if location == "hall1": - # dsgn = "hall1caretaker" - # elif location == "hall3": - # dsgn = "hall3caretaker" - # else : - # dsgn = "hall4caretaker" if location == "hall-1": dsgn ="hall1caretaker" elif location =="hall-3": @@ -1252,9 +1128,9 @@ def supervisor(request): messages.success(request,message) # return HttpResponseRedirect('/complaint/user') + + return HttpResponseRedirect('/complaint/supervisor') - return render(request, "complaintModule/supervisor1.html", - {'all_caretaker': all_caretaker, 'all_complaint': all_complaint}) else: @@ -1309,15 +1185,13 @@ def supervisor(request): complaint_final_list=[] for i in comp_list: complaint_final_list.append(i[0]) - print("**********") - print(des[0].designation) - print(user_details.username) + sorted_history_out = sorted(complaint_final_list, key=attrgetter('complaint_date'), reverse=True) + inbox_files = view_inbox( username=user_details.username, designation=des[0].designation, src_module="complaint" ) - print(inbox_files) inbox=[] comp_list_in=set() for i in inbox_files: @@ -1342,10 +1216,12 @@ def supervisor(request): complaint_final_list_in=[] for i in comp_list_in: complaint_final_list_in.append(i[0]) + + sorted_history = sorted(complaint_final_list_in, key=attrgetter('complaint_date'), reverse=True) print(complaint_final_list_in) return render(request, "complaintModule/supervisor1.html", - {'history':complaint_final_list_in,'all_caretaker': all_caretaker, 'all_complaint': all_complaint,'outbox':complaint_final_list}) + {'history':sorted_history,'all_caretaker': all_caretaker, 'all_complaint': all_complaint,'outbox':sorted_history_out}) @login_required def caretaker_id_know_more(request,caretaker_id): diff --git a/FusionIIIT/templates/complaintModule/complaint_caretaker.html b/FusionIIIT/templates/complaintModule/complaint_caretaker.html index 4db5b1127..9a078fde1 100644 --- a/FusionIIIT/templates/complaintModule/complaint_caretaker.html +++ b/FusionIIIT/templates/complaintModule/complaint_caretaker.html @@ -116,7 +116,7 @@ {% comment %}The ... start here!{% endcomment %}
{% block lodgecomplaint %} - {% include 'complaintModule/lodgecomplaint_user.html' %} + {% include 'complaintModule/lodgecomplaint_caretaker.html' %} {% endblock %}
{% comment %}The ... end here!{% endcomment %} diff --git a/FusionIIIT/templates/complaintModule/complainthistory_super_final.html b/FusionIIIT/templates/complaintModule/complainthistory_super_final.html index b9effc8e9..a8844459d 100644 --- a/FusionIIIT/templates/complaintModule/complainthistory_super_final.html +++ b/FusionIIIT/templates/complaintModule/complainthistory_super_final.html @@ -10,9 +10,6 @@ Pending
Complaints - Resolved
Complaints @@ -360,13 +357,13 @@

{% endblock%} \ No newline at end of file diff --git a/FusionIIIT/templates/complaintModule/complainthistory_user_final.html b/FusionIIIT/templates/complaintModule/complainthistory_user_final.html index e54c02f43..23244d78e 100644 --- a/FusionIIIT/templates/complaintModule/complainthistory_user_final.html +++ b/FusionIIIT/templates/complaintModule/complainthistory_user_final.html @@ -5,14 +5,10 @@ {% comment %}The tab menu starts here!{% endcomment %}
-
Pending
Complaints - Resolved
Complaints diff --git a/FusionIIIT/templates/complaintModule/feedback.html b/FusionIIIT/templates/complaintModule/feedback.html index 98e586258..7772c82ae 100644 --- a/FusionIIIT/templates/complaintModule/feedback.html +++ b/FusionIIIT/templates/complaintModule/feedback.html @@ -127,7 +127,7 @@
{% endblock %} \ No newline at end of file diff --git a/FusionIIIT/templates/complaintModule/lodgecomplaint_caretaker.html b/FusionIIIT/templates/complaintModule/lodgecomplaint_caretaker.html new file mode 100644 index 000000000..d549a8290 --- /dev/null +++ b/FusionIIIT/templates/complaintModule/lodgecomplaint_caretaker.html @@ -0,0 +1,160 @@ +{% load static %} +{% block lodgecomplaint %} + + {% comment %}The tab menu starts here!{% endcomment %} +
+ + Complaint + +
+ +
+
+ +
+ {% csrf_token %} +
+ Add a new Complaint: +
+ +
+ +
+ +
+ +
+ + + +
Select Complaint Type
+ +
+
+ Electricity +
+ +
+ Carpenter +
+ +
+ Plumber +
+
+ Garbage +
+
+ Dustbin +
+
+ Internet +
+
+ Other +
+
+ +
+
+ +
+ +
+ + + +
Select Location
+ + + +
+
+
+ +
+ +
+ +
+
+ +
+ + +
+ +
+ + +
+ Complaint Will be Register with your User ID : {{ comp_id }} + + +
+ + + +
+
+ +
+ +
+
+
+
+ + +{% endblock %} + +{% block javascript %} + + + + +{% endblock %} \ No newline at end of file diff --git a/FusionIIIT/templates/complaintModule/lodgecomplaint_super.html b/FusionIIIT/templates/complaintModule/lodgecomplaint_super.html new file mode 100644 index 000000000..496e26510 --- /dev/null +++ b/FusionIIIT/templates/complaintModule/lodgecomplaint_super.html @@ -0,0 +1,160 @@ +{% load static %} +{% block lodgecomplaint %} + + {% comment %}The tab menu starts here!{% endcomment %} +
+ + Complaint + +
+ +
+
+ +
+ {% csrf_token %} +
+ Add a new Complaint: +
+ +
+ +
+ +
+ +
+ + + +
Select Complaint Type
+ +
+
+ Electricity +
+ +
+ Carpenter +
+ +
+ Plumber +
+
+ Garbage +
+
+ Dustbin +
+
+ Internet +
+
+ Other +
+
+ +
+
+ +
+ +
+ + + +
Select Location
+ + + +
+
+
+ +
+ +
+ +
+
+ +
+ + +
+ +
+ + +
+ Complaint Will be Register with your User ID : {{ comp_id }} + + +
+ + + +
+
+ +
+ +
+
+
+
+ + +{% endblock %} + +{% block javascript %} + + + + +{% endblock %} \ No newline at end of file diff --git a/FusionIIIT/templates/complaintModule/resolve_caretaker.html b/FusionIIIT/templates/complaintModule/resolve_caretaker.html index 5627f8528..78cb13479 100644 --- a/FusionIIIT/templates/complaintModule/resolve_caretaker.html +++ b/FusionIIIT/templates/complaintModule/resolve_caretaker.html @@ -98,7 +98,7 @@

- + @@ -156,7 +156,7 @@

{% endblock %} \ No newline at end of file diff --git a/FusionIIIT/templates/complaintModule/supervisor1.html b/FusionIIIT/templates/complaintModule/supervisor1.html index 252175c89..f58efc48d 100644 --- a/FusionIIIT/templates/complaintModule/supervisor1.html +++ b/FusionIIIT/templates/complaintModule/supervisor1.html @@ -93,7 +93,7 @@ {% comment %}The ... start here!{% endcomment %}
{% block lodgecomplaint %} - {% include 'complaintModule/lodgecomplaint_user.html' %} + {% include 'complaintModule/lodgecomplaint_super.html' %} {% endblock %}
{% comment %}The ... end here!{% endcomment %} diff --git a/FusionIIIT/templates/complaintModule/unresolvecomplaint.html b/FusionIIIT/templates/complaintModule/unresolvecomplaint.html index b002df023..af101f0d0 100644 --- a/FusionIIIT/templates/complaintModule/unresolvecomplaint.html +++ b/FusionIIIT/templates/complaintModule/unresolvecomplaint.html @@ -278,7 +278,7 @@

{% endblock %} \ No newline at end of file diff --git a/FusionIIIT/templates/complaintModule/unresolved_super.html b/FusionIIIT/templates/complaintModule/unresolved_super.html index 5db957cb1..9390464ad 100644 --- a/FusionIIIT/templates/complaintModule/unresolved_super.html +++ b/FusionIIIT/templates/complaintModule/unresolved_super.html @@ -250,7 +250,7 @@

From 2677ecf26ff68f0655c7f565c99a071202362633 Mon Sep 17 00:00:00 2001 From: Armin Patel <72291325+arminpatel@users.noreply.github.com> Date: Sun, 14 Apr 2024 16:31:03 +0530 Subject: [PATCH 31/34] fts implementation in api and bug fixes --- .../complaint_system/api/serializers.py | 5 ++ .../applications/complaint_system/api/urls.py | 1 + .../complaint_system/api/views.py | 51 ++++++++---- .../applications/complaint_system/models.py | 77 ++++++++++++++++++- 4 files changed, 118 insertions(+), 16 deletions(-) diff --git a/FusionIIIT/applications/complaint_system/api/serializers.py b/FusionIIIT/applications/complaint_system/api/serializers.py index f8683d62b..39ef67823 100644 --- a/FusionIIIT/applications/complaint_system/api/serializers.py +++ b/FusionIIIT/applications/complaint_system/api/serializers.py @@ -34,6 +34,11 @@ class Meta: model=Supervisor fields=('__all__') + def to_representation(self, instance): + response = super().to_representation(instance) + response['name'] = instance.sup_id.user.first_name + ' ' + instance.sup_id.user.last_name + return response + class ExtraInfoSerializers(serializers.ModelSerializer): class Meta: model=ExtraInfo diff --git a/FusionIIIT/applications/complaint_system/api/urls.py b/FusionIIIT/applications/complaint_system/api/urls.py index 480cd9af7..4f147e261 100644 --- a/FusionIIIT/applications/complaint_system/api/urls.py +++ b/FusionIIIT/applications/complaint_system/api/urls.py @@ -26,4 +26,5 @@ url(r'^removesupervisor/(?P[0-9]+)',views.edit_supervisor_api,name='supervisor-delete-api'), url(r'^updatesupervisor/(?P[0-9]+)',views.edit_supervisor_api,name='supervisor-put-api'), + url(r'^forward', views.forward_complaint_api, name='forward-complaint-api'), ] diff --git a/FusionIIIT/applications/complaint_system/api/views.py b/FusionIIIT/applications/complaint_system/api/views.py index 2283a0184..782120b9d 100644 --- a/FusionIIIT/applications/complaint_system/api/views.py +++ b/FusionIIIT/applications/complaint_system/api/views.py @@ -1,8 +1,7 @@ from django.contrib.auth import get_user_model from django.contrib.auth.decorators import login_required from applications.globals.models import (HoldsDesignation,Designation) -from django.shortcuts import get_object_or_404 -from django.forms.models import model_to_dict +from django.shortcuts import get_object_or_404 from rest_framework.permissions import IsAuthenticated from rest_framework.authentication import TokenAuthentication from rest_framework import status @@ -49,16 +48,27 @@ def student_complain_api(request): caretaker = Caretaker.objects.filter(staff_id=extra_info_id) supervisor = Supervisor.objects.filter(sup_id=extra_info_id) if caretaker.exists(): - complain = StudentComplain.objects.filter(location = caretaker.first().area) + complaints = StudentComplain.get_complaints_by_user(user, 'caretaker') user_type = 'caretaker' elif supervisor.exists(): - complain = StudentComplain.objects.filter(location = supervisor.first().area) + complaints = StudentComplain.get_complaints_by_user(user, 'supervisor') user_type = 'supervisor' else: - complain = StudentComplain.objects.filter(complainer = user) - complains = serializers.StudentComplainSerializers(complain,many=True).data + complaints = StudentComplain.get_complaints_by_user(user, 'student') + + complaints = serializers.StudentComplainSerializers(complaints,many=True).data + + if user_type == 'caretaker' or user_type == 'student': + for complaint in complaints: + last_forwarded = StudentComplain.get_complaint_owner(complaint['id']) + if last_forwarded.username != request.user.username: + complaint['last_forwarded'] = { + 'name': last_forwarded.first_name + ' ' + last_forwarded.last_name, + 'username': last_forwarded.username, + } + resp = { - 'student_complain' : complains, + 'student_complain' : complaints, 'user_type': user_type, } return Response(data=resp,status=status.HTTP_200_OK) @@ -67,15 +77,14 @@ def student_complain_api(request): @permission_classes([IsAuthenticated]) @authentication_classes([TokenAuthentication]) def create_complain_api(request): - print(request.FILES) - print(request.data) serializer = serializers.StudentComplainSerializers(data=request.data) if serializer.is_valid(): serializer.save() + StudentComplain.create_file_for_complaint(serializer.instance) return Response(serializer.data, status=status.HTTP_201_CREATED) return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) -@api_view(['DELETE','PUT']) +@api_view(['DELTE','PUT']) @permission_classes([IsAuthenticated]) @authentication_classes([TokenAuthentication]) def edit_complain_api(request,c_id): @@ -90,7 +99,7 @@ def edit_complain_api(request,c_id): serializer = serializers.StudentComplainSerializers(complain,data=request.data) if serializer.is_valid(): serializer.save() - return Response(serializer.data,status=status.HTTP_200_OK) + return Response(serializer.data,status=status.HTTP_201_CREATED) return Response(serializer.errors,status=status.HTTP_400_BAD_REQUEST) @api_view(['GET','POST']) @@ -167,7 +176,7 @@ def caretaker_api(request): user = get_object_or_404(User ,username=request.user.username) user = ExtraInfo.objects.all().filter(user = user).first() try : - supervisor = Supervisor.objects.get(staff_id=user) + supervisor = Supervisor.objects.get(sup_id=user) except Supervisor.DoesNotExist: return Response({'message':'Logged in user does not have the permissions'},status=status.HTTP_203_NON_AUTHORITATIVE_INFORMATION) serializer = serializers.CaretakerSerializers(data=request.data) @@ -183,7 +192,7 @@ def edit_caretaker_api(request,c_id): user = get_object_or_404(User ,username=request.user.username) user = ExtraInfo.objects.all().filter(user = user).first() try : - supervisor = Supervisor.objects.get(staff_id=user) + supervisor = Supervisor.objects.get(sup_id=user) except Supervisor.DoesNotExist: return Response({'message':'Logged in user does not have the permissions'},status=status.HTTP_203_NON_AUTHORITATIVE_INFORMATION) try: @@ -244,3 +253,19 @@ def edit_supervisor_api(request,s_id): return Response(serializer.data,status=status.HTTP_200_OK) return Response(serializer.errors,status=status.HTTP_400_BAD_REQUEST) + +@api_view(['POST']) +@permission_classes([IsAuthenticated]) +@authentication_classes([TokenAuthentication]) +def forward_complaint_api(request): + user = get_object_or_404(User, username=request.user.username) + user = ExtraInfo.objects.get(user=user) + supervisor = Supervisor.objects.filter(sup_id=user) + caretaker = Caretaker.objects.filter(staff_id=user) + + if supervisor.exists() or caretaker.exists(): + forward_supervisor = Supervisor.objects.get(id=request.data['forward_id']) + StudentComplain.forward_complaint(forward_supervisor.sup_id, request.data['complaint_id']) + return Response({'message':'Complaint forwarded'},status=status.HTTP_200_OK) + else: + return Response({'message':'Logged in user does not have permission'},status=status.HTTP_403_FORBIDDEN) diff --git a/FusionIIIT/applications/complaint_system/models.py b/FusionIIIT/applications/complaint_system/models.py index 9f8849e69..43ba80881 100644 --- a/FusionIIIT/applications/complaint_system/models.py +++ b/FusionIIIT/applications/complaint_system/models.py @@ -2,14 +2,16 @@ from django.db import models from django.utils import timezone -from applications.globals.models import ExtraInfo +from applications.globals.models import ExtraInfo, HoldsDesignation +from applications.filetracking.sdk import methods as fts +from applications.filetracking.models import File +from django.contrib.auth.models import User # Class definations: class Constants: - AREA = ( - ('hall-1', 'hall-1'), + AREA = ( ('hall-1', 'hall-1'), ('hall-3', 'hall-3'), ('hall-4', 'hall-4'), ('CC1', 'CC1'), @@ -79,6 +81,75 @@ class StudentComplain(models.Model): def __str__(self): return str(self.complainer.user.username) + @staticmethod + def get_complaints_by_user(user: ExtraInfo, role: str): + """ + user: ExtraInfo + role: student, caretaker or supervisor + """ + if role == 'student': + return StudentComplain.objects.filter(complainer=user) + elif role == 'caretaker' or role == 'supervisor': + designation = HoldsDesignation.objects.get(user=user.user).designation.name + complaints = fts.view_inbox( + username=user.user.username, + designation=designation, + src_module='complaint' + ) + complaint_queryset = StudentComplain.objects.none() + for complaint in complaints: + complaint_queryset |= StudentComplain.objects.filter(id=complaint['src_object_id']) + + return complaint_queryset + + + @staticmethod + def create_file_for_complaint(complaint): + """ + complaint: StudentComplain + """ + + caretaker = Caretaker.objects.get(area=complaint.location) + caretaker_designation = HoldsDesignation.objects.get(user=caretaker.staff_id.user).designation.name + + fts.create_file( + uploader=complaint.complainer.user.username, + uploader_designation='student', + receiver=caretaker.staff_id.user.username, + receiver_designation=caretaker_designation, + src_module='complaint', + src_object_id=complaint.id + ) + + return complaint + + @staticmethod + def forward_complaint(user: ExtraInfo, complaint_id: int): + """ + user: ExtraInfo + complaint_id: int + """ + file = File.objects.get(src_object_id=complaint_id, src_module='complaint') + user_designation = HoldsDesignation.objects.get(user=user.user) + try: + fts.forward_file( + file_id=file.id, + receiver=user.user.username, + receiver_designation=user_designation.designation.name, + file_extra_JSON={}, + ) + return True, 'Complaint forwarded successfully' + except Exception as e: + return False, str(e) + + + # owner refers to whom it was last forwarded not the complainer + @staticmethod + def get_complaint_owner(complaint_id: int) -> User: + file = File.objects.get(src_object_id=complaint_id, src_module='complaint') + owner_id = fts.get_current_file_owner(file.id) + return User.objects.get(username=owner_id) + class Supervisor(models.Model): sup_id = models.ForeignKey(ExtraInfo, on_delete=models.CASCADE) From e41c09dae9cc960ea6652b7abb27cfd455663da1 Mon Sep 17 00:00:00 2001 From: Armin Patel <72291325+arminpatel@users.noreply.github.com> Date: Sun, 14 Apr 2024 20:04:54 +0530 Subject: [PATCH 32/34] change requirements.txt --- requirements.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 37740b227..1d50f7d05 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,5 @@ amqp==5.0.2 +arabic-reshaper>=2.1.1 asgiref==3.3.1 attrs==20.3.0 beautifulsoup4==4.9.3 @@ -71,7 +72,4 @@ xhtml2pdf==0.2.5 xlrd==2.0.1 XlsxWriter==1.3.7 xlwt==1.3.0 -<<<<<<< HEAD -======= django-crontab==0.7.1 ->>>>>>> 3c5af535f2184900660afdc91924f17616e471af From a0ddb2df8f1a02e836f798df5e7afcabaafb1e69 Mon Sep 17 00:00:00 2001 From: Armin Patel <72291325+arminpatel@users.noreply.github.com> Date: Mon, 15 Apr 2024 02:09:29 +0530 Subject: [PATCH 33/34] add user_type enum --- .../applications/complaint_system/api/views.py | 17 +++++++++-------- .../applications/complaint_system/models.py | 6 ++++++ 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/FusionIIIT/applications/complaint_system/api/views.py b/FusionIIIT/applications/complaint_system/api/views.py index 86cb693ce..14d092598 100644 --- a/FusionIIIT/applications/complaint_system/api/views.py +++ b/FusionIIIT/applications/complaint_system/api/views.py @@ -10,6 +10,7 @@ from rest_framework.response import Response from applications.globals.models import User,ExtraInfo from applications.complaint_system.models import Caretaker, StudentComplain, Supervisor, Workers +from applications.complaint_system.models import USER_TYPE from . import serializers @@ -43,22 +44,22 @@ def student_complain_api(request): user = get_object_or_404(User,username = request.user.username) user = ExtraInfo.objects.all().filter(user = user).first() - user_type = 'student' + user_type = USER_TYPE.student extra_info_id = ExtraInfo.objects.get(id=user.id) caretaker = Caretaker.objects.filter(staff_id=extra_info_id) supervisor = Supervisor.objects.filter(sup_id=extra_info_id) if caretaker.exists(): - complaints = StudentComplain.get_complaints_by_user(user, 'caretaker') - user_type = 'caretaker' + complaints = StudentComplain.get_complaints_by_user(user, USER_TYPE.caretaker) + user_type = USER_TYPE.caretaker elif supervisor.exists(): - complaints = StudentComplain.get_complaints_by_user(user, 'supervisor') - user_type = 'supervisor' + complaints = StudentComplain.get_complaints_by_user(user, USER_TYPE.supervisor) + user_type = USER_TYPE.supervisor else: - complaints = StudentComplain.get_complaints_by_user(user, 'student') + complaints = StudentComplain.get_complaints_by_user(user, USER_TYPE.student) complaints = serializers.StudentComplainSerializers(complaints,many=True).data - if user_type == 'caretaker' or user_type == 'student': + if user_type == USER_TYPE.caretaker or user_type == USER_TYPE.supervisor: for complaint in complaints: last_forwarded = StudentComplain.get_complaint_owner(complaint['id']) if last_forwarded.username != request.user.username: @@ -84,7 +85,7 @@ def create_complain_api(request): return Response(serializer.data, status=status.HTTP_201_CREATED) return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) -@api_view(['DELTE','PUT']) +@api_view(['DELETE','PUT']) @permission_classes([IsAuthenticated]) @authentication_classes([TokenAuthentication]) def edit_complain_api(request,c_id): diff --git a/FusionIIIT/applications/complaint_system/models.py b/FusionIIIT/applications/complaint_system/models.py index cf0c7117e..3d69def17 100644 --- a/FusionIIIT/applications/complaint_system/models.py +++ b/FusionIIIT/applications/complaint_system/models.py @@ -7,6 +7,8 @@ from applications.filetracking.models import File from django.contrib.auth.models import User +from enum import Enum + # Class definations: @@ -37,6 +39,10 @@ class Constants: ('other', 'other'), ) +class USER_TYPE(Enum): + student = 'student' + caretaker = 'caretaker' + supervisor = 'supervisor' class Caretaker(models.Model): staff_id = models.ForeignKey(ExtraInfo, on_delete=models.CASCADE) From 75556285646571cfeb6fc1aa0a6e2eccb98bed04 Mon Sep 17 00:00:00 2001 From: nidhibarapatre Date: Fri, 19 Apr 2024 21:46:43 +0530 Subject: [PATCH 34/34] minor changes --- .../migrations/__init__.py | 0 .../migrations/__init__.py | 0 .../central_mess/migrations/__init__.py | 0 .../complaint_system/migrations/__init__.py | 0 .../applications/complaint_system/models.py | 3 +- .../static/complaint_system/js/rating.js | 2 +- .../applications/complaint_system/urls.py | 21 +- .../applications/complaint_system/views.py | 1250 ++++------------- .../counselling_cell/migrations/__init__.py | 0 .../department/migrations/__init__.py | 0 .../applications/eis/migrations/__init__.py | 0 .../establishment/migrations/__init__.py | 0 .../estate_module/migrations/__init__.py | 0 .../applications/feeds/migrations/__init__.py | 0 .../filetracking/migrations/__init__.py | 0 .../finance_accounts/migrations/__init__.py | 0 .../globals/migrations/__init__.py | 0 FusionIIIT/applications/globals/views.py | 3 +- .../gymkhana/migrations/__init__.py | 0 .../health_center/migrations/__init__.py | 0 .../hostel_management/migrations/__init__.py | 0 .../applications/hr2/migrations/__init__.py | 0 .../income_expenditure/migrations/__init__.py | 0 .../iwdModuleV2/migrations/__init__.py | 0 .../applications/leave/migrations/__init__.py | 0 .../library/migrations/__init__.py | 0 .../migrations/__init__.py | 0 .../office_module/migrations/__init__.py | 0 .../online_cms/migrations/__init__.py | 0 .../placement_cell/migrations/__init__.py | 0 .../migrations/__init__.py | 0 .../applications/ps1/migrations/__init__.py | 0 .../recruitment/migrations/__init__.py | 0 .../migrations/__init__.py | 0 .../scholarships/migrations/__init__.py | 0 .../visitor_hostel/migrations/__init__.py | 0 .../complaintModule/assignworker.html | 10 +- .../complaintModule/complaint_caretaker.html | 6 +- .../complainthistory_care_final.html | 2 +- .../complainthistory_super_final.html | 2 +- .../complainthistory_user_final.html | 2 +- .../lodgecomplaint_caretaker.html | 8 +- .../complaintModule/lodgecomplaint_super.html | 8 +- .../complaintModule/lodgecomplaint_user.html | 7 +- .../complaintModule/resolve_pending.html | 2 +- .../submit_feedback_caretaker.html | 7 +- .../complaintModule/supervisor1.html | 94 +- .../templates/complaintModule/temp.html | 176 +++ .../complaintModule/unresolved_super.html | 4 +- 49 files changed, 537 insertions(+), 1070 deletions(-) create mode 100644 FusionIIIT/applications/academic_information/migrations/__init__.py create mode 100644 FusionIIIT/applications/academic_procedures/migrations/__init__.py create mode 100644 FusionIIIT/applications/central_mess/migrations/__init__.py create mode 100644 FusionIIIT/applications/complaint_system/migrations/__init__.py create mode 100644 FusionIIIT/applications/counselling_cell/migrations/__init__.py create mode 100644 FusionIIIT/applications/department/migrations/__init__.py create mode 100644 FusionIIIT/applications/eis/migrations/__init__.py create mode 100644 FusionIIIT/applications/establishment/migrations/__init__.py create mode 100644 FusionIIIT/applications/estate_module/migrations/__init__.py create mode 100644 FusionIIIT/applications/feeds/migrations/__init__.py create mode 100644 FusionIIIT/applications/filetracking/migrations/__init__.py create mode 100644 FusionIIIT/applications/finance_accounts/migrations/__init__.py create mode 100644 FusionIIIT/applications/globals/migrations/__init__.py create mode 100644 FusionIIIT/applications/gymkhana/migrations/__init__.py create mode 100644 FusionIIIT/applications/health_center/migrations/__init__.py create mode 100644 FusionIIIT/applications/hostel_management/migrations/__init__.py create mode 100644 FusionIIIT/applications/hr2/migrations/__init__.py create mode 100644 FusionIIIT/applications/income_expenditure/migrations/__init__.py create mode 100644 FusionIIIT/applications/iwdModuleV2/migrations/__init__.py create mode 100644 FusionIIIT/applications/leave/migrations/__init__.py create mode 100644 FusionIIIT/applications/library/migrations/__init__.py create mode 100644 FusionIIIT/applications/notifications_extension/migrations/__init__.py create mode 100644 FusionIIIT/applications/office_module/migrations/__init__.py create mode 100644 FusionIIIT/applications/online_cms/migrations/__init__.py create mode 100644 FusionIIIT/applications/placement_cell/migrations/__init__.py create mode 100644 FusionIIIT/applications/programme_curriculum/migrations/__init__.py create mode 100644 FusionIIIT/applications/ps1/migrations/__init__.py create mode 100644 FusionIIIT/applications/recruitment/migrations/__init__.py create mode 100644 FusionIIIT/applications/research_procedures/migrations/__init__.py create mode 100644 FusionIIIT/applications/scholarships/migrations/__init__.py create mode 100644 FusionIIIT/applications/visitor_hostel/migrations/__init__.py create mode 100644 FusionIIIT/templates/complaintModule/temp.html diff --git a/FusionIIIT/applications/academic_information/migrations/__init__.py b/FusionIIIT/applications/academic_information/migrations/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/FusionIIIT/applications/academic_procedures/migrations/__init__.py b/FusionIIIT/applications/academic_procedures/migrations/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/FusionIIIT/applications/central_mess/migrations/__init__.py b/FusionIIIT/applications/central_mess/migrations/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/FusionIIIT/applications/complaint_system/migrations/__init__.py b/FusionIIIT/applications/complaint_system/migrations/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/FusionIIIT/applications/complaint_system/models.py b/FusionIIIT/applications/complaint_system/models.py index 47145fad3..9ff563902 100644 --- a/FusionIIIT/applications/complaint_system/models.py +++ b/FusionIIIT/applications/complaint_system/models.py @@ -12,8 +12,7 @@ class Constants: ('hall-1', 'hall-1'), ('hall-3', 'hall-3'), ('hall-4', 'hall-4'), - ('library', 'CC1'), - ('computer center', 'CC2'), + ('computer center', 'CC'), ('core_lab', 'core_lab'), ('LHTC', 'LHTC'), ('NR2', 'NR2'), diff --git a/FusionIIIT/applications/complaint_system/static/complaint_system/js/rating.js b/FusionIIIT/applications/complaint_system/static/complaint_system/js/rating.js index 825fe759d..6fb5a8caf 100644 --- a/FusionIIIT/applications/complaint_system/static/complaint_system/js/rating.js +++ b/FusionIIIT/applications/complaint_system/static/complaint_system/js/rating.js @@ -22,7 +22,7 @@ $(document).ready(function(){ var complaint_type = $('input[name="complaint_type"]').val() ; var details =$('input[name="details"]').val() ; var myfile = $('input[name="myfile"]').val(); - if(specific_location=="" || Location=="" || details=="" || complaint_type=="") + if(complaint_type=="" || Location=="" || details=="" || specific_location=="") { alert("Please fill all the details!"); return; diff --git a/FusionIIIT/applications/complaint_system/urls.py b/FusionIIIT/applications/complaint_system/urls.py index 2bd0c87e0..e134936c8 100644 --- a/FusionIIIT/applications/complaint_system/urls.py +++ b/FusionIIIT/applications/complaint_system/urls.py @@ -15,20 +15,19 @@ # url(r'^user/check_complaint/$', views.save_comp), # caretaker - url(r'^caretaker/lodge/$', views.caretakerlodge), + # url(r'^caretaker/lodge/$', views.caretakerlodge), url(r'^caretaker/$', views.caretaker, name='caretaker'), url(r'^caretaker/feedback/(?P[0-9]+)/$', views.feedback_care), url(r'^caretaker/pending/(?P[0-9]+)/$', views.resolvepending), url(r'^caretaker/detail2/(?P[0-9]+)/$', views.detail), - url(r'^caretaker/search_complaint$', views.search_complaint), url(r'^caretaker/(?P[0-9]+)/feedback/$', views.submitfeedbackcaretaker), # supervisor - url(r'^supervisor/lodge/$', views.supervisorlodge), + # url(r'^supervisor/lodge/$', views.supervisorlodge), url(r'^supervisor/$', views.supervisor), url(r'^supervisor/feedback/(?P[0-9]+)/$', views.feedback_super), - url(r'^supervisor/caretaker_id_know_more/(?P[0-9]+)/$', views.caretaker_id_know_more), + # url(r'^supervisor/caretaker_id_know_more/(?P[0-9]+)/$', views.caretaker_id_know_more), # url(r'^supervisor/caretaker_id_know_more/(?P[0-9]+)/complaint_reassign_super/(?P[0-9]+)/$', views.complaint_reassign_super, name = 'complaint_reassign_super'), url(r'^supervisor/detail/(?P[0-9]+)/$', views.detail3, name = 'detail3'), url(r'^supervisor/pending/(?P[0-9]+)/$', views.resolvependingsuper), @@ -36,13 +35,17 @@ + + + + + # CRUD task - url(r'^caretaker/worker_id_know_more/(?P[0-9]+)/removew/$', views.removew), - url(r'^caretaker/(?P[0-9]+)/$', views.assign_worker,name='assign_worker'), - url(r'^caretaker/deletecomplaint/(?P[0-9]+)/$', views.deletecomplaint), + url(r'^caretaker/(?P[0-9]+)/$', views.redirect,name='assign_worker'), + # url(r'^caretaker/deletecomplaint/(?P[0-9]+)/$', views.deletecomplaint), # url(r'^caretaker/(?P[0-9]+)/$', views.assign_worker), - url(r'^caretaker/(?P[0-9]+)/(?P[0-9]+)/$', views.changestatus), - url(r'^supervisor/(?P[0-9]+)/(?P[0-9]+)/$', views.changestatussuper), + # url(r'^caretaker/(?P[0-9]+)/(?P[0-9]+)/$', views.changestatus), + # url(r'^supervisor/(?P[0-9]+)/(?P[0-9]+)/$', views.changestatussuper), url(r'^api/',include('applications.complaint_system.api.urls')) diff --git a/FusionIIIT/applications/complaint_system/views.py b/FusionIIIT/applications/complaint_system/views.py index 9d3dd7316..0e92c9afc 100644 --- a/FusionIIIT/applications/complaint_system/views.py +++ b/FusionIIIT/applications/complaint_system/views.py @@ -18,79 +18,10 @@ from applications.filetracking.models import * from operator import attrgetter -#function for reassign to another worker -# @login_required -# def complaint_reassign(request,wid,iid): - # current_user = get_object_or_404(User, username=request.user.username) - # y = ExtraInfo.objects.all().select_related('user','department').filter(user=current_user).first() - # if request.method == 'POST': - # type = request.POST.get('submit', '') - # a = get_object_or_404(User, username=request.user.username) - # y = ExtraInfo.objects.all().select_related('user','department').filter(user=a).first() - # comp_id = y.id - # if type == 'assign': - - # complaint_finish = request.POST.get('complaint_finish', '') - # worker_id = request.POST.get('assign_worker', '') - # w = Workers.objects.select_related('secincharge_id','secincharge_id__staff_id','secincharge_id__staff_id__user','secincharge_id__staff_id__department').get(id=worker_id) - # StudentComplain.objects.select_for_update().filter(id=iid).\ - # update(worker_id=w, status=1) - # url = '/complaint/secincharge/worker_id_know_more/'+wid; - # complainer_details = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department').get(id=iid) - # student=0 - # message = "Your complaint has been re-assigned" - # complaint_system_notif(request.user, complainer_details.complainer.user ,'reassign_worker_alert',complainer_details.id,student,message) - # return HttpResponseRedirect(url) - - # else: - # y = ExtraInfo.objects.all().select_related('user','department').get(id=y.id) - # a = SectionIncharge.objects.select_related('staff_id','staff_id__user','staff_id__department').get(staff_id=y) - # b = a.work_type - # comp_id = y.id - # try: - # detail = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department').filter(id=iid).first() - # total_secincharge = SectionIncharge.objects.select_related('staff_id','staff_id__user','staff_id__department').all() - # total_secincharges_in_area = SectionIncharge.objects.select_related('staff_id','staff_id__user','staff_id__department').filter(work_type=b) - # worker = [] - # workertemp = [] - # flag = '' - # temp = detail.location - # try: - - # if Workers.objects.select_related('secincharge_id','secincharge_id__staff_id','secincharge_id__staff_id__user','secincharge_id__staff_id__department').filter(secincharge_id=a).count() == 0: - # flag = 'no_worker' - # else: - # workertemp = Workers.objects.select_related('secincharge_id','secincharge_id__staff_id','secincharge_id__staff_id__user','secincharge_id__staff_id__department').filter(secincharge_id=a) - # j = 1 - # for i in workertemp: - # worker.append(i) - - # except SectionIncharge.DoesNotExist: - # flag = 'no_worker' - - # except StudentComplain.DoesNotExist: - # return HttpResponse("

Not a valid complaint

") - # return render(request, "complaintModule/reassignworker.html", - # {'detail': detail, 'worker': worker, 'flag': - # flag, 'total_secincharge': total_secincharge,'a':a, 'wid':wid, 'total_secincharges_in_area':total_secincharges_in_area}) - - -# @login_required -# def complaint_reassign_super(request,caretaker_id,iid): - # current_user = get_object_or_404(User, username=request.user.username) - # y = ExtraInfo.objects.all().select_related('user','department').filter(user=current_user).first() - # sup = Supervisor.objects.select_related('sup_id','sup_id__user','sup_id__department').get(sup_id = y) - # this_area = sup.area - # if request.method == 'POST': - # a = get_object_or_404(User, username=request.user.username) - # y = ExtraInfo.objects.all().select_related('user','department').filter(user=a).first() - # comp_id = y.id - - -#for SectionIncharge +#for caretaker @login_required -def assign_worker(request, comp_id1): +def redirect(request, comp_id1): current_user = get_object_or_404(User, username=request.user.username) y = ExtraInfo.objects.all().select_related('user','department').filter(user=current_user).first() """ @@ -106,43 +37,48 @@ def assign_worker(request, comp_id1): context - Holds data needed to make necessary changes in the template. """ if request.method == 'POST': - type = request.POST.get('submit', '') - a = get_object_or_404(User, username=request.user.username) - y = ExtraInfo.objects.all().select_related('user','department').filter(user=a).first() - comp_id = y.id - - - complaint_details = StudentComplain.objects.all().filter(id=comp_id1) - - - - complaint_type=complaint_details[0].complaint_type + try: + type = request.POST.get('submit', '') + a = get_object_or_404(User, username=request.user.username) + y = ExtraInfo.objects.all().select_related('user','department').filter(user=a).first() + comp_id = y.id - supervisor=Supervisor.objects.all().filter(type=complaint_type) - if not supervisor.exists(): - return HttpResponse("

Supervisor does not exist of this complaint type

") - - supervisor_details=ExtraInfo.objects.all().filter(id=supervisor[0].sup_id.id) + + complaint_details = StudentComplain.objects.all().filter(id=comp_id1) + + + + complaint_type=complaint_details[0].complaint_type + + supervisor=Supervisor.objects.all().filter(type=complaint_type) + if not supervisor.exists(): + return HttpResponse("

Supervisor does not exist of this complaint type

") - StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(id=comp_id1).\ - update(status=1) + supervisor_details=ExtraInfo.objects.all().filter(id=supervisor[0].sup_id.id) + + StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(id=comp_id1).\ + update(status=1) + + sup = HoldsDesignation.objects.select_related('user','working','designation').filter(user = supervisor_details[0].user_id) + - sup = HoldsDesignation.objects.select_related('user','working','designation').filter(user = supervisor_details[0].user_id) + files=File.objects.all().filter(src_object_id=comp_id1) - - files=File.objects.all().filter(src_object_id=comp_id1) - - supervisor_username=User.objects.all().filter(id=supervisor_details[0].user_id) - file=forward_file(file_id= files.first().id, - receiver=supervisor_username[0].username, - receiver_designation=sup[0].designation, - file_extra_JSON= {}, - remarks = "", - file_attachment= None) - print(file) - - - return HttpResponseRedirect('/complaint/caretaker/') + supervisor_username=User.objects.all().filter(id=supervisor_details[0].user_id) + file=forward_file(file_id= files.first().id, + receiver=supervisor_username[0].username, + receiver_designation=sup[0].designation, + file_extra_JSON= {}, + remarks = "", + file_attachment= None) + print(file) + + + return HttpResponseRedirect('/complaint/caretaker/') + except: + return HttpResponseRedirect('/complaint/caretaker/') + finally: + return HttpResponseRedirect('/complaint/caretaker/') else: y = ExtraInfo.objects.all().select_related('user','department').get(id=y.id) # a = SectionIncharge.objects.select_related('staff_id','staff_id__user','staff_id__department').get(staff_id=y) @@ -150,48 +86,16 @@ def assign_worker(request, comp_id1): comp_id = y.id try: detail = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department').filter(id=comp_id1).first() - # total_caretaker = Caretaker.objects.select_related('staff_id','staff_id__user','staff_id__department').all() - # total_caretakers_in_area = Supervisor.objects.select_related('sup_id') - # supervisors_in_area= HoldsDesignation.objects.select_related('user','working','designation').get(total_caretakers_in_area = dsgn) - # workertemp = [] - # worker = [] - # flag = '' - # temp = detail.location - # try: - # if Workers.objects.select_related('secincharge_id','secincharge_id__staff_id','secincharge_id__staff_id__user','secincharge_id__staff_id__department').filter(secincharge_id=a).count() == 0: - # flag = 'no_worker' - # else: - # workertemp1 = Workers.objects.select_related('secincharge_id','secincharge_id__staff_id','secincharge_id__staff_id__user','secincharge_id__staff_id__department').filter(secincharge_id=a) - # workertemp = workertemp1.filter(worker_type=detail.complaint_type) - # j = 1 - # for i in workertemp: - # worker.append(i) - - # except SectionIncharge.DoesNotExist: - # flag = 'no_worker' - + complaint_type=detail.complaint_type + supervisor=Supervisor.objects.all().filter(type=complaint_type) + sup_name=supervisor[0].sup_id.id + print(sup_name) except StudentComplain.DoesNotExist: return HttpResponse("

Not a valid complaint

") return render(request, "complaintModule/assignworker.html", - {'detail': detail}) + {'detail': detail,'sup_name':sup_name}) -#for SectionIncharge -@login_required -def discharge_worker(request,wid,cid): - current_user = get_object_or_404(User, username=request.user.username) - y = ExtraInfo.objects.all().select_related('user','department').filter(user=current_user).first() - - this_worker = Workers.objects.select_related('secincharge_id','secincharge_id__staff_id','secincharge_id__staff_id__user','secincharge_id__staff_id__department').get(id=wid) - com_in_concern= StudentComplain.objects.select_related('complainer','complainer__user','complainer__department').get(id=cid); - com_in_concern.worker_id=None; - com_in_concern.status=0; - StudentComplain.objects.select_for_update().filter(id=cid).\ - update(worker_id=None, status=0) - url='/complaint/secincharge/detail2/'+cid; - return HttpResponseRedirect(url) - - @login_required def caretaker_feedback(request): @@ -224,24 +128,6 @@ def caretaker_feedback(request): return render(request, "complaintModule/submit_feedback_caretaker.html", {'a': a}) -#for SectionIncharge -@login_required -def worker_id_know_more(request, work_id): - """ - function to know pending complaints assigned to the worker - """ - this_worker = Workers.objects.select_related('secincharge_id','secincharge_id__staff_id','secincharge_id__staff_id__user','secincharge_id__staff_id__department').get(id=work_id) - num = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department').filter(worker_id=this_worker).count(); - complaints_list = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department').filter(worker_id=this_worker); - complaints_list_onhold = [] - for i in complaints_list: - if i.status == 1: - complaints_list_onhold.append(i) - numpend = len(complaints_list_onhold) - work_under_secincharge1 = this_worker.secincharge_id.staff_id.user.first_name - work_under_secincharge2 = this_worker.secincharge_id.staff_id.user.last_name - return render(request, "complaintModule/worker_id_know_more.html",{'this_worker':this_worker,'work_under_secincharge1':work_under_secincharge1,'work_under_secincharge2':work_under_secincharge2, 'num':num, 'complaints_list':complaints_list, 'complaints_list_onhold':complaints_list_onhold, 'numpend':numpend}) - @login_required @@ -263,16 +149,7 @@ def check(request): a = get_object_or_404(User, username=request.user.username) b = ExtraInfo.objects.all().select_related('user','department').filter(user=a).first() temp = ExtraInfo.objects.all().select_related('user','department').filter(user_type='faculty') - print('----------------------------') - print(len(temp)) temp = ExtraInfo.objects.all().select_related('user','department').filter(user_type='fx') - print('----------------------------') - print(len(temp)) - print('----------------------------') - print(b.user_type) - print('----------------------------') - print('----------------------------') - print('----------------------------') supervisor_list=Supervisor.objects.all() caretaker_list=Caretaker.objects.all() is_supervisor=False @@ -324,99 +201,73 @@ def user(request): num = 1 comp_id = y.id if request.method == 'POST': - comp_type = request.POST.get('complaint_type', '') - location = request.POST.get('Location', '') - specific_location = request.POST.get('specific_location', '') - comp_file = request.FILES.get('myfile') - - details = request.POST.get('details', '') - status = 0 - # finish time is according to complaint type - complaint_finish = datetime.now() + timedelta(days=2) - if comp_type == 'Electricity': - complaint_finish = datetime.now() + timedelta(days=2) - elif comp_type == 'carpenter': - complaint_finish = datetime.now() + timedelta(days=2) - elif comp_type == 'plumber': + try: + comp_type = request.POST.get('complaint_type', '') + location = request.POST.get('Location', '') + specific_location = request.POST.get('specific_location', '') + comp_file = request.FILES.get('myfile') + + details = request.POST.get('details', '') + status = 0 + # finish time is according to complaint type complaint_finish = datetime.now() + timedelta(days=2) - elif comp_type == 'garbage': - complaint_finish = datetime.now() + timedelta(days=1) - elif comp_type == 'dustbin': - complaint_finish = datetime.now() + timedelta(days=1) - elif comp_type == 'internet': - complaint_finish = datetime.now() + timedelta(days=4) - elif comp_type == 'other': - complaint_finish = datetime.now() + timedelta(days=3) - - if location!="": - - user_details=User.objects.get(id=y.user_id) - - obj1, created = StudentComplain.objects.get_or_create(complainer=y, - complaint_type=comp_type, - location=location, - specific_location=specific_location, - details=details, - status=status, - complaint_finish=complaint_finish, - upload_complaint=comp_file) - - - - - - - if location == "hall-1": - dsgn ="hall1caretaker" - elif location =="hall-3": - dsgn ="hall3caretaker" - elif location =="hall-4": - dsgn ="hall4caretaker" - elif location =="CC1": - dsgn ="cc1convener" - elif location =="CC2": - dsgn ="CC2 convener" - elif location == "core_lab": - dsgn = "corelabcaretaker" - elif location =="LHTC": - dsgn ="lhtccaretaker" - elif location =="NR2": - dsgn ="nr2caretaker" - elif location =="Maa Saraswati Hostel": - dsgn ="mshcaretaker" - elif location =="Nagarjun Hostel": - dsgn ="nhcaretaker" - elif location =="Panini Hostel": - dsgn ="phcaretaker" - else: - dsgn = "rewacaretaker" - caretaker_name = HoldsDesignation.objects.select_related('user','working','designation').get(designation__name = dsgn) - - c1=HoldsDesignation.objects.filter(user_id=y.user_id).all() - print(c1[0].designation) - file_id = create_file(uploader=user_details.username, - uploader_designation=c1[0].designation, - receiver=caretaker_name.user.username, - receiver_designation=caretaker_name.designation, - src_module="complaint", - src_object_id= str(obj1.id), - file_extra_JSON= {}, - attached_file = None) + if comp_type == 'Electricity': + complaint_finish = datetime.now() + timedelta(days=2) + elif comp_type == 'carpenter': + complaint_finish = datetime.now() + timedelta(days=2) + elif comp_type == 'plumber': + complaint_finish = datetime.now() + timedelta(days=2) + elif comp_type == 'garbage': + complaint_finish = datetime.now() + timedelta(days=1) + elif comp_type == 'dustbin': + complaint_finish = datetime.now() + timedelta(days=1) + elif comp_type == 'internet': + complaint_finish = datetime.now() + timedelta(days=4) + elif comp_type == 'other': + complaint_finish = datetime.now() + timedelta(days=3) - # print(" wertyuioiuhygfdsdfghjk") - print(file_id) - - # This is to allow the student - student = 0 - message = "A New Complaint has been lodged" - complaint_system_notif(request.user, caretaker_name.user,'lodge_comp_alert',obj1.id,student,message) - # complaint_system_notif(request.user, secincharge_name.staff_id.user,'lodge_comp_alert',obj1.id,1,message) - - messages.success(request,message) - - + if location!="": + + user_details=User.objects.get(id=y.user_id) + + obj1, created = StudentComplain.objects.get_or_create(complainer=y, + complaint_type=comp_type, + location=location, + specific_location=specific_location, + details=details, + status=status, + complaint_finish=complaint_finish, + upload_complaint=comp_file) + + print("23456789") + caretaker= Caretaker.objects.filter(area=location) + print(caretaker) + username_of_caretaker=ExtraInfo.objects.filter(id=caretaker[0].staff_id.id) + print(username_of_caretaker) + designation_id=HoldsDesignation.objects.filter(user_id=username_of_caretaker[0].user_id) + print(designation_id) + c1=HoldsDesignation.objects.filter(user_id=y.user_id).all() + file_id = create_file(uploader=user_details.username, + uploader_designation=c1[0].designation, + receiver=designation_id[0].user.username, + receiver_designation=designation_id[0].designation, + src_module="complaint", + src_object_id= str(obj1.id), + file_extra_JSON= {}, + attached_file = None) + + # This is to allow the student + student = 0 + message = "A New Complaint has been lodged" + complaint_system_notif(request.user, designation_id[0].user,'lodge_comp_alert',obj1.id,student,message) + + messages.success(request,message) + return HttpResponseRedirect('/complaint/user') + except: + return HttpResponseRedirect('/complaint/user') + finally: + return HttpResponseRedirect('/complaint/user') - return HttpResponseRedirect('/complaint/user') else: a = get_object_or_404(User, username=request.user.username) @@ -427,34 +278,25 @@ def user(request): notification = Notification.objects.filter(recipient=a.id) notification = notification.filter(data__exact={'url':'complaint:detail','module':'Complaint System'}) - # notification_message = [] - # for notification in x: - # to = User.objects.get(id=notification.actor_object_id).username - # from django.utils.timesince import timesince as timesince_ - # duration = timesince_(notification.timestamp,None) - # notification_message.append(notification.verb+' by '+ to + ' ' + duration + ' ago ') c1=HoldsDesignation.objects.filter(user_id=y.user_id).all() - print(c1[0].designation) # c2=Designation.objects.filter(i) - - + + outbox_files = view_outbox( username=user_details.username, designation=c1[0].designation, src_module="complaint" ) - print(outbox_files) outbox=[] comp_list=set() for i in outbox_files: outbox.append(i) - print(outbox) for i in outbox: file_history = view_history(file_id=i['id']) print(i['id']) @@ -464,15 +306,7 @@ def user(request): print(complaint) if complaint[0].complainer.user.username == user_details.username : comp_list.add(complaint) - # file_history = view_history(file_id=i['id']) - - # comp=File.objects.filter(uploader=file_history[0]['current_id']) - # for j in comp: - # c=StudentComplain.objects.all().filter(id=j.src_object_id) - # comp_list.add(c) - # print(c[0]) - - # break + complaint_final_list=[] for i in comp_list: complaint_final_list.append(i[0]) @@ -480,7 +314,9 @@ def user(request): sorted_history = sorted(complaint_final_list, key=attrgetter('complaint_date'), reverse=True) print(complaint_final_list) return render(request, "complaintModule/complaint_user.html", - {'outbox': sorted_history,'notification':notification, 'comp_id': y.id, 'history':outbox}) + {'outbox': sorted_history,'notification':notification, 'comp_id': y.id, 'history':outbox}) + + @login_required @@ -553,176 +389,88 @@ def caretaker(request): y = ExtraInfo.objects.all().select_related('user','department').filter(user=current_user).first() if request.method == 'POST': - # type = request.POST.get('submit', '') - # worker_type = request.POST.get('complaint_type', '') - # name = request.POST.get('name', '') - # phone = request.POST.get('phone_no', '') - # age = request.POST.get('age', '') - # try: - # y = ExtraInfo.objects.all().select_related('user','department').get(id=y.id) - # a = Caretaker.objects.select_related('staff_id','staff_id__user','staff_id__department').get(staff_id=y) - # except Exception as e: - # a = None - # y = None - # intage = int(age) - # intphone = int(phone) - # if len(phone) == 10 and intage > 20 and intage < 50 and intphone > 1999999999: - # x = Workers(caretaker_id=a, - # name=name, - # age=age, - # phone=phone, - # worker_type=worker_type) - # if not Workers.objects.filter(caretaker_id=a,name=name, age=age,phone=phone,worker_type=worker_type).exists(): - # x.save() - - # if len(phone) == 10 and intage > 20 and intage < 50 and intphone > 1999999999: - # obj, created = Workers.objects.get_or_create(caretaker_id=a, - # name=name, - # age=age, - # phone=phone, - # worker_type=worker_type) - - # b = a.area - # historytemp = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(location=b).order_by('-id') - # history = [] - # j = 1 - # k = 1 - # for i in historytemp: - # history.append(i) - # # if j%2 == 1: - # # history.append(i) - # # j = j+1 - - # for h in history: - # h.serial_no = k - # k=k+1 - user_details=User.objects.get(id=y.user_id) - # if user_details.username=="shyams": - # desgn="hall3caretaker" - # if user_details.username=="hall4caretaker": - # desgn="hall4caretaker" - - # total_worker = [] + try: + user_details=User.objects.get(id=y.user_id) - - # total_workertemp = Workers.objects.select_related('caretaker_id','caretaker_id__staff_id','caretaker_id__staff_id__user','caretaker_id__staff_id__department').filter(caretaker_id=a) - # j = 1 - # for i in total_workertemp: - # if j%2 != 0: - # total_worker.append(i) - # j = j + 1 - - - # for i in total_workertemp: - # total_worker.append(i) - - complaint_assign_no = [] - comp_type = request.POST.get('complaint_type', '') - location = request.POST.get('Location', '') - specific_location = request.POST.get('specific_location', '') - comp_file = request.FILES.get('myfile') - - details = request.POST.get('details', '') - status = 0 - # finish time is according to complaint type - complaint_finish = datetime.now() + timedelta(days=2) - if comp_type == 'Electricity': - complaint_finish = datetime.now() + timedelta(days=2) - elif comp_type == 'carpenter': - complaint_finish = datetime.now() + timedelta(days=2) - elif comp_type == 'plumber': + complaint_assign_no = [] + comp_type = request.POST.get('complaint_type', '') + location = request.POST.get('Location', '') + specific_location = request.POST.get('specific_location', '') + comp_file = request.FILES.get('myfile') + + details = request.POST.get('details', '') + status = 0 + # finish time is according to complaint type complaint_finish = datetime.now() + timedelta(days=2) - elif comp_type == 'garbage': - complaint_finish = datetime.now() + timedelta(days=1) - elif comp_type == 'dustbin': - complaint_finish = datetime.now() + timedelta(days=1) - elif comp_type == 'internet': - complaint_finish = datetime.now() + timedelta(days=4) - elif comp_type == 'other': - complaint_finish = datetime.now() + timedelta(days=3) - # y = ExtraInfo.objects.all().select_related('user','department').get(id=comp_id) - #check if location given - if location!="": + if comp_type == 'Electricity': + complaint_finish = datetime.now() + timedelta(days=2) + elif comp_type == 'carpenter': + complaint_finish = datetime.now() + timedelta(days=2) + elif comp_type == 'plumber': + complaint_finish = datetime.now() + timedelta(days=2) + elif comp_type == 'garbage': + complaint_finish = datetime.now() + timedelta(days=1) + elif comp_type == 'dustbin': + complaint_finish = datetime.now() + timedelta(days=1) + elif comp_type == 'internet': + complaint_finish = datetime.now() + timedelta(days=4) + elif comp_type == 'other': + complaint_finish = datetime.now() + timedelta(days=3) + # y = ExtraInfo.objects.all().select_related('user','department').get(id=comp_id) + #check if location given + if location!="": + user_details=User.objects.get(id=y.user_id) + obj1, created = StudentComplain.objects.get_or_create(complainer=y, + complaint_type=comp_type, + location=location, + specific_location=specific_location, + details=details, + status=status, + complaint_finish=complaint_finish, + upload_complaint=comp_file) + + + user_details=User.objects.get(id=y.user_id) - obj1, created = StudentComplain.objects.get_or_create(complainer=y, - complaint_type=comp_type, - location=location, - specific_location=specific_location, - details=details, - status=status, - complaint_finish=complaint_finish, - upload_complaint=comp_file) - - - if location == "hall-1": - dsgn ="hall1caretaker" - elif location =="hall-3": - dsgn ="hall3caretaker" - elif location =="hall-4": - dsgn ="hall4caretaker" - elif location =="CC1": - dsgn ="cc1convener" - elif location =="CC2": - dsgn ="CC2 convener" - elif location == "core_lab": - dsgn = "corelabcaretaker" - elif location =="LHTC": - dsgn ="lhtccaretaker" - elif location =="NR2": - dsgn ="nr2caretaker" - elif location =="Maa Saraswati Hostel": - dsgn ="mshcaretaker" - elif location =="Nagarjun Hostel": - dsgn ="nhcaretaker" - elif location =="Panini Hostel": - dsgn ="phcaretaker" - else: - dsgn = "rewacaretaker" - caretaker_name = HoldsDesignation.objects.select_related('user','working','designation').get(designation__name = dsgn) - print(caretaker_name.user.username) - print(user_details.username) - print(caretaker_name.designation) - - user_details=User.objects.get(id=y.user_id) - des=HoldsDesignation.objects.filter(user=user_details).all() - file_id = create_file(uploader=user_details.username, - uploader_designation=des[0].designation, - receiver=caretaker_name.user.username, - receiver_designation=dsgn, - src_module="complaint", - src_object_id= str(obj1.id), - file_extra_JSON= {}, - attached_file = None) + des=HoldsDesignation.objects.filter(user=user_details).all() - # This is to allow the student - student = 1 - message = "A New Complaint has been lodged" - complaint_system_notif(request.user, caretaker_name.user,'lodge_comp_alert',obj1.id,student,message) + caretaker= Caretaker.objects.filter(area=location) + username_of_caretaker=ExtraInfo.objects.filter(id=caretaker[0].staff_id.id) + designation_id=HoldsDesignation.objects.filter(user_id=username_of_caretaker[0].user_id) + file_id = create_file(uploader=user_details.username, + uploader_designation=des[0].designation, + receiver=designation_id[0].user.username, + receiver_designation=designation_id[0].designation, + src_module="complaint", + src_object_id= str(obj1.id), + file_extra_JSON= {}, + attached_file = None) - # return render(request, "complaintModule/complaint_user.html", - # {'history': history, 'comp_id': comp_id }) - # next = request.POST.get('next', '/') - messages.success(request,message) - # return HttpResponseRedirect('/complaint/user') + # This is to allow the student + student = 1 + message = "A New Complaint has been lodged" + complaint_system_notif(request.user, designation_id[0].user,'lodge_comp_alert',obj1.id,student,message) + - # for x in total_worker: - # worker = Workers.objects.select_related('caretaker_id','caretaker_id__staff_id','caretaker_id__staff_id__user','caretaker_id__staff_id__department').get(id=x.id) - # temp = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(worker_id=worker).count() - # worker.total_complaint = temp - # complaint_assign_no.append(worker) + messages.success(request,message) + + + notification = Notification.objects.filter(recipient=current_user.id) + notification = notification.filter(data__exact={'url':'complaint:detail2','module':'Complaint System'}) + + return HttpResponseRedirect('/complaint/caretaker') + except: + return HttpResponseRedirect('/complaint/caretaker') + finally: + return HttpResponseRedirect('/complaint/caretaker') - notification = Notification.objects.filter(recipient=current_user.id) - notification = notification.filter(data__exact={'url':'complaint:detail2','module':'Complaint System'}) - - return HttpResponseRedirect('/complaint/caretaker') else: - # y = ExtraInfo.objects.all().select_related('user','department').get(id=y.id) a = Caretaker.objects.select_related('staff_id','staff_id__user','staff_id__department').get(staff_id=y.id) b = a.area @@ -738,10 +486,6 @@ def caretaker(request): des=HoldsDesignation.objects.filter(user=user_details).all() - print("######") - print(user_details.username) - print(des[0].designation) - print("&&&&&") outbox_files = view_outbox( username=user_details.username, designation=des[0].designation, @@ -756,15 +500,10 @@ def caretaker(request): for i in outbox: file_history = view_history(file_id=i['id']) - print(i['id']) - print("********") + comp=File.objects.filter(id=i['id']) - print(comp[0].src_object_id) - print("------") complaint=StudentComplain.objects.all().filter(id=comp[0].src_object_id) - print(complaint[0].complainer.user.username) - - print("......") + if complaint[0].complainer.user.username== user_details.username : comp_list.add(complaint) @@ -780,7 +519,6 @@ def caretaker(request): designation=des[0].designation, src_module="complaint" ) - print(inbox_files) inbox=[] comp_list_in=set() @@ -790,11 +528,10 @@ def caretaker(request): file_history_list=[] for i in inbox: file_history = view_history(file_id=i['id']) - print(i['id']) + comp=File.objects.filter(id=i['id']) - print(comp[0].src_object_id) + complaint=StudentComplain.objects.all().filter(id=comp[0].src_object_id) - print(complaint) comp_list_in.add(complaint) complaint_final_list_in=[] @@ -803,26 +540,15 @@ def caretaker(request): # print(complaint_final_list_in) sorted_history = sorted(complaint_final_list_in, key=attrgetter('complaint_date'), reverse=True) + all_caretaker=Caretaker.objects.all() return render(request, "complaintModule/complaint_caretaker.html", { 'history': sorted_history, 'comp_id': y.id, 'carehistory':sorted_history_out, 'notification':notification, - 'care_id': a}) - -@login_required -def remove_worker_from_complaint(request,complaint_id): - """ - The function is used by secincharge to remove a worker - already assigned to a complaint - @param: - request - trivial - complaint_id - used to get complaint_id registered - """ - complaint = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department').filter(complaint_id=complaint_id).update(worker_id='') - return HttpResponseRedirect('/complaint/caretaker/') - + 'care_id': a, + 'caretakers' : all_caretaker}) @@ -886,28 +612,6 @@ def changestatussuper(request, complaint_id, status): return HttpResponseRedirect('/complaint/supervisor/') -@login_required -def removew(request, work_id): - """ - The function is used by secincharge to remove workers. - @param: - request - trivial. - work_id - id of the issue object which the user intends to support/unsupport. - - @variables: - issue - The issue object. - supported - True if the user's intention is to support the issue. - support_count - Total supporters of the above issue. - context - Holds data needed to make necessary changes in the template. - """ - worker = Workers.objects.select_related('secincharge_id','secincharge_id__staff_id','secincharge_id__staff_id__user','secincharge_id__staff_id__department').get(id=work_id) - temp = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department').filter(worker_id=worker).count() - if temp == 0: - worker.delete() - return HttpResponseRedirect('/complaint/secincharge/') - else: - return HttpResponse('

Worker is assign some complaint

') - @@ -1006,131 +710,105 @@ def supervisor(request): try: y = ExtraInfo.objects.all().select_related('user','department').get(id=y.id) a = Supervisor.objects.select_related('sup_id','sup_id__user','sup_id__department').get(sup_id=y) - except Exception as e: - a = None - y = None - all_caretaker = Caretaker.objects.select_related('staff_id','staff_id__user','staff_id__department').filter(area=location).order_by('-id') - area = all_caretaker[0].area - # ExtraInfo.objects.get(id=sup_id) - all_complaint = [] - numtemp = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department').filter(location = area).filter(status = 0).count() - num = int(numtemp/2+0.5) - - - - - - comp_type = request.POST.get('complaint_type', '') - location = request.POST.get('Location', '') - specific_location = request.POST.get('specific_location', '') - comp_file = request.FILES.get('myfile') - - details = request.POST.get('details', '') - status = 0 - # finish time is according to complaint type - complaint_finish = datetime.now() + timedelta(days=2) - if comp_type == 'Electricity': - complaint_finish = datetime.now() + timedelta(days=2) - elif comp_type == 'carpenter': - complaint_finish = datetime.now() + timedelta(days=2) - elif comp_type == 'plumber': - complaint_finish = datetime.now() + timedelta(days=2) - elif comp_type == 'garbage': - complaint_finish = datetime.now() + timedelta(days=1) - elif comp_type == 'dustbin': - complaint_finish = datetime.now() + timedelta(days=1) - elif comp_type == 'internet': - complaint_finish = datetime.now() + timedelta(days=4) - elif comp_type == 'other': - complaint_finish = datetime.now() + timedelta(days=3) - y = ExtraInfo.objects.all().select_related('user','department').get(id=comp_id) - #check if location given - if location!="": - # x = StudentComplain(complainer=y, - # complaint_type=comp_type, - # location=location, - # specific_location=specific_location, - # details=details, - # status=status, - # complaint_finish=complaint_finish, - # upload_complaint=comp_file) + all_caretaker = Caretaker.objects.select_related('staff_id','staff_id__user','staff_id__department').filter(area=location).order_by('-id') + area = all_caretaker[0].area + # ExtraInfo.objects.get(id=sup_id) + all_complaint = [] + numtemp = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department').filter(location = area).filter(status = 0).count() + num = int(numtemp/2+0.5) - # x.save() - obj1, created = StudentComplain.objects.get_or_create(complainer=y, - complaint_type=comp_type, - location=location, - specific_location=specific_location, - details=details, - status=status, - complaint_finish=complaint_finish, - upload_complaint=comp_file) - - if location == "hall-1": - dsgn ="hall1caretaker" - elif location =="hall-3": - dsgn ="hall3caretaker" - elif location =="hall-4": - dsgn ="hall4caretaker" - elif location =="CC1": - dsgn ="cc1convener" - elif location =="CC2": - dsgn ="CC2 convener" - elif location == "core_lab": - dsgn = "corelabcaretaker" - elif location =="LHTC": - dsgn ="lhtccaretaker" - elif location =="NR2": - dsgn ="nr2caretaker" - elif location =="Maa Saraswati Hostel": - dsgn ="mshcaretaker" - elif location =="Nagarjun Hostel": - dsgn ="nhcaretaker" - elif location =="Panini Hostel": - dsgn ="phcaretaker" - else: - dsgn = "rewacaretaker" - caretaker_name = HoldsDesignation.objects.select_related('user','working','designation').get(designation__name = dsgn) - user_details=User.objects.get(id=y.user_id) - # c2=Supervisor.objects.all().filter(area=location) - print(caretaker_name.user.username) - print(user_details.username) - print(caretaker_name.designation) - - # sup = HoldsDesignation.objects.select_related('user','working','designation').get(user = y.id) - # print(sup.designation) - - user_details=User.objects.get(id=y.user_id) - des=HoldsDesignation.objects.filter(user=user_details).all() - - - file_id = create_file(uploader=user_details.username, - uploader_designation=des[0].designation, - receiver=caretaker_name.user.username, - receiver_designation=str(caretaker_name.designation), - src_module="complaint", - src_object_id= str(obj1.id), - file_extra_JSON= {}, - attached_file = None) - + - # This is to allow the student - student = 1 - message = "A New Complaint has been lodged" - complaint_system_notif(request.user, caretaker_name.user,'lodge_comp_alert',obj1.id,student,message) + comp_type = request.POST.get('complaint_type', '') + location = request.POST.get('Location', '') + specific_location = request.POST.get('specific_location', '') + comp_file = request.FILES.get('myfile') + + details = request.POST.get('details', '') + status = 0 + # finish time is according to complaint type + complaint_finish = datetime.now() + timedelta(days=2) + if comp_type == 'Electricity': + complaint_finish = datetime.now() + timedelta(days=2) + elif comp_type == 'carpenter': + complaint_finish = datetime.now() + timedelta(days=2) + elif comp_type == 'plumber': + complaint_finish = datetime.now() + timedelta(days=2) + elif comp_type == 'garbage': + complaint_finish = datetime.now() + timedelta(days=1) + elif comp_type == 'dustbin': + complaint_finish = datetime.now() + timedelta(days=1) + elif comp_type == 'internet': + complaint_finish = datetime.now() + timedelta(days=4) + elif comp_type == 'other': + complaint_finish = datetime.now() + timedelta(days=3) + y = ExtraInfo.objects.all().select_related('user','department').get(id=comp_id) + #check if location given + if location!="": + # x = StudentComplain(complainer=y, + # complaint_type=comp_type, + # location=location, + # specific_location=specific_location, + # details=details, + # status=status, + # complaint_finish=complaint_finish, + # upload_complaint=comp_file) + + + # x.save() + obj1, created = StudentComplain.objects.get_or_create(complainer=y, + complaint_type=comp_type, + location=location, + specific_location=specific_location, + details=details, + status=status, + complaint_finish=complaint_finish, + upload_complaint=comp_file) - # return render(request, "complaintModule/complaint_user.html", - # {'history': history, 'comp_id': comp_id }) - # next = request.POST.get('next', '/') + + + user_details=User.objects.get(id=y.user_id) - messages.success(request,message) - # return HttpResponseRedirect('/complaint/user') - - return HttpResponseRedirect('/complaint/supervisor') + # sup = HoldsDesignation.objects.select_related('user','working','designation').get(user = y.id) + # print(sup.designation) + user_details=User.objects.get(id=y.user_id) + des=HoldsDesignation.objects.filter(user=user_details).all() + caretaker= Caretaker.objects.filter(area=location) + username_of_caretaker=ExtraInfo.objects.filter(id=caretaker[0].staff_id.id) + designation_id=HoldsDesignation.objects.filter(user_id=username_of_caretaker[0].user_id) + + file_id = create_file(uploader=user_details.username, + uploader_designation=des[0].designation, + receiver=designation_id[0].user.username, + receiver_designation=designation_id[0].designation, + src_module="complaint", + src_object_id= str(obj1.id), + file_extra_JSON= {}, + attached_file = None) + + + # This is to allow the student + student = 1 + message = "A New Complaint has been lodged" + complaint_system_notif(request.user, designation_id[0].user,'lodge_comp_alert',obj1.id,student,message) + + # return render(request, "complaintModule/complaint_user.html", + # {'history': history, 'comp_id': comp_id }) + # next = request.POST.get('next', '/') + + messages.success(request,message) + # return HttpResponseRedirect('/complaint/user') + + return HttpResponseRedirect('/complaint/supervisor') + except: + return HttpResponseRedirect('/complaint/supervisor') + finally: + return HttpResponseRedirect('/complaint/supervisor') else: @@ -1431,193 +1109,6 @@ def detail3(request, detailcomp_id1): return render(request, "complaintModule/complaint_supervisor_detail.html", {"detail3": detail3,"comp_id":comp_id,"care":care,"num":num}) - - -@login_required - -def supervisorlodge(request): - """ - The function is used to register a complaint - @param: - request - trivial. - - - @variables: - issue - The issue object. - supported - True if the user's intention is to support the issue. - support_count - Total supporters of the above issue. - context - Holds data needed to make necessary changes in the template. - """ - a = get_object_or_404(User, username=request.user.username) - y = ExtraInfo.objects.all().select_related('user','department').filter(user=a).first() - num = 1 - comp_id = y.id - if request.method == 'POST': - comp_type = request.POST.get('complaint_type', '') - location = request.POST.get('Location', '') - specific_location = request.POST.get('specific_location', '') - comp_file = request.FILES.get('myfile') - - details = request.POST.get('details', '') - status = 0 - # finish time is according to complaint type - complaint_finish = datetime.now() + timedelta(days=2) - if comp_type == 'Electricity': - complaint_finish = datetime.now() + timedelta(days=2) - elif comp_type == 'carpenter': - complaint_finish = datetime.now() + timedelta(days=2) - elif comp_type == 'plumber': - complaint_finish = datetime.now() + timedelta(days=2) - elif comp_type == 'garbage': - complaint_finish = datetime.now() + timedelta(days=1) - elif comp_type == 'dustbin': - complaint_finish = datetime.now() + timedelta(days=1) - elif comp_type == 'internet': - complaint_finish = datetime.now() + timedelta(days=4) - elif comp_type == 'other': - complaint_finish = datetime.now() + timedelta(days=3) - y = ExtraInfo.objects.all().select_related('user','department').get(id=comp_id) - #check if location given - if location!="": - # x = StudentComplain(complainer=y, - # complaint_type=comp_type, - # location=location, - # specific_location=specific_location, - # details=details, - # status=status, - # complaint_finish=complaint_finish, - # upload_complaint=comp_file) - - - # x.save() - obj1, created = StudentComplain.objects.get_or_create(complainer=y, - complaint_type=comp_type, - location=location, - specific_location=specific_location, - details=details, - status=status, - complaint_finish=complaint_finish, - upload_complaint=comp_file) - - - historytemp = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(complainer=y).order_by('-id') - history = [] - j = 1 - k = 1 - for i in historytemp: - history.append(i) - # if j%2 != 0: - # history.append(i) - # j = j+1 - - - for h in history: - h.serial_no = k - k = k+1 - # if location == "hall1": - # dsgn = "hall1caretaker" - # elif location == "hall3": - # dsgn = "hall3caretaker" - # else : - # dsgn = "hall4caretaker" - if location == "hall-1": - dsgn ="hall1caretaker" - elif location =="hall-3": - dsgn ="hall3caretaker" - elif location =="hall-4": - dsgn ="hall4caretaker" - elif location =="CC1": - dsgn ="cc1convener" - elif location =="CC2": - dsgn ="CC2 convener" - elif location == "core_lab": - dsgn = "corelabcaretaker" - elif location =="LHTC": - dsgn ="lhtccaretaker" - elif location =="NR2": - dsgn ="nr2caretaker" - elif location =="Maa Saraswati Hostel": - dsgn ="mshcaretaker" - elif location =="Nagarjun Hostel": - dsgn ="nhcaretaker" - elif location =="Panini Hostel": - dsgn ="phcaretaker" - else: - dsgn = "rewacaretaker" - caretaker_name = HoldsDesignation.objects.select_related('user','working','designation').get(designation__name = dsgn) - - - # This is to allow the student - student = 1 - message = "A New Complaint has been lodged" - complaint_system_notif(request.user, caretaker_name.user,'lodge_comp_alert',obj1.id,student,message) - - # return render(request, "complaintModule/complaint_user.html", - # {'history': history, 'comp_id': comp_id }) - # next = request.POST.get('next', '/') - - messages.success(request,message) - return HttpResponseRedirect('/complaint/supervisor') - - else: - a = get_object_or_404(User, username=request.user.username) - y = ExtraInfo.objects.all().select_related('user','department').filter(user=a).first() - historytemp = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(complainer=y).order_by('-id') - history=[] - - notification = Notification.objects.filter(recipient=a.id) - notification = notification.filter(data__exact={'url':'complaint:detail','module':'Complaint System'}) - # notification_message = [] - # for notification in x: - # to = User.objects.get(id=notification.actor_object_id).username - # from django.utils.timesince import timesince as timesince_ - # duration = timesince_(notification.timestamp,None) - # notification_message.append(notification.verb+' by '+ to + ' ' + duration + ' ago ') - - - - - j = 1 - for i in historytemp: - history.append(i) - # if j%2 != 0: - # history.append(i) - # j = j+1 - - for i in history: - i.serial_no = j - j = j+1 - - # if location == "hall-1": - # dsgn ="hall1caretaker" - # elif location =="hall-3": - # dsgn ="hall3caretaker" - # elif location =="hall-4": - # dsgn ="hall4caretaker" - # elif location =="CC1": - # dsgn ="CC convenor" - # elif location =="CC2": - # dsgn ="CC2 convener" - # elif location == "core_lab": - # dsgn = "corelabcaretaker" - # elif location =="LHTC": - # dsgn ="lhtccaretaker" - # elif location =="NR2": - # dsgn ="nr2caretaker" - # else: - # dsgn = "rewacaretaker" - # caretaker_name = HoldsDesignation.objects.get(designation__name = dsgn) - - # complaint_system_notif(request.user, caretaker_name.user,'lodge_comp_alert') - return render(request, "complaintModule/supervisor1.html", - {'history': history,'notification':notification, 'comp_id': y.id}) - - return render(request, "complaintModule/complaint_user.html", - {'history': history, 'comp_id': comp_id }) - - - - @login_required def submitfeedbacksuper(request, complaint_id): """ @@ -1660,187 +1151,6 @@ def submitfeedbacksuper(request, complaint_id): -@login_required - -def caretakerlodge(request): - """ - The function is used to register a complaint - @param: - request - trivial. - - - @variables: - issue - The issue object. - supported - True if the user's intention is to support the issue. - support_count - Total supporters of the above issue. - context - Holds data needed to make necessary changes in the template. - """ - a = get_object_or_404(User, username=request.user.username) - y = ExtraInfo.objects.all().select_related('user','department').filter(user=a).first() - num = 1 - comp_id = y.id - if request.method == 'POST': - comp_type = request.POST.get('complaint_type', '') - location = request.POST.get('Location', '') - specific_location = request.POST.get('specific_location', '') - comp_file = request.FILES.get('myfile') - - details = request.POST.get('details', '') - status = 0 - # finish time is according to complaint type - complaint_finish = datetime.now() + timedelta(days=2) - if comp_type == 'Electricity': - complaint_finish = datetime.now() + timedelta(days=2) - elif comp_type == 'carpenter': - complaint_finish = datetime.now() + timedelta(days=2) - elif comp_type == 'plumber': - complaint_finish = datetime.now() + timedelta(days=2) - elif comp_type == 'garbage': - complaint_finish = datetime.now() + timedelta(days=1) - elif comp_type == 'dustbin': - complaint_finish = datetime.now() + timedelta(days=1) - elif comp_type == 'internet': - complaint_finish = datetime.now() + timedelta(days=4) - elif comp_type == 'other': - complaint_finish = datetime.now() + timedelta(days=3) - y = ExtraInfo.objects.all().select_related('user','department').get(id=comp_id) - #check if location given - if location!="": - # x = StudentComplain(complainer=y, - # complaint_type=comp_type, - # location=location, - # specific_location=specific_location, - # details=details, - # status=status, - # complaint_finish=complaint_finish, - # upload_complaint=comp_file) - - - # x.save() - obj1, created = StudentComplain.objects.get_or_create(complainer=y, - complaint_type=comp_type, - location=location, - specific_location=specific_location, - details=details, - status=status, - complaint_finish=complaint_finish, - upload_complaint=comp_file) - - - historytemp = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(complainer=y).order_by('-id') - history = [] - j = 1 - k = 1 - for i in historytemp: - history.append(i) - # if j%2 != 0: - # history.append(i) - # j = j+1 - - - for h in history: - h.serial_no = k - k = k+1 - # if location == "hall1": - # dsgn = "hall1caretaker" - # elif location == "hall3": - # dsgn = "hall3caretaker" - # else : - # dsgn = "hall4caretaker" - if location == "hall-1": - dsgn ="hall1caretaker" - elif location =="hall-3": - dsgn ="hall3caretaker" - elif location =="hall-4": - dsgn ="hall4caretaker" - elif location =="CC1": - dsgn ="cc1convener" - elif location =="CC2": - dsgn ="CC2 convener" - elif location == "core_lab": - dsgn = "corelabcaretaker" - elif location =="LHTC": - dsgn ="lhtccaretaker" - elif location =="NR2": - dsgn ="nr2caretaker" - elif location =="Maa Saraswati Hostel": - dsgn ="mshcaretaker" - elif location =="Nagarjun Hostel": - dsgn ="nhcaretaker" - elif location =="Panini Hostel": - dsgn ="phcaretaker" - else: - dsgn = "rewacaretaker" - caretaker_name = HoldsDesignation.objects.select_related('user','working','designation').get(designation__name = dsgn) - - - # This is to allow the student - student = 1 - message = "A New Complaint has been lodged" - complaint_system_notif(request.user, caretaker_name.user,'lodge_comp_alert',obj1.id,student,message) - - # return render(request, "complaintModule/complaint_user.html", - # {'history': history, 'comp_id': comp_id }) - # next = request.POST.get('next', '/') - - messages.success(request,message) - return HttpResponseRedirect('/complaint/caretaker') - - else: - a = get_object_or_404(User, username=request.user.username) - y = ExtraInfo.objects.all().select_related('user','department').filter(user=a).first() - historytemp = StudentComplain.objects.select_related('complainer','complainer__user','complainer__department','worker_id','worker_id__caretaker_id__staff_id','worker_id__caretaker_id__staff_id__user','worker_id__caretaker_id__staff_id__department').filter(complainer=y).order_by('-id') - history=[] - - notification = Notification.objects.filter(recipient=a.id) - notification = notification.filter(data__exact={'url':'complaint:detail','module':'Complaint System'}) - # notification_message = [] - # for notification in x: - # to = User.objects.get(id=notification.actor_object_id).username - # from django.utils.timesince import timesince as timesince_ - # duration = timesince_(notification.timestamp,None) - # notification_message.append(notification.verb+' by '+ to + ' ' + duration + ' ago ') - - - - - j = 1 - for i in historytemp: - history.append(i) - # if j%2 != 0: - # history.append(i) - # j = j+1 - - for i in history: - i.serial_no = j - j = j+1 - - # if location == "hall-1": - # dsgn ="hall1caretaker" - # elif location =="hall-3": - # dsgn ="hall3caretaker" - # elif location =="hall-4": - # dsgn ="hall4caretaker" - # elif location =="CC1": - # dsgn ="CC convenor" - # elif location =="CC2": - # dsgn ="CC2 convener" - # elif location == "core_lab": - # dsgn = "corelabcaretaker" - # elif location =="LHTC": - # dsgn ="lhtccaretaker" - # elif location =="NR2": - # dsgn ="nr2caretaker" - # else: - # dsgn = "rewacaretaker" - # caretaker_name = HoldsDesignation.objects.get(designation__name = dsgn) - - # complaint_system_notif(request.user, caretaker_name.user,'lodge_comp_alert') - return render(request, "complaintModule/complaint_caretaker.html", - {'history': history,'notification':notification, 'comp_id': y.id}) - - return render(request, "complaintModule/complaint_user.html", - {'history': history, 'comp_id': comp_id }) @login_required diff --git a/FusionIIIT/applications/counselling_cell/migrations/__init__.py b/FusionIIIT/applications/counselling_cell/migrations/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/FusionIIIT/applications/department/migrations/__init__.py b/FusionIIIT/applications/department/migrations/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/FusionIIIT/applications/eis/migrations/__init__.py b/FusionIIIT/applications/eis/migrations/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/FusionIIIT/applications/establishment/migrations/__init__.py b/FusionIIIT/applications/establishment/migrations/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/FusionIIIT/applications/estate_module/migrations/__init__.py b/FusionIIIT/applications/estate_module/migrations/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/FusionIIIT/applications/feeds/migrations/__init__.py b/FusionIIIT/applications/feeds/migrations/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/FusionIIIT/applications/filetracking/migrations/__init__.py b/FusionIIIT/applications/filetracking/migrations/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/FusionIIIT/applications/finance_accounts/migrations/__init__.py b/FusionIIIT/applications/finance_accounts/migrations/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/FusionIIIT/applications/globals/migrations/__init__.py b/FusionIIIT/applications/globals/migrations/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/FusionIIIT/applications/globals/views.py b/FusionIIIT/applications/globals/views.py index 5b023abb5..4f82716c8 100644 --- a/FusionIIIT/applications/globals/views.py +++ b/FusionIIIT/applications/globals/views.py @@ -799,8 +799,7 @@ def profile(request, username=None): "co co-ordinator", "Convenor", "Convener", - "cc1convener", - "CC2 convener", + "ccconvener", "mess_convener_mess2", "mess_committee_mess2" ] diff --git a/FusionIIIT/applications/gymkhana/migrations/__init__.py b/FusionIIIT/applications/gymkhana/migrations/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/FusionIIIT/applications/health_center/migrations/__init__.py b/FusionIIIT/applications/health_center/migrations/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/FusionIIIT/applications/hostel_management/migrations/__init__.py b/FusionIIIT/applications/hostel_management/migrations/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/FusionIIIT/applications/hr2/migrations/__init__.py b/FusionIIIT/applications/hr2/migrations/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/FusionIIIT/applications/income_expenditure/migrations/__init__.py b/FusionIIIT/applications/income_expenditure/migrations/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/FusionIIIT/applications/iwdModuleV2/migrations/__init__.py b/FusionIIIT/applications/iwdModuleV2/migrations/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/FusionIIIT/applications/leave/migrations/__init__.py b/FusionIIIT/applications/leave/migrations/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/FusionIIIT/applications/library/migrations/__init__.py b/FusionIIIT/applications/library/migrations/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/FusionIIIT/applications/notifications_extension/migrations/__init__.py b/FusionIIIT/applications/notifications_extension/migrations/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/FusionIIIT/applications/office_module/migrations/__init__.py b/FusionIIIT/applications/office_module/migrations/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/FusionIIIT/applications/online_cms/migrations/__init__.py b/FusionIIIT/applications/online_cms/migrations/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/FusionIIIT/applications/placement_cell/migrations/__init__.py b/FusionIIIT/applications/placement_cell/migrations/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/FusionIIIT/applications/programme_curriculum/migrations/__init__.py b/FusionIIIT/applications/programme_curriculum/migrations/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/FusionIIIT/applications/ps1/migrations/__init__.py b/FusionIIIT/applications/ps1/migrations/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/FusionIIIT/applications/recruitment/migrations/__init__.py b/FusionIIIT/applications/recruitment/migrations/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/FusionIIIT/applications/research_procedures/migrations/__init__.py b/FusionIIIT/applications/research_procedures/migrations/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/FusionIIIT/applications/scholarships/migrations/__init__.py b/FusionIIIT/applications/scholarships/migrations/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/FusionIIIT/applications/visitor_hostel/migrations/__init__.py b/FusionIIIT/applications/visitor_hostel/migrations/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/FusionIIIT/templates/complaintModule/assignworker.html b/FusionIIIT/templates/complaintModule/assignworker.html index 47eb65201..458dbfb31 100644 --- a/FusionIIIT/templates/complaintModule/assignworker.html +++ b/FusionIIIT/templates/complaintModule/assignworker.html @@ -71,7 +71,7 @@

If you want to redirect this complaint ,
{% csrf_token %}
-
Complaint ID :{{ detail.complainer }}
+
Complaint ID :{{ detail.complainer.id }}
Complainer :{{ detail.complainer.user.first_name }} {{detail.complainer.user.last_name}}
@@ -96,6 +96,12 @@

If you want to redirect this complaint ,
: {{ detail.specific_location }}

+
+ + Redirected to: + : {{ sup_name }} + +
@@ -108,7 +114,7 @@

You have assigned a worker. First, remove the worker from this complaint the {% else %} --> @@ -202,7 +202,7 @@

{{ a.specific_location }} - {% if a.remarks != 'Pending' %}