Index: AAPClient/UI/DnaCodeScherm.pas =================================================================== diff -u -r95 -r126 --- AAPClient/UI/DnaCodeScherm.pas (.../DnaCodeScherm.pas) (revision 95) +++ AAPClient/UI/DnaCodeScherm.pas (.../DnaCodeScherm.pas) (revision 126) @@ -9,24 +9,29 @@ type TfmDnaCodeScherm = class(TfmDrieKnoppenScherm) - lblToelevering: TLabel; + lblToeleveringData: TLabel; lblScancode: TLabel; edtDnaCode: TEdit; - lblPalletCode: TLabel; + lblHuidigePalletData: TLabel; lblLaatstGescand: TLabel; lblLaatstGescandData: TLabel; lblAantalGescand: TLabel; lblTotaalAantal: TLabel; lblSlash: TLabel; imgGls: TImage; - btnInfo: TButton; + lblHuidigePallet: TLabel; + lblScanPallet: TLabel; + lblToelevering: TLabel; + imgInfo: TImage; procedure FormShow(Sender: TObject); procedure actPalletExecute(Sender: TObject); procedure actHomeExecute(Sender: TObject); procedure btnInfoClick(Sender: TObject); procedure actVolgendeExecute(Sender: TObject); procedure edtDnaCodeKeyPress(Sender: TObject; var Key: Char); + procedure FormCreate(Sender: TObject); private + fImagesScherm: TImagesScherm; procedure MeldDnaCodeAf(); procedure ZetToeleveringStatus(Status: DnaCodeStatus); procedure ToeleveringDataOphalen(); @@ -96,15 +101,21 @@ end; end; +procedure TfmDnaCodeScherm.FormCreate(Sender: TObject); +begin + inherited; + fImagesScherm := TImagesScherm.Create(self); +end; + procedure TfmDnaCodeScherm.FormShow(Sender: TObject); begin btnLinksOnder.Action := actPallet; btnCentraalOnder.Action := actHome; btnRechtsOnder.Action := actVolgende; edtDnaCode.Text := ''; ActiveControl := edtDnaCode; - lblPalletCode.Caption := UiContext.Pallet; - + lblHuidigePalletData.Caption := UiContext.Pallet; + fImagesScherm.ilAlgemeen64.GetIcon(1, imgInfo.Picture.Icon); if not (UiContext.Toelevering = '') then ToeleveringDataOphalen(); @@ -138,7 +149,7 @@ ToonPopupScherm(Response.Header.Omschrijving, 'Probeer opnieuw') end else begin UiContext.Toelevering := Response.DnaCodes[0].Toelevering; - lblToelevering.Caption := UiContext.Toelevering; + lblToeleveringData.Caption := UiContext.Toelevering; lblAantalGescand.Caption := IntToStr(Response.AantalReedsGescand); lblTotaalAantal.Caption := IntToStr(Response.AantalInToelevering); if Response.DnaCodes[0].IsGlsDirect then begin @@ -179,7 +190,7 @@ ToonPopupScherm(Response.Header.Omschrijving, 'Probeer opnieuw') end else begin UiContext.Toelevering := Response.DnaCodes[0].Toelevering; - lblToelevering.Caption := UiContext.Toelevering; + lblToeleveringData.Caption := UiContext.Toelevering; lblAantalGescand.Caption := IntToStr(Response.AantalReedsGescand); lblTotaalAantal.Caption := IntToStr(Response.AantalInToelevering); if Response.DnaCodes[0].IsGlsDirect then begin Index: AAPClient/UI/DnaCodeScherm.dfm =================================================================== diff -u -r95 -r126 --- AAPClient/UI/DnaCodeScherm.dfm (.../DnaCodeScherm.dfm) (revision 95) +++ AAPClient/UI/DnaCodeScherm.dfm (.../DnaCodeScherm.dfm) (revision 126) @@ -3,66 +3,107 @@ Caption = 'fmDnaCodeScherm' PixelsPerInch = 96 TextHeight = 19 - object lblToelevering: TLabel [1] - Left = 144 - Top = 8 - Width = 73 - Height = 19 + object lblToeleveringData: TLabel [0] + Left = 269 + Top = 344 + Width = 174 + Height = 39 AutoSize = False + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -32 + Font.Name = 'Tahoma' + Font.Style = [] + ParentFont = False end - object lblScancode: TLabel [2] + object lblScancode: TLabel [1] Left = 108 Top = 40 Width = 109 Height = 19 Caption = 'Scan DNA code' end - object lblPalletCode: TLabel [3] - Left = 8 - Top = 100 - Width = 73 - Height = 19 + object lblHuidigePalletData: TLabel [2] + Left = 269 + Top = 396 + Width = 174 + Height = 39 AutoSize = False + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -32 + Font.Name = 'Tahoma' + Font.Style = [] + ParentFont = False end - object lblLaatstGescand: TLabel [4] - Left = 8 - Top = 140 - Width = 113 - Height = 19 - AutoSize = False + object lblLaatstGescand: TLabel [3] + Left = 39 + Top = 441 + Width = 224 + Height = 39 Caption = 'Laatst gescand:' + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -32 + Font.Name = 'Tahoma' + Font.Style = [] + ParentFont = False end - object lblLaatstGescandData: TLabel [5] - Left = 144 - Top = 140 - Width = 73 - Height = 19 + object lblLaatstGescandData: TLabel [4] + Left = 269 + Top = 441 + Width = 174 + Height = 39 AutoSize = False + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -32 + Font.Name = 'Tahoma' + Font.Style = [] + ParentFont = False end - object lblAantalGescand: TLabel [6] - Left = 8 - Top = 68 - Width = 33 - Height = 19 + object lblAantalGescand: TLabel [5] + Left = 175 + Top = 108 + Width = 51 + Height = 39 Alignment = taRightJustify AutoSize = False + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -32 + Font.Name = 'Tahoma' + Font.Style = [] + ParentFont = False end - object lblTotaalAantal: TLabel [7] - Left = 47 - Top = 68 - Width = 33 - Height = 19 + object lblTotaalAantal: TLabel [6] + Left = 250 + Top = 108 + Width = 51 + Height = 39 AutoSize = False + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -32 + Font.Name = 'Tahoma' + Font.Style = [] + ParentFont = False end - object lblSlash: TLabel [8] - Left = 41 - Top = 68 - Width = 9 - Height = 19 + object lblSlash: TLabel [7] + Left = 232 + Top = 108 + Width = 12 + Height = 39 AutoSize = False Caption = '/' + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -32 + Font.Name = 'Tahoma' + Font.Style = [] + ParentFont = False end - object imgGls: TImage [9] + object imgGls: TImage [8] Left = 77 Top = 2 Width = 32 @@ -141,31 +182,72 @@ 494E434F525320476D6248108E214F0000000049454E44AE426082} Visible = False end - object edtDnaCode: TEdit [12] - Left = 108 - Top = 65 - Width = 109 - Height = 27 + object lblHuidigePallet: TLabel [9] + Left = 39 + Top = 396 + Width = 210 + Height = 39 + AutoSize = False + Caption = 'Huidige pallet:' + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -32 + Font.Name = 'Tahoma' + Font.Style = [] + ParentFont = False + end + object lblScanPallet: TLabel [10] + Left = 132 + Top = 192 + Width = 214 + Height = 39 + Caption = 'Scan Dna-code' + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -32 + Font.Name = 'Tahoma' + Font.Style = [] + ParentFont = False + end + object lblToelevering: TLabel [11] + Left = 39 + Top = 344 + Width = 210 + Height = 39 + AutoSize = False + Caption = 'Toelevering:' + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -32 + Font.Name = 'Tahoma' + Font.Style = [] + ParentFont = False + end + object imgInfo: TImage [12] + Left = 334 + Top = 99 + Width = 64 + Height = 64 + end + inherited pnlDrieKnoppen: TPanel + ExplicitTop = 508 + end + object edtDnaCode: TEdit [15] + Left = 67 + Top = 237 + Width = 345 + Height = 47 + AutoSize = False CharCase = ecUpperCase + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -32 + Font.Name = 'Tahoma' + Font.Style = [] + ParentFont = False TabOrder = 2 OnKeyPress = edtDnaCodeKeyPress end - inherited btnRechtsOnder: TButton - TabOrder = 3 - end - object btnInfo: TButton [14] - Left = 108 - Top = 2 - Width = 34 - Height = 34 - ParentCustomHint = False - ImageAlignment = iaCenter - ImageIndex = 2 - Images = ImagesScherm.ilAlgemeen32 - ModalResult = 8 - TabOrder = 4 - OnClick = btnInfoClick - end inherited alAlgemeen: TActionList Left = 16 Top = 160