/[projects]/dao/DelphiScanner/Main.pas
ViewVC logotype

Diff of /dao/DelphiScanner/Main.pas

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2995 by torben, Tue Mar 15 13:44:38 2016 UTC revision 2996 by torben, Fri Apr 8 14:01:34 2016 UTC
# Line 260  type Line 260  type
260      procedure SkrivScanningLogFil(var tekst : string);      procedure SkrivScanningLogFil(var tekst : string);
261      function TjekKoreliste(var RuteNummer, Koreliste : string) : string;      function TjekKoreliste(var RuteNummer, Koreliste : string) : string;
262      procedure VisAlarmSkaerm(strMessage: string);      procedure VisAlarmSkaerm(strMessage: string);
263        function InjectURL(Url : String) : String;
264    
265    public    public
266      { Public declarations }      { Public declarations }
# Line 503  begin Line 504  begin
504       PanelValgA.Font.Color := clWhite;       PanelValgA.Font.Color := clWhite;
505  end;  end;
506    
507    function TMainForm.InjectURL(Url : String) : String;
508    begin
509    
510      Url := Url + '&ver=' + TUtils.URLEncode( TUtils.Sto_GetFmtFileVersion(''));
511      Url := Url + '&host=' + TUtils.URLEncode( TUtils.GetComputerNameHelper());
512      Url := Url + '&user=' + TUtils.URLEncode( TUtils.GetCurrentUserName());
513    
514      Result := Url;
515    end;
516    
517  //InitForm kaldes før FormCreate  //InitForm kaldes før FormCreate
518  procedure TMainForm.FormCreate(Sender: TObject);  procedure TMainForm.FormCreate(Sender: TObject);
# Line 553  begin Line 563  begin
563      SkrivLog := ReadString('Settings','SkrivLog','0');      SkrivLog := ReadString('Settings','SkrivLog','0');
564      Sted := ReadString('Settings','Sted','');      Sted := ReadString('Settings','Sted','');
565      StedNavn := ReadString('Settings','Stednavn','');      StedNavn := ReadString('Settings','Stednavn','');
566    
567      UrlFindPakketype := ReadString('Settings','UrlFindPakketype','http://omdeling.info/webservices/bogpakkekontrol/FindPakketype.php?stregkode=%s');      UrlFindPakketype := ReadString('Settings','UrlFindPakketype','http://omdeling.info/webservices/bogpakkekontrol/FindPakketype.php?stregkode=%s');
568        UrlFindPakketype := InjectURL(UrlFindPakketype);
569    
570      UrlSendPrograminfo := ReadString('Settings','UrlSendPrograminfo','http://omdeling.info/webservices/bogpakkekontrol/SendPrograminfo.php?programnavn=%s&sted=%s&scanningtype=%s&infotype=%s&info=%s');      UrlSendPrograminfo := ReadString('Settings','UrlSendPrograminfo','http://omdeling.info/webservices/bogpakkekontrol/SendPrograminfo.php?programnavn=%s&sted=%s&scanningtype=%s&infotype=%s&info=%s');
571        UrlSendPrograminfo := InjectURL(UrlSendPrograminfo);
572    
573      UrlNormal := ReadString('Settings','UrlNormal','http://omdeling.info/webservices/bogpakkekontrol/bogpakkekontrol.php?sted=%s&pakkenummer=%s&boghandlernummer=%s&tjekkode=%s');      UrlNormal := ReadString('Settings','UrlNormal','http://omdeling.info/webservices/bogpakkekontrol/bogpakkekontrol.php?sted=%s&pakkenummer=%s&boghandlernummer=%s&tjekkode=%s');
574        UrlNormal := InjectURL(UrlNormal);
575    
576      UrlReturDAO := ReadString('Settings','UrlReturDAO','http://omdeling.info/webservices/bogpakkekontrol/bogpakkekontrol.php?sted=%s&pakkenummer=%s&boghandlernummer=%s&returpakketype=%s&pakkestorrelse=%s');      UrlReturDAO := ReadString('Settings','UrlReturDAO','http://omdeling.info/webservices/bogpakkekontrol/bogpakkekontrol.php?sted=%s&pakkenummer=%s&boghandlernummer=%s&returpakketype=%s&pakkestorrelse=%s');
577        UrlReturDAO := InjectURL(UrlReturDAO);
578    
579      UrlReturBoghandler := ReadString('Settings','UrlReturBoghandler','http://omdeling.info/webservices/bogpakkekontrol/bogpakkekontrol.php?sted=%s&pakkenummer=%s&boghandlernummer=%s&returpakketype=%s&pakkestorrelse=%s');      UrlReturBoghandler := ReadString('Settings','UrlReturBoghandler','http://omdeling.info/webservices/bogpakkekontrol/bogpakkekontrol.php?sted=%s&pakkenummer=%s&boghandlernummer=%s&returpakketype=%s&pakkestorrelse=%s');
580        UrlReturBoghandler := InjectURL(UrlReturBoghandler);
581    
582      UrlBudlevering := ReadString('Settings','UrlBudlevering','http://omdeling.info/webservices/bogpakkekontrol/bogpakkekontrol.php?sted=%s&pakkenummer=%s&leveringstype=%s&pakkestorrelse=%s');      UrlBudlevering := ReadString('Settings','UrlBudlevering','http://omdeling.info/webservices/bogpakkekontrol/bogpakkekontrol.php?sted=%s&pakkenummer=%s&leveringstype=%s&pakkestorrelse=%s');
583        UrlBudlevering := InjectURL(UrlBudlevering);
584    
585      UrlManglendeScanninger := ReadString('Settings','UrlManglendeScanninger','http://omdeling.info/webservices/bogpakkekontrol/bogpakkemanglendescanninger.php?sted=%s&type=%s');      UrlManglendeScanninger := ReadString('Settings','UrlManglendeScanninger','http://omdeling.info/webservices/bogpakkekontrol/bogpakkemanglendescanninger.php?sted=%s&type=%s');
586        UrlManglendeScanninger := InjectURL(UrlManglendeScanninger);
587    
588      UrlEKLoverforsel := ReadString('Settings','UrlEKLoverforsel','http://omdeling.info/webservices/bogpakkekontrol/bogpakkertilekl.php?sted=%s');      UrlEKLoverforsel := ReadString('Settings','UrlEKLoverforsel','http://omdeling.info/webservices/bogpakkekontrol/bogpakkertilekl.php?sted=%s');
589        UrlEKLoverforsel := InjectURL(UrlEKLoverforsel);
590    
591      UrlEKLoverforselPakkeshop := ReadString('Settings','UrlEKLoverforselPakkeshop','http://omdeling.info/webservices/pakkeshop/pakkertilekl.php?sted=%s');      UrlEKLoverforselPakkeshop := ReadString('Settings','UrlEKLoverforselPakkeshop','http://omdeling.info/webservices/pakkeshop/pakkertilekl.php?sted=%s');
592        UrlEKLoverforselPakkeshop := InjectURL(UrlEKLoverforselPakkeshop);
593    
594      UrlPakkeshoplevering := ReadString('Settings','UrlPakkeshoplevering','http://omdeling.info/webservices/pakkeshop/pakkekontrol.php?sted=%s&stregkode=%s&tjekkode=%s');      UrlPakkeshoplevering := ReadString('Settings','UrlPakkeshoplevering','http://omdeling.info/webservices/pakkeshop/pakkekontrol.php?sted=%s&stregkode=%s&tjekkode=%s');
595        UrlPakkeshoplevering := InjectURL(UrlPakkeshoplevering);
596    
597      UrlReturPakkeshop := ReadString('Settings','UrlReturPakkeshop','http://omdeling.info/webservices/pakkeshop/returpakkekontrol.php?sted=%s&stregkode=%s');      UrlReturPakkeshop := ReadString('Settings','UrlReturPakkeshop','http://omdeling.info/webservices/pakkeshop/returpakkekontrol.php?sted=%s&stregkode=%s');
598        UrlReturPakkeshop := InjectURL(UrlReturPakkeshop);
599    
600      UrlPakkeshopManglendeScanninger := ReadString('Settings','UrlPakkeshopManglendeScanninger','http://omdeling.info/webservices/pakkeshop/pakkemanglendescanninger.php?sted=%s');      UrlPakkeshopManglendeScanninger := ReadString('Settings','UrlPakkeshopManglendeScanninger','http://omdeling.info/webservices/pakkeshop/pakkemanglendescanninger.php?sted=%s');
601      UrlPakkeshopManglendeReturScanninger := ReadString('Settings','UrlPakkeshopManglendeReturScanninger','http://omdeling.info/webservices/pakkeshop/pakkemanglendereturscanninger.php?sted=%s');      UrlPakkeshopManglendeScanninger := InjectURL(UrlPakkeshopManglendeScanninger);
602    
603        UrlPakkeshopManglendeReturScanninger := ReadString('Settings','UrlPakkeshopManglendeReturScanninger','http://omdeling.info/webservices/pakkeshop/pakkemanglendereturscanninger.php?sted=%s');
604        UrlPakkeshopManglendeReturScanninger := InjectURL(UrlPakkeshopManglendeReturScanninger);
605    
606      UrlIndleveringsPakke := ReadString('Settings','UrlIndleveringsPakke','http://omdeling.info/webservices/pakkeshop/PakkekontrolIndleveringskode.php?sted=%s&pakkekode=%s');      UrlIndleveringsPakke := ReadString('Settings','UrlIndleveringsPakke','http://omdeling.info/webservices/pakkeshop/PakkekontrolIndleveringskode.php?sted=%s&pakkekode=%s');
607        UrlIndleveringsPakke := InjectURL(UrlIndleveringsPakke);
608    
609      UrlIndleveringsPakkeManglendeScanninger := ReadString('Settings', 'UrlIndleveringsPakkeManglendeScanninger','http://omdeling.info/webservices/pakkeshop/IndleveringsPakkeManglendeScanninger.php?sted=%s');      UrlIndleveringsPakkeManglendeScanninger := ReadString('Settings', 'UrlIndleveringsPakkeManglendeScanninger','http://omdeling.info/webservices/pakkeshop/IndleveringsPakkeManglendeScanninger.php?sted=%s');
610      URLOmdirigerTilPakkeshop := ReadString('Settings', 'URLOmdirigerTilPakkeshop','http://omdeling.info/webservices/pakkeshop/PakkeKontrolOmdirigerTilPakkeshop.php?sted=%s&stregkode=%s');      UrlIndleveringsPakkeManglendeScanninger := InjectURL(UrlIndleveringsPakkeManglendeScanninger);
611    
612        URLOmdirigerTilPakkeshop := ReadString('Settings', 'URLOmdirigerTilPakkeshop','http://omdeling.info/webservices/pakkeshop/PakkeKontrolOmdirigerTilPakkeshop.php?sted=%s&stregkode=%s');
613        URLOmdirigerTilPakkeshop := InjectURL(URLOmdirigerTilPakkeshop);
614    
615    
616    
# Line 725  begin Line 762  begin
762         SpecialVersionSted := '01';         SpecialVersionSted := '01';
763         SpecialVersionScanningtype := '4';         SpecialVersionScanningtype := '4';
764      end;      end;
765    
766      if SpecialVersionSted = 'FD' then      if SpecialVersionSted = 'FD' then
767      begin      begin
768         SpecialVersionSted := '03';         //SpecialVersionSted := '03'; //fra før at FD overtog scanning
769         SpecialVersionScanningtype := '4';         //SpecialVersionScanningtype := '4';
770    
771    
772          //FarveNormal := 'A9F5A9';  // her kan vi evt. overrule ini fil
773          Sted := SpecialVersionSted;
774         // her skal vi også disable de knapper BK ikke kan bruge
775          PanelValg2.Enabled := false;
776          PanelValg2.Font.Color := clInactiveCaption;
777          PanelValg3.Enabled := false;
778          PanelValg3.Font.Color := clInactiveCaption;
779          //PanelValg6.Enabled := false;
780          //PanelValg6.Font.Color := clInactiveCaption;
781    
782         // her skal vi også disable de menupunkter FD ikke kan bruge
783          ReturpakkerfraDAO1.Enabled := false;
784          Returpakkerfraboghandler1.Enabled := false;
785    
786          //Returpakkerfrapakkeshop1.Enabled := false;
787    
788      end;      end;
789    
790      if (SpecialVersionSted = 'BK') OR (SpecialVersionSted = 'TK') then      if (SpecialVersionSted = 'BK') OR (SpecialVersionSted = 'TK') then
Legend:
Removed from v.2995  
changed lines
  Added in v.2996
  ViewVC Help
Powered by ViewVC 1.1.20