Index: AAPClient/UI/HernoemPalletScherm.pas =================================================================== diff -u -r103 -r104 --- AAPClient/UI/HernoemPalletScherm.pas (.../HernoemPalletScherm.pas) (revision 103) +++ AAPClient/UI/HernoemPalletScherm.pas (.../HernoemPalletScherm.pas) (revision 104) @@ -11,25 +11,32 @@ TfmHernoemPalletScherm = class(TfmDrieKnoppenScherm) pnlHoofd: TPanel; pcHernoemPallet: TPageControl; - tsInput: TTabSheet; + tsOudeCode: TTabSheet; tsResultaat: TTabSheet; - edtPallet: TEdit; - lblScanPallet: TLabel; + edtOudeCode: TEdit; + lblOudeCode: TLabel; sgToeleveringData: TStringGrid; btnEerst: TButton; btnVorige: TButton; btnVolgende: TButton; btnLaatst: TButton; lblPallet: TLabel; lblAantal: TLabel; + tsNieuweCode: TTabSheet; + edtNieuweCode: TEdit; + lblNieuweCode: TLabel; procedure FormShow(Sender: TObject); procedure actHomeExecute(Sender: TObject); procedure actVolgendeExecute(Sender: TObject); procedure FormCreate(Sender: TObject); + procedure btnEerstClick(Sender: TObject); + procedure btnVorigeClick(Sender: TObject); + procedure btnVolgendeClick(Sender: TObject); + procedure btnLaatstClick(Sender: TObject); private procedure VulGridMetToeleveringData(DnaCodes: array of DnaCode); procedure GridLeegmaken; - function HernoemPallet(OudeCode: string): HernoemPalletResponse; + function HernoemPallet(OudeCode, NieuweCode: string): HernoemPalletResponse; public { Public declarations } end; @@ -54,11 +61,41 @@ begin inherited; if pcHernoemPallet.ActivePageIndex = 0 then begin - HernoemPallet(edtPallet.Text); + HernoemPallet(edtOudeCode.Text,''); + end else if pcHernoemPallet.ActivePageIndex = 1 then begin + pcHernoemPallet.ActivePageIndex := 2; + end else if pcHernoemPallet.ActivePageIndex = 2 then begin + HernoemPallet(edtOudeCode.Text, edtNieuweCode.Text); end; end; -function TfmHernoemPalletScherm.HernoemPallet(OudeCode: string): HernoemPalletResponse; +procedure TfmHernoemPalletScherm.btnEerstClick(Sender: TObject); +begin + inherited; + sgToeleveringData.Row := 1; +end; + +procedure TfmHernoemPalletScherm.btnLaatstClick(Sender: TObject); +begin + inherited; + sgToeleveringData.Row := sgToeleveringData.RowCount - 1; +end; + +procedure TfmHernoemPalletScherm.btnVolgendeClick(Sender: TObject); +begin + inherited; + if sgToeleveringData.Row < sgToeleveringData.RowCount - 1 then + sgToeleveringData.Row := sgToeleveringData.Row + 1 +end; + +procedure TfmHernoemPalletScherm.btnVorigeClick(Sender: TObject); +begin + inherited; + if sgToeleveringData.Row > 1 then + sgToeleveringData.Row := sgToeleveringData.Row - 1; +end; + +function TfmHernoemPalletScherm.HernoemPallet(OudeCode, NieuweCode: string): HernoemPalletResponse; var Service: DnaCodeServiceSoap; Request: HernoemPalletRequest; @@ -74,6 +111,7 @@ Header.ComputerNaam := ComputerName(); Request.Header := Header; Request.OudeCode := OudeCode; + Request.OudeCode := NieuweCode; Response := Service.HernoemPallet(Request); try Index: AAPClient/UI/HernoemPalletScherm.dfm =================================================================== diff -u -r102 -r104 --- AAPClient/UI/HernoemPalletScherm.dfm (.../HernoemPalletScherm.dfm) (revision 102) +++ AAPClient/UI/HernoemPalletScherm.dfm (.../HernoemPalletScherm.dfm) (revision 104) @@ -38,16 +38,16 @@ Top = 39 Width = 232 Height = 150 - ActivePage = tsInput + ActivePage = tsOudeCode Align = alBottom Style = tsFlatButtons TabOrder = 2 - object tsInput: TTabSheet - Caption = 'tsInput' + object tsOudeCode: TTabSheet + Caption = 'tsOudeCode' TabVisible = False ExplicitTop = 33 ExplicitHeight = 113 - object lblScanPallet: TLabel + object lblOudeCode: TLabel Left = 3 Top = 38 Width = 218 @@ -62,7 +62,7 @@ ParentFont = False WordWrap = True end - object edtPallet: TEdit + object edtOudeCode: TEdit Left = 59 Top = 73 Width = 121 @@ -107,6 +107,7 @@ ImageIndex = 2 Images = ImagesScherm.ilAlgemeen16 TabOrder = 1 + OnClick = btnEerstClick end object btnVorige: TButton Left = 196 @@ -116,6 +117,7 @@ ImageIndex = 1 Images = ImagesScherm.ilAlgemeen16 TabOrder = 2 + OnClick = btnVorigeClick end object btnVolgende: TButton Left = 196 @@ -125,6 +127,7 @@ ImageIndex = 0 Images = ImagesScherm.ilAlgemeen16 TabOrder = 3 + OnClick = btnVolgendeClick end object btnLaatst: TButton Left = 196 @@ -134,8 +137,39 @@ ImageIndex = 3 Images = ImagesScherm.ilAlgemeen16 TabOrder = 4 + OnClick = btnLaatstClick end end + object tsNieuweCode: TTabSheet + Caption = 'tsNieuweCode' + ImageIndex = 2 + TabVisible = False + ExplicitTop = 33 + ExplicitHeight = 113 + object lblNieuweCode: TLabel + Left = 3 + Top = 38 + Width = 218 + Height = 76 + Alignment = taCenter + Caption = 'Scan nieuwe pallet- of DNA-code' + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -16 + Font.Name = 'Tahoma' + Font.Style = [] + ParentFont = False + WordWrap = True + end + object edtNieuweCode: TEdit + Left = 59 + Top = 73 + Width = 121 + Height = 27 + CharCase = ecUpperCase + TabOrder = 0 + end + end end inherited alAlgemeen: TActionList inherited actVolgende: TAction