bug fix while displaying the oee dashboard.

scripts/core/handlers/api_handler.py

@@ -100,14 +100,10 @@ class APIHandler:
                     hierarchy=request_data.hierarchy,
                     prod_start_time=request_data.queryDate[0],
                     prod_end_time=request_data.queryDate[1],
-                    reference_id=request_data.reference_id,
-                    tz=request_data.tz
+                    reference_id=request_data.reference_id
                 )
-                if isinstance(data, list) and data:
-                    data = data[0]
                 raw_data = self.oee_agg.processor(data)
                 return chart_maker.main_creator(raw_data, overall=False)
-                return dict()
             else:
                 agg_data = self.oee_agg.aggregator(request_data=request_data)
                 return chart_maker.main_creator(agg_data)

scripts/db/psql/oee_discrete.py

 from fastapi.encoders import jsonable_encoder
 from sqlalchemy import func
-from sqlalchemy.orm import Session, defer
+from sqlalchemy.orm import Session
 
 from scripts.db.db_models import OEEDiscreteTable
 from scripts.errors import ILensError
@@ -97,10 +97,9 @@ class DiscreteOEE(SQLDBUtils):
             raise
 
     def get_chart_data(
-            self, prod_start_time, prod_end_time, hierarchy, reference_id, tz, aggregation=False
+            self, prod_start_time, prod_end_time, hierarchy, reference_id
     ):
         try:
-            if not aggregation:
             data = (
                 self.session.query(self.table)
                 .filter(
@@ -113,22 +112,6 @@ class DiscreteOEE(SQLDBUtils):
             )
             if data:
                 return jsonable_encoder(data)
-            else:
-                data = (
-                    self.session.query(self.table)
-                        .filter(
-                        self.table.hierarchy == hierarchy,
-                        self.table.prod_start_time >= prod_start_time,
-                        self.table.prod_end_time <= prod_end_time,
-                    )
-                        .options(
-                        defer(self.table.hierarchy),
-                        defer(self.table.batch_id),
-                        defer(self.table.uom),
-                    )
-                )
-                if data:
-                    return [jsonable_encoder(each) for each in data]
             raise ILensError("Record(s) not found")
         except Exception as e:
             logger.exception(e)