Index: AAPClient/UI/DnaCodeReedsGescandScherm.dfm =================================================================== diff -u --- AAPClient/UI/DnaCodeReedsGescandScherm.dfm (revision 0) +++ AAPClient/UI/DnaCodeReedsGescandScherm.dfm (revision 159) @@ -0,0 +1,121 @@ +inherited fmDrieKnoppenScherm1: TfmDrieKnoppenScherm1 + Caption = 'fmDrieKnoppenScherm1' + ExplicitWidth = 480 + ExplicitHeight = 640 + PixelsPerInch = 96 + TextHeight = 19 + inherited pnlDrieKnoppen: TPanel + Visible = False + end + object pnlWegnemen: TPanel [2] + Left = 60 + Top = 96 + Width = 157 + Height = 183 + BevelOuter = bvNone + Color = 1513421 + ParentBackground = False + TabOrder = 2 + object imgWegnemen: TImage + Left = 14 + Top = 16 + Width = 128 + Height = 128 + Transparent = True + end + object lblWegnemen: TLabel + Left = 0 + Top = 150 + Width = 157 + Height = 33 + Align = alBottom + Alignment = taCenter + AutoSize = False + Caption = 'Wegnemen' + Font.Charset = DEFAULT_CHARSET + Font.Color = clWhite + Font.Height = -27 + Font.Name = 'Tahoma' + Font.Style = [] + ParentFont = False + Layout = tlCenter + WordWrap = True + ExplicitLeft = -8 + ExplicitTop = 134 + end + end + object pnlVerplaatsen: TPanel [3] + Left = 256 + Top = 96 + Width = 157 + Height = 183 + BevelOuter = bvNone + Color = 1513421 + ParentBackground = False + TabOrder = 3 + object imgVerplaatsen: TImage + Left = 14 + Top = 16 + Width = 128 + Height = 128 + Transparent = True + end + object lblVerplaatsen: TLabel + Left = 0 + Top = 150 + Width = 157 + Height = 33 + Align = alBottom + Alignment = taCenter + AutoSize = False + Caption = 'Verplaatsen' + Font.Charset = DEFAULT_CHARSET + Font.Color = clWhite + Font.Height = -27 + Font.Name = 'Tahoma' + Font.Style = [] + ParentFont = False + Layout = tlCenter + WordWrap = True + ExplicitLeft = -8 + ExplicitTop = 134 + end + end + object pnlAnnuleren: TPanel [4] + Left = 256 + Top = 319 + Width = 157 + Height = 183 + BevelOuter = bvNone + Color = 1513421 + ParentBackground = False + TabOrder = 4 + object imgAnnuleren: TImage + Left = 14 + Top = 16 + Width = 128 + Height = 128 + Transparent = True + end + object lblAnnuleren: TLabel + Left = 0 + Top = 150 + Width = 157 + Height = 33 + Align = alBottom + Alignment = taCenter + AutoSize = False + Caption = 'Annuleren' + Font.Charset = DEFAULT_CHARSET + Font.Color = clWhite + Font.Height = -27 + Font.Name = 'Tahoma' + Font.Style = [] + ParentFont = False + Layout = tlCenter + WordWrap = True + ExplicitLeft = -8 + ExplicitTop = 134 + end + end +end Index: AAPClient/UI/DnaCodeReedsGescandScherm.pas =================================================================== diff -u --- AAPClient/UI/DnaCodeReedsGescandScherm.pas (revision 0) +++ AAPClient/UI/DnaCodeReedsGescandScherm.pas (revision 159) @@ -0,0 +1,34 @@ +unit DnaCodeReedsGescandScherm; + +interface + +uses + Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics, + Vcl.Controls, Vcl.Forms, Vcl.Dialogs, DrieKnoppenScherm, Vcl.ActnList, + Vcl.StdCtrls, Vcl.ExtCtrls; + +type + TfmDrieKnoppenScherm1 = class(TfmDrieKnoppenScherm) + pnlWegnemen: TPanel; + imgWegnemen: TImage; + lblWegnemen: TLabel; + pnlVerplaatsen: TPanel; + imgVerplaatsen: TImage; + lblVerplaatsen: TLabel; + pnlAnnuleren: TPanel; + imgAnnuleren: TImage; + lblAnnuleren: TLabel; + private + { Private declarations } + public + { Public declarations } + end; + +var + fmDrieKnoppenScherm1: TfmDrieKnoppenScherm1; + +implementation + +{$R *.dfm} + +end. Index: AAPClient/UI/DnaCodeScherm.pas =================================================================== diff -u -r150 -r159 --- AAPClient/UI/DnaCodeScherm.pas (.../DnaCodeScherm.pas) (revision 150) +++ AAPClient/UI/DnaCodeScherm.pas (.../DnaCodeScherm.pas) (revision 159) @@ -35,6 +35,7 @@ procedure MeldDnaCodeAf(); procedure ZetToeleveringStatus(Status: DnaCodeStatus); procedure ToeleveringDataOphalen(); + procedure VerwerkReedsGescandeDnaCode(); public end; @@ -132,6 +133,7 @@ Request: DnaCodeAfmeldenRequest; Response: DnaCodeAfmeldenResponse; Header: RequestHeader; + List: TStrings; begin Service := DnaCodeService.GetDnaCodeServiceSoap(); // request opbouwen @@ -148,20 +150,29 @@ Response := Service.DnaCodeAfmelden(Request); try - if Response.Header.Status <> '200' then begin - Self.ModalResult := mrDnaCode; - ToonPopupScherm(Response.Header.Omschrijving, 'Probeer opnieuw') - end else begin - UiContext.Toelevering := Response.DnaCodes[0].Toelevering; - lblToeleveringData.Caption := UiContext.Toelevering; - lblAantalGescand.Caption := IntToStr(Response.AantalReedsGescand); - lblTotaalAantal.Caption := IntToStr(Response.AantalInToelevering); - if Response.DnaCodes[0].IsGlsDirect then begin - ToonPopupScherm('GLS DIRECT', 'OK'); - imgGls.Visible := Response.DnaCodes[0].IsGlsDirect; - end; - lblLaatstGescandData.Caption := Request.DnaCode; - Self.ModalResult := mrDnaCode; + List := TStringList.Create; + ExtractStrings([':'], [], PChar(Response.Header.Status), List); + case strtoint(List[0]) of + 200: begin + UiContext.Toelevering := Response.DnaCodes[0].Toelevering; + lblToeleveringData.Caption := UiContext.Toelevering; + lblAantalGescand.Caption := IntToStr(Response.AantalReedsGescand); + lblTotaalAantal.Caption := IntToStr(Response.AantalInToelevering); + imgInfo.Visible := true; + if Response.DnaCodes[0].IsGlsDirect then begin + ToonPopupScherm('GLS DIRECT', 'OK'); + imgGls.Visible := Response.DnaCodes[0].IsGlsDirect; + end; + lblLaatstGescandData.Caption := Request.DnaCode; + Self.ModalResult := mrDnaCode; + end; + 1005: begin //reeds gescand + VerwerkReedsGescandeDnaCode(); + end; + else begin + Self.ModalResult := mrDnaCode; + ToonPopupScherm(Response.Header.Omschrijving, 'Probeer opnieuw') + end; end; finally Response.Free; @@ -171,6 +182,11 @@ end; end; +procedure TfmDnaCodeScherm.VerwerkReedsGescandeDnaCode; +begin + ToonPopupScherm(Response.Header.Omschrijving, 'Probeer opnieuw') +end; + procedure TfmDnaCodeScherm.ToeleveringDataOphalen; var Service: DnaCodeServiceSoap; FishEye: Tag 47 refers to a dead (removed) revision in file `AAPClient/WS/DnaCodeService.dfm'. FishEye: No comparison available. Pass `N' to diff?