--- dao/DelphiScanner/Configuration.pas	2015/09/04 12:39:33	2705
+++ dao/DelphiScanner/Configuration.pas	2016/08/21 22:34:01	3097
@@ -6,6 +6,9 @@
 
 type
   TConfiguration = class
+  private
+     BaseURL : string;
+
   public
 
     Sted : String;
@@ -36,19 +39,106 @@
     YPosSmskode : integer;
     FontSizeSmskode : integer;
 
+     FarveNormal, FarveReturDAO, FarveReturBoghandler, FarveBudlevering, FarvePakkeshoplevering, FarveReturPakkeshop,
+          FarveIndlevering : String;
+
+     TitelNormal, TitelReturDAO, TitelReturBoghandler, TitelBudlevering, TitelPakkeshoplevering, TitelReturPakkeshop,
+          TitelIndlevering : String;
+
+
+
+   UrlNormal, UrlReturDAO, UrlReturBoghandler, UrlBudlevering, UrlManglendeScanninger, UrlPakkeshoplevering,
+            UrlReturPakkeshop, UrlPakkeshopManglendeScanninger, UrlPakkeshopManglendeReturScanninger,UrlIndleveringsPakke,
+            UrlIndleveringsPakkeManglendeScanninger,UrlEKLoverforsel, URLOmdirigerTilPakkeshop : String;
+
+    URLPrintLabel : String;
+    UrlEKLoverforselPakkeshop : String;
+
+    URLUdenforSpecifikation : String;
+    UrlEmballageRepareret : String;
+
+    UrlFindPakketype, UrlSendPrograminfo: String;
+
+    AlarmLyd : String;
+    ScannetOkLyd : String;
+    ScannetOkStorLyd : String;
+
+    ScannetOkTilTjekkodeLyd : String;
+
+    PrinterNavn : String;
+    TjekPrinter : String;
+
+    SporgEfterBoghandler : String;
+
+    ScanTjekkode : String;
+    ScanTjekkodeAutomatik : string;
+
+    TjekUrls : String;
+    TestFunktionen : String;
+
+    LabelStor : integer;
+
+
+
     procedure ReadFromInifile( iniFile: TIniFile);
+    function InjectURL(Url : String) : String;
 
   end;
 
 implementation
 
+uses Utils, SysUtils;
+
 
 procedure TConfiguration.ReadFromInifile( iniFile: TIniFile);
 begin
+
+
+  BaseURL := 'http://omdeling.info/';
+
   with iniFile do
   begin
+    FarveNormal := ReadString('Settings','FarveNormal','D8D8D8');
+    TitelNormal := ReadString('Settings','TitelNormal','Modtagelse af DAO NAT X-PRESS pakker');
+    FarveReturDAO := ReadString('Settings','FarveReturDAO','A9F5A9');
+    TitelReturDAO := ReadString('Settings','TitelReturDAO','Returforsendelse fra DAO');
+    FarveReturBoghandler := ReadString('Settings','FarveReturBoghandler','F2F5A9');
+    TitelReturBoghandler := ReadString('Settings','TitelReturBoghandler','Returforsendelse fra boghandler');
+    FarveBudlevering := ReadString('Settings','FarveBudlevering','2E9AFE');
+    TitelBudlevering := ReadString('Settings','TitelBudlevering','Modtagelse af DAO DIREKTE pakker');
+    FarvePakkeshoplevering := ReadString('Settings','FarvePakkeshoplevering','99FFFF');
+    TitelPakkeshoplevering := ReadString('Settings','TitelPakkeshoplevering','Modtagelse af DAO PAKKESHOP pakker');
+
+    FarveReturPakkeshop := ReadString('Settings','FarveReturPakkeshop','99FFCC');
+    TitelReturPakkeshop := ReadString('Settings','TitelReturPakkeshop','Returforsendelse fra pakkeshop');
+
+    FarveIndlevering := ReadString('Settings', 'FarveIndlevering', 'E5B2CB');
+    TitelIndlevering := ReadString('Settings', 'TitelIndlevering', 'Indleveringskode');
+
+
+    SporgEfterBoghandler := ReadString('Settings','SporgEfterBoghandler','0');
+    ScanTjekkode := ReadString('Settings','ScanTjekkode','0');
+    ScanTjekkodeAutomatik := ReadString('Settings','ScanTjekkodeAutomatik','1');
+
+    //Scanningtype := ReadString('Settings','Scanningtype','A');  //Scanningstype skal ikke lęses fra config
+    //Pakketype := ReadString('Settings','Pakketype','0');        //Pakketype Skal ikke lęses fra config
+
+    TestFunktionen := ReadString('Settings','TestFunktion','0');
+
+    AlarmLyd := ReadString('Settings','AlarmLyd','Sounds\Alarm.wav');
+    ScannetOkLyd := ReadString('Settings','ScannetOkLyd','Sounds\Ok.wav');
+    ScannetOkStorLyd := ReadString('Settings','ScannetOkStorLyd','Sounds\Ok_stor.wav');
 
