From 3d53e523892d63170ac19f4c8c5f9c0a8f141ca4 Mon Sep 17 00:00:00 2001 From: Mohit Saini Date: Wed, 24 Apr 2024 00:07:30 +0530 Subject: [PATCH 1/9] Introduces Subtype option and implemented generate report --- .../ps1/migrations/0002_auto_20240423_0459.py | 69 ++++ .../0003_indentfile_item_subtype.py | 18 + FusionIIIT/applications/ps1/models.py | 1 + FusionIIIT/applications/ps1/urls.py | 3 +- FusionIIIT/applications/ps1/views.py | 96 ++++- FusionIIIT/templates/ps1/composeIndent.html | 5 + FusionIIIT/templates/ps1/createdindent.html | 2 +- .../templates/ps1/current_stock_view.html | 2 + .../ps1/current_stock_view_filter.html | 3 + FusionIIIT/templates/ps1/forwardedIndent.html | 2 +- FusionIIIT/templates/ps1/forwardindent.html | 2 +- FusionIIIT/templates/ps1/generate_report.html | 361 +++++------------- .../templates/ps1/generate_report_filter.html | 82 ++++ FusionIIIT/templates/ps1/ps2.html | 11 +- .../templates/ps1/stock_item_details.html | 224 +++++++++++ FusionIIIT/templates/ps1/stock_item_view.html | 17 +- FusionIIIT/templates/ps1/stock_transfer.html | 4 +- FusionIIIT/templates/ps1/view_transfer.html | 2 + 18 files changed, 615 insertions(+), 289 deletions(-) create mode 100644 FusionIIIT/applications/ps1/migrations/0002_auto_20240423_0459.py create mode 100644 FusionIIIT/applications/ps1/migrations/0003_indentfile_item_subtype.py create mode 100644 FusionIIIT/templates/ps1/generate_report_filter.html create mode 100644 FusionIIIT/templates/ps1/stock_item_details.html diff --git a/FusionIIIT/applications/ps1/migrations/0002_auto_20240423_0459.py b/FusionIIIT/applications/ps1/migrations/0002_auto_20240423_0459.py new file mode 100644 index 000000000..43bf897d0 --- /dev/null +++ b/FusionIIIT/applications/ps1/migrations/0002_auto_20240423_0459.py @@ -0,0 +1,69 @@ +# Generated by Django 3.1.5 on 2024-04-23 04:59 + +from django.db import migrations, models +import django.db.models.deletion +import django.utils.timezone + + +class Migration(migrations.Migration): + + dependencies = [ + ('globals', '0001_initial'), + ('ps1', '0001_initial'), + ] + + operations = [ + migrations.CreateModel( + name='StockItem', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('nomenclature', models.CharField(max_length=100, unique=True)), + ('inUse', models.BooleanField(default=True)), + ('location', models.CharField(choices=[('SR1', 'LHTC'), ('SR2', 'Computer Center'), ('SR3', 'Panini Hostel'), ('SR4', 'Lab complex'), ('SR5', 'Admin Block')], default='SR1', max_length=100)), + ('isTransferred', models.BooleanField(default=False)), + ], + options={ + 'db_table': 'StockItem', + }, + ), + migrations.RenameField( + model_name='indentfile', + old_name='indent_type', + new_name='item_type', + ), + migrations.RemoveField( + model_name='stockentry', + name='item_name', + ), + migrations.AddField( + model_name='stockentry', + name='location', + field=models.CharField(choices=[('SR1', 'LHTC'), ('SR2', 'Computer Center'), ('SR3', 'Panini Hostel'), ('SR4', 'Lab complex'), ('SR5', 'Admin Block')], default='SR1', max_length=100), + ), + migrations.CreateModel( + name='StockTransfer', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('src_location', models.CharField(choices=[('SR1', 'LHTC'), ('SR2', 'Computer Center'), ('SR3', 'Panini Hostel'), ('SR4', 'Lab complex'), ('SR5', 'Admin Block')], default='SR1', max_length=100)), + ('dest_location', models.CharField(choices=[('SR1', 'LHTC'), ('SR2', 'Computer Center'), ('SR3', 'Panini Hostel'), ('SR4', 'Lab complex'), ('SR5', 'Admin Block')], default='SR2', max_length=100)), + ('dateTime', models.DateTimeField(default=django.utils.timezone.now)), + ('dest_dept', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='dept_dest_transfers', to='globals.departmentinfo')), + ('indent_file', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='ps1.indentfile')), + ('src_dept', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='dept_src_transfers', to='globals.departmentinfo')), + ('stockItem', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='ps1.stockitem')), + ], + options={ + 'db_table': 'StockTransfer', + }, + ), + migrations.AddField( + model_name='stockitem', + name='StockEntryId', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='ps1.stockentry'), + ), + migrations.AddField( + model_name='stockitem', + name='department', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='globals.departmentinfo'), + ), + ] diff --git a/FusionIIIT/applications/ps1/migrations/0003_indentfile_item_subtype.py b/FusionIIIT/applications/ps1/migrations/0003_indentfile_item_subtype.py new file mode 100644 index 000000000..8e9d97dd1 --- /dev/null +++ b/FusionIIIT/applications/ps1/migrations/0003_indentfile_item_subtype.py @@ -0,0 +1,18 @@ +# Generated by Django 3.1.5 on 2024-04-23 05:06 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('ps1', '0002_auto_20240423_0459'), + ] + + operations = [ + migrations.AddField( + model_name='indentfile', + name='item_subtype', + field=models.CharField(default='computers', max_length=250), + ), + ] diff --git a/FusionIIIT/applications/ps1/models.py b/FusionIIIT/applications/ps1/models.py index ffbe50020..b34683836 100644 --- a/FusionIIIT/applications/ps1/models.py +++ b/FusionIIIT/applications/ps1/models.py @@ -16,6 +16,7 @@ class IndentFile(models.Model): purpose=models.CharField(max_length=250,blank=False ) specification=models.CharField(max_length=250) item_type=models.CharField(max_length=250) + item_subtype = models.CharField(max_length=250,blank=False,default='computers') nature=models.BooleanField(default = False) indigenous= models.BooleanField(default = False) replaced =models.BooleanField(default = False) diff --git a/FusionIIIT/applications/ps1/urls.py b/FusionIIIT/applications/ps1/urls.py index 148e0c753..dc0b33bae 100644 --- a/FusionIIIT/applications/ps1/urls.py +++ b/FusionIIIT/applications/ps1/urls.py @@ -68,7 +68,8 @@ url(r'^outboxview/$', views.outboxview, name='outboxview'), - url(r'^update_stock_item_inUse/$', views.updateStockItemInUse, name='outboxview'), + url(r'^update_stock_item_inUse/$', views.updateStockItemInUse, name='stockItemInUse'), + url(r'^item_detail/(?P\d+)/$', views.item_detail, name='item_detail'), # BASE API url(r'^api/',include('applications.ps1.api.urls')), diff --git a/FusionIIIT/applications/ps1/views.py b/FusionIIIT/applications/ps1/views.py index 7efeb869e..465156ef4 100644 --- a/FusionIIIT/applications/ps1/views.py +++ b/FusionIIIT/applications/ps1/views.py @@ -20,6 +20,7 @@ import json from django.db.models import Q,Count +from datetime import datetime dept_admin_to_dept = { "deptadmin_cse": "CSE", @@ -29,9 +30,10 @@ "deptadmin_design": "Design", "deptadmin_liberalarts": "Liberal Arts", "deptadmin_ns": "Natural Science", + "Admin IWD":"IWD" } -dept_admin_design = ["deptadmin_cse", "deptadmin_ece", "deptadmin_me","deptadmin_sm", "deptadmin_design", "deptadmin_liberalarts","deptadmin_ns" ] +dept_admin_design = ["deptadmin_cse", "deptadmin_ece", "deptadmin_me","deptadmin_sm", "deptadmin_design", "deptadmin_liberalarts","deptadmin_ns" ,"Admin IWD"] @login_required(login_url = "/accounts/login/") @@ -118,6 +120,8 @@ def create_proposal(request): purpose=request.POST.get('purpose') specification=request.POST.get('specification') item_type=request.POST.get('item_type') + item_subtype=request.POST.get('item_subtype') + nature=request.POST.get('nature') indigenous=request.POST.get('indigenous') replaced =request.POST.get('replaced') @@ -150,6 +154,7 @@ def create_proposal(request): purpose=purpose, specification=specification, item_type=item_type, + item_subtype=item_subtype, nature=nature, indigenous=indigenous, replaced = replaced , @@ -191,6 +196,8 @@ def create_proposal(request): purpose=request.POST.get('purpose') specification=request.POST.get('specification') item_type=request.POST.get('item_type') + item_subtype=request.POST.get('item_subtype') + nature=request.POST.get('nature') indigenous=request.POST.get('indigenous') replaced =request.POST.get('replaced') @@ -249,6 +256,7 @@ def create_proposal(request): purpose=purpose, specification=specification, item_type=item_type, + item_subtype=item_subtype, nature=nature, indigenous=indigenous, replaced = replaced , @@ -1104,11 +1112,12 @@ def current_stock_view(request): StockEntryId__item_id__item_type=type ) - grouped_items = StockItems.values('StockEntryId__item_id__item_type', 'department').annotate(total_quantity=Count('id')) + grouped_items = StockItems.values('StockEntryId__item_id__item_type','StockEntryId__item_id__item_subtype', 'department').annotate(total_quantity=Count('id')) grouped_items_list = [ { 'item_type': item['StockEntryId__item_id__item_type'], + 'item_subtype': item['StockEntryId__item_id__item_subtype'], 'department': DepartmentInfo.objects.get(id=department), 'total_quantity': item['total_quantity'] } @@ -1118,6 +1127,7 @@ def current_stock_view(request): firstStock=StockItems.first() + print(grouped_items_list) return render(request,'ps1/current_stock_view.html',{'stocks':grouped_items_list,'first_stock':firstStock, @@ -1149,11 +1159,12 @@ def current_stock_view(request): return redirect('/dashboard') - grouped_items = StockItems.values('StockEntryId__item_id__item_type','department').annotate(total_quantity=Count('id')) + grouped_items = StockItems.values('StockEntryId__item_id__item_type','StockEntryId__item_id__item_subtype','department').annotate(total_quantity=Count('id')) grouped_items_list = [ { 'item_type': item['StockEntryId__item_id__item_type'], + 'item_subtype': item['StockEntryId__item_id__item_subtype'], 'department': DepartmentInfo.objects.values('id','name').get(id=item['department']), 'departmentId': item['department'], 'total_quantity': item['total_quantity'] @@ -1178,11 +1189,13 @@ def stock_item_view(request): if request.method=="POST": departmentId = request.POST.get('departmentId') type = request.POST.get('item_type') + subtype = request.POST.get('item_subtype') # StockEntryId__item_id__file_info_grade StockItems = StockItem.objects.filter( department=departmentId, - StockEntryId__item_id__item_type=type + StockEntryId__item_id__item_type=type, + StockEntryId__item_id__item_subtype=subtype ) return render(request,'ps1/stock_item_view.html',{'stocks':StockItems}) @@ -1344,16 +1357,56 @@ def generate_report(request): if request.session['currentDesignationSelected'] not in dept_admin_design + ["ps_admin"]: return redirect('/dashboard') + - des = HoldsDesignation.objects.all().select_related().filter(user = request.user).first() - department = request.user.extrainfo.department.name + if request.method =='GET': + if request.session['currentDesignationSelected'] in dept_admin_design: - if request.session['currentDesignationSelected'] in dept_admin_design: - sto=StockEntry.objects.filter(item_id__file_info__uploader__department__name=dept_admin_to_dept[request.session['currentDesignationSelected']]) - else: - sto=StockEntry.objects.all() + deptId = DepartmentInfo.objects.values('id', 'name').get(name=dept_admin_to_dept[request.session['currentDesignationSelected']]) + departments=[deptId] + + elif request.session['currentDesignationSelected'] == "ps_admin": + departments=DepartmentInfo.objects.values('id','name').all() + + return render(request,'ps1/generate_report_filter.html',{'departments':departments}) - return render(request,'ps1/generate_report.html',{'sto':sto}) + + if request.method=="POST": + + + departments = request.POST.getlist('departments') + start_date = request.POST.get('start_date'); + finish_date = request.POST.get('finish_date'); + + + + start_date = datetime.strptime(start_date, '%Y-%m-%d').date() + finish_date = datetime.strptime(finish_date, '%Y-%m-%d').date() + + if(departments[0]=='all'): + StockItems = StockItem.objects.filter(StockEntryId__recieved_date__range=(start_date, finish_date)) + else : + StockItems = StockItem.objects.filter(department__in=departments, StockEntryId__recieved_date__range=(start_date, finish_date)) + + + grouped_items = StockItems.values('StockEntryId__item_id__item_type','department').annotate(total_quantity=Count('id')) + + grouped_items_list = [ + { + 'item_type': item['StockEntryId__item_id__item_type'], + 'department': DepartmentInfo.objects.values('id','name').get(id=item['department']), + 'departmentId': item['department'], + 'total_quantity': item['total_quantity'], + 'StockItems': StockItem.objects.filter( + department=item['department'], + StockEntryId__item_id__item_type=item['StockEntryId__item_id__item_type'] + ) + } + for item in grouped_items + ] + + + return render(request,'ps1/generate_report.html',{'departments':departments,'stocks':grouped_items_list}) @login_required(login_url = "/accounts/login") @@ -1542,6 +1595,8 @@ def outboxview(request): @login_required(login_url="/accounts/login") def updateStockItemInUse(request): + print("updatestockiteminuse"); + if request.session['currentDesignationSelected'] not in dept_admin_design + ["ps_admin"]: return redirect('/dashboard') @@ -1568,4 +1623,21 @@ def updateStockItemInUse(request): return JsonResponse({'success': True}) - # return HttpResponseRedirect('../current_stock_view') \ No newline at end of file + # return HttpResponseRedirect('../current_stock_view') + + +@login_required(login_url="/accounts/login") +def item_detail(request, id): + if request.session['currentDesignationSelected'] not in dept_admin_design + ["ps_admin"]: + return redirect('/dashboard') + + stock_transfers = StockTransfer.objects.filter(stockItem=id).order_by('dateTime') + stock_item = StockItem.objects.filter(id=id).first(); + # Do something with the stock_transfers + + context = { + 'transfers': stock_transfers, + 'item': stock_item + } + + return render(request, 'ps1/stock_item_details.html', context) diff --git a/FusionIIIT/templates/ps1/composeIndent.html b/FusionIIIT/templates/ps1/composeIndent.html index 8c406a8b6..d71d826e9 100644 --- a/FusionIIIT/templates/ps1/composeIndent.html +++ b/FusionIIIT/templates/ps1/composeIndent.html @@ -80,6 +80,11 @@

