Changeset 4 for trunk/UFormCalls.pas

Timestamp:

Aug 24, 2019, 12:56:52 PM (5 years ago)

Author:

chronos

Message:

• Modified: Moved call history loading to API class.

Location:

trunk

Files:

• . (modified) (1 prop)
• UFormCalls.pas (modified) (3 diffs)

trunk

@@ -3 +3 @@
 __recovery
 __history
+OdorikApi.dproj.local

@@ -3 +3 @@
 __recovery
 __history
+OdorikApi.dproj.local

trunk/UFormCalls.pas

@@ -8 +8 @@
   FMX.ListView.Types, FMX.ListView.Appearances, FMX.ListView.Adapters.Base,
   FMX.ListView, FMX.TabControl, FMX.StdCtrls, FMX.Controls.Presentation,
-  System.DateUtils, System.TimeSpan, System.JSON;
+  System.DateUtils, System.TimeSpan, System.JSON, Generics.Collections,
+  UOdorikApi, FMX.Layouts, FMX.ListBox;
 
 type
@@ -19 +20 @@
     TabItemActive: TTabItem;
     TabItemStatistics: TTabItem;
-    ListView1: TListView;
+    ListBox1: TListBox;
     procedure SpeedButtonBackClick(Sender: TObject);
     procedure TabControl1Change(Sender: TObject);
@@ -50 +51 @@
 end;
 
-function DateTimeToXMLTime(Value: TDateTime; ApplyLocalBias: Boolean = True): string;
-const
-  Neg: array[Boolean] of string = ('+', '-');
-var
-  Bias: Integer;
-begin
-  Result := FormatDateTime('yyyy''-''mm''-''dd''T''hh'':''nn'':''ss''.''zzz', Value); { Do not localize }
-  Bias := Trunc(TTimeZone.Local.GetUtcOffset(Value).TotalMinutes);
-  if (Bias <> 0) and ApplyLocalBias then
-  begin
-    Result := Format('%s%s%.2d:%.2d', [Result, Neg[Bias > 0],                         { Do not localize }
-                                       Abs(Bias) div MinsPerHour,
-                                       Abs(Bias) mod MinsPerHour]);
-  end else
-    Result := Result + 'Z'; { Do not localize }
-end;
-
 procedure TFormCalls.TabControl1Change(Sender: TObject);
 var
-  Response: string;
   IntervalFrom: TDateTime;
   IntervalTo: TDateTime;
   ListViewItem: TListViewItem;
-  Lines: TArray<string>;
-  I: Integer;
-  LJsonResponse: TJSONValue;
-  jv: TJSONValue;
-  joName: TJSONObject;
+  Call: TCall;
+  CallHistory: TList<TCall>;
 begin
   ListView1.Items.Clear;
   IntervalTo := Now;
   IntervalFrom := IntervalTo - OneHour * 24;
-  Response := FormMain.OdorikApi.SendGet('/calls.json', 'from=' + DateTimeToXMLTime(IntervalFrom) +
-    '&to=' + DateTimeToXMLTime(IntervalTo));
-  LJsonResponse := TJSONObject.ParseJSONValue(Response);
-  for jv in LJsonResponse as TJSONArray do begin
-    joName := jv as TJSONObject;
+  CallHistory := FormMain.OdorikApi.GetCallHistory(IntervalFrom, IntervalTo);
+  for Call in CallHistory do begin
     ListViewItem := ListView1.Items.Add;
-    ListViewItem.Text := joName.Get('source_number').JSONValue.Value;
+    ListViewItem.Text := Call.SourceNumber;
   end;
 end;

@@ -3 +3 @@
 __recovery
 __history
+OdorikApi.dproj.local