Changeset 17

Timestamp:

Nov 15, 2012, 2:56:05 PM (12 years ago)

Author:

chronos

Message:

• Opraveno: Editace časových údajů.
• Opraveno: Generování ovládacích prvků v okně editace.

Location:

trunk

Files:

• Forms/UFormEdit.pas (modified) (3 diffs)
• Languages/Dochazka.cs.po (modified) (3 diffs)
• Modules/Attendance/UModuleAttendance.pas (modified) (1 diff)
• Packages/CoolWeb/Persistence/USqlDatabase.pas (modified) (3 diffs)

trunk/Forms/UFormEdit.pas

@@ -139 +139 @@
   W := 130;
   H := 24;
+  for I := PanelControls.ControlCount - 1 downto 0 do
+    PanelControls.Controls[I].Free;
   for I := 0 to View.Items.Count - 1 do
   with TFormItem(View.Items[I]) do begin
@@ -232 +234 @@
       NewControl := TDateEdit.Create(Self);
       NewControl.Parent := PanelControls;
-      TDateEdit(NewControl).Date := SQLToDateTime(Values.Values[Name]);
+      TDateEdit(NewControl).Date := SQLToDate(Values.Values[Name]);
       NewControl.SetBounds(Rect.Left * W, Rect.Top * H,
        (Rect.Right - Rect.Left) * W - TEditButton(NewControl).Button.Width, (Rect.Bottom - Rect.Top) * H);
@@ -269 +271 @@
   with TFormItem(View.Items[I]) do begin
     case ControlType of
-      ctSpinEdit, ctDate, ctTime, ctDateTime, ctReference: Values.Add(Name, '0');
+      ctCheckBox, ctSpinEdit, ctReference: Values.Add(Name, '0');
+      ctDateTime: Values.Add(Name, '0000-00-00 00:00:00');
+      ctDate: Values.Add(Name, '0000-00-00');
+      ctTime: Values.Add(Name, '00:00:00');
       else Values.Add(Name, '');
     end;

trunk/Languages/Dochazka.cs.po

@@ -13 +13 @@
 #: tdatamoduleattendance.areadfromterminal.caption
 msgid "Read from terminal"
-msgstr ""
+msgstr "Číst z terminálu"
 
 #: tdatamoduleattendance.areadfromterminal.hint
 msgid "Read new data from terminal"
-msgstr ""
+msgstr "Číst nová data z terminálu"
 
 #: tform1.actionexit.caption
@@ -257 +257 @@
 #: uformedit.sitemnotfound
 msgid "Item not found"
-msgstr ""
+msgstr "PoloÅŸka nenalezena"
 
 #: uformlist.sadditem
 msgid "Add item"
-msgstr ""
+msgstr "Přidat poloÅŸku"
 
 #: uformlist.sdoyouwanttodeleteitem
@@ -571 +571 @@
 msgid "Year"
 msgstr "Rok"
-

trunk/Modules/Attendance/UModuleAttendance.pas

@@ -183 +183 @@
   with ViewFormPassage do begin
     with Items do begin
-      AddItem(STime, 'Time', ctDate, True, Bounds(1, 0, 1, 1));
+      AddItem(STime, 'Time', ctDateTime, True, Bounds(1, 0, 1, 1));
       with AddItem(SUser, 'User', ctReference, True, Bounds(3, 0, 1, 1)) do
         ReferencedTable := 'User';

trunk/Packages/CoolWeb/Persistence/USqlDatabase.pas

@@ -91 +91 @@
   function SQLToDateTime(Value: string): TDateTime;
   function SQLToTime(Value: string): TDateTime;
+  function SQLToDate(Value: string): TDateTime;
   function DateTimeToSQL(Value: TDateTime): string;
   function TimeToSQL(Value: TDateTime): string;
@@ -173 +174 @@
 end;
 
+function SQLToDate(Value: string): TDateTime;
+var
+  DateParts: TListString;
+  Date: TDateTime;
+begin
+  try
+    DateParts := TListString.Create;
+    DateParts.Explode(Value, '-', StrToStr);
+    if TryEncodeDate(StrToInt(DateParts[0]), StrToInt(DateParts[1]),
+      StrToInt(DateParts[2]), Date) then
+        Result := Date else Result := 0;
+  finally
+    DateParts.Free;
+  end;
+end;
+
 function DateTimeToSQL(Value: TDateTime): string;
 begin
-  Result := FormatDateTime('yyyy-mm-dd hh.nn.ss', Value);
+  Result := FormatDateTime('yyyy-mm-dd hh:nn:ss', Value);
 end;
 
 function TimeToSQL(Value: TDateTime): string;
 begin
-  Result := FormatDateTime('hh.nn.ss', Value);
+  Result := FormatDateTime('hh:nn:ss', Value);
 end;
 
@@ -191 +208 @@
 var
   TimeParts: TListString;
+  Time: TDateTime;
 begin
   try
     TimeParts := TListString.Create;
     TimeParts.Explode(Value, ':', StrToStr);
-    Result := Result + EncodeTime(StrToInt(TimeParts[0]), StrToInt(TimeParts[1]),
-      StrToInt(TimeParts[2]), 0);
+    if TryEncodeTime(StrToInt(TimeParts[0]), StrToInt(TimeParts[1]),
+      StrToInt(TimeParts[2]), 0, time) then
+        Result := Time else Result := 0;
   finally
     TimeParts.Free;