+
+ + +
+
diff --git a/FusionIIIT/templates/ps1/createdindent.html b/FusionIIIT/templates/ps1/createdindent.html index dd5c06a75..f88edfeb1 100644 --- a/FusionIIIT/templates/ps1/createdindent.html +++ b/FusionIIIT/templates/ps1/createdindent.html @@ -59,7 +59,7 @@
Quantity :-{{indent.quantity}} - Present Stock :{{indent.present_stock}} + SubType {{indent.item_subtype}}
diff --git a/FusionIIIT/templates/ps1/current_stock_view.html b/FusionIIIT/templates/ps1/current_stock_view.html index d49b32e3e..968f29f89 100644 --- a/FusionIIIT/templates/ps1/current_stock_view.html +++ b/FusionIIIT/templates/ps1/current_stock_view.html @@ -35,6 +35,7 @@

Item Type + department/Section Quantity @@ -45,6 +46,7 @@

{{s.item_type}} + {{s.department}} {{s.total_quantity}} diff --git a/FusionIIIT/templates/ps1/current_stock_view_filter.html b/FusionIIIT/templates/ps1/current_stock_view_filter.html index d5ec0df6b..1ac37ab58 100644 --- a/FusionIIIT/templates/ps1/current_stock_view_filter.html +++ b/FusionIIIT/templates/ps1/current_stock_view_filter.html @@ -82,6 +82,7 @@

Item Type + Item Subtype department/section Quantity View Stocks @@ -94,12 +95,14 @@

{{s.item_type}} + {{s.item_subtype}} {{s.department.name}} {{s.total_quantity}}
{% csrf_token %} +
diff --git a/FusionIIIT/templates/ps1/forwardedIndent.html b/FusionIIIT/templates/ps1/forwardedIndent.html index d149ec563..97ce26ab5 100644 --- a/FusionIIIT/templates/ps1/forwardedIndent.html +++ b/FusionIIIT/templates/ps1/forwardedIndent.html @@ -58,7 +58,7 @@
Quantity :-{{indent.quantity}} - Present Stock :{{indent.present_stock}} + SubType :{{indent.item_subtype}}
diff --git a/FusionIIIT/templates/ps1/forwardindent.html b/FusionIIIT/templates/ps1/forwardindent.html index 5c5e17ab1..7cb74b51c 100644 --- a/FusionIIIT/templates/ps1/forwardindent.html +++ b/FusionIIIT/templates/ps1/forwardindent.html @@ -45,7 +45,7 @@
Quantity :-{{indent.quantity}} - Present Stock :{{indent.present_stock}} + SubType :{{indent.item_subtype}}
diff --git a/FusionIIIT/templates/ps1/generate_report.html b/FusionIIIT/templates/ps1/generate_report.html index 7374c533d..e5f022416 100644 --- a/FusionIIIT/templates/ps1/generate_report.html +++ b/FusionIIIT/templates/ps1/generate_report.html @@ -1,274 +1,101 @@ -{% extends 'ps1/ps2.html' %} -{% load static %} - -{% block filetracking_tab %} - - -
-

- - Stocks present in database - -

-
-
- -
-
-
-

- - Procuremented stock entry view - -

- -
-
- - - - -
- {% if sto %} - - - - - - - - - - - - - - {% for s in sto %} - {% if s.item_id.purchased %} - - - - - - - - - - - - - - - - {% endif %} + // Clone the element + let clonedPdfjs = pdfjs.cloneNode(true); - {% endfor %} - + // Set width of the cloned element to match the width of the PDF document + var widthInPixels = 450 * 3.78; + clonedPdfjs.style.width = widthInPixels + 'px'; -
item_idStock_NameQuantity dealing assistant idDepartment/Sectionstock Report
{{s.item_id.file_info.id}}{{s.item_name}}{{s.current_stock}}{{s.dealing_assistant_id}}{{s.item_id.file_info.uploader.department.name}}
{% csrf_token %} - - -
-
- -
- {% else %} -

No Records present in database

