Commit ec655291 authored by Jérome Perrin's avatar Jérome Perrin

Inventory API(interpolation): fix operator/logical_operator

parent 60e8992e
...@@ -676,12 +676,12 @@ class SimulationTool(BaseTool): ...@@ -676,12 +676,12 @@ class SimulationTool(BaseTool):
ComplexQuery( ComplexQuery(
Query(mirror_date=from_date, range='min'), Query(mirror_date=from_date, range='min'),
Query(date=to_date, range='max'), Query(date=to_date, range='max'),
operator="AND"), logical_operator="AND"),
ComplexQuery( ComplexQuery(
Query(date=from_date, range='min'), Query(date=from_date, range='min'),
Query(mirror_date=to_date, range='max'), Query(mirror_date=to_date, range='max'),
operator="AND"), logical_operator="AND"),
operator="OR" logical_operator="OR"
) )
else: else:
column_value_dict['date'] = ComplexQuery( column_value_dict['date'] = ComplexQuery(
...@@ -690,12 +690,12 @@ class SimulationTool(BaseTool): ...@@ -690,12 +690,12 @@ class SimulationTool(BaseTool):
ComplexQuery( ComplexQuery(
Query(mirror_date=from_date, range='min'), Query(mirror_date=from_date, range='min'),
Query(date=at_date, range='ngt'), Query(date=at_date, range='ngt'),
operator="AND"), logical_operator="AND"),
ComplexQuery( ComplexQuery(
Query(date=from_date, range='min'), Query(date=from_date, range='min'),
Query(mirror_date=at_date, range='ngt'), Query(mirror_date=at_date, range='ngt'),
operator="AND"), logical_operator="AND"),
operator="OR" logical_operator="OR"
) )
else: else:
column_value_dict['date'] = {'query': [to_date], 'range': 'ngt'} column_value_dict['date'] = {'query': [to_date], 'range': 'ngt'}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment