Changeset 14 for trunk/UCore.pas

Timestamp:

Mar 19, 2013, 8:38:28 PM (11 years ago)

Author:

chronos

Message:

• Přidáno: Možnost nastavit si formát jména výstupního souboru.
• Opraveno: Omezení nastavení časového intervalu na povolené hodnoty.

File:

• trunk/UCore.pas (modified) (11 diffs)

trunk/UCore.pas

@@ -57 +57 @@
     MenuItem7: TMenuItem;
     MenuItem8: TMenuItem;
+    MenuItem9: TMenuItem;
     PopupMenuTray: TPopupMenu;
     TrayIcon1: TTrayIcon;
@@ -70 +71 @@
     procedure DataModuleDestroy(Sender: TObject);
   private
-    { private declarations }
+    function GetFileName: string;
   public
     RegistryContext: TRegistryContext;
@@ -81 +82 @@
     ReportTimeFrom: TDateTime;
     ReportTimeTo: TDateTime;
+    OutputFormat: string;
+    SelectedAccountIndex: Integer;
     procedure LoadAccount(Account: TAccount);
     procedure LoadAccounts;
@@ -101 +104 @@
   SReport = 'Dump %s';
   SSavedToFile = 'Dump saved to file %s';
+  SDumpFormat = 'Dump %d %t.%f';
 
 { TAccount }
@@ -121 +125 @@
     Name := UTF8Encode(ReadStringWithDefault('Name', UTF8Decode('Učet')));
     Time := ReadDateTimeWithDefault('Time', 0);
-    Token :=UTF8Encode( ReadStringWithDefault('Token', ''));
+    Token := UTF8Encode(ReadStringWithDefault('Token', ''));
     Balance := ReadFloatWithDefault('Balance', 0);
     Number := UTF8Encode(ReadStringWithDefault('Number', ''));
@@ -227 +231 @@
   SaveToRegistry(RegistryContext);
   FreeAndNil(Accounts);
+end;
+
+function TCore.GetFileName: string;
+begin
+  Result := OutputFormat;
+  Result := StringReplace(Result, '%f', DataFormatURL[DataFormat], [rfReplaceAll]);
+  Result := StringReplace(Result, '%d', DateToStr(Now), [rfReplaceAll]);
+  Result := StringReplace(Result, '%t', TimeToStr(Now), [rfReplaceAll]);
+  Result := StringReplace(Result, '%a', CurrentAccount.Number, [rfReplaceAll]);
+  Result := StringReplace(Result, '%n', CurrentAccount.Name, [rfReplaceAll]);
+  Result := StringReplace(Result, '%%', '%', [rfReplaceAll]);
 end;
 
@@ -302 +317 @@
     WriteInteger('ReportId', ReportId);
     WriteString('Language', CoolTranslator1.Language.Code);
+    WriteString('FileNameFormat', OutputFormat);
+    WriteInteger('SelectedAccountIndex', SelectedAccountIndex);
   finally
     Free;
@@ -321 +338 @@
     ReportId := ReadIntegerWithDefault('ReportId', MonthOf(Now));
     CoolTranslator1.Language := CoolTranslator1.Languages.SearchByCode(ReadStringWithDefault('Language', 'cs'));
+    OutputFormat := UTF8Encode(ReadStringWithDefault('FileNameFormat', UTF8Decode(SDumpFormat)));
+    SelectedAccountIndex := ReadIntegerWithDefault('SelectedAccountIndex', 0);
   finally
     Free;
@@ -353 +372 @@
     FioAPI.Token := CurrentAccount.Token;
     if FioAPI.DownloadLast(List) then begin
-      FileName := TargetDirectory + DirectorySeparator + Format(SReport, [FormatDateTime('yyyy-mm-dd hh-nn-ss', Now) +
-        ExtensionSeparator + DataFormatURL[FioAPI.Format]]);
+      FileName := TargetDirectory + DirectorySeparator + GetFileName;
       List.SaveToFile(UTF8Decode(FileName));
       ShowMessage(Format(SSavedToFile, [FileName]));
@@ -376 +394 @@
     FioAPI.Token := CurrentAccount.Token;
     if FioAPI.DownloadMonthly(ReportYear, ReportId, List) then begin
-      FileName := TargetDirectory + DirectorySeparator + Format(SReport, [IntToStr(ReportYear) +
-        '-' + IntToStr(ReportId) +
-        ExtensionSeparator + DataFormatURL[FioAPI.Format]]);
+      FileName := TargetDirectory + DirectorySeparator + GetFileName;
       List.SaveToFile(UTF8Decode(FileName));
       ShowMessage(Format(SSavedToFile, [FileName]));
@@ -400 +416 @@
     FioAPI.Token := CurrentAccount.Token;
     if FioAPI.DownloadInterval(ReportTimeFrom, ReportTimeTo, List) then begin
-      FileName := TargetDirectory + DirectorySeparator + Format(SReport, [FormatDateTime('yyyy-mm-dd', ReportTimeFrom) +
-        ' ' + FormatDateTime('yyyy-mm-dd', ReportTimeTo) +
-        ExtensionSeparator + DataFormatURL[FioAPI.Format]]);
+      FileName := TargetDirectory + DirectorySeparator + GetFileName;
       List.SaveToFile(UTF8Decode(FileName));
       ShowMessage(Format(SSavedToFile, [FileName]));