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 c07889c43..f8c14bb8f 100644 --- a/FusionIIIT/applications/ps1/views.py +++ b/FusionIIIT/applications/ps1/views.py @@ -20,6 +20,8 @@ import json from django.db.models import Q,Count +from datetime import datetime +from datetime import datetime dept_admin_to_dept = { "deptadmin_cse": "CSE", @@ -29,9 +31,11 @@ "deptadmin_design": "Design", "deptadmin_liberalarts": "Liberal Arts", "deptadmin_ns": "Natural Science", + "Admin IWD":"IWD", + "Compounder":"Health Center" } -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 +122,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 +156,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 +198,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 +258,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 +1114,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 +1129,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, @@ -1135,9 +1147,11 @@ def current_stock_view(request): print(dept_admin_to_dept[request.session['currentDesignationSelected']]); deptId = DepartmentInfo.objects.values('id', 'name').get(name=dept_admin_to_dept[request.session['currentDesignationSelected']]) + + departments=[deptId] - StockItems = StockItem.objects.filter(department=deptId) + StockItems = StockItem.objects.filter(department=deptId['id']) elif request.session['currentDesignationSelected'] == "ps_admin": departments=DepartmentInfo.objects.values('id','name').all() @@ -1147,11 +1161,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'] @@ -1170,14 +1185,19 @@ def stock_item_view(request): if request.session['currentDesignationSelected'] not in dept_admin_design + ["ps_admin"]: return redirect('/dashboard') + if request.method=="GET": + return HttpResponseRedirect('../current_stock_view') + 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}) @@ -1339,16 +1359,57 @@ 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}) + + + 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)) + - return render(request,'ps1/generate_report.html',{'sto':sto}) + 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'], + '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") @@ -1447,7 +1508,7 @@ def perform_transfer(request): dest_location=dest_location ) - messages.success(request,'Stock Transfer Done Successfully.!') + messages.success(request,'Stock Transfer Done Successfully.!') # if the quantity required for this indent file is fulfilled we should mark this indentfile as done. if(moreStocksRequired<=0): myIndent.purchased=True @@ -1458,7 +1519,7 @@ def perform_transfer(request): department = request.user.extrainfo.department.name - return HttpResponseRedirect('../view_transfer') + return JsonResponse({'success':True}) # This is to get the list of all the available stock items for transfer. @login_required(login_url = "/accounts/login") @@ -1537,8 +1598,14 @@ 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') + + if request.method=="GET": + return redirect('../current_stock_view') + if request.method == "POST": @@ -1557,4 +1624,23 @@ def updateStockItemInUse(request): stock_item.inUse = checked stock_item.save() - return redirect('/purchase-and-store/current_stock_view') \ No newline at end of file + return JsonResponse({'success': True}) + + # 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 88153c82a..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}} @@ -56,7 +58,7 @@

-
+
@@ -81,7 +83,13 @@

- + {% endif %} 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 @@

+ @@ -94,12 +95,14 @@

+ + @@ -47,12 +50,31 @@

{% for s in stocks %} {% if s.StockEntryId.item_id.purchased %}

- + + - + + + + {% endif %} @@ -83,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(); @@ -101,8 +123,12 @@

No Records present in database

'csrfmiddlewaretoken': '{{csrf_token}}' }, success: function (response) { - // Handle success response console.log("success in sending stock items information"); + if (response.success) { + window.location.href = '../current_stock_view'; + } else { + console.log("Request was successful, but response indicates failure."); + } }, error: function (xhr, errmsg, err) { // Handle error response diff --git a/FusionIIIT/templates/ps1/stock_transfer.html b/FusionIIIT/templates/ps1/stock_transfer.html index 048e145e8..a7a5f4b44 100644 --- a/FusionIIIT/templates/ps1/stock_transfer.html +++ b/FusionIIIT/templates/ps1/stock_transfer.html @@ -31,10 +31,10 @@

{{s.location}} {{s.isTransferred}} {{s.StockEntryId.vendor}}{{s.StockEntryId.bill}} + {% if s.StockEntryId.bill %} + {{ s.StockEntryId.bill }} + {% else %} + No bill available + {% endif %} +
Item TypeItem Subtype department/section Quantity View Stocks
{{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..6a90b234b 100644 --- a/FusionIIIT/templates/ps1/generate_report.html +++ b/FusionIIIT/templates/ps1/generate_report.html @@ -1,274 +1,104 @@ -{% 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_entry_item_view.html b/FusionIIIT/templates/ps1/stock_entry_item_view.html index 886ffcd6d..65472dbc5 100644 --- a/FusionIIIT/templates/ps1/stock_entry_item_view.html +++ b/FusionIIIT/templates/ps1/stock_entry_item_view.html @@ -71,7 +71,7 @@

{% if stocks %} -
+
+ {% 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 e2a562010..2cd88c6d7 100644 --- a/FusionIIIT/templates/ps1/stock_item_view.html +++ b/FusionIIIT/templates/ps1/stock_item_view.html @@ -16,9 +16,11 @@

Stock Items View

+ {% if request.session.currentDesignationSelected != "ps_admin" %}
+ {% endif %} @@ -39,6 +41,7 @@

Current Location Transferred InUse
{{s.nomenclature}} + {{ s.nomenclature }} + {{s.StockEntryId.item_id.item_name}} {{s.department.name}} {{s.location}} {{s.isTransferred}} + {% if request.session.currentDesignationSelected == "ps_admin" %} + + {% else %} + + {% endif %} + + + +
- + - + @@ -46,13 +46,13 @@

- - + + - + @@ -121,8 +121,11 @@

'csrfmiddlewaretoken': '{{csrf_token}}' }, success: function (response) { - // Handle success response - console.log("success in sending stock items information"); + if (response.success) { + window.location.href = '../view_transfer'; + } else { + console.log("Request was successful, but response indicates failure."); + } }, error: function (xhr, errmsg, err) { // Handle error response 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 @@

+ @@ -57,6 +58,7 @@

+
Stock Item IDNomenclature Item NameNomenclature Item TypeItem SubType Current Location Current Department/Section Vendor
{{item.id}} {{item.StockEntryId.item_id.item_name}} {{item.nomenclature}} {{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}}File Id Item TypeItem SubType Item Name Nomenclature Src Dept/Sec {{s.indent_file.file_info.id}} {{s.indent_file.item_type}} {{s.indent_file.item_subtype}} {{s.indent_file.item_name}} {{s.stockItem.nomenclature}}