Foi adicionado verificação para o tipo ftDateTime em Bind4D.Component…

….DateTimePicker.pas Foi corrigido a rotina que atribui o valor ao Edit em Bind4D.Component.Edit.pas
academiadocodigo · Jan 20, 2022 · cc2db24 · cc2db24
1 parent 613f66b
commit cc2db24
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/Bind4D.Component.DateTimePicker.pas b/src/Bind4D.Component.DateTimePicker.pas
@@ -80,14 +80,17 @@ function TBind4DComponentDateTimePicker.ApplyValue: iBind4DComponent;
 begin
   Result := Self;
   case FAttributes.FieldType of
-    ftDate,
     ftDateTime :
+    begin
+      FComponent.DateTime := TBind4DUtils.FormatStrJsonToDateTime(FAttributes.ValueVariant);
+    end;
+    ftDate :
     begin
       FComponent.Date := TBind4DUtils.FormatStrJsonToDateTime(FAttributes.ValueVariant);
     end;
     ftTime :
     begin
-      FComponent.Date := TBind4DUtils.FormatStrJsonToTime(FAttributes.ValueVariant);
+      FComponent.Time := TBind4DUtils.FormatStrJsonToTime(FAttributes.ValueVariant);
     end;
   end;
 end;

diff --git a/src/Bind4D.Component.Edit.pas b/src/Bind4D.Component.Edit.pas
@@ -104,6 +104,8 @@ function TBind4DComponentEdit.ApplyText: iBind4DComponent;
   FComponent.Text := FAttributes.ValueVariant;
 end;
 function TBind4DComponentEdit.ApplyValue: iBind4DComponent;
+var
+  VariantD : Double;
 begin
   Result := Self;
   if VarIsNull(FAttributes.ValueVariant) then exit;
@@ -133,7 +135,8 @@ function TBind4DComponentEdit.ApplyValue: iBind4DComponent;
       ftFloat,
       ftCurrency:
       begin
-        FComponent.Text := FloatToStr(FAttributes.ValueVariant);
+        VariantD := FAttributes.ValueVariant;
+        FComponent.Text := format('%n', [VariantD]);
       end;
     end;
 end;