-    LabelType := ReadInteger('Settings','LabelType',1);
+    ScannetOkTilTjekkodeLyd := ReadString('Settings','ScannetOkTilTjekkodeLyd','Sounds\Ok_til_tjekkode.wav');
+
+    PrinterNavn := ReadString('Settings','PrinterNavn','');
+    TjekPrinter := ReadString('Settings','TjekPrinter','1');
+    TjekUrls := ReadString('Settings','TjekUrls','2');
+
+
+    LabelType := ReadInteger('Settings','LabelType', 1);
+
+    LabelStor := ReadInteger('Settings','LabelStor', 0);
 
     if LabelType = 0 then
     begin
@@ -121,6 +211,101 @@
     end;
   end;  //With ... do
 
+    UrlFindPakketype := BaseURL + '/webservices/bogpakkekontrol/FindPakketype.php?stregkode=%s';
+    UrlFindPakketype := InjectURL(UrlFindPakketype);
+
+    UrlSendPrograminfo := BaseURL + '/webservices/bogpakkekontrol/SendPrograminfo.php?programnavn=%s&sted=%s&scanningtype=%s&infotype=%s&info=%s';
+    UrlSendPrograminfo := InjectURL(UrlSendPrograminfo);
+
+    UrlNormal := BaseURL + '/webservices/bogpakkekontrol/bogpakkekontrol.php?sted=%s&pakkenummer=%s&boghandlernummer=%s&tjekkode=%s';
+    UrlNormal := InjectURL(UrlNormal);
+
+    UrlReturDAO := BaseURL + '/webservices/bogpakkekontrol/bogpakkekontrol.php?sted=%s&pakkenummer=%s&boghandlernummer=%s&returpakketype=%s&pakkestorrelse=%s';
+    UrlReturDAO := InjectURL(UrlReturDAO);
+
+    UrlReturBoghandler := BaseURL + '/webservices/bogpakkekontrol/bogpakkekontrol.php?sted=%s&pakkenummer=%s&boghandlernummer=%s&returpakketype=%s&pakkestorrelse=%s';
+    UrlReturBoghandler := InjectURL(UrlReturBoghandler);
+
+    UrlBudlevering := BaseURL + '/webservices/bogpakkekontrol/bogpakkekontrol.php?sted=%s&pakkenummer=%s&leveringstype=%s&pakkestorrelse=%s';
+    UrlBudlevering := InjectURL(UrlBudlevering);
+
+    UrlManglendeScanninger := BaseURL + '/webservices/bogpakkekontrol/bogpakkemanglendescanninger.php?sted=%s&type=%s';
+    UrlManglendeScanninger := InjectURL(UrlManglendeScanninger);
+
+    UrlEKLoverforsel := BaseURL + '/webservices/bogpakkekontrol/bogpakkertilekl.php?sted=%s';
+    UrlEKLoverforsel := InjectURL(UrlEKLoverforsel);
+
+    UrlEKLoverforselPakkeshop := BaseURL + '/webservices/pakkeshop/pakkertilekl.php?sted=%s';
+    UrlEKLoverforselPakkeshop := InjectURL(UrlEKLoverforselPakkeshop);
+
+    UrlPakkeshoplevering := BaseURL + '/webservices/pakkeshop/pakkekontrol.php?sted=%s&stregkode=%s&tjekkode=%s';
+    UrlPakkeshoplevering := InjectURL(UrlPakkeshoplevering);
+
+    UrlReturPakkeshop := BaseURL + '/webservices/pakkeshop/returpakkekontrol.php?sted=%s&stregkode=%s';
+    UrlReturPakkeshop := InjectURL(UrlReturPakkeshop);
+
+    UrlPakkeshopManglendeScanninger := BaseURL + '/webservices/pakkeshop/pakkemanglendescanninger.php?sted=%s';
+    UrlPakkeshopManglendeScanninger := InjectURL(UrlPakkeshopManglendeScanninger);
+
+    UrlPakkeshopManglendeReturScanninger := BaseURL + '/webservices/pakkeshop/pakkemanglendereturscanninger.php?sted=%s';
+    UrlPakkeshopManglendeReturScanninger := InjectURL(UrlPakkeshopManglendeReturScanninger);
+
+    UrlIndleveringsPakke := BaseURL + '/webservices/pakkeshop/PakkekontrolIndleveringskode.php?sted=%s&pakkekode=%s';
+    UrlIndleveringsPakke := InjectURL(UrlIndleveringsPakke);
+
+    UrlIndleveringsPakkeManglendeScanninger := BaseURL + '/webservices/pakkeshop/IndleveringsPakkeManglendeScanninger.php?sted=%s';
+    UrlIndleveringsPakkeManglendeScanninger := InjectURL(UrlIndleveringsPakkeManglendeScanninger);
+
+    URLOmdirigerTilPakkeshop := BaseURL + '/webservices/pakkeshop/PakkeKontrolOmdirigerTilPakkeshop.php?sted=%s&stregkode=%s';
+    URLOmdirigerTilPakkeshop := InjectURL(URLOmdirigerTilPakkeshop);
+
+    UrlEmballageRepareret := BaseURL + '/webservices/pakkeshop/EmballageRepareret.php?sted=%s&stregkode=%s';
+    UrlEmballageRepareret := InjectURL(UrlEmballageRepareret);
+
+    URLUdenforSpecifikation := BaseURL + '/webservices/pakkeshop/UdenforSpecifikation.php?sted=%s&stregkode=%s';
+    URLUdenforSpecifikation := InjectURL(URLUdenforSpecifikation);
+
+
+    URLPrintLabel := BaseURL + '/WebServices/BogpakkeKontrol/PrintLabel.php?stregkode=%s';
+    URLPrintLabel := InjectURL(URLPrintLabel);
+
+
+
+    //Finally check for files:
+    if not FileExists(AlarmLyd) then
+    begin
+      AlarmLyd := '';
+    end;
+
+    if not FileExists(ScannetOkLyd) then
+    begin
+      ScannetOkLyd := '';
+    end;
+
+    if not FileExists(ScannetOkStorLyd) then
+    begin
+      ScannetOkStorLyd := '';
+    end;
+
+
+    if not FileExists(ScannetOkTilTjekkodeLyd) then
+    begin
+      ScannetOkTilTjekkodeLyd := '';
+    end;
+
+
+
+end;
+
+
+function TConfiguration.InjectURL(Url : String) : String;
+begin
+
+  Url := Url + '&ver=' + TUtils.URLEncode( TUtils.Sto_GetFmtFileVersion(''));
+  Url := Url + '&host=' + TUtils.URLEncode( TUtils.GetComputerNameHelper());
+  Url := Url + '&user=' + TUtils.URLEncode( TUtils.GetCurrentUserName());
+
+  Result := Url;
 end;
 
 end.