Index: AAPClient/UI/InfoLogScherm.pas
===================================================================
diff -u -r176 -r195
--- AAPClient/UI/InfoLogScherm.pas	(.../InfoLogScherm.pas)	(revision 176)
+++ AAPClient/UI/InfoLogScherm.pas	(.../InfoLogScherm.pas)	(revision 195)
@@ -46,6 +46,9 @@
 
 implementation
 
+uses
+  Agent;
+
 {$R *.dfm}
 
 procedure TfmInfoLogScherm.actSchermLinksExecute(Sender: TObject);
@@ -66,41 +69,22 @@
 
 procedure TfmInfoLogScherm.actOngedaanMakenExecute(Sender: TObject);
 var
-  Service: DnaCodeServiceSoap;
-  Request: DnaCodeAfmeldenRequest;
   Response: DnaCodeAfmeldenResponse;
-  Header: RequestHeader;
   fWaarschuwingModalResult: TModalResult;
 begin
   Self.ModalResult := mrInfoLog;
   fWaarschuwingModalResult := ToonPopupScherm('Scan ongedaan maken?'+#13#10+sgToeleveringData.Rows[sgToeleveringData.Row][0],'Ja','Nee',14,6,7);
 
   if fWaarschuwingModalResult = mrYes then begin
-    Service := DnaCodeService.GetDnaCodeServiceSoap();
-    // request opbouwen
-    Request := DnaCodeAfmeldenRequest.Create;
-    Header := RequestHeader.Create;
+    Response := TAgent.Create(UiContext).DnaCodeAfmelden(sgToeleveringData.Rows[sgToeleveringData.Row][0], UiContext.Toelevering, sgToeleveringData.Rows[sgToeleveringData.Row][1], -1);
     try
-      Header.Initialen := lblGebruiker.Caption;
-      Header.ComputerNaam := FullName();
-      Request.Header := Header;
-      Request.DnaCode := sgToeleveringData.Rows[sgToeleveringData.Row][0];
-      Request.Aantal := -1;
-      Request.Toelevering := UiContext.Toelevering;
-      Request.PalletCode := sgToeleveringData.Rows[sgToeleveringData.Row][1];
-
-      Response := Service.DnaCodeAfmelden(Request);
-      try
-        if Response.Header.Status <> '200' then begin
-          ToonPopupScherm(Response.Header.Omschrijving, 'Probeer opnieuw','')
-        end else begin
-          VulGridMetToeleveringData(Response.DnaCodes);
-        end;
-      finally
-        Response.Free;
+      if Response.Header.Status <> '200' then begin
+        ToonPopupScherm(Response.Header.Omschrijving, 'Probeer opnieuw','')
+      end else begin
+        VulGridMetToeleveringData(Response.DnaCodes);
       end;
     finally
-      Request.Free;
+      Response.Free;
     end;
   end;
 end;
@@ -158,41 +142,24 @@
 
 function TfmInfoLogScherm.ToeleveringDataOphalen: ZoekViaToeleveringResponse;
 var
-  Service: DnaCodeServiceSoap;
-  Request: ZoekViaToeleveringRequest;
   Response: ZoekViaToeleveringResponse;
-  Header: RequestHeader;
 begin
-  Service := DnaCodeService.GetDnaCodeServiceSoap();
-  // request opbouwen
-  Request := ZoekViaToeleveringRequest.Create;
-  Header := RequestHeader.Create;
+  Response := TAgent.Create(UiContext).ZoekViaToelevering(UiContext.Toelevering);
   try
-    Header.Initialen := UiContext.Initialen;
-    Header.ComputerNaam := FullName();
-    Request.Header := Header;
-    Request.Toelevering := UiContext.Toelevering;
-
-    Response := Service.ZoekViaToelevering(Request);
-    try
-      if Response.Header.Status <> '200' then begin
-        ToonPopupScherm(Response.Header.Omschrijving, 'Probeer opnieuw','')
+    if Response.Header.Status <> '200' then begin
+      ToonPopupScherm(Response.Header.Omschrijving, 'Probeer opnieuw','')
+    end else begin
+      if ToonGescand then begin
+        lblAantallen.Caption := 'Afgescand';
+        lblAantalGescand.Caption := IntToStr(Response.AantalReedsGescand);
       end else begin
-        if ToonGescand then begin
-          lblAantallen.Caption := 'Afgescand';
-          lblAantalGescand.Caption := IntToStr(Response.AantalReedsGescand);
-        end else begin
-          lblAantallen.Caption := 'Te scannen';
-          lblAantalGescand.Caption := IntToStr(Response.AantalInToelevering - Response.AantalReedsGescand);
-        end;
-        lblTotaalAantal.Caption := IntToStr(Response.AantalInToelevering);
+        lblAantallen.Caption := 'Te scannen';
+        lblAantalGescand.Caption := IntToStr(Response.AantalInToelevering - Response.AantalReedsGescand);
       end;
-    finally
-      result := Response;
-      //Response.Free;
+      lblTotaalAantal.Caption := IntToStr(Response.AantalInToelevering);
     end;
   finally
-    Request.Free;
+    result := Response;
   end;
 end;