Index: VerpakkingsDefinitie/WS/Agent.pas
===================================================================
diff -u -r546 -r548
--- VerpakkingsDefinitie/WS/Agent.pas (.../Agent.pas) (revision 546)
+++ VerpakkingsDefinitie/WS/Agent.pas (.../Agent.pas) (revision 548)
@@ -1,42 +1,45 @@
unit Agent;
interface
+
uses UserServerService;
+
type
-TAgent = class
+ TAgent = class
private
fServer: String;
fUserServerSoap: UserServerSoap;
public
Constructor Create(); overload;
- function GebruikerAanmelden(Gebruikersnaam: string; Wachtwoord: string): PxStatus;
-end;
+ function GebruikerAanmelden(Gebruikersnaam: string; Wachtwoord: string) : PxStatus;
+ end;
+
implementation
constructor TAgent.Create();
var
fNamespace: string;
+ fUserServer: string;
begin
fServer := 'cachedevut2010';
- fNameSpace := 'dev1';
+ fNamespace := 'dev1';
if fServer = 'cache01' then
- fNameSpace := 'admin1';
- fUserServerSoap := UserServerService.GetUserServerSoap(false,'http://'+fServer+':57772/csp/'+fNameSpace+'/WS.Halux.AAP.GebruikerService.cls',nil);
- end;
+ fNamespace := 'admin1';
+ //fUserServer := 'http://' + fServer + ':57772/csp/' + fNamespace + '/WS.Halux.AAP.GebruikerService.cls';
+ fUserServer := 'http://cacheaccept2010:57772/csp/dev1/WS.Sys.Toegang.UserServer.cls';
+ fUserServerSoap := UserServerService.GetUserServerSoap(false, fUserServer, nil);
+end;
-function TAgent.GebruikerAanmelden(Gebruikersnaam: string; Wachtwoord: string): PxStatus;
+function TAgent.GebruikerAanmelden(Gebruikersnaam: string; Wachtwoord: string) : PxStatus;
var
- Request : PxStatus;
- LogInObject : PxLogin;
- fTest : string;
+ fLogInObject: PxLogin;
+ fResponse: PxStatus;
begin
- Request := PxStatus.Create;
- LogInObject := PxLogin.Create;
- try
- Result := fUserServerSoap.LogIn('vhintra', Gebruikersnaam, Wachtwoord, '1', LogInObject );
- fTest := 'hoi'
- finally
-
- end;
+ fLogInObject := PxLogin.Create;
+ // By REF ingevuld wanneer pxStatus geen fout bevat
+ // LogIn(Application, GebruikersNaam, WachtWoord, Domein, pxLogIn) -> pxStatus
+ fResponse := fUserServerSoap.LogIn('vhintra', Gebruikersnaam, Wachtwoord, '1', fLogInObject);
+ Result := fResponse
end;
+
end.
Index: VerpakkingsDefinitie/WS/UserServerService.pas
===================================================================
diff -u -r546 -r548
--- VerpakkingsDefinitie/WS/UserServerService.pas (.../UserServerService.pas) (revision 546)
+++ VerpakkingsDefinitie/WS/UserServerService.pas (.../UserServerService.pas) (revision 548)
@@ -1,11 +1,12 @@
// ************************************************************************ //
// The types declared in this file were generated from data read from the
// WSDL File described below:
-// WSDL : http://cachedevut2010:57772/csp/dev1/WS.Sys.Toegang.UserServer.CLS?WSDL=1
-// >Import : http://cachedevut2010:57772/csp/dev1/WS.Sys.Toegang.UserServer.CLS?WSDL=1>0
+// WSDL : http://cacheaccept2010:57772/csp/dev1/WS.Sys.Toegang.UserServer.CLS?WSDL=1
+// >Import : http://cacheaccept2010:57772/csp/dev1/WS.Sys.Toegang.UserServer.CLS?WSDL=1>0
// Encoding : UTF-8
+// Codegen : [wfSkipUnusedTypes-, wfAllowOutParameters+]
// Version : 1.0
-// (16/04/2021 10:15:08 - - $Rev: 45757 $)
+// (2/08/2021 14:58:05 - - $Rev: 45757 $)
// ************************************************************************ //
unit UserServerService;
@@ -25,7 +26,7 @@
// The following types, referred to in the WSDL document are not being represented
// in this file. They are either aliases[@] of other types represented or were referred
// to but never[!] declared in the document. The types from the latter category
- // typically map to predefined/known XML or Embarcadero types; however, they could also
+ // typically map to predefined/known XML or Embarcadero types; however, they could also
// indicate incorrect WSDL documents that failed to declare or import a schema type.
// ************************************************************************ //
// !:string - "http://www.w3.org/2001/XMLSchema"[Gbl]
@@ -116,7 +117,7 @@
// binding : UserServerSoap
// service : UserServer
// port : UserServerSoap
- // URL : http://cachedevut2010:57772/csp/dev1/WS.Sys.Toegang.UserServer.cls
+ // URL : http://cacheaccept2010:57772/csp/dev1/WS.Sys.Toegang.UserServer.cls
// ************************************************************************ //
UserServerSoap = interface(IInvokable)
['{161BA6C5-717D-1FD5-0A06-6B43E6A58125}']
@@ -132,8 +133,8 @@
function GetUserServerSoap(UseWSDL: Boolean; Addr: string; HTTPRIO: THTTPRIO): UserServerSoap;
const
- defWSDL = 'http://cachedevut2010:57772/csp/dev1/WS.Sys.Toegang.UserServer.CLS?WSDL=1';
- defURL = 'http://cachedevut2010:57772/csp/dev1/WS.Sys.Toegang.UserServer.cls';
+ defWSDL = 'http://cacheaccept2010:57772/csp/dev1/WS.Sys.Toegang.UserServer.CLS?WSDL=1';
+ defURL = 'http://cacheaccept2010:57772/csp/dev1/WS.Sys.Toegang.UserServer.cls';
defSvc = 'UserServer';
defPrt = 'UserServerSoap';
var
@@ -293,4 +294,4 @@
RemClassRegistry.RegisterExternalPropName(TypeInfo(pxStatus), 'Message_', '[ExtName="Message"]');
RemClassRegistry.RegisterXSClass(pxLogIn, 'http://vhintra.vanhoecke.be', 'pxLogIn');
-end.
+end.
\ No newline at end of file
Index: VerpakkingsDefinitie/UI/LogInScherm.dfm
===================================================================
diff -u -r547 -r548
--- VerpakkingsDefinitie/UI/LogInScherm.dfm (.../LogInScherm.dfm) (revision 547)
+++ VerpakkingsDefinitie/UI/LogInScherm.dfm (.../LogInScherm.dfm) (revision 548)
@@ -3,8 +3,8 @@
Top = 0
BorderStyle = bsNone
Caption = 'Log In'
- ClientHeight = 443
- ClientWidth = 972
+ ClientHeight = 240
+ ClientWidth = 192
Color = 1513421
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
@@ -13,66 +13,80 @@
Font.Style = []
OldCreateOrder = False
Position = poScreenCenter
+ DesignSize = (
+ 192
+ 240)
PixelsPerInch = 96
TextHeight = 13
object Label1: TLabel
- Left = 384
- Top = 104
- Width = 162
- Height = 52
+ Left = 19
+ Top = 28
+ Width = 160
+ Height = 55
+ Anchors = [akTop]
Caption = 'vHintra'
Font.Charset = DEFAULT_CHARSET
Font.Color = clWhite
Font.Height = -43
Font.Name = 'Tahoma'
Font.Style = [fsBold]
ParentFont = False
+ ExplicitLeft = 40
end
object Label2: TLabel
- Left = 408
- Top = 162
- Width = 116
- Height = 16
+ Left = 43
+ Top = 90
+ Width = 114
+ Height = 19
+ Anchors = [akTop]
Caption = 'GEBRUIKERSNAAM'
Font.Charset = DEFAULT_CHARSET
Font.Color = clWhite
Font.Height = -13
Font.Name = 'Tahoma'
Font.Style = [fsBold]
ParentFont = False
+ ExplicitLeft = 64
end
object Label3: TLabel
- Left = 416
- Top = 211
- Width = 96
- Height = 16
+ Left = 51
+ Top = 143
+ Width = 94
+ Height = 19
+ Anchors = [akTop]
Caption = 'WACHTWOORD'
Font.Charset = DEFAULT_CHARSET
Font.Color = clWhite
Font.Height = -13
Font.Name = 'Tahoma'
Font.Style = [fsBold]
ParentFont = False
+ ExplicitLeft = 72
end
- object edtGebruikersnaam: TEdit
- Left = 384
- Top = 184
- Width = 161
- Height = 21
+ object EditGebruikersnaam: TEdit
+ Left = 19
+ Top = 114
+ Width = 159
+ Height = 24
+ Anchors = [akTop]
TabOrder = 0
+ ExplicitLeft = 40
end
- object edtWachtwoord: TEdit
- Left = 384
- Top = 233
- Width = 161
- Height = 21
+ object EditWachtwoord: TEdit
+ Left = 19
+ Top = 167
+ Width = 159
+ Height = 24
+ Anchors = [akTop]
TabOrder = 1
+ ExplicitLeft = 40
end
object Panel1: TPanel
- Left = 418
- Top = 268
- Width = 94
- Height = 25
+ Left = 53
+ Top = 205
+ Width = 92
+ Height = 28
+ Anchors = [akTop]
BevelEdges = []
BevelOuter = bvSpace
BiDiMode = bdLeftToRight
@@ -86,5 +100,6 @@
ParentFont = False
TabOrder = 2
OnClick = Panel1Click
+ ExplicitLeft = 74
end
end
FishEye: Tag 548 refers to a dead (removed) revision in file `VerpakkingsDefinitie/WS/GebruikerService.pas'.
FishEye: No comparison available. Pass `N' to diff?
Index: VerpakkingsDefinitie/VerpakkingsDefinitie.dproj
===================================================================
diff -u -r547 -r548
--- VerpakkingsDefinitie/VerpakkingsDefinitie.dproj (.../VerpakkingsDefinitie.dproj) (revision 547)
+++ VerpakkingsDefinitie/VerpakkingsDefinitie.dproj (.../VerpakkingsDefinitie.dproj) (revision 548)
@@ -88,16 +88,12 @@
-
-
-
-
+
-
Cfg_2
Index: VerpakkingsDefinitie/VerpakkingsDefinitie.dpr
===================================================================
diff -u -r547 -r548
--- VerpakkingsDefinitie/VerpakkingsDefinitie.dpr (.../VerpakkingsDefinitie.dpr) (revision 547)
+++ VerpakkingsDefinitie/VerpakkingsDefinitie.dpr (.../VerpakkingsDefinitie.dpr) (revision 548)
@@ -2,14 +2,12 @@
uses
Vcl.Forms,
- Main in 'Main.pas' {FormMain} ,
+ Main in 'Main.pas' {FormMain},
ApplicationContext in 'ApplicationContext.pas',
- Unit1 in 'UI\Unit1.pas' {Form1} ,
GebruikerService in 'WS\GebruikerService.pas',
- LoginScherm in 'UI\LoginScherm.pas' {FormLogin} ,
+ LogInScherm in 'UI\LogInScherm.pas' {FormLogin},
UserServerService in 'WS\UserServerService.pas',
Agent in 'WS\Agent.pas',
- UIContext in 'UI\UIContext.pas',
Subscherm in 'UI\Subscherm.pas';
{$R *.res}
Index: VerpakkingsDefinitie/UI/LogInScherm.pas
===================================================================
diff -u -r547 -r548
--- VerpakkingsDefinitie/UI/LogInScherm.pas (.../LogInScherm.pas) (revision 547)
+++ VerpakkingsDefinitie/UI/LogInScherm.pas (.../LogInScherm.pas) (revision 548)
@@ -13,9 +13,9 @@
TFormLogin = class(TFormSubscherm)
Label1: TLabel;
Label2: TLabel;
- edtGebruikersnaam: TEdit;
+ EditGebruikersnaam: TEdit;
Label3: TLabel;
- edtWachtwoord: TEdit;
+ EditWachtwoord: TEdit;
Panel1: TPanel;
procedure Panel1Click(Sender: TObject);
@@ -35,8 +35,8 @@
fAgent: TAgent;
begin
fAgent := TAgent.Create();
- Response := fAgent.GebruikerAanmelden(edtGebruikersnaam.Text,edtWachtwoord.Text);
- edtGebruikersnaam.Text := Response.ToString
+ Response := fAgent.GebruikerAanmelden(EditGebruikersnaam.Text,EditWachtwoord.Text);
+ ShowMessage(Response.ToString);
end;
end.