- {% endif %} - - - - - -
- - - - all_users = JSON.parse(response.users); - console.log(all_users[0].fields.username); - app = [] - $('#input_list').html(''); - for(var i=0;i'+all_users[i].fields.username+''); - } - }, - error: function(rs, e){ - console.log('error-------'); - }, - }); - console.log("dsfagdfdshadf"); - }); - - -{% endblock %} - - +{% endblock %} \ No newline at end of file diff --git a/FusionIIIT/templates/ps1/generate_report_filter.html b/FusionIIIT/templates/ps1/generate_report_filter.html new file mode 100644 index 000000000..45ddd040a --- /dev/null +++ b/FusionIIIT/templates/ps1/generate_report_filter.html @@ -0,0 +1,82 @@ +{% extends 'ps1/ps2.html' %} +{% load static %} + + +{% block filetracking_tab %} + {% comment %}the compounder prescription tab starts here {% endcomment %} + + +
+

+ + Add Filters + +

+
+ + {% comment %}the ambulance schedule tab starts here {% endcomment %} +
+
+ +
+ {% csrf_token %} +
+ + +
+ +
+ + +
+ + + + +
+ + +
+ + + + + + + + + +
+ +
+ +
+ +
+ +
+ + +{% endblock %} + + + diff --git a/FusionIIIT/templates/ps1/ps2.html b/FusionIIIT/templates/ps1/ps2.html index 8a1a67d68..a209cd72b 100644 --- a/FusionIIIT/templates/ps1/ps2.html +++ b/FusionIIIT/templates/ps1/ps2.html @@ -40,10 +40,10 @@ - + Current Stock Situation @@ -51,7 +51,12 @@ - Transfer Stock View + View Transfer Execution + + + + + Generate Report diff --git a/FusionIIIT/templates/ps1/stock_item_details.html b/FusionIIIT/templates/ps1/stock_item_details.html new file mode 100644 index 000000000..2ff108cb6 --- /dev/null +++ b/FusionIIIT/templates/ps1/stock_item_details.html @@ -0,0 +1,224 @@ + +{% extends 'ps1/ps2.html' %} +{% load static %} + +{% block filetracking_tab %} + + +
+

+ + Detailed Stock Item View + +

+
+
+ +
+
+
+

+ + Stock Item Details + +

+ +
+ + +
+ {% if item %} +
+ +
+
+
+
+
Item Name
+
:
+
{{item.StockEntryId.item_id.item_name}}
+
+
+
+
+
+
+
+
Item Type
+
:
+
{{item.StockEntryId.item_id.item_type}}
+
+
+
+
+ +
+
+
+
+
Item SubType
+
:
+
{{item.StockEntryId.item_id.item_subtype}}
+
+
+
+
+
+
+
+
Dealing Assistant
+
:
+
{{item.StockEntryId.dealing_assistant_id}}
+
+
+
+
+ +
+
+
+
+
Vendor Name
+
:
+
{{item.StockEntryId.vendor}}
+
+
+
+
+
+
+
+
Initially Transferred to
+
:
+
{{item.StockEntryId.item_id.file_info.uploader.department.name}}
+
+
+
+
+ +
+
+
+
+
Bill
+
:
+
+ + {% if item.StockEntryId.bill %} + {{ item.StockEntryId.bill }} + {% else %} + No bill available + {% endif %} +
+
+
+
+
+
+
+
+
Received Date
+
:
+
{{item.StockEntryId.recieved_date}}
+
+
+
+
+ +
+

+ + Stock Item Transfer History + +

+ +
+ + + + + + + + + + + + + + + + + {% for s in transfers %} + + + + + + + + + + + {% endfor %} + +
File IdSrc Department Dest Department Src Location Dest Location Date Time
{{s.indent_file.file_info.id}} {{s.src_dept.name}}{{s.dest_dept.name}}{{s.src_location}}{{s.dest_location}}{{s.dateTime}}
+ +
+ + +
+ {% else %} +

No Records present in database

+ {% endif %} + + + + + +
+ + {% endblock %} \ No newline at end of file diff --git a/FusionIIIT/templates/ps1/stock_item_view.html b/FusionIIIT/templates/ps1/stock_item_view.html index 1f259fea9..2cd88c6d7 100644 --- a/FusionIIIT/templates/ps1/stock_item_view.html +++ b/FusionIIIT/templates/ps1/stock_item_view.html @@ -41,6 +41,7 @@

Current Location Transferred InUse + @@ -49,7 +50,10 @@

{% for s in stocks %} {% if s.StockEntryId.item_id.purchased %} - {{s.nomenclature}} + + {{ s.nomenclature }} + + {{s.StockEntryId.item_id.item_name}} {{s.department.name}} {{s.location}} @@ -62,6 +66,15 @@

{% endif %} + + + + + {% endif %} @@ -92,7 +105,7 @@

No Records present in database

$('#form').on('submit', function (event) { event.preventDefault(); // Prevent default form submission var selectedItems = []; // Array to store selected item IDs - + // Iterate over each checked checkbox and add its value to the array $('input[name="selected_stock_item"]').each(function () { var itemId = $(this).val(); diff --git a/FusionIIIT/templates/ps1/stock_transfer.html b/FusionIIIT/templates/ps1/stock_transfer.html index 8775e88cd..a7a5f4b44 100644 --- a/FusionIIIT/templates/ps1/stock_transfer.html +++ b/FusionIIIT/templates/ps1/stock_transfer.html @@ -34,6 +34,7 @@

Nomenclature Item Name Item Type + Item SubType Current Location Current Department/Section Vendor @@ -49,8 +50,9 @@

{{item.StockEntryId.item_id.item_name}} {{item.StockEntryId.item_id.item_type}} + {{item.StockEntryId.item_id.item_subtype}} {{item.StockEntryId.location}} - {{item.department}} + {{item.department.name}} {{item.StockEntryId.vendor}} diff --git a/FusionIIIT/templates/ps1/view_transfer.html b/FusionIIIT/templates/ps1/view_transfer.html index 6cb11448c..79636f5ac 100644 --- a/FusionIIIT/templates/ps1/view_transfer.html +++ b/FusionIIIT/templates/ps1/view_transfer.html @@ -37,6 +37,7 @@

File Id Item Type + Item SubType Item Name Nomenclature Src Dept/Sec @@ -57,6 +58,7 @@

{{s.indent_file.file_info.id}} {{s.indent_file.item_type}} + {{s.indent_file.item_subtype}} {{s.indent_file.item_name}} {{s.stockItem.nomenclature}} From 18944dde2f085d0db18890032d020bc467a73e92 Mon Sep 17 00:00:00 2001 From: Srivatsa19 Date: Wed, 24 Apr 2024 02:07:22 +0530 Subject: [PATCH 2/9] Added notifications and tracking for each file --- .../migrations/0002_auto_20231116_2323.py | 18 - FusionIIIT/applications/iwdModuleV2/models.py | 13 - FusionIIIT/applications/iwdModuleV2/urls.py | 74 +- FusionIIIT/applications/iwdModuleV2/views.py | 683 ++++++++---------- .../iwdModuleV2/auditDocumentView.html | 25 +- .../iwdModuleV2/createdRequests.html | 26 +- .../templates/iwdModuleV2/dashboard.html | 14 +- .../iwdModuleV2/deanProcessedRequests.html | 28 +- .../engineerProcessedRequests.html | 25 +- .../generatedBillsRequestsView.html | 33 +- .../templates/iwdModuleV2/issueWorkOrder.html | 11 +- .../iwdModuleV2/requestsInProgress.html | 16 +- .../templates/iwdModuleV2/requestsView.html | 11 +- .../iwdModuleV2/settleBillsView.html | 27 +- .../templates/iwdModuleV2/updateRequests.html | 12 +- .../templates/iwdModuleV2/view_file.html | 165 +++++ .../templates/iwdModuleV2/workOrder.html | 10 + 17 files changed, 619 insertions(+), 572 deletions(-) delete mode 100644 FusionIIIT/applications/globals/migrations/0002_auto_20231116_2323.py create mode 100644 FusionIIIT/templates/iwdModuleV2/view_file.html diff --git a/FusionIIIT/applications/globals/migrations/0002_auto_20231116_2323.py b/FusionIIIT/applications/globals/migrations/0002_auto_20231116_2323.py deleted file mode 100644 index 51f5a76b5..000000000 --- a/FusionIIIT/applications/globals/migrations/0002_auto_20231116_2323.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.1.5 on 2023-11-16 23:23 - -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/iwdModuleV2/models.py b/FusionIIIT/applications/iwdModuleV2/models.py index a0834f1bb..9a3337987 100644 --- a/FusionIIIT/applications/iwdModuleV2/models.py +++ b/FusionIIIT/applications/iwdModuleV2/models.py @@ -186,19 +186,6 @@ class WorkOrder(models.Model): alloted_time = models.CharField(max_length=200) start_date = models.DateField() completion_date = models.DateField() - -class Inventory(models.Model): - name = models.CharField(max_length=200) - quantity = models.IntegerField(default=0) - cost = models.IntegerField(default=0) - -class UsedItems(models.Model): - # requestId = models.IntegerField() - request_id = models.ForeignKey(Requests, on_delete=models.CASCADE) - itemName = models.CharField(max_length=200) - cost = models.IntegerField(default=0) - quantity = models.IntegerField(default=0) - date = models.DateField(default=date.today) class Bills(models.Model): # requestId = models.IntegerField() diff --git a/FusionIIIT/applications/iwdModuleV2/urls.py b/FusionIIIT/applications/iwdModuleV2/urls.py index 0c0830cea..e976034d3 100644 --- a/FusionIIIT/applications/iwdModuleV2/urls.py +++ b/FusionIIIT/applications/iwdModuleV2/urls.py @@ -1,5 +1,5 @@ -from django.conf.urls import url - +from django.conf.urls import url, include +from django.urls import path from . import views app_name = 'iwdModuleV2' @@ -37,45 +37,37 @@ url(r'addendumView/$', views.addendumView, name='Addendum View'), url('agreementView/$', views.agreementView, name='Agreement VIew'), url(r'corrigendumView/$', views.corrigendumView, name='Corrigendum View'), - url('requestsView/',views.requestsView, name='Requests view'), - url('createdRequestsView/',views.createdRequests, name='Created Requests view'), - url('handleEngineerProcessRequests/', views.handleEngineerProcessRequests, name='Engineer-Process-Requests'), - url('engineerProcessedRequestsView/',views.engineerProcessedRequests, name='Engineer-Processed-Requests view'), - url('handleDeanProcessRequests/', views.handleDeanProcessRequests, name='Dean-Process-Requests'), - url('deanProcessedRequestsView/',views.deanProcessedRequests, name='Dean-Processed-Requests view'), - url('handleDirectorApprovalRequests/', views.handleDirectorApprovalRequests, name='Director-Approval-Requests'), - url('handleDirectorRejectionRequests/', views.handleDirectorRejectionRequests, name='Director-Rejection-Requests'), - url('updateRejectedRequests/', views.updateRejectedRequests, name='Update-Rejected-Requests'), - url('handleUpdateRequests/', views.handleUpdateRequests, name='Handle-Update-Requests'), + url(r'^requestsView/',views.requestsView, name='Requests view'), + url(r'^createdRequestsView/',views.createdRequests, name='Created Requests view'), + url(r'^handleEngineerProcessRequests/', views.handleEngineerProcessRequests, name='Engineer-Process-Requests'), + url(r'^engineerProcessedRequestsView/',views.engineerProcessedRequests, name='Engineer-Processed-Requests view'), + url(r'^handleDeanProcessRequests/', views.handleDeanProcessRequests, name='Dean-Process-Requests'), + url(r'^deanProcessedRequestsView/',views.deanProcessedRequests, name='Dean-Processed-Requests view'), + url(r'^handleDirectorApprovalRequests/', views.handleDirectorApprovalRequests, name='Director-Approval-Requests'), + url(r'^updateRejectedRequests/', views.updateRejectedRequests, name='Update-Rejected-Requests'), + url(r'^handleUpdateRequests/', views.handleUpdateRequests, name='Handle-Update-Requests'), # url('rejectedRequests/', views.rejectedRequests, name='Rejected-Requests'), - url('rejectedRequestsView/',views.rejectedRequests, name='Rejected Requests view'), - url('requestsStatus/', views.requestsStatus, name='Requests-Status'), - url('fetchDesignations/', views.fetchDesignations, name='Fetch-Designations'), - url('fetchRequest/', views.fetchRequest, name='Fetch-Request'), - url('issueWorkOrder/', views.issueWorkOrder, name='Issue Work Order'), - url('workOrder/', views.workOrder, name='Work Order'), - url('inventory/', views.inventory, name='Inventory'), - url('addItemsView/', views.addItemsView, name='Add Items View'), - url('addItems/', views.addItems, name='Add Items'), - url('editInventoryView/', views.editInventoryView, name='Edit Inventory View'), - url('editInventory/', views.editInventory, name='Edit Inventory'), - url('requestsInProgess/', views.requestsInProgess, name='Requests In Progress'), - url('workCompleted/', views.workCompleted, name='Work Completed'), - url('requestFromInventory/', views.requestFromInventory, name='Request From Inventory'), - url('editInventoryAfterRequest/', views.editInventoryAfterRequest, name='Edit-Inventory-After-Request'), - url('generateFinalBill/', views.generateFinalBill, name='Generate-Final-Bill'), - url('handleBillGeneratedRequests/', views.handleBillGeneratedRequests, name='Handle-Bill-Generated-Requests'), - url('generatedBillsView/', views.generatedBillsView, name='Generated-Bills-View'), - url('handleProcessedBills/', views.handleProcessedBills, name='Handle-Processed-Bills'), - url('auditDocumentView/', views.auditDocumentView, name='Audit-Document-View'), - url('auditDocument/', views.auditDocument, name='Audit-Document'), - url('settleBillsView/', views.settleBillsView, name='Settle-Bills-View'), - url('handleSettleBillRequests/', views.handleSettleBillRequests, name='Handle-Settle-Bill-Requests'), - url('viewBudget/', views.viewBudget, name='View-Budget'), - url('budget/', views.budget, name='Budget'), - url('addBudget/', views.addBudget, name='Add-Budget'), - url('editBudgetView/', views.editBudgetView, name='Edit-Budget-View'), - url('editBudget/', views.editBudget, name='Edit-Budget'), - # url('billsView/',views.billsView, name='Bills View'), + url(r'^rejectedRequestsView/',views.rejectedRequests, name='Rejected Requests view'), + url(r'^requestsStatus/', views.requestsStatus, name='Requests-Status'), + url(r'^fetchDesignations/', views.fetchDesignations, name='Fetch-Designations'), + url(r'^fetchRequest/', views.fetchRequest, name='Fetch-Request'), + url(r'^issueWorkOrder/', views.issueWorkOrder, name='Issue Work Order'), + url(r'^workOrder/', views.workOrder, name='Work Order'), + url(r'^requestsInProgess/', views.requestsInProgess, name='Requests In Progress'), + url(r'^workCompleted/', views.workCompleted, name='Work Completed'), + url(r'^generateFinalBill/', views.generateFinalBill, name='Generate-Final-Bill'), + url(r'^handleBillGeneratedRequests/', views.handleBillGeneratedRequests, name='Handle-Bill-Generated-Requests'), + url(r'^generatedBillsView/', views.generatedBillsView, name='Generated-Bills-View'), + url(r'^handleProcessedBills/', views.handleProcessedBills, name='Handle-Processed-Bills'), + url(r'^auditDocumentView/', views.auditDocumentView, name='Audit-Document-View'), + url(r'^auditDocument/', views.auditDocument, name='Audit-Document'), + url(r'^settleBillsView/', views.settleBillsView, name='Settle-Bills-View'), + url(r'^handleSettleBillRequests/', views.handleSettleBillRequests, name='Handle-Settle-Bill-Requests'), + url(r'^viewBudget/', views.viewBudget, name='View-Budget'), + url(r'^budget/', views.budget, name='Budget'), + url(r'^addBudget/', views.addBudget, name='Add-Budget'), + url(r'^editBudgetView/', views.editBudgetView, name='Edit-Budget-View'), + url(r'^editBudget/', views.editBudget, name='Edit-Budget'), + path('view_file//',views.view_file,name="view_file"), ] diff --git a/FusionIIIT/applications/iwdModuleV2/views.py b/FusionIIIT/applications/iwdModuleV2/views.py index 38a7e4ee7..1f999ebd9 100644 --- a/FusionIIIT/applications/iwdModuleV2/views.py +++ b/FusionIIIT/applications/iwdModuleV2/views.py @@ -1,12 +1,15 @@ from django.shortcuts import render, redirect from django.urls import reverse from django.db.models import Q +from django.contrib import messages from applications.globals.models import * +from applications.ps1.models import * from django.contrib.auth.decorators import login_required from .models import * from django.http import HttpResponseRedirect from applications.filetracking.sdk.methods import * from applications.globals.models import ExtraInfo, HoldsDesignation, Designation +from notification.views import iwd_notif from datetime import datetime from reportlab.lib.pagesizes import letter from reportlab.pdfgen import canvas @@ -41,12 +44,7 @@ #Junior Engineer, Electrical Engineer (Civil), Electrical_AE, Electrical_JE, EE, Civil_AE, Civil_JE def dashboard(request): - eligible = "" - userObj = request.user - userDesignationObjects = HoldsDesignation.objects.filter(user=userObj) - for p in userDesignationObjects: - eligible = p.designation.name - print(eligible) + eligible = request.session.get('currentDesignationSelected') return render(request, 'iwdModuleV2/dashboard.html', {'eligible': eligible}) def page1_1(request): @@ -476,7 +474,6 @@ def fetchDesignations(request): def requestsView(request): if request.method == 'POST': formObject = Requests() - # formObject.key = Projects.objects.get(id=request.session['projectId']) formObject.name = request.POST['name'] formObject.description = request.POST['description'] formObject.area = request.POST['area'] @@ -491,47 +488,53 @@ def requestsView(request): formObject.billProcessed = 0 formObject.billSettled = 0 formObject.save() - print(request.user) - print(request.user.username) request_object = Requests.objects.get(pk=formObject.pk) - d = HoldsDesignation.objects.get(user__username=request.POST['designation']) - d1 = HoldsDesignation.objects.get(user__username=request.user) - print(d) - print(d1) + desg = request.session.get('currentDesignationSelected') + receiver_user, receiver_desg = request.POST['designation'].split('|') create_file(uploader=request.user.username, - uploader_designation=d1.designation, - receiver=request.POST['designation'], - receiver_designation=d.designation, + uploader_designation=desg, + receiver=receiver_user, + receiver_designation=receiver_desg, src_module="IWD", src_object_id= str(request_object.id), file_extra_JSON= {"value": 2}, attached_file = None) + messages.success(request, "Request Successfully Created") + receiver_user_obj = User.objects.get(username=receiver_user) - eligible = "" - userObj = request.user - userDesignationObjects = HoldsDesignation.objects.filter(user=userObj) - for p in userDesignationObjects: - eligible = p.designation.name + iwd_notif(request.user, receiver_user_obj, "Request_added") + + eligible = request.session.get('currentDesignationSelected') return render(request, 'iwdModuleV2/dashboard.html', {'eligible' : eligible}) @login_required def createdRequests(request): obj = [] - d = HoldsDesignation.objects.get(user__username=request.user) + desg = request.session.get('currentDesignationSelected') inbox_files = view_inbox( username=request.user, - designation=d.designation, + designation=desg, src_module="IWD" ) for result in inbox_files: src_object_id = result['src_object_id'] request_object = Requests.objects.filter(id=src_object_id).first() + file_obj= File.objects.get(src_object_id= request_object.id, src_module = "IWD") if request_object: - element = [request_object.id, request_object.name, request_object.area, request_object.description, request_object.requestCreatedBy] + element = [request_object.id, request_object.name, request_object.area, request_object.description, request_object.requestCreatedBy, file_obj.id] obj.append(element) + return render(request, 'iwdModuleV2/createdRequests.html', {'obj' : obj}) + +@login_required +def view_file(request, id, url): + file1= File.objects.get(id=id) + tracks= Tracking.objects.filter(file_id=file1) + current_user = Tracking.objects.filter(file_id=file1).order_by('-receive_date')[0].receiver_id + print(current_user) + designations = Designation.objects.filter() holdsDesignations = [] @@ -542,231 +545,218 @@ def createdRequests(request): list = HoldsDesignation.objects.filter(designation=d) holdsDesignations.append(list) - return render(request, 'iwdModuleV2/createdRequests.html', {'obj' : obj, 'holdsDesignations' : holdsDesignations}) + eligible = request.session.get('currentDesignationSelected') + + return render(request, "iwdModuleV2/view_file.html", context= {"file": file1, "tracks": tracks, "current_user": current_user, "holdsDesignations" : holdsDesignations, "url" : url, "eligible" : eligible}) @login_required def handleEngineerProcessRequests(request): if request.method == 'POST': + obj= request.POST + + fileid = obj.get('fileid') + request_id = File.objects.get(id=fileid).src_object_id + + remarks = obj.get('remarks') + attachment = request.FILES.get('attachment') + receiver_user, receiver_desg = request.POST['designation'].split('|') + - request_id = request.POST.get("id", 0) + forward_file( + file_id= fileid, + receiver= receiver_user, + receiver_designation=receiver_desg, + file_extra_JSON= { "message": "Request forwarded."}, + remarks= remarks, + file_attachment= attachment, + ) - d = HoldsDesignation.objects.get(user__username=request.POST['designation']) - d1 = HoldsDesignation.objects.get(user__username=request.user) + Requests.objects.filter(id=request_id).update(engineerProcessed=1, status="Approved by the Engineer") + + obj = [] + desg = request.session.get('currentDesignationSelected') - create_file(uploader=request.user.username, - uploader_designation=d1.designation, - receiver=request.POST['designation'], - receiver_designation=d.designation, - src_module="IWD", - src_object_id= str(request_id), - file_extra_JSON= {"value": 2}, - attached_file = None) - - Requests.objects.filter(id=request_id).update(engineerProcessed=1, status="Approved by the engineer") - inbox_files = view_inbox( username=request.user, - designation=d1.designation, + designation=desg, src_module="IWD" ) - for p in inbox_files: - if p['src_object_id'] == request_id: - delete_file(file_id = p['id']) - break + for result in inbox_files: + src_object_id = result['src_object_id'] + request_object = Requests.objects.filter(id=src_object_id).first() + file_obj= File.objects.get(src_object_id= request_object.id, src_module = "IWD") + if request_object: + element = [request_object.id, request_object.name, request_object.area, request_object.description, request_object.requestCreatedBy, file_obj.id] + obj.append(element) + + messages.success(request, "File Forwarded") + receiver_user_obj = User.objects.get(username=receiver_user) + + iwd_notif(request.user, receiver_user_obj, "file_forward") - eligible = "" - userObj = request.user - userDesignationObjects = HoldsDesignation.objects.filter(user=userObj) - for p in userDesignationObjects: - eligible = p.designation.name + return render(request, 'iwdModuleV2/createdRequests.html', {'obj' : obj}) - return render(request, 'iwdModuleV2/dashboard.html', {'eligible': eligible}) @login_required def engineerProcessedRequests(request): obj = [] - d = HoldsDesignation.objects.get(user__username=request.user) + desg = request.session.get('currentDesignationSelected') inbox_files = view_inbox( username=request.user, - designation=d.designation, + designation=desg, src_module="IWD" ) for result in inbox_files: src_object_id = result['src_object_id'] request_object = Requests.objects.filter(id=src_object_id).first() + file_obj= File.objects.get(src_object_id= src_object_id, src_module = "IWD") if request_object: - element = [request_object.id, request_object.name, request_object.area, request_object.description, request_object.requestCreatedBy] + element = [request_object.id, request_object.name, request_object.area, request_object.description, request_object.requestCreatedBy, file_obj.id] obj.append(element) - designations = Designation.objects.filter() - - holdsDesignations = [] - - for d in designations: - for x in designations_list: - if d.name == x: - list = HoldsDesignation.objects.filter(designation=d) - holdsDesignations.append(list) - - return render(request, 'iwdModuleV2/engineerProcessedRequests.html', {'obj' : obj, 'holdsDesignations' : holdsDesignations}) + return render(request, 'iwdModuleV2/engineerProcessedRequests.html', {'obj' : obj}) @login_required def handleDeanProcessRequests(request): if request.method == 'POST': - request_id = request.POST.get("id", 0) - - d = HoldsDesignation.objects.get(user__username=request.POST['designation']) - d1 = HoldsDesignation.objects.get(user__username=request.user) + obj= request.POST + + fileid = obj.get('fileid') + request_id = File.objects.get(id=fileid).src_object_id + + remarks = obj.get('remarks') + attachment = request.FILES.get('attachment') + receiver_user, receiver_desg = request.POST['designation'].split('|') + - create_file(uploader=request.user.username, - uploader_designation=d1.designation, - receiver=request.POST['designation'], - receiver_designation=d.designation, - src_module="IWD", - src_object_id= str(request_id), - file_extra_JSON= {"value": 2}, - attached_file = None) + forward_file( + file_id= fileid, + receiver= receiver_user, + receiver_designation=receiver_desg, + file_extra_JSON= { "message": "Request forwarded."}, + remarks= remarks, + file_attachment= attachment, + ) Requests.objects.filter(id=request_id).update(deanProcessed=1, status="Approved by the dean") + desg = request.session.get('currentDesignationSelected') inbox_files = view_inbox( username=request.user, - designation=d1.designation, + designation=desg, src_module="IWD" ) - for p in inbox_files: - if p['src_object_id'] == request_id: - delete_file(file_id = p['id']) - break + obj = [] - eligible = "" - userObj = request.user - userDesignationObjects = HoldsDesignation.objects.filter(user=userObj) - for p in userDesignationObjects: - eligible = p.designation.name - return render(request, 'iwdModuleV2/dashboard.html', {'eligible': eligible}) + for result in inbox_files: + src_object_id = result['src_object_id'] + request_object = Requests.objects.filter(id=src_object_id).first() + file_obj= File.objects.get(src_object_id = src_object_id, src_module = "IWD") + if request_object: + element = [request_object.id, request_object.name, request_object.area, request_object.description, request_object.requestCreatedBy, file_obj.id] + obj.append(element) + + messages.success(request, "File Forwarded") + receiver_user_obj = User.objects.get(username=receiver_user) + + iwd_notif(request.user, receiver_user_obj, "file_forward") + + return render(request, 'iwdModuleV2/engineerProcessedRequests.html', {'obj': obj}) @login_required def deanProcessedRequests(request): obj = [] - d = HoldsDesignation.objects.get(user__username=request.user) + desg = request.session.get('currentDesignationSelected') inbox_files = view_inbox( username=request.user, - designation=d.designation, + designation=desg, src_module="IWD" ) for result in inbox_files: src_object_id = result['src_object_id'] request_object = Requests.objects.filter(id=src_object_id).first() + file_obj= File.objects.get(src_object_id = src_object_id, src_module = "IWD") if request_object: - element = [request_object.id, request_object.name, request_object.area, request_object.description, request_object.requestCreatedBy] + element = [request_object.id, request_object.name, request_object.area, request_object.description, request_object.requestCreatedBy, file_obj.id] obj.append(element) - designations = Designation.objects.filter() - - holdsDesignations = [] - - for d in designations: - for x in designations_list: - if d.name == x: - list = HoldsDesignation.objects.filter(designation=d) - holdsDesignations.append(list) - - return render(request, 'iwdModuleV2/deanProcessedRequests.html', {'obj' : obj, 'holdsDesignations' : holdsDesignations}) + return render(request, 'iwdModuleV2/deanProcessedRequests.html', {'obj' : obj}) @login_required def handleDirectorApprovalRequests(request): if request.method == 'POST': - request_id = request.POST.get("id", 0) - - d = HoldsDesignation.objects.get(user__username=request.POST['designation']) - d1 = HoldsDesignation.objects.get(user__username=request.user) - - create_file(uploader=request.user.username, - uploader_designation=d1.designation, - receiver=request.POST['designation'], - receiver_designation=d.designation, - src_module="IWD", - src_object_id= str(request_id), - file_extra_JSON= {"value": 2}, - attached_file = None) + obj= request.POST + + fileid = obj.get('fileid') + request_id = File.objects.get(id=fileid).src_object_id + + remarks = obj.get('remarks') + attachment = request.FILES.get('attachment') + receiver_user, receiver_desg = request.POST['designation'].split('|') - Requests.objects.filter(id=request_id).update(directorApproval=1, status="Approved by the director") - inbox_files = view_inbox( - username=request.user, - designation=d1.designation, - src_module="IWD" + forward_file( + file_id= fileid, + receiver= receiver_user, + receiver_designation=receiver_desg, + file_extra_JSON= { "message": "Request forwarded."}, + remarks= remarks, + file_attachment= attachment, ) - for p in inbox_files: - if p['src_object_id'] == request_id: - delete_file(file_id = p['id']) - break - - eligible = "" - userObj = request.user - userDesignationObjects = HoldsDesignation.objects.filter(user=userObj) - for p in userDesignationObjects: - eligible = p.designation.name - return render(request, 'iwdModuleV2/dashboard.html', {'eligible': eligible}) + message = "" -@login_required -def handleDirectorRejectionRequests(request): - if request.method == 'POST': - request_id = request.POST.get("id", 0) - - d = HoldsDesignation.objects.get(user__username=request.POST['designation']) - d1 = HoldsDesignation.objects.get(user__username=request.user) + if (obj.get('action') == 'approve'): + message = "Request_approved" + Requests.objects.filter(id=request_id).update(directorApproval=1, status="Approved by the director") + else: + message = "Request_rejected" + Requests.objects.filter(id=request_id).update(directorApproval=-1, status="Rejected by the director") - create_file(uploader=request.user.username, - uploader_designation=d1.designation, - receiver=request.POST['designation'], - receiver_designation=d.designation, - src_module="IWD", - src_object_id= str(request_id), - file_extra_JSON= {"value": 2}, - attached_file = None) - - Requests.objects.filter(id=request_id).update(directorApproval=-1, status="Rejected by the director") + desg = request.session.get('currentDesignationSelected') inbox_files = view_inbox( username=request.user, - designation=d1.designation, + designation=desg, src_module="IWD" ) - for p in inbox_files: - if p['src_object_id'] == request_id: - delete_file(file_id = p['id']) - break + obj = [] - eligible = "" - userObj = request.user - userDesignationObjects = HoldsDesignation.objects.filter(user=userObj) - for p in userDesignationObjects: - eligible = p.designation.name - return render(request, 'iwdModuleV2/dashboard.html', {'eligible': eligible}) + for result in inbox_files: + src_object_id = result['src_object_id'] + request_object = Requests.objects.filter(id=src_object_id).first() + file_obj= File.objects.get(src_object_id = src_object_id, src_module = "IWD") + if request_object: + element = [request_object.id, request_object.name, request_object.area, request_object.description, request_object.requestCreatedBy, file_obj.id] + obj.append(element) + + messages.success(request, "File forwarded") + receiver_user_obj = User.objects.get(username=receiver_user) + + iwd_notif(request.user, receiver_user_obj, message) + + return render(request, 'iwdModuleV2/deanProcessedRequests.html', {'obj': obj}) @login_required def rejectedRequests(request): obj = [] - d = HoldsDesignation.objects.get(user__username=request.user) + desg = request.session.get('currentDesignationSelected') inbox_files = view_inbox( username=request.user, - designation=d.designation, + designation=desg, src_module="IWD" ) @@ -793,11 +783,11 @@ def rejectedRequests(request): def updateRejectedRequests(request): request_id = request.POST.get("id", 0) - d1 = HoldsDesignation.objects.get(user__username=request.user) + desg = request.session.get('currentDesignationSelected') inbox_files = view_inbox( username=request.user, - designation=d1.designation, + designation=desg, src_module="IWD" ) @@ -827,8 +817,8 @@ def updateRejectedRequests(request): def handleUpdateRequests(request): if request.method == 'POST': request_id = request.POST.get("id", 0) - d = HoldsDesignation.objects.get(user__username=request.POST['designation']) - d1 = HoldsDesignation.objects.get(user__username=request.user) + desg = request.session.get('currentDesignationSelected') + receiver_user, receiver_desg = request.POST['designation'].split('|') Requests.objects.filter(id=request_id).update(name=request.POST['name'], description=request.POST['description'], area=request.POST['area'], @@ -843,41 +833,38 @@ def handleUpdateRequests(request): billProcessed=0, billSettled=0) create_file(uploader=request.user.username, - uploader_designation=d1.designation, - receiver=request.POST['designation'], - receiver_designation=d.designation, + uploader_designation=desg, + receiver=receiver_user, + receiver_designation=receiver_desg, src_module="IWD", src_object_id= str(request_id), file_extra_JSON= {"value": 2}, attached_file = None) - eligible = "" - userObj = request.user - userDesignationObjects = HoldsDesignation.objects.filter(user=userObj) - for p in userDesignationObjects: - eligible = p.designation.name + messages.success(request, "Request updated") + receiver_user_obj = User.objects.get(username=receiver_user) + + iwd_notif(request.user, receiver_user_obj, "Request_added") + eligible = request.session.get('currentDesignationSelected') return render(request, 'iwdModuleV2/dashboard.html', {'eligible' : eligible}) @login_required def issueWorkOrder(request): obj = [] - d = HoldsDesignation.objects.get(user__username=request.user) + desg = request.session.get('currentDesignationSelected') inbox_files = view_inbox( username=request.user, - designation=d.designation, + designation=desg, src_module="IWD" ) for result in inbox_files: - uploader = result['sent_by_designation'] - if uploader == 'Director': - src_object_id = result['src_object_id'] - request_object = Requests.objects.filter(id=src_object_id).first() - if request_object: - element = [request_object.id, request_object.name, request_object.area, request_object.description, request_object.requestCreatedBy] - obj.append(element) - + src_object_id = result['src_object_id'] + request_object = Requests.objects.filter(id=src_object_id, directorApproval=1, issuedWorkOrder=0).first() + if request_object: + element = [request_object.id, request_object.name, request_object.area, request_object.description, request_object.requestCreatedBy] + obj.append(element) return render(request, 'iwdModuleV2/issueWorkOrder.html', {'obj' : obj}) @login_required @@ -904,36 +891,23 @@ def workOrder(request): Requests.objects.filter(id=request.POST['id']).update(status="Work Order issued", issuedWorkOrder=1) - d = HoldsDesignation.objects.get(user__username=request.user) + desg = request.session.get('currentDesignationSelected') inbox_files = view_inbox( username=request.user, - designation=d.designation, - src_module="IWD" - ) - - for result in inbox_files: - if result['src_object_id'] == request.POST['id'] and result['sent_by_designation'] == 'Director': - delete_file(file_id = result['id']) - break - - inbox_files = view_inbox( - username=request.user, - designation=d.designation, + designation=desg, src_module="IWD" ) obj = [] for result in inbox_files: - uploader = result['sent_by_designation'] - if uploader == 'Director': - src_object_id = result['src_object_id'] - request_object = Requests.objects.filter(id=src_object_id).first() - if request_object: - element = [request_object.id, request_object.name, request_object.area, request_object.description, request_object.requestCreatedBy] - obj.append(element) - + src_object_id = result['src_object_id'] + request_object = Requests.objects.filter(id=src_object_id).first() + if request_object.issuedWorkOrder==0: + element = [request_object.id, request_object.name, request_object.area, request_object.description, request_object.requestCreatedBy] + obj.append(element) + messages.success(request, "Work Order Issued") return render(request, 'iwdModuleV2/issueWorkOrder.html', {'obj' : obj}) @login_required @@ -945,56 +919,6 @@ def requestsStatus(request): obj.append(element) return render(request, 'iwdModuleV2/requestsStatus.html', {'obj' : obj}) -@login_required -def inventory(request): - items = Inventory.objects.filter() - obj = [] - for i in items: - element = [i.id, i.name, i.quantity, i.cost] - obj.append(element) - return render(request, 'iwdModuleV2/inventory.html', {'obj' : obj}) - -@login_required -def addItemsView(request): - return render(request, 'iwdModuleV2/addItemsView.html') - -@login_required -def addItems(request): - if request.method == "POST": - formObject = Inventory() - formObject.name = request.POST['name'] - formObject.quantity = request.POST['quantity'] - formObject.cost = request.POST['cost'] - formObject.save() - return render(request, 'iwdModuleV2/addItemsView.html') - -@login_required -def editInventoryView(request): - items = Inventory.objects.filter() - obj = [] - for i in items: - element = [i.id, i.name, i.quantity, i.cost] - obj.append(element) - return render(request, 'iwdModuleV2/editInventory.html', {'obj' : obj}) - -@login_required -def editInventory(request): - if request.method == "POST": - itemId = request.POST['id'] - itemName = request.POST['name'] - itemQuantity = request.POST['quantity'] - itemCost = request.POST['cost'] - if itemQuantity == "0": - Inventory.objects.filter(id=itemId).delete() - else: - Inventory.objects.filter(id=itemId).update(name=itemName, quantity=itemQuantity, cost=itemCost) - items = Inventory.objects.filter() - obj = [] - for i in items: - element = [i.id, i.name, i.quantity, i.cost] - obj.append(element) - return render(request, 'iwdModuleV2/editInventory.html', {'obj' : obj}) - @login_required def requestsInProgess(request): obj = [] @@ -1013,63 +937,33 @@ def workCompleted(request): for x in requestsObject: element = [x.id, x.name, x.area, x.description, x.requestCreatedBy, x.workCompleted] obj.append(element) + messages.success(request, "Work Completed") return render(request, 'iwdModuleV2/requestsInProgress.html', {'obj' : obj}) -@login_required -def requestFromInventory(request): - if request.method == 'POST': - requestId = request.POST['id'] - Req = Requests.objects.filter(id=requestId) - Items = Inventory.objects.filter() - req = [] - items = [] - for x in Req: - element = [x.id, x.name, x.area, x.description, x.requestCreatedBy, x.workCompleted] - req.append(element) - - for x in Items: - element = [x.id, x.name, x.quantity, x.cost] - items.append(element) - print(items) - return render(request, 'iwdModuleV2/requestFromInventory.html', {'req' : req, 'items' : items}) - -@login_required -def editInventoryAfterRequest(request): - if request.method == 'POST': - selectedItem = Inventory.objects.get(id=request.POST['selected_item_id']) - q = int(selectedItem.quantity) - if q == int(request.POST['quantity']): - Inventory.objects.filter(id=request.POST['selected_item_id']).delete() - else: - Inventory.objects.filter(id=request.POST['selected_item_id']).update(quantity=(q-int(request.POST['quantity']))) - formObject = UsedItems() - request_instance = Requests.objects.get(pk=request.POST['id']) - formObject.request_id = request_instance - formObject.itemName = selectedItem.name - formObject.cost = selectedItem.cost - formObject.quantity = request.POST['quantity'] - formObject.date = datetime.now().date() - formObject.save() - eligible = "" - userObj = request.user - userDesignationObjects = HoldsDesignation.objects.filter(user=userObj) - for p in userDesignationObjects: - eligible = p.designation.name - return render(request, 'iwdModuleV2/dashboard.html', {'eligible': eligible}) - @login_required def generateFinalBill(request): if request.method == 'POST': requestId = request.POST.get("id", 0) - usedItems = UsedItems.objects.filter(request_id=requestId) + # usedItems = UsedItems.objects.filter(request_id=requestId) workOrder = WorkOrder.objects.get(request_id=requestId) + iwd_items = StockItem.objects.filter(department = 34) + itemsList = [] - for used in usedItems: - element = [used.itemName, used.quantity, used.cost, used.date] - itemsList.append(element) + for x in iwd_items: + stock_entry_id = x.StockEntryId.item_id.file_info + indent_file_object = IndentFile.objects.filter(file_info = stock_entry_id) + for items in indent_file_object: + if items.purpose == requestId: + element = [items.item_name, items.quantity, items.estimated_cost, items.file_info.upload_date] + itemsList.append(element) + + + # for used in usedItems: + # element = [used.itemName, used.quantity, used.cost, used.date] + # itemsList.append(element) filename = f"Request_id_{requestId}_final_bill.pdf" @@ -1120,6 +1014,8 @@ def generateFinalBill(request): response['Content-Disposition'] = f'attachment; filename="{filename}"' response.write(buffer.getvalue()) + # messages.success(request, "Bill generated") + return response @login_required @@ -1136,69 +1032,75 @@ def handleBillGeneratedRequests(request): @login_required def generatedBillsView(request): - request_object = Requests.objects.filter(billGenerated=1, billProcessed=0) + request_object = Requests.objects.filter(billGenerated=1) obj = [] for x in request_object: - element = [x.id, x.name, x.description, x.area, x.requestCreatedBy] - obj.append(element) - designations = Designation.objects.filter() - - holdsDesignations = [] - - for d in designations: - for x in designations_list: - if d.name == x: - list = HoldsDesignation.objects.filter(designation=d) - holdsDesignations.append(list) + file_obj= File.objects.get(src_object_id= x.id, src_module = "IWD") + if request_object: + element = [x.id, x.name, x.description, x.area, x.requestCreatedBy, file_obj.id] + obj.append(element) - return render(request, 'iwdModuleV2/generatedBillsRequestsView.html', {'obj' : obj, 'holdsDesignations' : holdsDesignations}) + return render(request, 'iwdModuleV2/generatedBillsRequestsView.html', {'obj' : obj}) @login_required def handleProcessedBills(request): if request.method == 'POST': - requestId = request.POST.get("id", 0) - request_instance = Requests.objects.get(pk=requestId) + obj= request.POST + + fileid = obj.get('fileid') + # filez= File.objects.get(id=fileid) + request_id = File.objects.get(id=fileid).src_object_id + + remarks = obj.get('remarks') + attachment = request.FILES.get('attachment') + receiver_user, receiver_desg = request.POST['designation'].split('|') + - d = HoldsDesignation.objects.get(user__username=request.POST['designation']) - d1 = HoldsDesignation.objects.get(user__username=request.user) + forward_file( + file_id= fileid, + receiver= receiver_user, + receiver_designation=receiver_desg, + file_extra_JSON= { "message": "Request forwarded."}, + remarks= remarks, + file_attachment= attachment, + ) + + Requests.objects.filter(id=request_id).update(billProcessed=1, status="Final Bill Processed") + - create_file(uploader=request.user.username, - uploader_designation=d1.designation, - receiver=request.POST['designation'], - receiver_designation=d.designation, - src_module="IWD", - src_object_id= str(requestId), - file_extra_JSON= {"value": 2}, - attached_file = request.FILES['bill']) + request_instance = Requests.objects.get(pk=request_id) formObject = Bills() formObject.request_id = request_instance - formObject.file = request.FILES['bill'] + formObject.file = attachment formObject.save() - Requests.objects.filter(id=requestId).update(status="Final Bill Processed", billProcessed=1) + req_object = Requests.objects.filter(billGenerated=1) - request_object = Requests.objects.filter(billGenerated=1, billProcessed=0) obj = [] - for x in request_object: - element = [x.id, x.name, x.description, x.area, x.requestCreatedBy] - obj.append(element) - eligible = "" - userObj = request.user - userDesignationObjects = HoldsDesignation.objects.filter(user=userObj) - for p in userDesignationObjects: - eligible = p.designation.name + for result in req_object: + request_object = Requests.objects.filter(id=result.id).first() + file_obj= File.objects.get(src_object_id = result.id, src_module = "IWD") + if request_object: + element = [request_object.id, request_object.name, request_object.area, request_object.description, request_object.requestCreatedBy, file_obj.id] + obj.append(element) - return render(request, 'iwdModuleV2/dashboard.html', {'obj' : obj, 'eligible': eligible}) + messages.success(request, "Bill processed") + + receiver_user_obj = User.objects.get(username=receiver_user) + + iwd_notif(request.user, receiver_user_obj, "file_forward") + + return render(request, 'iwdModuleV2/generatedBillsRequestsView.html', {'obj' : obj}) @login_required def auditDocumentView(request): - d = HoldsDesignation.objects.get(user__username=request.user) + desg = request.session.get('currentDesignationSelected') inbox_files = view_inbox( username=request.user, - designation=d.designation, + designation=desg, src_module="IWD" ) @@ -1207,66 +1109,68 @@ def auditDocumentView(request): for x in inbox_files: requestId = x['src_object_id'] files = Bills.objects.get(request_id=requestId) - element = [files.request_id.id, files.file, files.file.url] + file_obj= File.objects.get(src_object_id = requestId, src_module = "IWD") + element = [files.request_id.id, files.file, files.file.url, file_obj.id, file_obj.id, file_obj.id] obj.append(element) - designations = Designation.objects.filter() - - holdsDesignations = [] - - for d in designations: - if d.name == "Engineer" or d.name == "Dean" or d.name == "Director" or d.name == "Accounts Admin" or d.name == "Admin IWD": - list = HoldsDesignation.objects.filter(designation=d) - holdsDesignations.append(list) - - return render(request, 'iwdModuleV2/auditDocumentView.html', {'obj' : obj, 'holdsDesignations' : holdsDesignations}) + return render(request, 'iwdModuleV2/auditDocumentView.html', {'obj' : obj}) @login_required def auditDocument(request): if request.method == 'POST': - requestId = request.POST.get("id", 0) + obj= request.POST + + fileid = obj.get('fileid') + request_id = File.objects.get(id=fileid).src_object_id + + remarks = obj.get('remarks') + attachment = request.FILES.get('attachment') + receiver_user, receiver_desg = request.POST['designation'].split('|') + - d = HoldsDesignation.objects.get(user__username=request.POST['designation']) - d1 = HoldsDesignation.objects.get(user__username=request.user) + forward_file( + file_id= fileid, + receiver= receiver_user, + receiver_designation=receiver_desg, + file_extra_JSON= { "message": "Request forwarded."}, + remarks= remarks, + file_attachment= attachment, + ) - create_file(uploader=request.user.username, - uploader_designation=d1.designation, - receiver=request.POST['designation'], - receiver_designation=d.designation, - src_module="IWD", - src_object_id= str(requestId), - file_extra_JSON= {"value": 2}, - attached_file = None) + Requests.objects.filter(id=request_id).update(status="Bill Audited") + + desg = request.session.get('currentDesignationSelected') inbox_files = view_inbox( username=request.user, - designation=d1.designation, + designation=desg, src_module="IWD" ) - for result in inbox_files: - print(result['src_object_id']) - if result['src_object_id'] == requestId: - delete_file(file_id = result['id']) - break + obj = [] - Requests.objects.filter(id=requestId).update(status="Bill Audited") + for x in inbox_files: + requestId = x['src_object_id'] + files = Bills.objects.get(request_id=requestId) + file_obj= File.objects.get(src_object_id = requestId, src_module = "IWD") + element = [files.request_id.id, files.file, files.file.url, file_obj.id, file_obj.id, file_obj.id] + obj.append(element) - eligible = "" - userObj = request.user - userDesignationObjects = HoldsDesignation.objects.filter(user=userObj) - for p in userDesignationObjects: - eligible = p.designation.name + messages.success(request, "File Audit done") - return render(request, 'iwdModuleV2/dashboard.html', {'eligible' : eligible}) + receiver_user_obj = User.objects.get(username=receiver_user) + + iwd_notif(request.user, receiver_user_obj, "file_forward") + + return render(request, 'iwdModuleV2/auditDocumentView.html', {'obj' : obj}) @login_required def settleBillsView(request): - d = HoldsDesignation.objects.get(user__username=request.user) + desg = request.session.get('currentDesignationSelected') inbox_files = view_inbox( username=request.user, - designation=d.designation, + designation=desg, src_module="IWD" ) @@ -1275,7 +1179,9 @@ def settleBillsView(request): for x in inbox_files: requestId = x['src_object_id'] bills_object = Bills.objects.filter(request_id=requestId).first() - element = [bills_object.request_id.id, bills_object.file, bills_object.file.url] + file_obj= File.objects.get(src_object_id = requestId, src_module = "IWD") + request_object = Requests.objects.get(id = requestId) + element = [bills_object.request_id.id, bills_object.file, bills_object.file.url, request_object.billSettled, file_obj.id, file_obj.id] obj.append(element) return render(request, 'iwdModuleV2/settleBillsView.html', {'obj' : obj}) @@ -1285,35 +1191,28 @@ def handleSettleBillRequests(request): if request.method == 'POST': request_id = request.POST.get("id", 0) - d = HoldsDesignation.objects.get(user__username=request.user) + desg = request.session.get('currentDesignationSelected') inbox_files = view_inbox( username=request.user, - designation=d.designation, + designation=desg, src_module="IWD" ) - for p in inbox_files: - if p['src_object_id'] == request_id: - delete_file(file_id = p['id']) - break - Requests.objects.filter(id=request_id).update(status="Final Bill Settled", billSettled=1) - inbox_files = view_inbox( - username=request.user, - designation=d.designation, - src_module="IWD" - ) - obj = [] for x in inbox_files: - request_id = x['src_object_id'] - bills_object = Bills.objects.get(request_id=request_id) - element = [request_id, bills_object.file, bills_object.file.url] + requestId = x['src_object_id'] + bills_object = Bills.objects.filter(request_id=requestId).first() + file_obj= File.objects.get(src_object_id = requestId, src_module = "IWD") + request_object = Requests.objects.get(id = requestId) + element = [bills_object.request_id.id, bills_object.file, bills_object.file.url, request_object.billSettled, file_obj.id, file_obj.id] obj.append(element) + messages.success(request, "Final Bill settled") + return render(request, 'iwdModuleV2/settleBillsView.html', {'obj' : obj}) @login_required diff --git a/FusionIIIT/templates/iwdModuleV2/auditDocumentView.html b/FusionIIIT/templates/iwdModuleV2/auditDocumentView.html index afb68fc59..c891c37c4 100644 --- a/FusionIIIT/templates/iwdModuleV2/auditDocumentView.html +++ b/FusionIIIT/templates/iwdModuleV2/auditDocumentView.html @@ -12,6 +12,16 @@ {% include 'dashboard/navbar.html' %} {% endblock %} + +
{% comment %}The left-margin segment!{% endcomment %} @@ -57,7 +67,6 @@ Id Document - Send To @@ -67,19 +76,7 @@ {{f.0}} {{f.1}} - -
- {% csrf_token %} - - - -
+ diff --git a/FusionIIIT/templates/iwdModuleV2/createdRequests.html b/FusionIIIT/templates/iwdModuleV2/createdRequests.html index cce743dec..bc18b8640 100644 --- a/FusionIIIT/templates/iwdModuleV2/createdRequests.html +++ b/FusionIIIT/templates/iwdModuleV2/createdRequests.html @@ -12,6 +12,16 @@ {% include 'dashboard/navbar.html' %} {% endblock %} + +
{% comment %}The left-margin segment!{% endcomment %} @@ -54,14 +64,12 @@ - - @@ -74,19 +82,7 @@ diff --git a/FusionIIIT/templates/iwdModuleV2/dashboard.html b/FusionIIIT/templates/iwdModuleV2/dashboard.html index c8ffaa0ec..f8b80762f 100644 --- a/FusionIIIT/templates/iwdModuleV2/dashboard.html +++ b/FusionIIIT/templates/iwdModuleV2/dashboard.html @@ -12,6 +12,16 @@ {% include 'dashboard/navbar.html' %} {% endblock %} + + {% comment %}The grid starts here!{% endcomment %}
@@ -145,10 +155,6 @@
{% comment %}The Tab-Menu starts here!{% endcomment %}
- - Inventory - - Manage Budget diff --git a/FusionIIIT/templates/iwdModuleV2/deanProcessedRequests.html b/FusionIIIT/templates/iwdModuleV2/deanProcessedRequests.html index 98f9ad72f..2d8a1e014 100644 --- a/FusionIIIT/templates/iwdModuleV2/deanProcessedRequests.html +++ b/FusionIIIT/templates/iwdModuleV2/deanProcessedRequests.html @@ -46,7 +46,6 @@
Details:-
Id Name Description Area Created BySend to
{{f.2}} {{f.4}} - -
- {% csrf_token %} - - - -
+
- @@ -65,32 +64,7 @@ diff --git a/FusionIIIT/templates/iwdModuleV2/engineerProcessedRequests.html b/FusionIIIT/templates/iwdModuleV2/engineerProcessedRequests.html index 6b7386054..115c0c74a 100644 --- a/FusionIIIT/templates/iwdModuleV2/engineerProcessedRequests.html +++ b/FusionIIIT/templates/iwdModuleV2/engineerProcessedRequests.html @@ -12,6 +12,16 @@ {% include 'dashboard/navbar.html' %} {% endblock %} + +
{% comment %}The left-margin segment!{% endcomment %} @@ -56,7 +66,6 @@
Details:-
Id Name{{f.2}} {{f.4}} -
-
- {% csrf_token %} - - - -
-
- {% csrf_token %} - - - -
-
+
- @@ -75,19 +84,7 @@ diff --git a/FusionIIIT/templates/iwdModuleV2/generatedBillsRequestsView.html b/FusionIIIT/templates/iwdModuleV2/generatedBillsRequestsView.html index 38badd860..2c76e79fb 100644 --- a/FusionIIIT/templates/iwdModuleV2/generatedBillsRequestsView.html +++ b/FusionIIIT/templates/iwdModuleV2/generatedBillsRequestsView.html @@ -12,6 +12,16 @@ {% include 'dashboard/navbar.html' %} {% endblock %} + +
{% comment %}The left-margin segment!{% endcomment %} @@ -58,8 +68,6 @@
- - @@ -69,24 +77,9 @@ -
- {% csrf_token %} - - - + {% endfor %} diff --git a/FusionIIIT/templates/iwdModuleV2/issueWorkOrder.html b/FusionIIIT/templates/iwdModuleV2/issueWorkOrder.html index 7aef765b2..ce77ceef4 100644 --- a/FusionIIIT/templates/iwdModuleV2/issueWorkOrder.html +++ b/FusionIIIT/templates/iwdModuleV2/issueWorkOrder.html @@ -12,6 +12,16 @@ {% include 'dashboard/navbar.html' %} {% endblock %} + +
{% comment %}The left-margin segment!{% endcomment %} @@ -54,7 +64,6 @@
Details:-
Id Name{{f.2}} {{f.4}} - -
- {% csrf_token %} - - - -
+
Id Name Created ByBillSend to
{{f.0}} {{f.1}} {{f.4}} - - - - - - - + +
- diff --git a/FusionIIIT/templates/iwdModuleV2/requestsInProgress.html b/FusionIIIT/templates/iwdModuleV2/requestsInProgress.html index bceaad0ab..d38fa62c7 100644 --- a/FusionIIIT/templates/iwdModuleV2/requestsInProgress.html +++ b/FusionIIIT/templates/iwdModuleV2/requestsInProgress.html @@ -12,6 +12,16 @@ {% include 'dashboard/navbar.html' %} {% endblock %} + +
{% comment %}The left-margin segment!{% endcomment %} @@ -93,11 +103,7 @@
-
- {% csrf_token %} - - - + {% endif %}
diff --git a/FusionIIIT/templates/iwdModuleV2/requestsView.html b/FusionIIIT/templates/iwdModuleV2/requestsView.html index 882e84274..408bc229d 100644 --- a/FusionIIIT/templates/iwdModuleV2/requestsView.html +++ b/FusionIIIT/templates/iwdModuleV2/requestsView.html @@ -11,6 +11,15 @@ {% block navBar %} {% include 'dashboard/navbar.html' %} {% endblock %} +
@@ -82,7 +91,7 @@ diff --git a/FusionIIIT/templates/iwdModuleV2/settleBillsView.html b/FusionIIIT/templates/iwdModuleV2/settleBillsView.html index 928d3a092..4aa8bb26a 100644 --- a/FusionIIIT/templates/iwdModuleV2/settleBillsView.html +++ b/FusionIIIT/templates/iwdModuleV2/settleBillsView.html @@ -12,6 +12,16 @@ {% include 'dashboard/navbar.html' %} {% endblock %} + +
{% comment %}The left-margin segment!{% endcomment %} @@ -58,6 +68,7 @@
+ {% for f in obj %} @@ -66,12 +77,16 @@ + diff --git a/FusionIIIT/templates/iwdModuleV2/updateRequests.html b/FusionIIIT/templates/iwdModuleV2/updateRequests.html index 3a63ab253..915aa6e3b 100644 --- a/FusionIIIT/templates/iwdModuleV2/updateRequests.html +++ b/FusionIIIT/templates/iwdModuleV2/updateRequests.html @@ -12,6 +12,16 @@ {% include 'dashboard/navbar.html' %} {% endblock %} + +
{% comment %}The left-margin segment!{% endcomment %} @@ -93,7 +103,7 @@ diff --git a/FusionIIIT/templates/iwdModuleV2/view_file.html b/FusionIIIT/templates/iwdModuleV2/view_file.html new file mode 100644 index 000000000..2787c59b3 --- /dev/null +++ b/FusionIIIT/templates/iwdModuleV2/view_file.html @@ -0,0 +1,165 @@ +{% extends 'globals/base.html' %} +{% load static %} + + +{% block title %} +Academic +{% endblock %} + + +{% block body %} +{% block navBar %} +{% include 'dashboard/navbar.html' %} +{% endblock %} + + + +
+ + {% comment %}The left-margin segment!{% endcomment %} +
+ + {% comment %}The left-rail segment starts here!{% endcomment %} +
+ {% comment %}The user image card starts here!{% endcomment %} + {% block usercard %} + {% include 'globals/usercard.html' %} + {% endblock %} + {% comment %}The user image card ends here!{% endcomment %} + +
+ + {% comment %}The Tab-Menu ends here!{% endcomment %} +
+ +
+ + +
+
+ Created By :-{{file.uploader.user}}-{{file.designation}} + {% comment %} File ID :{{file.uploader.department.name}}-{{file.upload_date.year}}-{{file.upload_date.month}}-#{{file.id}} {% endcomment %} +
+
+ {% csrf_token %} +
+
+
{{file.subject}}
+
+
+
+ {% for t in tracks %} +
+
+
+
+
+ Sent by: + {{ t.current_design }} + + + {{ t.forward_date }} + +
+
+ Received by: {{ t.receiver_id }}-{{ t.receive_design }} +
+
+
+
+
+ Remarks : +
+
+ {% if t.remarks %} + {{ t.remarks }} + {% else %} + No Remarks + {% endif %} +
+
+ {% if t.upload_file %} + Attachment: {{ t.upload_file }} + + {% else %} + No attachments + {% endif %} +
+
+
+
+ {% endfor %} + +
+ {% if request.user == current_user and eligible != "Accounts Admin" %} + + +
+ {% csrf_token %} + +
+ +
+ +
+
+ + + +
+ +
+ +
+ + +
+ {% if eligible != "Director" %} + + {% endif %} + {% if eligible == "Director" %} + + + {% endif %} + + {% endif %} +
+
+
+
+
+
+
+
+ +{% endblock %} + +{% block javascript %} + + + + +{% endblock %} diff --git a/FusionIIIT/templates/iwdModuleV2/workOrder.html b/FusionIIIT/templates/iwdModuleV2/workOrder.html index 11f2f9d93..e42b479d3 100644 --- a/FusionIIIT/templates/iwdModuleV2/workOrder.html +++ b/FusionIIIT/templates/iwdModuleV2/workOrder.html @@ -12,6 +12,16 @@ {% include 'dashboard/navbar.html' %} {% endblock %} + +
{% comment %}The left-margin segment!{% endcomment %} From 2b28b61a18d69329a9c16d6ec9af296d043bd50e Mon Sep 17 00:00:00 2001 From: Srivatsa19 Date: Wed, 24 Apr 2024 03:30:27 +0530 Subject: [PATCH 3/9] Removed unwanted files --- .../templates/iwdModuleV2/addItemsView.html | 120 ----------------- .../templates/iwdModuleV2/editInventory.html | 124 ------------------ .../templates/iwdModuleV2/inventory.html | 111 ---------------- 3 files changed, 355 deletions(-) delete mode 100644 FusionIIIT/templates/iwdModuleV2/addItemsView.html delete mode 100644 FusionIIIT/templates/iwdModuleV2/editInventory.html delete mode 100644 FusionIIIT/templates/iwdModuleV2/inventory.html diff --git a/FusionIIIT/templates/iwdModuleV2/addItemsView.html b/FusionIIIT/templates/iwdModuleV2/addItemsView.html deleted file mode 100644 index b9b1f003c..000000000 --- a/FusionIIIT/templates/iwdModuleV2/addItemsView.html +++ /dev/null @@ -1,120 +0,0 @@ -{% extends 'globals/base.html' %} -{% load static %} - - -{% block title %} -Academic -{% endblock %} - - -{% block body %} -{% block navBar %} -{% include 'dashboard/navbar.html' %} -{% endblock %} - -
- - {% comment %}The left-margin segment!{% endcomment %} -
- - {% comment %}The left-rail segment starts here!{% endcomment %} -
- {% comment %}The user image card starts here!{% endcomment %} - {% block usercard %} - {% include 'globals/usercard.html' %} - {% endblock %} - {% comment %}The user image card ends here!{% endcomment %} - -
- - {% comment %}The Tab-Menu ends here!{% endcomment %} -
- {% comment %} - The left-rail segment ends here! - {% endcomment %} - - {% comment %} - The central-rail segment starts here! - {% endcomment %} -
- - - - {% load static %} - {% comment %}the main tab starts here {% endcomment %} - -
- Add Items -
-
- {% csrf_token %} -
- -
- -
-
- -
- -
- -
- -
-
- -
- -
- -
- -
-
- -
- -
- -
- -
- -
- - - - -
- {% comment %}The central-rail segment ends here!{% endcomment %} - - {% comment %}The right-rail segment starts here!{% endcomment %} -
-
- {% comment %} - TODO: the right rail! - {% endcomment %} -
-
- {% comment %}The right-rail segment ends here!{% endcomment %} - - {% comment %}The right-margin segment!{% endcomment %} -
- -
-{% comment %}The grid ends here!{% endcomment %} - -{% endblock %} - -{% block javascript %} - - - - -{% endblock %} \ No newline at end of file diff --git a/FusionIIIT/templates/iwdModuleV2/editInventory.html b/FusionIIIT/templates/iwdModuleV2/editInventory.html deleted file mode 100644 index e06876b90..000000000 --- a/FusionIIIT/templates/iwdModuleV2/editInventory.html +++ /dev/null @@ -1,124 +0,0 @@ -{% extends 'globals/base.html' %} -{% load static %} - - -{% block title %} -Academic -{% endblock %} - - -{% block body %} -{% block navBar %} -{% include 'dashboard/navbar.html' %} -{% endblock %} - -
- - {% comment %}The left-margin segment!{% endcomment %} -
- - {% comment %}The left-rail segment starts here!{% endcomment %} -
- {% comment %}The user image card starts here!{% endcomment %} - {% block usercard %} - {% include 'globals/usercard.html' %} - {% endblock %} - {% comment %}The user image card ends here!{% endcomment %} - -
- - {% comment %}The Tab-Menu ends here!{% endcomment %} -
- {% comment %} - The left-rail segment ends here! - {% endcomment %} - - {% comment %} - The central-rail segment starts here! - {% endcomment %} -
- - - - {% load static %} - {% comment %}the main tab starts here {% endcomment %} - -
- Inventory -
-
-
-
- -
Details:-
Id Name
Id Bill
{{f.0}} {{f.1}} - -
- {% csrf_token %} - - -
+ + 		+ {% if f.3 != 1 %} +
+ {% csrf_token %} + + +
+ {% endif %}
- - - - - - - - - - - {% for f in obj %} - - -
- {% csrf_token %} - - - - - - - - - {% endfor %} -
IdNameQuantityCost (in Rupees)
{{f.0}} - - - - - - - - -
-
-
-

- - - -
- {% comment %}The central-rail segment ends here!{% endcomment %} - - {% comment %}The right-rail segment starts here!{% endcomment %} -
-
- {% comment %} - TODO: the right rail! - {% endcomment %} -
-
- {% comment %}The right-rail segment ends here!{% endcomment %} - - {% comment %}The right-margin segment!{% endcomment %} -
- -
-{% comment %}The grid ends here!{% endcomment %} - -{% endblock %} - -{% block javascript %} - - - - -{% endblock %} \ No newline at end of file diff --git a/FusionIIIT/templates/iwdModuleV2/inventory.html b/FusionIIIT/templates/iwdModuleV2/inventory.html deleted file mode 100644 index 4e35ce614..000000000 --- a/FusionIIIT/templates/iwdModuleV2/inventory.html +++ /dev/null @@ -1,111 +0,0 @@ -{% extends 'globals/base.html' %} -{% load static %} - - -{% block title %} -Academic -{% endblock %} - - -{% block body %} -{% block navBar %} -{% include 'dashboard/navbar.html' %} -{% endblock %} - -
- - {% comment %}The left-margin segment!{% endcomment %} -
- - {% comment %}The left-rail segment starts here!{% endcomment %} -
- {% comment %}The user image card starts here!{% endcomment %} - {% block usercard %} - {% include 'globals/usercard.html' %} - {% endblock %} - {% comment %}The user image card ends here!{% endcomment %} - -
- - {% comment %}The Tab-Menu ends here!{% endcomment %} -
- {% comment %} - The left-rail segment ends here! - {% endcomment %} - - {% comment %} - The central-rail segment starts here! - {% endcomment %} -
- - - - {% load static %} - {% comment %}the main tab starts here {% endcomment %} - -
- Inventory -
-
-
-
- - - - - - - - - - - - {% for f in obj %} - - - - - - - - - {% endfor %} -
IdNameQuantityCost (in Rupees)
{{f.0}}{{f.1}}{{f.2}}{{f.3}}
-
-
-
- - - -
- {% comment %}The central-rail segment ends here!{% endcomment %} - - {% comment %}The right-rail segment starts here!{% endcomment %} -
-
- {% comment %} - TODO: the right rail! - {% endcomment %} -
-
- {% comment %}The right-rail segment ends here!{% endcomment %} - - {% comment %}The right-margin segment!{% endcomment %} -
- -
-{% comment %}The grid ends here!{% endcomment %} - -{% endblock %} - -{% block javascript %} - - - - -{% endblock %} \ No newline at end of file From bf4d3863ef9920e7045ea599811b589668de37ad Mon Sep 17 00:00:00 2001 From: Mohit Saini Date: Wed, 24 Apr 2024 00:07:30 +0530 Subject: [PATCH 4/9] Introduces Subtype option and implemented generate report --- FusionIIIT/applications/ps1/models.py | 1 + FusionIIIT/applications/ps1/urls.py | 3 +- FusionIIIT/applications/ps1/views.py | 96 ++++- FusionIIIT/templates/ps1/composeIndent.html | 5 + FusionIIIT/templates/ps1/createdindent.html | 2 +- .../templates/ps1/current_stock_view.html | 2 + .../ps1/current_stock_view_filter.html | 3 + FusionIIIT/templates/ps1/forwardedIndent.html | 2 +- FusionIIIT/templates/ps1/forwardindent.html | 2 +- FusionIIIT/templates/ps1/generate_report.html | 361 +++++------------- .../templates/ps1/generate_report_filter.html | 82 ++++ FusionIIIT/templates/ps1/ps1.html | 3 +- FusionIIIT/templates/ps1/ps2.html | 11 +- .../templates/ps1/stock_item_details.html | 224 +++++++++++ FusionIIIT/templates/ps1/stock_item_view.html | 17 +- FusionIIIT/templates/ps1/stock_transfer.html | 4 +- FusionIIIT/templates/ps1/view_transfer.html | 2 + 17 files changed, 530 insertions(+), 290 deletions(-) create mode 100644 FusionIIIT/templates/ps1/generate_report_filter.html create mode 100644 FusionIIIT/templates/ps1/stock_item_details.html diff --git a/FusionIIIT/applications/ps1/models.py b/FusionIIIT/applications/ps1/models.py index ffbe50020..b34683836 100644 --- a/FusionIIIT/applications/ps1/models.py +++ b/FusionIIIT/applications/ps1/models.py @@ -16,6 +16,7 @@ class IndentFile(models.Model): purpose=models.CharField(max_length=250,blank=False ) specification=models.CharField(max_length=250) item_type=models.CharField(max_length=250) + item_subtype = models.CharField(max_length=250,blank=False,default='computers') nature=models.BooleanField(default = False) indigenous= models.BooleanField(default = False) replaced =models.BooleanField(default = False) diff --git a/FusionIIIT/applications/ps1/urls.py b/FusionIIIT/applications/ps1/urls.py index 148e0c753..dc0b33bae 100644 --- a/FusionIIIT/applications/ps1/urls.py +++ b/FusionIIIT/applications/ps1/urls.py @@ -68,7 +68,8 @@ url(r'^outboxview/$', views.outboxview, name='outboxview'), - url(r'^update_stock_item_inUse/$', views.updateStockItemInUse, name='outboxview'), + url(r'^update_stock_item_inUse/$', views.updateStockItemInUse, name='stockItemInUse'), + url(r'^item_detail/(?P\d+)/$', views.item_detail, name='item_detail'), # BASE API url(r'^api/',include('applications.ps1.api.urls')), diff --git a/FusionIIIT/applications/ps1/views.py b/FusionIIIT/applications/ps1/views.py index 7efeb869e..242afd534 100644 --- a/FusionIIIT/applications/ps1/views.py +++ b/FusionIIIT/applications/ps1/views.py @@ -20,6 +20,7 @@ import json from django.db.models import Q,Count +from datetime import datetime dept_admin_to_dept = { "deptadmin_cse": "CSE", @@ -29,9 +30,10 @@ "deptadmin_design": "Design", "deptadmin_liberalarts": "Liberal Arts", "deptadmin_ns": "Natural Science", + "Admin IWD":"IWD" } -dept_admin_design = ["deptadmin_cse", "deptadmin_ece", "deptadmin_me","deptadmin_sm", "deptadmin_design", "deptadmin_liberalarts","deptadmin_ns" ] +dept_admin_design = ["deptadmin_cse", "deptadmin_ece", "deptadmin_me","deptadmin_sm", "deptadmin_design", "deptadmin_liberalarts","deptadmin_ns" ,"Admin IWD","Compounder"] @login_required(login_url = "/accounts/login/") @@ -118,6 +120,8 @@ def create_proposal(request): purpose=request.POST.get('purpose') specification=request.POST.get('specification') item_type=request.POST.get('item_type') + item_subtype=request.POST.get('item_subtype') + nature=request.POST.get('nature') indigenous=request.POST.get('indigenous') replaced =request.POST.get('replaced') @@ -150,6 +154,7 @@ def create_proposal(request): purpose=purpose, specification=specification, item_type=item_type, + item_subtype=item_subtype, nature=nature, indigenous=indigenous, replaced = replaced , @@ -191,6 +196,8 @@ def create_proposal(request): purpose=request.POST.get('purpose') specification=request.POST.get('specification') item_type=request.POST.get('item_type') + item_subtype=request.POST.get('item_subtype') + nature=request.POST.get('nature') indigenous=request.POST.get('indigenous') replaced =request.POST.get('replaced') @@ -249,6 +256,7 @@ def create_proposal(request): purpose=purpose, specification=specification, item_type=item_type, + item_subtype=item_subtype, nature=nature, indigenous=indigenous, replaced = replaced , @@ -1104,11 +1112,12 @@ def current_stock_view(request): StockEntryId__item_id__item_type=type ) - grouped_items = StockItems.values('StockEntryId__item_id__item_type', 'department').annotate(total_quantity=Count('id')) + grouped_items = StockItems.values('StockEntryId__item_id__item_type','StockEntryId__item_id__item_subtype', 'department').annotate(total_quantity=Count('id')) grouped_items_list = [ { 'item_type': item['StockEntryId__item_id__item_type'], + 'item_subtype': item['StockEntryId__item_id__item_subtype'], 'department': DepartmentInfo.objects.get(id=department), 'total_quantity': item['total_quantity'] } @@ -1118,6 +1127,7 @@ def current_stock_view(request): firstStock=StockItems.first() + print(grouped_items_list) return render(request,'ps1/current_stock_view.html',{'stocks':grouped_items_list,'first_stock':firstStock, @@ -1149,11 +1159,12 @@ def current_stock_view(request): return redirect('/dashboard') - grouped_items = StockItems.values('StockEntryId__item_id__item_type','department').annotate(total_quantity=Count('id')) + grouped_items = StockItems.values('StockEntryId__item_id__item_type','StockEntryId__item_id__item_subtype','department').annotate(total_quantity=Count('id')) grouped_items_list = [ { 'item_type': item['StockEntryId__item_id__item_type'], + 'item_subtype': item['StockEntryId__item_id__item_subtype'], 'department': DepartmentInfo.objects.values('id','name').get(id=item['department']), 'departmentId': item['department'], 'total_quantity': item['total_quantity'] @@ -1178,11 +1189,13 @@ def stock_item_view(request): if request.method=="POST": departmentId = request.POST.get('departmentId') type = request.POST.get('item_type') + subtype = request.POST.get('item_subtype') # StockEntryId__item_id__file_info_grade StockItems = StockItem.objects.filter( department=departmentId, - StockEntryId__item_id__item_type=type + StockEntryId__item_id__item_type=type, + StockEntryId__item_id__item_subtype=subtype ) return render(request,'ps1/stock_item_view.html',{'stocks':StockItems}) @@ -1344,16 +1357,56 @@ def generate_report(request): if request.session['currentDesignationSelected'] not in dept_admin_design + ["ps_admin"]: return redirect('/dashboard') + - des = HoldsDesignation.objects.all().select_related().filter(user = request.user).first() - department = request.user.extrainfo.department.name + if request.method =='GET': + if request.session['currentDesignationSelected'] in dept_admin_design: - if request.session['currentDesignationSelected'] in dept_admin_design: - sto=StockEntry.objects.filter(item_id__file_info__uploader__department__name=dept_admin_to_dept[request.session['currentDesignationSelected']]) - else: - sto=StockEntry.objects.all() + deptId = DepartmentInfo.objects.values('id', 'name').get(name=dept_admin_to_dept[request.session['currentDesignationSelected']]) + departments=[deptId] + + elif request.session['currentDesignationSelected'] == "ps_admin": + departments=DepartmentInfo.objects.values('id','name').all() + + return render(request,'ps1/generate_report_filter.html',{'departments':departments}) - return render(request,'ps1/generate_report.html',{'sto':sto}) + + if request.method=="POST": + + + departments = request.POST.getlist('departments') + start_date = request.POST.get('start_date'); + finish_date = request.POST.get('finish_date'); + + + + start_date = datetime.strptime(start_date, '%Y-%m-%d').date() + finish_date = datetime.strptime(finish_date, '%Y-%m-%d').date() + + if(departments[0]=='all'): + StockItems = StockItem.objects.filter(StockEntryId__recieved_date__range=(start_date, finish_date)) + else : + StockItems = StockItem.objects.filter(department__in=departments, StockEntryId__recieved_date__range=(start_date, finish_date)) + + + grouped_items = StockItems.values('StockEntryId__item_id__item_type','department').annotate(total_quantity=Count('id')) + + grouped_items_list = [ + { + 'item_type': item['StockEntryId__item_id__item_type'], + 'department': DepartmentInfo.objects.values('id','name').get(id=item['department']), + 'departmentId': item['department'], + 'total_quantity': item['total_quantity'], + 'StockItems': StockItem.objects.filter( + department=item['department'], + StockEntryId__item_id__item_type=item['StockEntryId__item_id__item_type'] + ) + } + for item in grouped_items + ] + + + return render(request,'ps1/generate_report.html',{'departments':departments,'stocks':grouped_items_list}) @login_required(login_url = "/accounts/login") @@ -1542,6 +1595,8 @@ def outboxview(request): @login_required(login_url="/accounts/login") def updateStockItemInUse(request): + print("updatestockiteminuse"); + if request.session['currentDesignationSelected'] not in dept_admin_design + ["ps_admin"]: return redirect('/dashboard') @@ -1568,4 +1623,21 @@ def updateStockItemInUse(request): return JsonResponse({'success': True}) - # return HttpResponseRedirect('../current_stock_view') \ No newline at end of file + # return HttpResponseRedirect('../current_stock_view') + + +@login_required(login_url="/accounts/login") +def item_detail(request, id): + if request.session['currentDesignationSelected'] not in dept_admin_design + ["ps_admin"]: + return redirect('/dashboard') + + stock_transfers = StockTransfer.objects.filter(stockItem=id).order_by('dateTime') + stock_item = StockItem.objects.filter(id=id).first(); + # Do something with the stock_transfers + + context = { + 'transfers': stock_transfers, + 'item': stock_item + } + + return render(request, 'ps1/stock_item_details.html', context) diff --git a/FusionIIIT/templates/ps1/composeIndent.html b/FusionIIIT/templates/ps1/composeIndent.html index 8c406a8b6..d71d826e9 100644 --- a/FusionIIIT/templates/ps1/composeIndent.html +++ b/FusionIIIT/templates/ps1/composeIndent.html @@ -80,6 +80,11 @@

+
+ + +
+
diff --git a/FusionIIIT/templates/ps1/createdindent.html b/FusionIIIT/templates/ps1/createdindent.html index dd5c06a75..f88edfeb1 100644 --- a/FusionIIIT/templates/ps1/createdindent.html +++ b/FusionIIIT/templates/ps1/createdindent.html @@ -59,7 +59,7 @@
Quantity :-{{indent.quantity}} - Present Stock :{{indent.present_stock}} + SubType {{indent.item_subtype}}
diff --git a/FusionIIIT/templates/ps1/current_stock_view.html b/FusionIIIT/templates/ps1/current_stock_view.html index d49b32e3e..968f29f89 100644 --- a/FusionIIIT/templates/ps1/current_stock_view.html +++ b/FusionIIIT/templates/ps1/current_stock_view.html @@ -35,6 +35,7 @@

Item Type + department/Section Quantity @@ -45,6 +46,7 @@

{{s.item_type}} + {{s.department}} {{s.total_quantity}} diff --git a/FusionIIIT/templates/ps1/current_stock_view_filter.html b/FusionIIIT/templates/ps1/current_stock_view_filter.html index d5ec0df6b..1ac37ab58 100644 --- a/FusionIIIT/templates/ps1/current_stock_view_filter.html +++ b/FusionIIIT/templates/ps1/current_stock_view_filter.html @@ -82,6 +82,7 @@

Item Type + Item Subtype department/section Quantity View Stocks @@ -94,12 +95,14 @@

{{s.item_type}} + {{s.item_subtype}} {{s.department.name}} {{s.total_quantity}}
{% csrf_token %} +
diff --git a/FusionIIIT/templates/ps1/forwardedIndent.html b/FusionIIIT/templates/ps1/forwardedIndent.html index d149ec563..97ce26ab5 100644 --- a/FusionIIIT/templates/ps1/forwardedIndent.html +++ b/FusionIIIT/templates/ps1/forwardedIndent.html @@ -58,7 +58,7 @@
Quantity :-{{indent.quantity}} - Present Stock :{{indent.present_stock}} + SubType :{{indent.item_subtype}}
diff --git a/FusionIIIT/templates/ps1/forwardindent.html b/FusionIIIT/templates/ps1/forwardindent.html index 5c5e17ab1..7cb74b51c 100644 --- a/FusionIIIT/templates/ps1/forwardindent.html +++ b/FusionIIIT/templates/ps1/forwardindent.html @@ -45,7 +45,7 @@
Quantity :-{{indent.quantity}} - Present Stock :{{indent.present_stock}} + SubType :{{indent.item_subtype}}
diff --git a/FusionIIIT/templates/ps1/generate_report.html b/FusionIIIT/templates/ps1/generate_report.html index 7374c533d..e5f022416 100644 --- a/FusionIIIT/templates/ps1/generate_report.html +++ b/FusionIIIT/templates/ps1/generate_report.html @@ -1,274 +1,101 @@ -{% extends 'ps1/ps2.html' %} -{% load static %} - -{% block filetracking_tab %} - - -
-

- - Stocks present in database - -

-
-
- -
-
-
-

- - Procuremented stock entry view - -

- -
-
- - - - -
- {% if sto %} - - - - - - - - - - - - - - {% for s in sto %} - {% if s.item_id.purchased %} - - - - - - - - - - - - - - - - {% endif %} + // Clone the element + let clonedPdfjs = pdfjs.cloneNode(true); - {% endfor %} - + // Set width of the cloned element to match the width of the PDF document + var widthInPixels = 450 * 3.78; + clonedPdfjs.style.width = widthInPixels + 'px'; -
item_idStock_NameQuantity dealing assistant idDepartment/Sectionstock Report
{{s.item_id.file_info.id}}{{s.item_name}}{{s.current_stock}}{{s.dealing_assistant_id}}{{s.item_id.file_info.uploader.department.name}}
{% csrf_token %} - - -
-
- -
- {% else %} -

No Records present in database

- {% endif %} - - - - - -
- - - - all_users = JSON.parse(response.users); - console.log(all_users[0].fields.username); - app = [] - $('#input_list').html(''); - for(var i=0;i'+all_users[i].fields.username+''); - } - }, - error: function(rs, e){ - console.log('error-------'); - }, - }); - console.log("dsfagdfdshadf"); - }); - - -{% endblock %} - - +{% endblock %} \ No newline at end of file diff --git a/FusionIIIT/templates/ps1/generate_report_filter.html b/FusionIIIT/templates/ps1/generate_report_filter.html new file mode 100644 index 000000000..45ddd040a --- /dev/null +++ b/FusionIIIT/templates/ps1/generate_report_filter.html @@ -0,0 +1,82 @@ +{% extends 'ps1/ps2.html' %} +{% load static %} + + +{% block filetracking_tab %} + {% comment %}the compounder prescription tab starts here {% endcomment %} + + +
+

+ + Add Filters + +

+
+ + {% comment %}the ambulance schedule tab starts here {% endcomment %} +
+
+ +
+ {% csrf_token %} +
+ + +
+ +
+ + +
+ + + + +
+ + +
+ + + + + + + + + +
+ +
+ +
+ +
+ +
+ + +{% endblock %} + + + diff --git a/FusionIIIT/templates/ps1/ps1.html b/FusionIIIT/templates/ps1/ps1.html index c79184378..1759282e1 100644 --- a/FusionIIIT/templates/ps1/ps1.html +++ b/FusionIIIT/templates/ps1/ps1.html @@ -36,7 +36,8 @@ {% comment %}The Tab-Menu starts here!{% endcomment %}
- {% with dept_admin_designations="['ps_admin', 'deptadmin_cse', 'deptadmin_ece', 'deptadmin_me', 'deptadmin_sm', 'deptadmin_design', 'deptadmin_liberalarts', 'deptadmin_ns']" %} + {% with dept_admin_designations="['ps_admin', 'deptadmin_cse', 'deptadmin_ece', 'deptadmin_me', 'deptadmin_sm', 'deptadmin_design', 'deptadmin_liberalarts', 'deptadmin_ns', + 'Admin IWD','Compounder']" %} {% if request.session.currentDesignationSelected not in dept_admin_designations %} diff --git a/FusionIIIT/templates/ps1/ps2.html b/FusionIIIT/templates/ps1/ps2.html index 8a1a67d68..a209cd72b 100644 --- a/FusionIIIT/templates/ps1/ps2.html +++ b/FusionIIIT/templates/ps1/ps2.html @@ -40,10 +40,10 @@ - + Current Stock Situation @@ -51,7 +51,12 @@ - Transfer Stock View + View Transfer Execution + + + + + Generate Report diff --git a/FusionIIIT/templates/ps1/stock_item_details.html b/FusionIIIT/templates/ps1/stock_item_details.html new file mode 100644 index 000000000..2ff108cb6 --- /dev/null +++ b/FusionIIIT/templates/ps1/stock_item_details.html @@ -0,0 +1,224 @@ + +{% extends 'ps1/ps2.html' %} +{% load static %} + +{% block filetracking_tab %} + + +
+

+ + Detailed Stock Item View + +

+
+
+ +
+
+
+

+ + Stock Item Details + +

+ +
+ + +
+ {% if item %} +
+ +
+
+
+
+
Item Name
+
:
+
{{item.StockEntryId.item_id.item_name}}
+
+
+
+
+
+
+
+
Item Type
+
:
+
{{item.StockEntryId.item_id.item_type}}
+
+
+
+
+ +
+
+
+
+
Item SubType
+
:
+
{{item.StockEntryId.item_id.item_subtype}}
+
+
+
+
+
+
+
+
Dealing Assistant
+
:
+
{{item.StockEntryId.dealing_assistant_id}}
+
+
+
+
+ +
+
+
+
+
Vendor Name
+
:
+
{{item.StockEntryId.vendor}}
+
+
+
+
+
+
+
+
Initially Transferred to
+
:
+
{{item.StockEntryId.item_id.file_info.uploader.department.name}}
+
+
+
+
+ +
+
+
+
+
Bill
+
:
+
+ + {% if item.StockEntryId.bill %} + {{ item.StockEntryId.bill }} + {% else %} + No bill available + {% endif %} +
+
+
+
+
+
+
+
+
Received Date
+
:
+
{{item.StockEntryId.recieved_date}}
+
+
+
+
+ +
+

+ + Stock Item Transfer History + +

+ +
+ + + + + + + + + + + + + + + + + {% for s in transfers %} + + + + + + + + + + + {% endfor %} + +
File IdSrc Department Dest Department Src Location Dest Location Date Time
{{s.indent_file.file_info.id}} {{s.src_dept.name}}{{s.dest_dept.name}}{{s.src_location}}{{s.dest_location}}{{s.dateTime}}
+ +
+ + +
+ {% else %} +

No Records present in database

+ {% endif %} + + + + + +
+ + {% endblock %} \ No newline at end of file diff --git a/FusionIIIT/templates/ps1/stock_item_view.html b/FusionIIIT/templates/ps1/stock_item_view.html index 1f259fea9..2cd88c6d7 100644 --- a/FusionIIIT/templates/ps1/stock_item_view.html +++ b/FusionIIIT/templates/ps1/stock_item_view.html @@ -41,6 +41,7 @@

Current Location Transferred InUse + @@ -49,7 +50,10 @@

{% for s in stocks %} {% if s.StockEntryId.item_id.purchased %} - {{s.nomenclature}} + + {{ s.nomenclature }} + + {{s.StockEntryId.item_id.item_name}} {{s.department.name}} {{s.location}} @@ -62,6 +66,15 @@

{% endif %} + + + + + {% endif %} @@ -92,7 +105,7 @@

No Records present in database

$('#form').on('submit', function (event) { event.preventDefault(); // Prevent default form submission var selectedItems = []; // Array to store selected item IDs - + // Iterate over each checked checkbox and add its value to the array $('input[name="selected_stock_item"]').each(function () { var itemId = $(this).val(); diff --git a/FusionIIIT/templates/ps1/stock_transfer.html b/FusionIIIT/templates/ps1/stock_transfer.html index 8775e88cd..a7a5f4b44 100644 --- a/FusionIIIT/templates/ps1/stock_transfer.html +++ b/FusionIIIT/templates/ps1/stock_transfer.html @@ -34,6 +34,7 @@

Nomenclature Item Name Item Type + Item SubType Current Location Current Department/Section Vendor @@ -49,8 +50,9 @@

{{item.StockEntryId.item_id.item_name}} {{item.StockEntryId.item_id.item_type}} + {{item.StockEntryId.item_id.item_subtype}} {{item.StockEntryId.location}} - {{item.department}} + {{item.department.name}} {{item.StockEntryId.vendor}} diff --git a/FusionIIIT/templates/ps1/view_transfer.html b/FusionIIIT/templates/ps1/view_transfer.html index 6cb11448c..79636f5ac 100644 --- a/FusionIIIT/templates/ps1/view_transfer.html +++ b/FusionIIIT/templates/ps1/view_transfer.html @@ -37,6 +37,7 @@

File Id Item Type + Item SubType Item Name Nomenclature Src Dept/Sec @@ -57,6 +58,7 @@

{{s.indent_file.file_info.id}} {{s.indent_file.item_type}} + {{s.indent_file.item_subtype}} {{s.indent_file.item_name}} {{s.stockItem.nomenclature}} From b438fa46ccef6e927393bbd2db87afaa7407a8ba Mon Sep 17 00:00:00 2001 From: itsspriyansh Date: Thu, 25 Apr 2024 18:58:34 +0530 Subject: [PATCH 5/9] refactor: urls and views --- FusionIIIT/applications/scholarships/urls.py | 1 - FusionIIIT/applications/scholarships/views.py | 89 +++++-------------- .../scholarshipsModule/applyNew.html | 16 ++-- .../templates/scholarshipsModule/invite.html | 35 +------- 4 files changed, 29 insertions(+), 112 deletions(-) diff --git a/FusionIIIT/applications/scholarships/urls.py b/FusionIIIT/applications/scholarships/urls.py index 769dec040..121cdd116 100755 --- a/FusionIIIT/applications/scholarships/urls.py +++ b/FusionIIIT/applications/scholarships/urls.py @@ -17,6 +17,5 @@ url(r'^getConvocationFlag/$', views.getConvocationFlag, name='getConvocationFlag'), url(r'^getContent/$', views.getContent, name='getContent'), url(r'^updateEndDate/$', views.updateEndDate, name='updateEndDate'), - url(r'^deleteRelease/$', views.deleteRelease, name='deleteRelease'), ] \ No newline at end of file diff --git a/FusionIIIT/applications/scholarships/views.py b/FusionIIIT/applications/scholarships/views.py index 9bffc3fb8..bbcbffb16 100755 --- a/FusionIIIT/applications/scholarships/views.py +++ b/FusionIIIT/applications/scholarships/views.py @@ -3,7 +3,6 @@ from operator import or_ from functools import reduce -from django.http import JsonResponse from django.contrib import messages from django.contrib.auth.decorators import login_required from django.http import HttpResponse, HttpResponseRedirect @@ -24,13 +23,9 @@ from .validations import MCM_list, MCM_schema, gold_list, gold_schema, silver_list, silver_schema, proficiency_list,proficiency_schema from jsonschema import validate from jsonschema.exceptions import ValidationError -from .helpers import getBatch # Create your views here. - - - @login_required(login_url='/accounts/login') def spacs(request): convener = Designation.objects.get(name='spacsconvenor') @@ -75,8 +70,6 @@ def spacs(request): @login_required(login_url='/accounts/login') def convener_view(request): - print(request) - try: convener = Designation.objects.get(name='spacsconvenor') hd = HoldsDesignation.objects.get( @@ -84,11 +77,8 @@ def convener_view(request): except: return HttpResponseRedirect('/logout') if request.method == 'POST': - print("this is a check for post request") if 'Submit' in request.POST: - print("this is a check for post xfhjgisdfkhlsjk request") award = request.POST.get('type') - print("award " + award) programme = request.POST.get('programme') batch = request.POST.get('batch') from_date = request.POST.get('From') @@ -108,17 +98,14 @@ def convener_view(request): ) # It updates the student Notification table on the spacs head sending the mcm invitation - if batch == 'All': + if batch == 'all': active_batches = range(datetime.datetime.now().year - 4 , datetime.datetime.now().year + 1) - query = reduce(or_, (Q(id__id__startswith=int(batch)-2000) for batch in active_batches)) recipient = Student.objects.filter(programme=programme).filter(query) else: recipient = Student.objects.filter(programme=programme, id__id__startswith=int(batch)-2000) - # Notification starts - print(recipient) convenor = request.user for student in recipient: scholarship_portal_notif(convenor, student.id.user, 'award_' + award) # Notification @@ -139,9 +126,9 @@ def convener_view(request): notification_convocation_flag=True, invite_convocation_accept_flag=False) for student in recipient]) # Notification ends - print(batch) + messages.success(request, - award + ' applications are invited successfully for ' + str(batch) + ' batch(es)') + award + ' applications are invited successfully for ' + batch + ' batch(es)') return HttpResponseRedirect('/spacs/convener_view') elif 'Email' in request.POST: @@ -278,7 +265,6 @@ def convener_view(request): @login_required(login_url='/accounts/login') def student_view(request): - if request.method == 'POST': if 'Submit_MCM' in request.POST: return submitMCM(request) @@ -404,52 +390,37 @@ def convenerCatalogue(request): context['result'] = 'Failure' return HttpResponse(json.dumps(context), content_type='convenerCatalogue/json') - - -#below function is refactored and changed as it is not used by the user interface -#it will be changed later for other testing and download of winners def getWinners(request): - # Extract parameters from the request award_name = request.GET.get('award_name') batch_year = int(request.GET.get('batch')) programme_name = request.GET.get('programme') - - # Get the Award_and_scholarship object based on the provided award name - try: - award = Award_and_scholarship.objects.get(award_name=award_name) - except Award_and_scholarship.DoesNotExist: - return JsonResponse({'result': 'Failure', 'message': 'Award not found'}) - - # Query for previous winners based on the provided criteria - winners = Previous_winner.objects.select_related('student__extra_info').filter( + award = Award_and_scholarship.objects.get(award_name=award_name) + winners = Previous_winner.objects.select_related('student','award_id').filter( year=batch_year, award_id=award, programme=programme_name) + context = {} + context['student_name'] = [] + context['student_program'] = [] + context['roll'] = [] - context = { - 'result': 'Success', - 'winners': [], - } - - # Process the winners if any found +# If-Else Condition for previous winner if there is or no data in the winner table if winners: for winner in winners: - # Fetch extra information for the student - extra_info = winner.student.extra_info + + extra_info = ExtraInfo.objects.get(id=winner.student_id) + student_id = Student.objects.get(id=extra_info) student_name = extra_info.user.first_name student_roll = winner.student_id - student_program = winner.student.programme - - # Append student details to the context - context['winners'].append({ - 'student_name': student_name, - 'roll': student_roll, - 'student_program': student_program, - }) + student_program = student_id.programme + context['student_name'].append(student_name) + context['roll'].append(student_roll) + context['student_program'].append(student_program) + + context['result'] = 'Success' else: context['result'] = 'Failure' - context['message'] = 'No winners found for the provided criteria' - return JsonResponse(context) + return HttpResponse(json.dumps(context), content_type='getWinners/json') def get_MCM_Flag(request): # Here we are extracting mcm_flag print("get mcm_flags here") @@ -469,7 +440,6 @@ def get_MCM_Flag(request): # Here we are extracting mcm_flag # return HttpResponseRedirect('/spacs/student_view') def getConvocationFlag(request): # Here we are extracting convocation_flag - print("get convo_flags here") x = Notification.objects.filter(student_id=request.user.extrainfo.id) for i in x: @@ -521,18 +491,6 @@ def updateEndDate(request): context['result'] = 'Failure' return HttpResponse(json.dumps(context), content_type='updateEndDate/json') -def deleteRelease(request): - print("deleteRelease") - id = request.GET.get('id') - is_deleted = Release.objects.filter(pk=id).delete() - request.session['last_clicked'] = "Release_deleted" - context = {} - if is_deleted: - context['result'] = 'Success' - else: - context['result'] = 'Failure' - return HttpResponse(json.dumps(context), content_type='deleteRelease/json') - def getAwardId(request): award = request.POST.get('award') a = Award_and_scholarship.objects.get(award_name=award).id @@ -1064,6 +1022,7 @@ def sendConvenerRenderRequest(request, additionalParams={}): source = Constants.FATHER_OCC_CHOICE time = Constants.TIME release = Release.objects.all() + notification = Notification.objects.select_related('student_id','release_id').all() spi = Spi.objects.all() context.update({ 'source': source, 'time': time, 'ch': ch, 'spi': spi, 'release': release}) context.update(additionalParams) @@ -1071,7 +1030,6 @@ def sendConvenerRenderRequest(request, additionalParams={}): def sendStudentRenderRequest(request, additionalParams={}): context = getCommonParams(request) - ch = Constants.BATCH time = Constants.TIME mother_occ = Constants.MOTHER_OCC_CHOICES @@ -1091,7 +1049,6 @@ def sendStudentRenderRequest(request, additionalParams={}): update_con_flag = False x_notif_mcm_flag = False x_notif_con_flag = False - student_batch = getBatch(request.user.extrainfo.student) for dates in release: if checkDate(dates.startdate, dates.enddate): print("sudheer's test --->") @@ -1102,11 +1059,11 @@ def sendStudentRenderRequest(request, additionalParams={}): if no_of_mcm_filled > 0: update_mcm_flag = True elif dates.award == 'Convocation Medals' and dates.batch == "20"+str(request.user.extrainfo.student)[0:2]and dates.programme == request.user.extrainfo.student.programme: + x_notif_con_flag = True if no_of_con_filled > 0: update_con_flag = True else: - if dates.award == "Merit-cum-Means Scholarship" and dates.batch =="20"+ str(request.user.extrainfo.student)[0:2]: try: @@ -1141,7 +1098,7 @@ def sendStudentRenderRequest(request, additionalParams={}): context.update(additionalParams) return render(request, 'scholarshipsModule/scholarships_student.html',context) -def sendStaffRenderRequest(request, additionalParams={}): +def sendStaffRenderRequest(request, additionalParams={}): context = getCommonParams(request) context.update(additionalParams) return render(request, 'scholarshipsModule/scholarships_staff.html', context) diff --git a/FusionIIIT/templates/scholarshipsModule/applyNew.html b/FusionIIIT/templates/scholarshipsModule/applyNew.html index 503c8b365..b240a9157 100755 --- a/FusionIIIT/templates/scholarshipsModule/applyNew.html +++ b/FusionIIIT/templates/scholarshipsModule/applyNew.html @@ -33,7 +33,7 @@ @@ -318,7 +318,7 @@

{% endif %} {% else %} -
+
Applications not invited or has already been submitted
{% endif %} @@ -368,7 +368,7 @@
{% endif %} {% else %} -
+
Apply
{% endif %} @@ -957,7 +957,7 @@
- @@ -1077,7 +1077,7 @@ success: function (response) { if(response.result==='Success'){ location.reload(); - console.log("reuk", response.result) + console.log(response.result) } else{ console.log(response.result); @@ -1104,12 +1104,6 @@ } }); }); - - $(document).on('click', '#submit_silver', function (event){ - event.preventDefault(); - $.ajax() - }) -