Index: AAPClient/ProScanMain.pas
===================================================================
diff -u -r35 -r37
--- AAPClient/ProScanMain.pas (.../ProScanMain.pas) (revision 35)
+++ AAPClient/ProScanMain.pas (.../ProScanMain.pas) (revision 37)
@@ -18,6 +18,7 @@
fLoginScherm: TForm;
fHomeScherm: TForm;
fPalletScherm: TForm;
+ fBestaandePalletScherm: TForm;
procedure HuidigeGebruikerAfmelden;
public
end;
@@ -28,7 +29,8 @@
implementation
uses
- LoginScherm, GebruikerService, HomeScherm, DrieKnoppenScherm, PalletScherm;
+ LoginScherm, GebruikerService, HomeScherm, DrieKnoppenScherm, PalletScherm,
+ BestaandePalletscherm;
{$R *.dfm}
@@ -47,6 +49,7 @@
fLoginScherm := TfmLoginScherm.Create(Self);
fHomeScherm := TfmHomeScherm.Create(Self);
fPalletScherm := TfmPalletScherm.Create(Self);
+ fBestaandePalletScherm := TfmBestaandePalletScherm.Create(Self);
fHuidigScherm := fLoginScherm;
Self.Show;
@@ -102,16 +105,23 @@
fHuidigScherm := fPalletScherm;
end;
if fHuidigScherm.ModalResult = mrNo then begin
- ShowMessage('Bestaande pallet scherm');
+ fHuidigScherm := fBestaandePalletScherm;
end;
if fHuidigScherm.ModalResult = mrOk then begin
ShowMessage('DnaCodeLeeg scherm');
end;
if fHuidigScherm.ModalResult = mrAbort then begin
ShowMessage('DnaCodeGevuld scherm');
end;
+ continue;
+ end;
-
+ //BestaandePalletScherm tonen
+ if fHuidigScherm.ClassType = TfmBestaandePalletScherm then begin
+ fModalResult := fHuidigScherm.ShowModal;
+ if fHuidigScherm.ModalResult = mrYes then begin
+ fHuidigScherm := fHomeScherm;
+ end;
continue;
end;
Index: AAPClient/Win32/Debug/DrieKnoppenScherm.dcu
===================================================================
diff -u -r32 -r37
Binary files differ
Index: AAPClient/Win32/Debug/ProScan.exe
===================================================================
diff -u -r35 -r37
Binary files differ
Index: AAPClient/ProScan.dproj.local
===================================================================
diff -u -r35 -r37
--- AAPClient/ProScan.dproj.local (.../ProScan.dproj.local) (revision 35)
+++ AAPClient/ProScan.dproj.local (.../ProScan.dproj.local) (revision 37)
@@ -14,8 +14,8 @@
2019/03/04 07:46:54.000.107,=E:\svn\Delphi\AAPClient\Unit1.pas
2019/03/04 07:48:44.000.257,=E:\svn\Delphi\AAPClient\Unit1.pas
2019/03/04 07:48:53.000.280,E:\svn\Delphi\AAPClient\UI\LoginScherm.pas=
- 2019/03/04 07:49:00.000.838,E:\svn\Delphi\AAPClient\UI\LoginScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm
2019/03/04 07:49:00.000.838,E:\svn\Delphi\AAPClient\UI\LoginScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas
+ 2019/03/04 07:49:00.000.838,E:\svn\Delphi\AAPClient\UI\LoginScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm
2019/03/05 10:51:12.000.820,=E:\svn\Delphi\AAPClient\WS.pas
2019/03/05 10:53:16.000.806,=E:\svn\Delphi\AAPClient\WS.pas
2019/03/05 10:56:57.000.976,E:\svn\Delphi\AAPClient\WS.pas=E:\svn\Delphi\AAPClient\WS\GebruikerService.pas
@@ -26,20 +26,23 @@
2019/03/06 07:41:41.580,E:\svn\Delphi\AAPClient\UI\Images.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm
2019/03/06 07:41:41.580,E:\svn\Delphi\AAPClient\UI\Images.pas=E:\svn\Delphi\AAPClient\Unit1.pas
2019/03/07 08:39:12.150,=E:\svn\Delphi\AAPClient\Unit1.pas
- 2019/03/07 08:39:29.118,E:\svn\Delphi\AAPClient\UI\HomeScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm
2019/03/07 08:39:29.118,E:\svn\Delphi\AAPClient\UI\HomeScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas
+ 2019/03/07 08:39:29.118,E:\svn\Delphi\AAPClient\UI\HomeScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm
2019/03/07 11:22:02.536,=E:\svn\Delphi\AAPClient\Unit1.pas
2019/03/07 11:29:09.427,E:\svn\Delphi\AAPClient\UI\PalletScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm
2019/03/07 11:29:09.427,E:\svn\Delphi\AAPClient\UI\PalletScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas
2019/03/07 15:18:54.922,=E:\svn\Delphi\AAPClient\WS.pas
2019/03/07 15:19:13.507,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas
2019/03/08 10:21:18.208,=E:\svn\Delphi\AAPClient\WS.pas
2019/03/08 10:26:55.996,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=
- 2019/03/08 10:27:08.419,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\UI\PalletScherm.pas
2019/03/08 10:27:08.419,E:\svn\Delphi\AAPClient\WS\DnaCodeService.dfm=E:\svn\Delphi\AAPClient\UI\PalletScherm.dfm
+ 2019/03/08 10:27:08.419,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\UI\PalletScherm.pas
2019/03/08 10:27:45.805,E:\svn\Delphi\AAPClient\UI\PalletScherm.dfm=E:\svn\Delphi\AAPClient\WS\DnaCodeService.dfm
2019/03/08 10:27:45.805,E:\svn\Delphi\AAPClient\UI\PalletScherm.pas=E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas
2019/03/08 10:28:02.451,E:\svn\Delphi\AAPClient\WS\DnaCodeService.pas=E:\svn\Delphi\AAPClient\WS.pas
+ 2019/03/08 11:14:25.860,=E:\svn\Delphi\AAPClient\Unit1.pas
+ 2019/03/08 11:15:19.292,E:\svn\Delphi\AAPClient\UI\BestaandePalletScherm.pas=E:\svn\Delphi\AAPClient\Unit1.pas
+ 2019/03/08 11:15:19.292,E:\svn\Delphi\AAPClient\UI\BestaandePalletScherm.dfm=E:\svn\Delphi\AAPClient\Unit1.dfm
@@ -55,6 +58,8 @@
+
+
Index: AAPClient/Win32/Debug/LoginScherm.dcu
===================================================================
diff -u -r32 -r37
Binary files differ
Index: AAPClient/ProScan.dpr
===================================================================
diff -u -r30 -r37
--- AAPClient/ProScan.dpr (.../ProScan.dpr) (revision 30)
+++ AAPClient/ProScan.dpr (.../ProScan.dpr) (revision 37)
@@ -10,7 +10,8 @@
Images in 'UI\Images.pas' {ImagesScherm},
HomeScherm in 'UI\HomeScherm.pas' {fmHomeScherm},
PalletScherm in 'UI\PalletScherm.pas' {fmPalletScherm},
- DnaCodeService in 'WS\DnaCodeService.pas';
+ DnaCodeService in 'WS\DnaCodeService.pas',
+ BestaandePalletScherm in 'UI\BestaandePalletScherm.pas' {fmBestaandePalletScherm};
{$R *.res}
@@ -25,5 +26,6 @@
Application.CreateForm(TImagesScherm, ImagesScherm);
Application.CreateForm(TfmHomeScherm, fmHomeScherm);
Application.CreateForm(TfmPalletScherm, fmPalletScherm);
+ Application.CreateForm(TfmBestaandePalletScherm, fmBestaandePalletScherm);
Application.Run;
end.
Index: AAPClient/UI/DrieKnoppenScherm.pas
===================================================================
diff -u -r32 -r37
--- AAPClient/UI/DrieKnoppenScherm.pas (.../DrieKnoppenScherm.pas) (revision 32)
+++ AAPClient/UI/DrieKnoppenScherm.pas (.../DrieKnoppenScherm.pas) (revision 37)
@@ -22,6 +22,7 @@
actHome: TAction;
actAfsluiten: TAction;
actUitloggen: TAction;
+ actPallet: TAction;
procedure FormShow(Sender: TObject);
procedure FormCreate(Sender: TObject);
private
Index: AAPClient/UI/BestaandePalletScherm.pas
===================================================================
diff -u
--- AAPClient/UI/BestaandePalletScherm.pas (revision 0)
+++ AAPClient/UI/BestaandePalletScherm.pas (revision 37)
@@ -0,0 +1,50 @@
+unit BestaandePalletScherm;
+
+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;
+
+type
+ TfmBestaandePalletScherm = class(TfmDrieKnoppenScherm)
+ btnExtraToelevering: TButton;
+ btnRework: TButton;
+ procedure FormShow(Sender: TObject);
+ procedure actHomeExecute(Sender: TObject);
+ procedure actPalletExecute(Sender: TObject);
+ private
+ { Private declarations }
+ public
+ { Public declarations }
+ end;
+
+var
+ fmBestaandePalletScherm: TfmBestaandePalletScherm;
+
+implementation
+
+{$R *.dfm}
+
+procedure TfmBestaandePalletScherm.actHomeExecute(Sender: TObject);
+begin
+ inherited;
+ //
+end;
+
+procedure TfmBestaandePalletScherm.actPalletExecute(Sender: TObject);
+begin
+ inherited;
+ //
+end;
+
+procedure TfmBestaandePalletScherm.FormShow(Sender: TObject);
+begin
+ btnLinksOnder.Action := actPallet;
+ btnCentraalOnder.Action := actHome;
+ btnRechtsOnder.Action := nil;
+ inherited;
+end;
+
+end.
Index: AAPClient/Win32/Debug/ProScanMain.dcu
===================================================================
diff -u -r35 -r37
Binary files differ
Index: AAPClient/UI/BestaandePalletScherm.dfm
===================================================================
diff -u
--- AAPClient/UI/BestaandePalletScherm.dfm (revision 0)
+++ AAPClient/UI/BestaandePalletScherm.dfm (revision 37)
@@ -0,0 +1,33 @@
+inherited fmBestaandePalletScherm: TfmBestaandePalletScherm
+ Caption = 'fmBestaandePalletScherm'
+ PixelsPerInch = 96
+ TextHeight = 19
+ object btnExtraToelevering: TButton [4]
+ Left = 56
+ Top = 112
+ Width = 121
+ Height = 66
+ Caption = 'Extra toelevering'
+ ModalResult = 7
+ TabOrder = 3
+ WordWrap = True
+ end
+ object btnRework: TButton [5]
+ Left = 56
+ Top = 40
+ Width = 121
+ Height = 66
+ Caption = 'Rework'
+ ModalResult = 6
+ TabOrder = 4
+ WordWrap = True
+ end
+ inherited alAlgemeen: TActionList
+ inherited actHome: TAction
+ OnExecute = actHomeExecute
+ end
+ inherited actPallet: TAction
+ OnExecute = actPalletExecute
+ end
+ end
+end
Index: AAPClient/UI/PalletScherm.pas
===================================================================
diff -u -r35 -r37
--- AAPClient/UI/PalletScherm.pas (.../PalletScherm.pas) (revision 35)
+++ AAPClient/UI/PalletScherm.pas (.../PalletScherm.pas) (revision 37)
@@ -87,7 +87,6 @@
try
if fZoekViaPalletCodeResponse.Header.Status = '200' then begin
Self.ModalResult := mrNo;
- ShowMessage('data gevonden');
end else begin
Self.ModalResult := mrOk;
end;
Index: AAPClient/ProScan.dproj
===================================================================
diff -u -r30 -r37
--- AAPClient/ProScan.dproj (.../ProScan.dproj) (revision 30)
+++ AAPClient/ProScan.dproj (.../ProScan.dproj) (revision 37)
@@ -112,6 +112,10 @@
dfm
+
+
+ dfm
+
Cfg_2
Base
Index: AAPClient/UI/DrieKnoppenScherm.dfm
===================================================================
diff -u -r15 -r37
--- AAPClient/UI/DrieKnoppenScherm.dfm (.../DrieKnoppenScherm.dfm) (revision 15)
+++ AAPClient/UI/DrieKnoppenScherm.dfm (.../DrieKnoppenScherm.dfm) (revision 37)
@@ -85,5 +85,8 @@
Caption = 'actUitloggen'
ImageIndex = 1
end
+ object actPallet: TAction
+ Category = 'Algemeen'
+ end
end
end