[QgsQuick] Support for custom formats and strings

vsklencar · wonder-sk · commit 7aa18dab5ef4 · 2020-09-11T13:45:12.000+02:00
diff --git a/src/quickgui/plugin/editor/qgsquickdatetime.qml b/src/quickgui/plugin/editor/qgsquickdatetime.qml
@@ -116,7 +116,7 @@ Item {
                   onClicked: {
                     var usedDate = new Date();
                     if (value !== undefined && value !== '') {
-                      usedDate = value;
+                      usedDate = main.isDateOrTime ? value : Date.fromLocaleString(Qt.locale(), value, config['field_format'])
                     }
 
                     calendar.selectedDate = usedDate
@@ -147,7 +147,8 @@ Item {
                     anchors.fill: parent
                     onClicked: {
                       var newDate = new Date()
-                      valueChanged(newDate, false)
+                      var newValue = field.isDateOrTime ? newDate : Qt.formatDateTime(newDate, config['field_format'])
+                      valueChanged(newValue, false)
                     }
                 }
             }
@@ -197,7 +198,10 @@ Item {
 
                         Controls1.Calendar {
                           id: calendar
-                          selectedDate: main.currentValue || new Date()
+                          selectedDate: {
+                            var date = field.isDateOrTime ? main.currentValue : Date.fromLocaleString(Qt.locale(), value, config['field_format'])
+                            date || new Date()
+                          }
                           weekNumbersVisible: true
                           focus: false
                           implicitWidth: calendarOverlay.width
@@ -302,8 +306,8 @@ Item {
                             newDate.setSeconds(secondsSpinBox.value);
                           }
 
-                          label.text = timeToString(newDate)
-                          valueChanged(newDate, newDate === undefined)
+                          var newValue = field.isDateOrTime ? newDate : Qt.formatDateTime(newDate, config['field_format'])
+                          valueChanged(newValue, newValue === undefined)
                           popup.close()
                       }
                   }
@@ -313,7 +317,7 @@ Item {
         }
 
         onCurrentValueChanged: {
-            label.text = timeToString(main.currentValue)
+            label.text = field.isDateOrTime ? timeToString(main.currentValue) : main.currentValue
         }
     }
 
diff --git a/src/quickgui/qgsquickutils.cpp b/src/quickgui/qgsquickutils.cpp
@@ -405,7 +405,7 @@ QString QgsQuickUtils::dateTimeFieldFormat( const QString &fieldFormat )
   }
   else
   {
-    return QString();
+    return QString( "Date Time" );
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ Item {`
`116`	`116`	`onClicked: {`
`117`	`117`	`var usedDate = new Date();`
`118`	`118`	`if (value !== undefined && value !== '') {`
`119`		`- usedDate = value;`
	`119`	`+ usedDate = main.isDateOrTime ? value : Date.fromLocaleString(Qt.locale(), value, config['field_format'])`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`calendar.selectedDate = usedDate`
`@@ -147,7 +147,8 @@ Item {`
`147`	`147`	`anchors.fill: parent`
`148`	`148`	`onClicked: {`
`149`	`149`	`var newDate = new Date()`
`150`		`- valueChanged(newDate, false)`
	`150`	`+ var newValue = field.isDateOrTime ? newDate : Qt.formatDateTime(newDate, config['field_format'])`
	`151`	`+ valueChanged(newValue, false)`
`151`	`152`	`}`
`152`	`153`	`}`
`153`	`154`	`}`
`@@ -197,7 +198,10 @@ Item {`
`197`	`198`
`198`	`199`	`Controls1.Calendar {`
`199`	`200`	`id: calendar`
`200`		`- selectedDate: main.currentValue \|\| new Date()`
	`201`	`+ selectedDate: {`
	`202`	`+ var date = field.isDateOrTime ? main.currentValue : Date.fromLocaleString(Qt.locale(), value, config['field_format'])`
	`203`	`+ date \|\| new Date()`
	`204`	`+ }`
`201`	`205`	`weekNumbersVisible: true`
`202`	`206`	`focus: false`
`203`	`207`	`implicitWidth: calendarOverlay.width`
`@@ -302,8 +306,8 @@ Item {`
`302`	`306`	`newDate.setSeconds(secondsSpinBox.value);`
`303`	`307`	`}`
`304`	`308`
`305`		`- label.text = timeToString(newDate)`
`306`		`- valueChanged(newDate, newDate === undefined)`
	`309`	`+ var newValue = field.isDateOrTime ? newDate : Qt.formatDateTime(newDate, config['field_format'])`
	`310`	`+ valueChanged(newValue, newValue === undefined)`
`307`	`311`	`popup.close()`
`308`	`312`	`}`
`309`	`313`	`}`
`@@ -313,7 +317,7 @@ Item {`
`313`	`317`	`}`
`314`	`318`
`315`	`319`	`onCurrentValueChanged: {`
`316`		`- label.text = timeToString(main.currentValue)`
	`320`	`+ label.text = field.isDateOrTime ? timeToString(main.currentValue) : main.currentValue`
`317`	`321`	`}`
`318`	`322`	`}`
`319`	`323`
Original file line number	Diff line number	Diff line change
`@@ -405,7 +405,7 @@ QString QgsQuickUtils::dateTimeFieldFormat( const QString &fieldFormat )`
`405`	`405`	`}`
`406`	`406`	`else`
`407`	`407`	`{`
`408`		`- return QString();`
	`408`	`+ return QString( "Date Time" );`
`409`	`409`	`}`
`410`	`410`	`}`
`411`	`411`