Merge pull request 'merge' (#1) from develop into version-14

Reviewed-on: #1

manufacturing_overview/manufacturing_overview/api.py

@@ -2,11 +2,9 @@ import frappe
 from functools import reduce
 from datetime import date
 
-# frappe.utils.logger.set_log_level("DEBUG")
+frappe.utils.logger.set_log_level("DEBUG")
-# logger = frappe.logger("manufacturing_overview",
+logger = frappe.logger("manufacturing_overview",
-#                       allow_site=True, file_count=100000)
+                       allow_site=True, file_count=10000)
-
-# logger.debug(f"String")
 
 
 def getDueInDays(d):
@@ -36,6 +34,7 @@ def shortenCustomerName(customer):
 
 
 def generateProductionOverviewCacheData():
+    logger.debug(f"Generating")
     salesOrderItems = frappe.db.sql(
         """
         SELECT
@@ -70,8 +69,6 @@ def generateProductionOverviewCacheData():
         soItem.currentWarehouseQty = calculateCurrentWarehouseQty(
             soItem.item_code, soItem.qty, currentWarehouseQtyList)
 
-        soItem.totalWarehouseQty = getAmountInWarehouses(soItem.item_code)
-
         soItem.due_in = getDueInDays(soItem.delivery_date)
 
         soItem.customer = shortenCustomerName(frappe.get_value(
@@ -121,10 +118,12 @@ def calculateStatus(item):
 
 @frappe.whitelist()
 def getSalesorderOverviewList():
-    salesOrderItems = frappe.cache().get_value('production_overview', expires=True)
+    logger.debug(f"Fetching Cache")
+    salesOrderItems = frappe.cache().get_value('production_overview')
 
     if salesOrderItems is None:
+        logger.debug(f"Cache not found")
         salesOrderItems = generateProductionOverviewCacheData()
-        frappe.cache().set_value('production_overview', salesOrderItems, expires_in_sec=60)
+        frappe.cache().set_value('production_overview', salesOrderItems, expires_in_sec=120)
 
     return salesOrderItems

manufacturing_overview/manufacturing_overview/productionplan.py

@@ -1,9 +1,9 @@
 import frappe
 from erpnext.stock.get_item_details import get_default_bom
 
-# frappe.utils.logger.set_log_level("DEBUG")
+frappe.utils.logger.set_log_level("DEBUG")
-# logger = frappe.logger("manufacturing_overview",
+logger = frappe.logger("manufacturing_overview",
-#                       allow_site=True, file_count=50)
+                       allow_site=True, file_count=50)
 
 # logger.debug(f"{current_value} + {value} = {updated_value}")
 

manufacturing_overview/public/js/manufacturing_overview_desk.vue

@@ -58,7 +58,7 @@ export default {
   },
   created() {
     this.fetchEventsList();
-    this.timer = setInterval(this.fetchEventsList, 10000);
+    this.timer = setInterval(this.fetchEventsList, 60000);
   },
   methods: {
     fetchEventsList() {