share display mapper in all code paths and improve date format for PriceCheck app

app/db_utils.py

@@ -28,6 +28,7 @@ NON_IDENTIFIER_COLUMNS = [
 
 display_map = {
     'ts': lambda x: f"{time.strftime('%Y-%m-%d %H:%M', (x.year, x.month, x.day, x.hour, x.minute, 0, 0, 0, 0))}",
+    '%d/%m %_I%P': lambda x: f"{time.strftime('%d/%m %_I%P', (x.year, x.month, x.day, x.hour, x.minute, 0, 0, 0, 0))}",
     'price': lambda x: f'{x:.4f}',
     'quantity': lambda x: f'{x:.2f}',
     'organic': lambda x: 'yes' if x else 'no',
@@ -50,11 +51,10 @@ def get_data(cursor, statement, display):
         (k, display(v, k)) for k,v in x.items()
     ]), cursor_as_dict(cursor))
 
-def get_session_transactions(cursor, statement, date, store):
+def get_session_transactions(cursor, statement, display):
     #print(cur.mogrify(statement).decode("utf-8"))
     #input()
-    cursor.execute(statement)
-    df = pd.DataFrame(cursor_as_dict(cursor))
+    df = pd.DataFrame(get_data(cursor, statement, display))
     if df.empty:
         return ''
     return df.drop(labels=[
@@ -142,10 +142,10 @@ class QueryManager(object):
         ], justify='justify-all', max_colwidth=16, index=False)
     
     def get_session_transactions(self, date, store):
-        return get_session_transactions(
-            self.cursor, get_session_transactions_statement(
-                parse_time(date), store, full_name=True, exact_time=True
-            ), date, store)
+        statement = get_session_transactions_statement(
+            parse_time(date), store, full_name=True, exact_time=True
+        )
+        return get_session_transactions(self.cursor, statement, self.display)
 
     def unique_suggestions(self, name, **kwargs):
         statement = get_transactions_statement()

app/price_view.py

@@ -63,7 +63,7 @@ def get_historic_prices_statement(sort, product, unit, organic=None, limit='90 d
         #('ts', SQL('{identifier}::date').format(
         #    identifier=Identifier('ts'),
         #)),
-        ('date', SQL("""date_part('day',ts)||'/'||date_part('month',ts)||'/'||date_part('year',ts)""")),
+        ('%d/%m %_I%P', Identifier('transactions', 'ts')),
         #('store', Identifier('stores', 'name')),
         ('code', Identifier('stores', 'code')),
         #('description', Identifier('transactions','description')),

app/txn_view.py

@@ -34,7 +34,7 @@ def get_transactions_statement():
 
 select = OrderedDict([
     ('id', Identifier('transactions','id')),
-    ('ts', SQL("""date_part('day',ts)||'/'||date_part('month',ts)||' '||date_part('hour',ts)::int%12""")),
+    ('ts', Identifier('transactions', 'ts')),
     ('store', Identifier('stores', 'name')),
     ('code', Identifier('stores', 'code')),
     ('description', Identifier('transactions','description')),