Index: ActiviteitenOpvolging/ProductiePitching/screens/employee/picker/EmployeePickerUserControl.Designer.vb =================================================================== diff -u -r1759 -r1807 --- ActiviteitenOpvolging/ProductiePitching/screens/employee/picker/EmployeePickerUserControl.Designer.vb (.../EmployeePickerUserControl.Designer.vb) (revision 1759) +++ ActiviteitenOpvolging/ProductiePitching/screens/employee/picker/EmployeePickerUserControl.Designer.vb (.../EmployeePickerUserControl.Designer.vb) (revision 1807) @@ -33,10 +33,12 @@ ' Me.TableLayoutPanel1.SetColumnSpan(Me.EmployeesComboBox, 3) Me.EmployeesComboBox.Dock = System.Windows.Forms.DockStyle.Top - Me.EmployeesComboBox.FormattingEnabled = true + Me.EmployeesComboBox.Font = New System.Drawing.Font("Microsoft Sans Serif", 16.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.EmployeesComboBox.FormattingEnabled = True + Me.EmployeesComboBox.ItemHeight = 25 Me.EmployeesComboBox.Location = New System.Drawing.Point(53, 303) Me.EmployeesComboBox.Name = "EmployeesComboBox" - Me.EmployeesComboBox.Size = New System.Drawing.Size(394, 21) + Me.EmployeesComboBox.Size = New System.Drawing.Size(394, 33) Me.EmployeesComboBox.TabIndex = 0 ' 'PictureBox1 Index: ActiviteitenOpvolging/ProductiePitching/ProductiePitchingForm.vb =================================================================== diff -u -r1787 -r1807 --- ActiviteitenOpvolging/ProductiePitching/ProductiePitchingForm.vb (.../ProductiePitchingForm.vb) (revision 1787) +++ ActiviteitenOpvolging/ProductiePitching/ProductiePitchingForm.vb (.../ProductiePitchingForm.vb) (revision 1807) @@ -19,7 +19,6 @@ ForeColor = Color.Black 'Update size and set center position. Size = New System.Drawing.Size(ConfigsLoader.AppWidth, ConfigsLoader.AppHeight) - StartPosition = FormStartPosition.CenterScreen 'Set the title name of the form from the config. Text = $"Productie pitching - {ConfigsLoader.AppName}" GridLabel.Text = ConfigsLoader.AppName @@ -43,6 +42,7 @@ MessageBox.Show(ex.Message, "An error occured...", MessageBoxButtons.OK, MessageBoxIcon.Error) Application.Exit() End Try + Me.Location = New Point(-7, 0) '??? End Sub Private Sub PauseActivitiesFromApp() @@ -56,7 +56,7 @@ 'Check if refresh was successful. If allSuccessfulRefresh Then 'Update latest refresh time label with current time. - RefreshTimeLabel.Text = TimeOfDay.ToString("HH:mm") + RefreshTimeLabel.Text = TimeOfDay.ToString("HH:mm:ss") RefreshFailedLabel.Visible = False Else RefreshFailedLabel.Visible = True @@ -83,6 +83,7 @@ 'Set other parameters. With userControl .Size = New System.Drawing.Size(ConfigsLoader.GridWidths(gridNumber), ConfigsLoader.GridHeights(gridNumber)) + .GridRowHeight = ConfigsLoader.GridRowHeight(gridNumber) End With 'Add to list of user controls. Index: ActiviteitenOpvolging/ProductiePitching/configs/ConfigsLoader.vb =================================================================== diff -u -r1765 -r1807 --- ActiviteitenOpvolging/ProductiePitching/configs/ConfigsLoader.vb (.../ConfigsLoader.vb) (revision 1765) +++ ActiviteitenOpvolging/ProductiePitching/configs/ConfigsLoader.vb (.../ConfigsLoader.vb) (revision 1807) @@ -113,6 +113,14 @@ End Get End Property Public ReadOnly Property NumberOfEmployees As Integer + + Private ReadOnly _GridRowHeight As New List(Of Integer) + Public ReadOnly Property GridRowHeight As List(Of Integer) + Get + Return New List(Of Integer)(_GridRowHeight) + End Get + End Property + #End Region ''' @@ -153,6 +161,8 @@ _gridHeights.Add(values(1)) 'Height ElseIf identifier.Contains("ColumnHeaderGrid") Then _gridsColumnHeaderNames.Add(value.Split(",")) + ElseIf identifier.Contains("GridRowHeigh") Then + _GridRowHeight.Add(value) ElseIf identifier.Contains("NumberOfActivitiesGrid") Then _numbersOfActivities.Add(value) ElseIf identifier.Contains("SQL") Then @@ -276,6 +286,7 @@ Return New List(Of Color)(_colorsEmployees) End Get End Property + #End Region #End Region ''' Index: ActiviteitenOpvolging/ProductiePitching/KCA-W10_DynamicConfigs.txt =================================================================== diff -u -r1790 -r1807 --- ActiviteitenOpvolging/ProductiePitching/KCA-W10_DynamicConfigs.txt (.../KCA-W10_DynamicConfigs.txt) (revision 1790) +++ ActiviteitenOpvolging/ProductiePitching/KCA-W10_DynamicConfigs.txt (.../KCA-W10_DynamicConfigs.txt) (revision 1807) @@ -17,11 +17,17 @@ GridLabel4=Lijn 4 % Afmetingen grids breedte x hoogte (in pixels) -DimensionsGrid1=300x550 -DimensionsGrid2=300x550 -DimensionsGrid3=300x550 -DimensionsGrid4=300x550 +DimensionsGrid1=360x550 +DimensionsGrid2=280x550 +DimensionsGrid3=280x550 +DimensionsGrid4=280x550 +% grids rijhoogte (in pixels) +GridRowHeight1=50 +GridRowHeight2=50 +GridRowHeight3=35 +GridRowHeight4=35 + % Kolom header namen voor elke grid. '-' betekent onzichtbaar. % De kolommen zijn: Batch, DueOut, Product, Naar, Opmerking ColumnHeaderGrid1=Batch,DueOut,Product,-,- @@ -42,4 +48,4 @@ SQL4=LIJN4 % Aantal gebruikers die acties kunnen uitvoeren -NumberOfEmployees=0 \ No newline at end of file +NumberOfEmployees=1 \ No newline at end of file Index: ActiviteitenOpvolging/ProductiePitching/screens/DataGridViewUserControl.vb =================================================================== diff -u -r1784 -r1807 --- ActiviteitenOpvolging/ProductiePitching/screens/DataGridViewUserControl.vb (.../DataGridViewUserControl.vb) (revision 1784) +++ ActiviteitenOpvolging/ProductiePitching/screens/DataGridViewUserControl.vb (.../DataGridViewUserControl.vb) (revision 1807) @@ -5,6 +5,16 @@ Private ReadOnly _parentForm As IWorkItemsMainForm Public ReadOnly Property GridNumber As Integer Implements IDataGridUserControl.GridNumber + Private _GridRowHeight As Integer + Public Property GridRowHeight As Integer + Set(NewValue As Integer) + _GridRowHeight = NewValue + _WorkItemsDataGridView.RowTemplate.Height = _GridRowHeight + End Set + Get + Return _GridRowHeight + End Get + End Property Sub New() ' This call is required by the designer. @@ -72,6 +82,9 @@ WorkItemsDataGridView.ColumnHeadersDefaultCellStyle.Font = New Font("Microsoft Sans Serif", 10) 'todo configureerbaar maken 'Center normal cells. WorkItemsDataGridView.DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter + WorkItemsDataGridView.DefaultCellStyle.Padding = New Padding(3, 0, 3, 0) + + 'DueOut column is right aligned. DueOut.DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight 'Make text bigger of normal cells. @@ -91,7 +104,7 @@ 'Hide the selectors in front of a row. WorkItemsDataGridView.RowHeadersVisible = False 'Edit row height before generating new rows. - WorkItemsDataGridView.RowTemplate.Height = 30 'todo configureerbaar maken + WorkItemsDataGridView.RowTemplate.Height = _GridRowHeight 'Set label. GridLabel.Text = ConfigsLoader.GridLabelNames(GridNumber) @@ -223,14 +236,14 @@ 'Load normal parameters. Dim data As New List(Of String) From { workItem.BatchVisual, - workItem.EndTimeStamp.ToString("d/MM HH:mm"), + workItem.EndTimeStamp.ToString("dd/MM - HH:mm"), workItem.ProductGroup, workItem.DeliverToResource, workItem.Remark } 'Add data from activities to end of list. 0 gets replaced by empty string. data.AddRange(workItem.Activities.Select( - Function(activity) If(activity.QuantityToProduce = 0, String.Empty, activity.QuantityToProduce.ToString()))) + Function(activity) If(activity.QuantityToProduce = 0, String.Empty, activity.QuantityToProduce.ToString() + Strings.Space(15)))) 'Add as a row to the data grid view. WorkItemsDataGridView.Rows.Add(data.ToArray()) Next @@ -284,6 +297,7 @@ 'Cast cell as right type. Dim cell As BorderedTextFigureCell = dataGridViewCell + cell.Style.Alignment = DataGridViewContentAlignment.MiddleRight 'Remove border. cell.BorderThickness = 0 Index: ActiviteitenOpvolging/ProductiePitching/ProductiePitchingForm.Designer.vb =================================================================== diff -u -r1787 -r1807 --- ActiviteitenOpvolging/ProductiePitching/ProductiePitchingForm.Designer.vb (.../ProductiePitchingForm.Designer.vb) (revision 1787) +++ ActiviteitenOpvolging/ProductiePitching/ProductiePitchingForm.Designer.vb (.../ProductiePitchingForm.Designer.vb) (revision 1807) @@ -98,6 +98,7 @@ Me.Controls.Add(Me.DatagridViewControlsFlowLayoutPanel) Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) Me.Name = "ProductiePitchingForm" + Me.StartPosition = System.Windows.Forms.FormStartPosition.Manual Me.Text = "Productie pitching Form" Me.ResumeLayout(false) Me.PerformLayout