--- dao/DelphiScanner/Main.pas 2015/08/26 13:20:47 2678 +++ dao/DelphiScanner/Main.pas 2015/09/03 14:53:37 2700 @@ -8,17 +8,16 @@ IdTCPClient, IdHTTP, xmldom, XMLIntf, msxmldom, XMLDoc, IniFiles, AppEvnts, Menus, ExtCtrls, ComCtrls, StrUtils, MMSystem, DateUtils, IdExplicitTLSClientServerBase, IdFTP, pngimage, GIFImg, IdException, - Winspool, Registry, ShellApi, ClipBrd, Buttons, wininet, + Winspool, ShellApi, ClipBrd, Buttons, wininet, UITypes, PakkeshopLabels, StBarC, - Math // DegToRad() bruges i PrintPakkeshopLabel - + Math, // DegToRad() bruges i PrintPakkeshopLabel + Utils ; type - TStrArray = array of string; TMainForm = class(TForm) StregkodeST: TStaticText; RuteNummerST: TStaticText; @@ -53,20 +52,20 @@ Testlyd1: TMenuItem; ListBox1: TListBox; Budlevering1: TMenuItem; - DownloadButton01: TButton; + BtnDownloadKontrolfil: TButton; IdFTP1: TIdFTP; Image1: TImage; ListBox2: TListBox; - OpdaterListenButton01: TButton; - UploadButton01: TButton; - DownloadButton03: TButton; + BtnOpdaterListen: TButton; + BtnUploadLogfil: TButton; + BtnDownloadRuteskiftFil: TButton; Pakkeshoplevering1: TMenuItem; PakkeshopText1: TStaticText; btnNulstil: TButton; Returpakkerfrapakkeshop1: TMenuItem; Altidprintepakkelabel1: TMenuItem; chkAltidPrintLabel: TCheckBox; - EKLoverforsel: TButton; + BtnEKLoverforsel: TButton; N5: TMenuItem; Uploadlogfil1: TMenuItem; Manual1: TMenuItem; @@ -94,21 +93,11 @@ PanelManglendePakker6: TPanel; menuIndlevering: TMenuItem; - - function Explode(var a: TStrArray; Border, S: string): Integer; - function BarCodeValid (ACode: string): boolean; - function Sto_GetFmtFileVersion(const FileName: String = ''): String; - function TColorToHex(Color : TColor) : string; - function HexToTColor(sColor : string) : TColor; function getProddato() : TDate; function getProddag() : String; function retRutenummer(rutenummer : String) : String; function GetCurrentPrinterHandle() : THandle; function SavePChar(p: PChar): PChar; - function AdobeReaderExists(): Boolean; - function FileTime2DateTime(FileTime: TFileTime): TDateTime; - function split(input: string; schar: Char; s: Integer): string; - function CheckUrl(url:string):boolean; procedure PlaySound(filename : PWideChar); procedure StartScreen(); @@ -139,8 +128,8 @@ procedure Button1Click(Sender: TObject); procedure ListBox1DrawItem(Control: TWinControl; Index: Integer; Rect: TRect; State: TOwnerDrawState); procedure Budlevering1Click(Sender: TObject); - procedure DownloadButton01Click(Sender: TObject); - procedure OpdaterListenButton01Click(Sender: TObject); + procedure BtnDownloadKontrolfilClick(Sender: TObject); + procedure BtnOpdaterListenClick(Sender: TObject); procedure DownloadBladhusRuteskiftfil(); procedure DownloadBladhusKontrolfil(); procedure SendFilTilDAO(fil_type, filnavn_input, filnavn_output: String); @@ -148,8 +137,8 @@ procedure UploadInifilTilDAO(); procedure SletStregkodelinieFraListboks2(StregKode : String); procedure FormDestroy(Sender: TObject); - procedure UploadButton01Click(Sender: TObject); - procedure DownloadButton03Click(Sender: TObject); + procedure BtnUploadLogfilClick(Sender: TObject); + procedure BtnDownloadRuteskiftFilClick(Sender: TObject); procedure Pakkeshoplevering1Click(Sender: TObject); procedure btnNulstilClick(Sender: TObject); procedure Returpakkerfrapakkeshop1Click(Sender: TObject); @@ -163,7 +152,7 @@ procedure Altidprintepakkelabel1Click(Sender: TObject); procedure chkAltidPrintLabelClick(Sender: TObject); - procedure EKLoverforselClick(Sender: TObject); + procedure BtnEKLoverforselClick(Sender: TObject); procedure Uploadlogfil1Click(Sender: TObject); procedure Manual1Click(Sender: TObject); procedure Timer1Timer(Sender: TObject); @@ -186,7 +175,6 @@ procedure Manualgenerel1Click(Sender: TObject); procedure TjekkerUrls(); - procedure RoundCornerOf(Control: TWinControl); procedure menuIndleveringClick(Sender: TObject); procedure PrintPakkeshopLabel( PakkeshopLabel : TPakkeshopLabel); @@ -199,7 +187,7 @@ SkrivLog : String; Sted : String; StedNavn : String; - Url, UrlNormal, UrlReturDAO, UrlReturBoghandler, UrlBudlevering, UrlManglendeScanninger, UrlPakkeshoplevering, UrlReturPakkeshop, UrlPakkeshopManglendeScanninger, UrlPakkeshopManglendeReturScanninger,UrlIndleveringsPakke,UrlEKLoverforsel : String; + Url, UrlNormal, UrlReturDAO, UrlReturBoghandler, UrlBudlevering, UrlManglendeScanninger, UrlPakkeshoplevering, UrlReturPakkeshop, UrlPakkeshopManglendeScanninger, UrlPakkeshopManglendeReturScanninger,UrlIndleveringsPakke,UrlIndleveringsPakkeManglendeScanninger,UrlEKLoverforsel : String; // 29150330: start UrlEKLoverforselPakkeshop : String; // 20150330: slut @@ -213,9 +201,9 @@ AlarmLyd : String; ScannetOkLyd : String; ScannetOkStorLyd : String; -// 20150317: start + ScannetOkTilTjekkodeLyd : String; -// 20150317: slut + PrinterNavn : String; TjekPrinter : String; XPosRute : integer; @@ -256,7 +244,6 @@ Barcode : TStBarcode; - function CheckSumModulo10(const data:string):string; { used for EAN 8/13 } procedure PrintLabel(RuteNummer, Kommentar, BoghandlerNavn, Koreliste, SmsKode, DBKbane, Leveringssted : String; var PrintNyLabel : Boolean; BoghandlerNummer : String = ''); procedure SendTilPrinter(kontrolKoreliste, RuteNummer, Kommentar, BoghandlerNavn, Koreliste, SmsKode, DBKbane, Leveringssted : String; var PrintNyLabel : Boolean; BoghandlerNummer : string = ''); @@ -290,23 +277,6 @@ implementation {$R *.dfm} -function TMainForm.TColorToHex(Color : TColor) : string; -begin - Result := - IntToHex(GetRValue(Color), 2) + - IntToHex(GetGValue(Color), 2) + - IntToHex(GetBValue(Color), 2) ; -end; - -function TMainForm.HexToTColor(sColor : string) : TColor; -begin - Result := - RGB( - StrToInt('$'+Copy(sColor, 1, 2)), - StrToInt('$'+Copy(sColor, 3, 2)), - StrToInt('$'+Copy(sColor, 5, 2)) - ) ; -end; procedure TMainForm.InitForm(Farve,Titel,Url : String); begin @@ -359,7 +329,7 @@ PanelValg7.Font.Color := clWindowText; end; - OpdaterListenButton01.Enabled := false; + BtnOpdaterListen.Enabled := false; if (BladhusSted > 00) and (BladhusSted < Length(BladhusStedNavn)) then begin @@ -413,7 +383,7 @@ StartScreen(); MainForm.Caption := Titel; - MainForm.Color := HexToTColor(Farve); + MainForm.Color := TUtils.HexToTColor(Farve); MainForm.Farve := Farve; MainForm.Titel := Titel; MainForm.Url := Url; @@ -473,13 +443,13 @@ end else begin - logTekst := 'Speciel version til: '+split(Titel, ':', 2)+' ('+Sted+')'; + logTekst := 'Speciel version til: ' + TUtils.split(Titel, ':', 2) + ' ('+Sted+')'; end; SkrivScanningLogFil(logTekst); end else begin - logTekst := 'Speciel version til: '+split(Titel, ':', 2)+' ('+SpecialVersionSted+')'; + logTekst := 'Speciel version til: ' + TUtils.split(Titel, ':', 2) + ' ('+SpecialVersionSted+')'; SkrivScanningLogFil(logTekst); end; end; @@ -522,27 +492,11 @@ procedure TMainForm.Automatiskvalg1Click(Sender: TObject); begin -// 20150317: start -(* - if Automatiskvalg1.Checked then - begin - AutomatiskValg1.Checked := true; - PanelValgA.Color := clGreen; - PanelValgA.Font.Color := clWhite; - end - else - begin - AutomatiskValg1.Checked := false; - PanelValgA.Color := clBtnFace; - PanelValgA.Font.Color := clWindowText; - end; -*) // Skal ikke toggle men bare sætte funktionen on // Fravælges ved at vælge en scanningstype AutomatiskValg1.Checked := true; PanelValgA.Color := clGreen; PanelValgA.Font.Color := clWhite; -// 20150317: slut end; procedure TMainForm.FormCreate(Sender: TObject); @@ -561,12 +515,12 @@ btnNulstil.BringToFront; - RoundCornerOf(PanelManglendePakker1); - RoundCornerOf(PanelManglendePakker2); - RoundCornerOf(PanelManglendePakker3); - RoundCornerOf(PanelManglendePakker4); - RoundCornerOf(PanelManglendePakker5); - RoundCornerOf(PanelManglendePakker6); + TUtils.RoundCornerOf(PanelManglendePakker1); + TUtils.RoundCornerOf(PanelManglendePakker2); + TUtils.RoundCornerOf(PanelManglendePakker3); + TUtils.RoundCornerOf(PanelManglendePakker4); + TUtils.RoundCornerOf(PanelManglendePakker5); + TUtils.RoundCornerOf(PanelManglendePakker6); // Hvis mappen Docs eksisterer kan vi vælge Manual i menuen Hjælp @@ -602,7 +556,10 @@ UrlPakkeshopManglendeScanninger := ReadString('Settings','UrlPakkeshopManglendeScanninger','http://omdeling.info/webservices/pakkeshop/pakkemanglendescanninger.php?sted=%s'); UrlPakkeshopManglendeReturScanninger := ReadString('Settings','UrlPakkeshopManglendeReturScanninger','http://omdeling.info/webservices/pakkeshop/pakkemanglendereturscanninger.php?sted=%s'); + UrlIndleveringsPakke := ReadString('Settings','UrlIndleveringsPakke','http://omdeling.info/webservices/pakkeshop/PakkekontrolIndleveringskode.php?sted=%s&pakkekode=%s'); + UrlIndleveringsPakkeManglendeScanninger := ReadString('Settings', 'UrlIndleveringsPakkeManglendeScanninger','http://omdeling.info/webservices/pakkeshop/IndleveringsPakkeManglendeScanninger.php?sted=%s'); + LabelType := ReadInteger('Settings','LabelType',1); @@ -642,11 +599,11 @@ if (SkrivLog = '1') then begin - logTekst := 'Program start (Version: ' + Sto_GetFmtFileVersion('') + ') Dato: ' + FormatDateTime('yyyy-mm-dd hh:nn:ss',now); + logTekst := 'Program start (Version: ' + TUtils.Sto_GetFmtFileVersion('') + ') Dato: ' + FormatDateTime('yyyy-mm-dd hh:nn:ss',now); try SkrivScanningLogFil(logTekst); Uploadlogfil1.Enabled := true; - UploadButton01.Enabled := true; + BtnUploadLogfil.Enabled := true; logTekst := 'Programmet er installeret som: '+ParamStr(0); SkrivScanningLogFil(logTekst); // Oprydning i gamle logfiler @@ -785,6 +742,20 @@ //SpecialVersionSted := 'FD'; // FD - sætter automatisk nedenstående SpecialVersionScanningtype til DIREKTE) // *************************** // +{$IfDef STED_BK} + SpecialVersionSted := 'BK'; +{$EndIf} +{$IfDef STED_DBK} + SpecialVersionSted := 'DBK'; +{$EndIf} +{$IfDef STED_FD} + SpecialVersionSted := 'FD'; +{$EndIf} +{$IfDef STED_NS} + SpecialVersionSted := 'NS'; +{$EndIf} + + //SpecialVersionSted := '01'; // NS - bruges sammen med nedenstående SpecialVersionScanningtype DIREKTE) //SpecialVersionSted := '02'; // BK - BRUGES IKKE (brug i stedet ovenstående SpecialVersionSted BK) //SpecialVersionSted := '03'; // FD - (bruges sammen med nedenstående SpecialVersionScanningtype DIREKTE) @@ -800,7 +771,6 @@ // Hvis specialversion er valgt (SpecialVersionSted er sat til en værdi ovenfor) // ændrer vi Sted og Scanningtype her: -// 20150313: start if SpecialVersionSted = 'NS' then begin SpecialVersionSted := '01'; @@ -811,7 +781,6 @@ SpecialVersionSted := '03'; SpecialVersionScanningtype := '4'; end; -// 20150313: slut if SpecialVersionSted = 'BK' then begin @@ -1156,7 +1125,7 @@ Scanningtype := gemScanningtype; SendInfoTilServer(Sted, Scanningtype, 'Begin', ''); - SendInfoTilServer(Sted, Scanningtype, 'ProgramVersion', Sto_GetFmtFileVersion('')); + SendInfoTilServer(Sted, Scanningtype, 'ProgramVersion', TUtils.Sto_GetFmtFileVersion('')); end; @@ -1608,9 +1577,9 @@ BoghandlerTjekkode := Stregkode; PakkeshopText1.Caption := 'Stregkode'; if (PakkeshopLevering1.Checked) then - MainForm.Color := HexToTColor(FarvePakkeshoplevering); + MainForm.Color := TUtils.HexToTColor(FarvePakkeshoplevering); if (Pakkernormal1.Checked) then - MainForm.Color := HexToTColor(FarveNormal); + MainForm.Color := TUtils.HexToTColor(FarveNormal); btnNulstil.Visible := false; end else @@ -1670,7 +1639,7 @@ end; if ( Pakkernormal1.Checked and (pakkeErScannet = 0) and (pakkeForkertSted = 0) and (tjekkodemangler = 0) and (RuteNummerST.Caption <> 'Ukendt') ) or (Copy(Kommentar,1,2) = 'Ok') then begin - MainForm.Color := HexToTColor(Farve); + MainForm.Color := TUtils.HexToTColor(Farve); if Storepakker1.Checked then begin PlaySound(PWideChar(ScannetOkStorLyd)); @@ -1683,7 +1652,7 @@ end else if (Returpakkerfradao1.Checked or Returpakkerfraboghandler1.Checked) then begin - MainForm.Color := HexToTColor(Farve); + MainForm.Color := TUtils.HexToTColor(Farve); if Storepakker1.Checked then begin PlaySound(PWideChar(ScannetOkStorLyd)); @@ -1808,11 +1777,11 @@ if (pos('/', wrkAntal) > 0) then // både pakker idag og senere begin wrkAntal := wrkAntal + '/'; // tilføjer '/' sidst i feltet af hensyn til split funktionen - wrkAntalIdag := StrToInt(split(wrkAntal, '/', 2)); + wrkAntalIdag := StrToInt( TUtils.split(wrkAntal, '/', 2)); // ShowMessage(SPLIT('data/another/yet/again/more/','/',3)); // ShowMessage(SPLIT('data/another/','/',3)); // ShowMessage(SPLIT('data/another','/',3)); - wrkAntalSenere := StrToInt(split(wrkAntal, '/', 3)); + wrkAntalSenere := StrToInt( TUtils.split(wrkAntal, '/', 3)); end else // kun idag begin @@ -2005,8 +1974,8 @@ 01 : begin; // NS Testprinter1.Visible := true; - DownloadButton01.Enabled := true; - OpdaterListenButton01.Enabled := true; + BtnDownloadKontrolfil.Enabled := true; + BtnOpdaterListen.Enabled := true; IdFTP1.Passive := true; IdFTP1.PassiveUseControlHost := true; BladhusKontrolfil_server := 'franordjyske/RuteKontrol.txt'; @@ -2021,8 +1990,8 @@ Storepakker1.Enabled := true; radioStorPakke.Enabled := true; radioLillePakke.Enabled := true; - DownloadButton01.Enabled := false; // kontrolfil bruges ikke her - OpdaterListenButton01.Enabled := true; + BtnDownloadKontrolfil.Enabled := false; // kontrolfil bruges ikke her + BtnOpdaterListen.Enabled := true; IdFTP1.Passive := true; IdFTP1.PassiveUseControlHost := true; IndlesManglendeScanninger(); @@ -2032,14 +2001,14 @@ Testprinter1.Visible := true; if (getProddag() = 'lørdag') then begin - DownloadButton03.Visible := false; + BtnDownloadRuteskiftFil.Visible := false; end else begin - DownloadButton03.Visible := false; + BtnDownloadRuteskiftFil.Visible := false; end; - DownloadButton01.Enabled := true; - OpdaterListenButton01.Enabled := true; + BtnDownloadKontrolfil.Enabled := true; + BtnOpdaterListen.Enabled := true; IdFTP1.Passive := true; IdFTP1.PassiveUseControlHost := true; BladhusRuteskiftfil_server := 'frafd/RuteSkift.txt'; @@ -2059,8 +2028,8 @@ Storepakker1.Enabled := true; radioStorPakke.Enabled := true; radioLillePakke.Enabled := true; - DownloadButton01.Enabled := false; // kontrolfil bruges ikke her - OpdaterListenButton01.Enabled := true; + BtnDownloadKontrolfil.Enabled := false; // kontrolfil bruges ikke her + BtnOpdaterListen.Enabled := true; IdFTP1.Passive := true; IdFTP1.PassiveUseControlHost := true; end; @@ -2180,6 +2149,7 @@ begin PrintNyLabel := True; //Indleveringskode vil ALTID udskrive label PakkeshopLabel := TPakkeshopLabel.Create( XMLDocument1 ); //Opret struct og parse xml doc + RuteNummer := PakkeshopLabel.Koreliste; PrintPakkeshopLabel( PakkeshopLabel ); @@ -2318,7 +2288,7 @@ SkrivScanningLogFil(logTekst); end; -procedure TMainForm.UploadButton01Click(Sender: TObject); +procedure TMainForm.BtnUploadLogfilClick(Sender: TObject); begin UploadLogfilTilDAO(); UploadInifilTilDAO(); @@ -2335,7 +2305,7 @@ nytRuteNummer, nyFarve : String; begin if Budlevering1.Checked then - RuteNummerST.Color := HexToTColor(Farve); + RuteNummerST.Color := TUtils.HexToTColor(Farve); pakkeErScannet := pos('PAKKEN ER SCANNET', BoghandlerNavn); if pakkeErScannet = 0 then @@ -2391,7 +2361,7 @@ PrintNyLabel := true; RuteNummerST.Caption := RuteNummer+' -> ny rute: '+nytRuteNummer; nyFarve := Farve; - RuteNummerST.Color := HexToTColor(nyFarve); + RuteNummerST.Color := TUtils.HexToTColor(nyFarve); List1msg := TimeToStr(now) + '; ' + RuteNummer+' -> ny rute: '+nytRuteNummer; RuteNummer := nytRuteNummer; ListBox1.Items.Insert(0,List1Msg); @@ -2682,7 +2652,7 @@ // Tjekker UrlNormal if PanelValg1.Enabled = true then begin - if CheckUrl(UrlNormal) then + if TUtils.CheckUrl(UrlNormal) then begin logTekst := 'UrlNormal accepteret: ' + UrlNormal; SkrivScanningLogFil(logTekst); @@ -2711,7 +2681,7 @@ // Tjekker UrlReturDAO if PanelValg2.Enabled = true then begin - if CheckUrl(UrlReturDAO) then + if TUtils.CheckUrl(UrlReturDAO) then begin logTekst := 'UrlReturDAO accepteret: ' + UrlReturDAO; SkrivScanningLogFil(logTekst); @@ -2739,7 +2709,7 @@ // Tjekker UrlReturBoghandler if PanelValg3.Enabled = true then begin - if CheckUrl(UrlReturBoghandler) then + if TUtils.CheckUrl(UrlReturBoghandler) then begin logTekst := 'UrlReturBoghandler accepteret: ' + UrlReturBoghandler; SkrivScanningLogFil(logTekst); @@ -2767,7 +2737,7 @@ // Tjekker UrlBudlevering if PanelValg4.Enabled = true then begin - if CheckUrl(UrlBudlevering) then + if TUtils.CheckUrl(UrlBudlevering) then begin logTekst := 'UrlBudlevering accepteret: ' + UrlBudlevering; SkrivScanningLogFil(logTekst); @@ -2795,7 +2765,7 @@ // Tjekker UrlPakkeshoplevering if PanelValg5.Enabled = true then begin - if CheckUrl(UrlPakkeshoplevering) then + if TUtils.CheckUrl(UrlPakkeshoplevering) then begin logTekst := 'UrlPakkeshoplevering accepteret: ' + UrlPakkeshoplevering; SkrivScanningLogFil(logTekst); @@ -2823,7 +2793,7 @@ // Tjekker UrlReturPakkeshop if PanelValg6.Enabled = true then begin - if CheckUrl(UrlReturPakkeshop) then + if TUtils.CheckUrl(UrlReturPakkeshop) then begin logTekst := 'UrlReturPakkeshop accepteret: ' + UrlReturPakkeshop; SkrivScanningLogFil(logTekst); @@ -2852,7 +2822,7 @@ if (PanelValg1.Enabled = true) or (PanelValg4.Enabled = true) then begin - if CheckUrl(UrlManglendeScanninger) then + if TUtils.CheckUrl(UrlManglendeScanninger) then begin logTekst := 'UrlManglendeScanninger accepteret: ' + UrlManglendeScanninger; SkrivScanningLogFil(logTekst); @@ -2880,7 +2850,7 @@ // Tjekker UrlPakkeshopManglendeScanninger if PanelValg5.Enabled = true then begin - if CheckUrl(UrlPakkeshopManglendeScanninger) then + if TUtils.CheckUrl(UrlPakkeshopManglendeScanninger) then begin logTekst := 'UrlPakkeshopManglendeScanninger accepteret: ' + UrlPakkeshopManglendeScanninger; SkrivScanningLogFil(logTekst); @@ -2908,7 +2878,7 @@ // Tjekker UrlPakkeshopManglendeReturScanninger if PanelValg6.Enabled = true then begin - if CheckUrl(UrlPakkeshopManglendeReturScanninger) then + if TUtils.CheckUrl(UrlPakkeshopManglendeReturScanninger) then begin logTekst := 'UrlPakkeshopManglendeReturScanninger accepteret: ' + UrlPakkeshopManglendeReturScanninger; SkrivScanningLogFil(logTekst); @@ -2933,10 +2903,62 @@ end; end; + // Tjekker UrlIndleveringsPakke og UrlIndleveringsPakkeManglendeScanninger + if PanelValg7.Enabled = true then + begin + if TUtils.CheckUrl(UrlIndleveringsPakke) then + begin + logTekst := 'UrlIndleveringsPakke accepteret: ' + UrlIndleveringsPakke; + SkrivScanningLogFil(logTekst); + end + else + begin + inc(urlFejl); // Optæller antal fejl + logTekst := 'UrlIndleveringsPakke svarer ikke: ' + UrlIndleveringsPakke; + ListBox1.Items.Insert(0,TimeToStr(now) + ': ' + logTekst); + if TjekUrls = '1' then + begin + logTekst := logTekst + crlf + crlf + 'Programmet afsluttes... '; + end; + SkrivScanningLogFil(logTekst); + if TjekUrls = '1' then + begin + ShowMessage(logTekst); + UrlSendPrograminfo := ''; // Her sletter vi lige url, så der ikke forsøges at sende besked ved program slut + Application.Terminate; + exit; + end; + end; + + if TUtils.CheckUrl(UrlIndleveringsPakkeManglendeScanninger) then + begin + logTekst := 'UrlIndleveringsPakkeManglendeScanninger accepteret: ' + UrlIndleveringsPakkeManglendeScanninger; + SkrivScanningLogFil(logTekst); + end + else + begin + inc(urlFejl); // Optæller antal fejl + logTekst := 'UrlIndleveringsPakkeManglendeScanninger svarer ikke: ' + UrlIndleveringsPakkeManglendeScanninger; + ListBox1.Items.Insert(0,TimeToStr(now) + ': ' + logTekst); + if TjekUrls = '1' then + begin + logTekst := logTekst + crlf + crlf + 'Programmet afsluttes... '; + end; + SkrivScanningLogFil(logTekst); + if TjekUrls = '1' then + begin + ShowMessage(logTekst); + UrlSendPrograminfo := ''; // Her sletter vi lige url, så der ikke forsøges at sende besked ved program slut + Application.Terminate; + exit; + end; + end; + end; + // Tjekker UrlEKLoverforsel if PanelValg1.Enabled = true then begin - if CheckUrl(UrlEKLoverforsel) then + if TUtils.CheckUrl(UrlEKLoverforsel) then begin logTekst := 'UrlEKLoverforsel accepteret: ' + UrlEKLoverforsel; SkrivScanningLogFil(logTekst); @@ -2965,7 +2987,7 @@ // Tjekker UrlEKLoverforselPakkeshop if PanelValg5.Enabled = true then begin - if CheckUrl(UrlEKLoverforselPakkeshop) then + if TUtils.CheckUrl(UrlEKLoverforselPakkeshop) then begin logTekst := 'UrlEKLoverforselPakkeshop accepteret: ' + UrlEKLoverforselPakkeshop; SkrivScanningLogFil(logTekst); @@ -2992,7 +3014,7 @@ // Tjekker UrlFindPakketype - if CheckUrl(UrlFindPakketype) then + if TUtils.CheckUrl(UrlFindPakketype) then begin logTekst := 'UrlFindPakketype accepteret: ' + UrlFindPakketype; SkrivScanningLogFil(logTekst); @@ -3017,7 +3039,7 @@ end; // Tjekker UrlSendPrograminfo - if CheckUrl(UrlSendPrograminfo) then + if TUtils.CheckUrl(UrlSendPrograminfo) then begin logTekst := 'UrlSendPrograminfo accepteret: ' + UrlSendPrograminfo; SkrivScanningLogFil(logTekst); @@ -3054,16 +3076,6 @@ end; -function TMainForm.FileTime2DateTime(FileTime: TFileTime): TDateTime; -var - LocalFileTime: TFileTime; - SystemTime: TSystemTime; -begin - FileTimeToLocalFileTime(FileTime, LocalFileTime) ; - FileTimeToSystemTime(LocalFileTime, SystemTime) ; - Result := SystemTimeToDateTime(SystemTime) ; -end; - procedure TMainForm.SletLogfiler(Path: string; FileList: TStrings); var SR: TSearchRec; @@ -3083,7 +3095,7 @@ dt := fileDateToDateTime(SR.Time); // finder filens timestamp for seneste ændring CreationTime := SR.FindData.ftCreationTime; // finder filens timestamp for oprettelse - dtCreation := FileTime2DateTime(CreationTime); // finder filens timestamp for oprettelse + dtCreation := TUtils.FileTime2DateTime(CreationTime); // finder filens timestamp for oprettelse // Selvom creation date godt kan være forskellig fra modified date, // skal vi alligevel altid tjekke filens alder ud fra modified date // (ændring den kan ligge både før og efter oprettelse, hvis filerne er flyttet eller ændret manuelt) @@ -3142,7 +3154,7 @@ // MainForm.Color := HexToTColor(Farve); if Farve <> '' then begin - MainForm.Color := HexToTColor(Farve); + MainForm.Color := TUtils.HexToTColor(Farve); // 20150312: start (* end @@ -3216,27 +3228,14 @@ procedure TMainForm.PanelValgAClick(Sender: TObject); begin -// 20150311: start -(* - if PanelValgA.Color = clBtnFace then - begin - AutomatiskValg1.Checked := true; - PanelValgA.Color := clGreen; - PanelValgA.Font.Color := clWhite; - end - else - begin - AutomatiskValg1.Checked := false; - PanelValgA.Color := clBtnFace; - PanelValgA.Font.Color := clWindowText; - end; -*) // Skal ikke toggle men bare sætte funktionen on // Fravælges ved at vælge en scanningstype - AutomatiskValg1.Checked := true; - PanelValgA.Color := clGreen; - PanelValgA.Font.Color := clWhite; -// 20150311: slut + AutomatiskValg1.Checked := true; + PanelValgA.Color := clGreen; + PanelValgA.Font.Color := clWhite; + + + end; procedure TMainForm.Pakkernormal1Click(Sender: TObject); @@ -3342,36 +3341,7 @@ end; end; -{ - VERY fast split function - this function returns part of a string based on - constant defineable delimiters, such as ";". So - SPLIT('this is a test ',' ',3) = 'is' or - SPLIT('data;another;yet;again;more;',';',4) = 'yet' - - Split function shifts index integer by two to - be compatible with commonly used PD split function - gpl 2004 / Juhani Suhonen -} -function TMainForm.split(input: string; schar: Char; s: Integer): string; -var - c: array of Integer; - b, t: Integer; -begin - Dec(s, 2); // for compatibility with very old & slow split function - t := 0; // variable T needs to be initialized... - setlength(c, Length(input)); - for b := 0 to pred(High(c)) do - begin - c[b + 1] := posex(schar, input, succ(c[b])); - // BREAK LOOP if posex looped (position before previous) - // or wanted position reached.. - if (c[b + 1] < c[b]) or (s < t) then break - else - Inc(t); - end; - Result := Copy(input, succ(c[s]), pred(c[s + 1] - c[s])); -end; + procedure TMainForm.Om1Click(Sender: TObject); const @@ -3380,7 +3350,7 @@ tekst, filversion : String; begin - filversion := Sto_GetFmtFileVersion(''); + filversion := TUtils.Sto_GetFmtFileVersion(''); tekst := 'Program til indscanning af pakker'+crlf+'Version '+filversion+crlf+crlf+'Udviklet af it afdelingen, DAO'; tekst := tekst+crlf+crlf; @@ -3402,12 +3372,12 @@ end else begin - tekst := tekst+crlf+crlf+'Speciel version til: '+split(Titel, ':', 2)+' ('+Sted+')'; + tekst := tekst+crlf+crlf+'Speciel version til: ' + TUtils.split(Titel, ':', 2) + ' ('+Sted+')'; end; end else begin - tekst := tekst+crlf+crlf+'Speciel version til: '+split(Titel, ':', 2)+' ('+SpecialVersionSted+')'; + tekst := tekst+crlf+crlf+'Speciel version til: ' + TUtils.split(Titel, ':', 2) + ' ('+SpecialVersionSted+')'; end; end; @@ -3475,7 +3445,7 @@ if FileExists(fileName) then begin - if AdobeReaderExists then + if TUtils.AdobeReaderExists then begin //ShellExecute(Handle, 'open', 'c:\Windows\notepad.exe', nil, nil, SW_SHOWNORMAL); ShellExecute(Handle,'open',PChar(fileName), nil, nil, SW_SHOWNORMAL); @@ -3499,14 +3469,14 @@ if FileExists(fileName) then begin - if AdobeReaderExists then + if TUtils.AdobeReaderExists then begin //ShellExecute(Handle, 'open', 'c:\Windows\notepad.exe', nil, nil, SW_SHOWNORMAL); ShellExecute(Handle,'open',PChar(fileName), nil, nil, SW_SHOWNORMAL); end else begin - ShowMessage('Acrobat Reader er ikke installeret!'); + ShowMessage('Adobe Reader er ikke installeret!'); end; end else @@ -3572,8 +3542,8 @@ radioStorPakke.Enabled := false; radioLillePakke.Enabled := false; ListBox1.Visible := true; - OpdaterListenButton01.Enabled := true; - EKLoverforsel.Enabled := true; + BtnOpdaterListen.Enabled := true; + BtnEKLoverforsel.Enabled := true; InitLillePakke(); ListBox1.Items.Clear; if BladhusSted = 0 then @@ -3606,7 +3576,7 @@ ListBox1.Visible := true; ListBox1.Items.Clear; ListBox2.Items.Clear; - EKLoverforsel.Enabled := false; + BtnEKLoverforsel.Enabled := false; InitLillePakke(); end; @@ -3632,7 +3602,7 @@ ListBox1.Visible := true; ListBox1.Items.Clear; ListBox2.Items.Clear; - EKLoverforsel.Enabled := false; + BtnEKLoverforsel.Enabled := false; InitLillePakke(); end; @@ -3658,10 +3628,10 @@ radioLillePakke.Enabled := true; ListBox1.Visible := true; ListBox1.Items.Clear; - DownloadButton01.Enabled := false; - OpdaterListenButton01.Enabled := true; - DownloadButton03.Visible := false; - EKLoverforsel.Enabled := false; + BtnDownloadKontrolfil.Enabled := false; + BtnOpdaterListen.Enabled := true; + BtnDownloadRuteskiftFil.Visible := false; + BtnEKLoverforsel.Enabled := false; IdFTP1.Passive := true; IdFTP1.PassiveUseControlHost := true; if (BladhusSted = 0) or (BladhusSted = 2) or (BladhusSted = 3) then @@ -3694,10 +3664,10 @@ radioLillePakke.Enabled := false; ListBox1.Visible := true; ListBox1.Items.Clear; - DownloadButton01.Enabled := false; - OpdaterListenButton01.Enabled := true; + BtnDownloadKontrolfil.Enabled := false; + BtnOpdaterListen.Enabled := true; - EKLoverforsel.Enabled := true; + BtnEKLoverforsel.Enabled := true; InitLillePakke(); IndlesScanningLogFil(); @@ -3731,9 +3701,9 @@ radioLillePakke.Enabled := false; ListBox1.Visible := true; ListBox1.Items.Clear; - DownloadButton01.Enabled := false; - OpdaterListenButton01.Enabled := true; - EKLoverforsel.Enabled := false; + BtnDownloadKontrolfil.Enabled := false; + BtnOpdaterListen.Enabled := true; + BtnEKLoverforsel.Enabled := false; InitLillePakke(); IndlesScanningLogFil(); if BladhusSted = 0 then @@ -3778,9 +3748,9 @@ ListBox1.Visible := true; ListBox1.Items.Clear(); - DownloadButton01.Enabled := false; - OpdaterListenButton01.Enabled := true; - EKLoverforsel.Enabled := false; + BtnDownloadKontrolfil.Enabled := false; + BtnOpdaterListen.Enabled := true; + BtnEKLoverforsel.Enabled := false; InitLillePakke(); IndlesScanningLogFil(); if BladhusSted = 0 then @@ -3818,60 +3788,7 @@ // 20150310: slut end; -/// -/// This function reads the file resource of "FileName" and returns -/// the version number as formatted text. -/// -/// Sto_GetFmtFileVersion() = '4.13.128.0' -/// Sto_GetFmtFileVersion('', '%.2d-%.2d-%.2d') = '04-13-128' -/// -/// If "Fmt" is invalid, the function may raise an -/// EConvertError exception. -/// Full path to exe or dll. If an empty -/// string is passed, the function uses the filename of the -/// running exe or dll. -/// Format string, you can use at most four integer -/// values. -/// Formatted version number of file, '' if no version -/// resource found. -function TMainForm.Sto_GetFmtFileVersion(const FileName: String = ''): String; -var - sFileName: String; - iBufferSize: DWORD; - iDummy: DWORD; - pBuffer: Pointer; - pFileInfo: Pointer; - iVer: array[1..4] of Integer; -begin - // set default value - Result := ''; - // get filename of exe/dll if no filename is specified - sFileName := Trim(FileName); - if (sFileName = '') then - sFileName := GetModuleName(HInstance); - // get size of version info (0 if no version info exists) - iBufferSize := GetFileVersionInfoSize(PChar(sFileName), iDummy); - if (iBufferSize > 0) then - begin - GetMem(pBuffer, iBufferSize); - try - // get fixed file info (language independent) - GetFileVersionInfo(PChar(sFileName), 0, iBufferSize, pBuffer); - VerQueryValue(pBuffer, '\', pFileInfo, iDummy); - // read version blocks - iVer[1] := HiWord(PVSFixedFileInfo(pFileInfo)^.dwFileVersionMS); - iVer[2] := LoWord(PVSFixedFileInfo(pFileInfo)^.dwFileVersionMS); - iVer[3] := HiWord(PVSFixedFileInfo(pFileInfo)^.dwFileVersionLS); - iVer[4] := LoWord(PVSFixedFileInfo(pFileInfo)^.dwFileVersionLS); - finally - FreeMem(pBuffer); - end; - // format result string - Result := Format('%d.%d.%d.%d', [iVer[1], iVer[2], iVer[3], iVer[4]]); - - end; -end; procedure TMainForm.PlaySound(filename : PWideChar); begin @@ -3942,7 +3859,7 @@ CheckCode(); end; -procedure TMainForm.EKLoverforselClick(Sender: TObject); +procedure TMainForm.BtnEKLoverforselClick(Sender: TObject); var WebSvar : String; URLStr : String; @@ -3952,7 +3869,7 @@ status, kommentar : String; begin - EKLoverforsel.Enabled := false; + BtnEKLoverforsel.Enabled := false; ListBox1.Items.Insert(0,TimeToStr(now) + ': ' + 'Overfører de scannede pakker til EKL'); logTekst := 'Overfører de scannede pakker til EKL'; @@ -4015,7 +3932,7 @@ end; end; - EKLoverforsel.Enabled := true; + BtnEKLoverforsel.Enabled := true; ListBox1.SetFocus; // for at flytte fokus væk fra knappen så denne ikke aktiveres ved scanning / indtastning af stregkode @@ -4056,7 +3973,7 @@ else MessageBox(Handle, 'fejl', 'Stregkode', MB_OK); } - Svar := 'Beregnet: '+CheckSumModulo10(LeftStr(Barcode,Length(Barcode)-1))+', Indtastet: '+Barcode; + Svar := 'Beregnet: ' + TUtils.CheckSumModulo10(LeftStr(Barcode,Length(Barcode)-1))+', Indtastet: '+Barcode; MessageBox(Handle, PWideChar(Svar), 'Stregkode', MB_OK); CheckCode(); @@ -4064,45 +3981,6 @@ end; -function TMainForm.BarCodeValid (ACode: string): boolean; -var - I: integer; - SumOdd, SumEven: integer; - ADigit, AChecksumDigit: integer; -begin - SumOdd := 0; - SumEven := 0; - for I := 1 to (Length (ACode) - 1) do begin - ADigit := StrToIntDef (ACode [I], 0); - if (I MOD 2 = 0) then begin - SumEven := SumEven + ADigit; - end else begin - SumOdd := SumOdd + ADigit; - end; {if} - end; {for} - AChecksumDigit := StrToIntDef (ACode [Length (ACode)], 0); - Result := ((SumOdd*3 + SumEven + AChecksumDigit) MOD 10 = 0); -end; {--BarCodeValid--} - -{ used for EAN 8/13 } -function TMainForm.CheckSumModulo10(const data:string):string; - var i,fak,sum : Integer; -begin - sum := 0; - fak := Length(data); - for i:=1 to Length(data) do - begin - if (fak mod 2) = 0 then - sum := sum + (StrToInt(data[i])*1) - else - sum := sum + (StrToInt(data[i])*3); - dec(fak); - end; - if (sum mod 10) = 0 then - result := data+'0' - else - result := data+IntToStr(10-(sum mod 10)); -end; // // Bladhus *** @@ -4580,13 +4458,13 @@ ListBox1.SetFocus; // for at flytte fokus væk fra upload knappen så denne ikke aktiveres ved scanning / indtastning af stregkode end; -procedure TMainForm.DownloadButton01Click(Sender: TObject); +procedure TMainForm.BtnDownloadKontrolfilClick(Sender: TObject); begin DownloadBladhusKontrolfil(); ListBox1.SetFocus; // for at flytte fokus væk fra download knappen så denne ikke aktiveres ved scanning / indtastning af stregkode end; -procedure TMainForm.OpdaterListenButton01Click(Sender: TObject); +procedure TMainForm.BtnOpdaterListenClick(Sender: TObject); const crlf = Chr(13) + Chr(10) ; // Carriage return & Linefeed @@ -4595,7 +4473,7 @@ ListBox1.SetFocus; // for at flytte fokus væk fra download knappen så denne ikke aktiveres ved scanning / indtastning af stregkode end; -procedure TMainForm.DownloadButton03Click(Sender: TObject); +procedure TMainForm.BtnDownloadRuteskiftFilClick(Sender: TObject); begin if (getProddag() = 'lørdag') then begin @@ -4604,19 +4482,6 @@ ListBox1.SetFocus; // for at flytte fokus væk fra download knappen så denne ikke aktiveres ved scanning / indtastning af stregkode end; -function TMainForm.Explode(var a: TStrArray; Border, S: string): Integer; -var - S2: string; -begin - Result := 0; - S2 := S + Border; - repeat - SetLength(A, Length(A) + 1); - a[Result] := Copy(S2, 0,Pos(Border, S2) - 1); - Delete(S2, 1,Length(a[Result] + Border)); - Inc(Result); - until S2 = ''; -end; // ToDo: PrintPakkeshopLabel() procedure TMainForm.PrintPakkeshopLabel( PakkeshopLabel : TPakkeshopLabel); @@ -4624,7 +4489,6 @@ XForm, XFormOld: TXForm; //Bruges til rotate X-formation Angle: integer; gMode: integer; - BarcodeArea: TRect; Dirigering: string; begin @@ -4777,13 +4641,18 @@ end; - if (Scanningtype = '6') then + + if (Scanningtype = '7') then + begin + URLStr := Format(UrlIndleveringsPakkeManglendeScanninger, [StedKode]); + end + else if (Scanningtype = '6') then begin - URLStr := Format(UrlPakkeshopManglendeReturScanninger,[StedKode]); + URLStr := Format(UrlPakkeshopManglendeReturScanninger, [StedKode]); end else if (Scanningtype = '5') then begin - URLStr := Format(UrlPakkeshopManglendeScanninger,[StedKode]); + URLStr := Format(UrlPakkeshopManglendeScanninger, [StedKode]); end else if (Scanningtype = '1') then begin @@ -4907,7 +4776,7 @@ // stregkoderMedTjekkodeArray[linienr] := stregkode; if (pos(' ', stregkode) > 0) then begin - stregkoderMedTjekkodeArray[linienr] := split(stregkode, ' ', 2); // Fjerner lige en evt. fremtidig dato fra feltet + stregkoderMedTjekkodeArray[linienr] := TUtils.split(stregkode, ' ', 2); // Fjerner lige en evt. fremtidig dato fra feltet end else begin @@ -5189,10 +5058,10 @@ ReadLn(SomeTxtFile, buffer) ; S := buffer; SetLength(A,0); - Explode(A, ';', S); + TUtils.Explode(A, ';', S); if (length(A) < 2) then begin - Explode(A, ',', S); + TUtils.Explode(A, ',', S); end; if (length(A) > 1) then begin @@ -5266,10 +5135,10 @@ ReadLn(SomeTxtFile, buffer) ; S := buffer; SetLength(A,0); - Explode(A, ';', S); + TUtils.Explode(A, ';', S); if (length(A) < 3) then begin - Explode(A, ',', S); + TUtils.Explode(A, ',', S); end; if (A[0]=imorgenYmd) then begin @@ -5470,77 +5339,11 @@ end; end; -function TMainForm.AdobeReaderExists: Boolean; -var - AReg: TRegistry; -begin - result:= false; - AReg := TRegistry.Create; - AReg.RootKey := HKEY_LOCAL_MACHINE; - if AReg.KeyExists('\SOFTWARE\Adobe\Acrobat Reader') then - result:= True; - AReg.Free; -end; -function TMainForm.CheckUrl(url:string):boolean; -var - hSession, hfile: hInternet; - dwindex,dwcodelen :dword; - dwcode:array[1..20] of char; - res : pchar; -begin - if pos('http://',lowercase(url))=0 then - url := 'http://'+url; - Result := false; - hSession := InternetOpen('InetURL:/1.0', - INTERNET_OPEN_TYPE_PRECONFIG, - nil, - nil, - 0); - if assigned(hsession) then - begin - hfile := InternetOpenUrl(hsession, - pchar(url), - nil, - 0, - INTERNET_FLAG_RELOAD, - 0); - dwIndex := 0; - dwCodeLen := 10; - HttpQueryInfo(hfile, - HTTP_QUERY_STATUS_CODE, - @dwcode, - dwcodeLen, - dwIndex); - res := pchar(@dwcode); - result:= (res ='200') or (res ='302'); - if assigned(hfile) then - InternetCloseHandle(hfile); - InternetCloseHandle(hsession); - end; -end; -procedure TMainForm.RoundCornerOf(Control: TWinControl); -var - R: TRect; - Rgn: HRGN; -begin - with Control do - begin - R := ClientRect; -// rgn := CreateRoundRectRgn(R.Left, R.Top, R.Right, R.Bottom, 20, 20) ; - rgn := CreateRoundRectRgn(R.Left, R.Top, R.Right, R.Bottom, 25, 25) ; -// rgn := CreateRoundRectRgn(R.Left, R.Top, R.Right, R.Bottom, 30, 30) ; - Perform(EM_GETRECT, 0, lParam(@r)) ; - InflateRect(r, - 4, - 4) ; - Perform(EM_SETRECTNP, 0, lParam(@r)) ; - SetWindowRgn(Handle, rgn, True) ; - Invalidate; - end; -end; procedure TMainForm.CheckPrintQue(tjektype : string); type