From 580dedb17f46aa31dc9f6ea0abe623b4418a040e Mon Sep 17 00:00:00 2001
From: Sander Vocke <sandervocke@gmail.com>
Date: Thu, 30 Jan 2020 23:55:27 +0059
Subject: [PATCH] Time stuff seems to be working.

---
 src/queries.js         |  4 +++-
 src/userquerywidget.js | 10 ++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/queries.js b/src/queries.js
index 0c3322b..f81a570 100644
--- a/src/queries.js
+++ b/src/queries.js
@@ -1,6 +1,7 @@
 
 import { create_photo, create_album, create_tag } from './media.js';
 import { sqljs_async_queries } from './database.js';
+import { format } from 'date-fns';
 
 export function escape_regex(s) {
     return s.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
@@ -174,7 +175,8 @@ export class TimeFilter extends ResultFilter {
             throw new Error("Unsupported time filter type.");
         }
 
-        return '(ImageInformation.creationDate' + operator + '"' + this.time.toLocaleString() + '")';
+        const timestr = format(this.time, "yyyy-MM-dd HH:mm:ss");
+        return '(ImageInformation.creationDate' + operator + '"' + timestr + '")';
     }
     simplify() { return this; }
 }
diff --git a/src/userquerywidget.js b/src/userquerywidget.js
index 2846910..92b2a0c 100644
--- a/src/userquerywidget.js
+++ b/src/userquerywidget.js
@@ -17,6 +17,7 @@ import Select from '@material-ui/core/Select';
 import TextField from '@material-ui/core/TextField';
 import ScheduleIcon from '@material-ui/icons/Schedule';
 import DateFnsUtils from '@date-io/date-fns';
+import { format } from 'date-fns';
 import { MuiPickersUtilsProvider, DateTimePicker } from "@material-ui/pickers";
 
 import { makeStyles } from '@material-ui/core/styles';
@@ -76,7 +77,7 @@ export function EditTimeFilterExpression(props) {
             <Select
                 labelId={labelid}
                 id={id}
-                value={filter.operator}
+                value={filter.type}
                 onChange={handleChangeType}
             >
                 <MenuItem value={TimeFilterTypeEnum.BEFORE}>Before</MenuItem>
@@ -499,7 +500,7 @@ export function TimeFilterExpressionControl(props) {
     const classes = useStyles();
     const { expr, onClick, onChange } = props;
 
-    const relation = "";
+    var relation = "";
     if (expr.type == TimeFilterTypeEnum.BEFORE) {
         relation = "Before: ";
     } else if (expr.type == TimeFilterTypeEnum.AFTER) {
@@ -508,6 +509,8 @@ export function TimeFilterExpressionControl(props) {
         throw new Error("Unsupported time filter type.");
     }
 
+    const datestr = format( expr.time, "yyyy-MM-dd, HH:mm:ss");
+
     return (
         <Button
             variant="outlined"
@@ -515,8 +518,7 @@ export function TimeFilterExpressionControl(props) {
             aria-controls="simple-menu" aria-haspopup="true"
             onClick={onClick}
             startIcon={<ScheduleIcon />}>
-            >
-            {relation + expr.time.toLocaleStr()}
+            {relation + datestr}
         </Button>
     );
 }