Jelajahi Sumber

Fixed issue with header styles

Kenric Nugteren 1 tahun lalu
induk
melakukan
1ffaa41e60

+ 15 - 1
prs.desktop/App.xaml

@@ -14,7 +14,21 @@
                 <ResourceDictionary Source="pack://application:,,,/Fluent;Component/Themes/Generic.xaml" />
 
                 <ResourceDictionary>
-                    
+
+                    <Style x:Key="TemplateHeaderStyle" TargetType="{x:Type syncfusion:GridHeaderCellControl}">
+                        <Setter Property="Background" Value="LightSkyBlue"/>
+                        <Setter Property="Foreground" Value="Black"/>
+                        <Setter Property="BorderBrush" Value="Black"/>
+                        <Setter Property="BorderThickness" Value="0.5,0.5,0.5,0.5"/>
+                        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+                        <Setter Property="VerticalContentAlignment" Value="Center"/>
+                        <Setter Property="Padding" Value="5,3"/>
+                        <Setter Property="FontFamily" Value="Segoe UI"/>
+                        <Setter Property="FontSize" Value="14"/>
+                        <Setter Property="FontWeight" Value="Normal"/>
+                        <Setter Property="IsTabStop" Value="False"/>
+                    </Style>
+
                     <Style TargetType="fluent:RibbonTabItem">
                         <Setter Property="HeaderPadding" Value="20,0,20,0" />
                         <Setter Property="Margin" Value="0,0,5,0" />

+ 8 - 8
prs.desktop/Dashboards/Common/DigitalFormsDashboard.xaml.cs

@@ -1156,7 +1156,7 @@ namespace PRSDesktop
             {
                 e.Column = new GridImageColumn();
                 e.Column.Width = DataGrid.RowHeight;
-                e.Column.HeaderStyle = Resources["TemplateHeaderStyle"] as Style;
+                e.Column.HeaderStyle = Application.Current.Resources["TemplateHeaderStyle"] as Style;
                 e.Column.HeaderText = "";
                 e.Column.Padding = new Thickness(4);
                 e.Column.ValueBinding = new Binding
@@ -1169,36 +1169,36 @@ namespace PRSDesktop
             else if (ParentType is not null && parentColumns.TryGetValue(ParentType, out var pColumns) && pColumns.Any(x => x.Item2.Equals(value.Path.Path)))
             {
                 e.Column.ColumnSizer = GridLengthUnitType.Auto;
-                e.Column.HeaderStyle = Resources["TemplateHeaderStyle"] as Style;
+                e.Column.HeaderStyle = Application.Current.Resources["TemplateHeaderStyle"] as Style;
             }
             else if (value.Path.Path.Equals("Job No"))
             {
                 e.Column.Width = 60;
-                e.Column.HeaderStyle = Resources["TemplateHeaderStyle"] as Style;
+                e.Column.HeaderStyle = Application.Current.Resources["TemplateHeaderStyle"] as Style;
             }
             else if (value.Path.Path.Equals("Description"))
             {
                 e.Column.TextAlignment = TextAlignment.Left;
                 e.Column.HorizontalHeaderContentAlignment = HorizontalAlignment.Left;
                 e.Column.Width = 450;
-                e.Column.HeaderStyle = Resources["TemplateHeaderStyle"] as Style;
+                e.Column.HeaderStyle = Application.Current.Resources["TemplateHeaderStyle"] as Style;
             }
             else if (value.Path.Path.Equals("Completed"))
             {
                 e.Column.Width = 100;
-                e.Column.HeaderStyle = Resources["TemplateHeaderStyle"] as Style;
+                e.Column.HeaderStyle = Application.Current.Resources["TemplateHeaderStyle"] as Style;
                 (e.Column as GridDateTimeColumn)!.Pattern = DateTimePattern.CustomPattern;
                 (e.Column as GridDateTimeColumn)!.CustomPattern = "dd MMM yy hh:mm";
             }
             else if (value.Path.Path.Equals("Completed By"))
             {
                 e.Column.Width = 100;
-                e.Column.HeaderStyle = Resources["TemplateHeaderStyle"] as Style;
+                e.Column.HeaderStyle = Application.Current.Resources["TemplateHeaderStyle"] as Style;
             }
             else if (value.Path.Path.Equals("Processed"))
             {
                 e.Column.Width = 100;
-                e.Column.HeaderStyle = Resources["TemplateHeaderStyle"] as Style;
+                e.Column.HeaderStyle = Application.Current.Resources["TemplateHeaderStyle"] as Style;
             }
             else
             {
@@ -1207,7 +1207,7 @@ namespace PRSDesktop
                 //Style style = new Style(typeof(GridCell));
                 //e.Column.CellStyle = style;
                 e.Column.Width = 100;
-                e.Column.HeaderStyle = Resources["TemplateHeaderStyle"] as Style;
+                e.Column.HeaderStyle = Application.Current.Resources["TemplateHeaderStyle"] as Style;
                 e.Column.HeaderText = QuestionCodes[e.Column.MappingName];
             }
         }

+ 11 - 11
prs.desktop/Dashboards/Common/QADashboard.xaml.cs

@@ -98,13 +98,13 @@ namespace PRSDesktop
             else if (value.Path.Path.Equals("Number"))
             {
                 e.Column.Width = 80;
-                e.Column.HeaderStyle = Resources["TemplateHeaderStyle"] as Style;
+                e.Column.HeaderStyle = Application.Current.Resources["TemplateHeaderStyle"] as Style;
             }
             else if (value.Path.Path.Equals("Location_Timestamp"))
             {
                 e.Column = new GridImageColumn();
                 e.Column.Width = dataGrid.RowHeight;
-                e.Column.HeaderStyle = Resources["TemplateHeaderStyle"] as Style;
+                e.Column.HeaderStyle = Application.Current.Resources["TemplateHeaderStyle"] as Style;
                 e.Column.HeaderText = "";
                 e.Column.Padding = new Thickness(4);
                 e.Column.ValueBinding = new Binding
@@ -117,46 +117,46 @@ namespace PRSDesktop
             else if (parentColumns.TryGetValue(parentType, out var pColumns) && pColumns.Any(x => x.Item2.Equals(value.Path.Path)))
             {
                 e.Column.ColumnSizer = GridLengthUnitType.Auto;
-                e.Column.HeaderStyle = Resources["TemplateHeaderStyle"] as Style;
+                e.Column.HeaderStyle = Application.Current.Resources["TemplateHeaderStyle"] as Style;
             }
             else if (value.Path.Path.Equals("Job No"))
             {
                 e.Column.Width = 60;
-                e.Column.HeaderStyle = Resources["TemplateHeaderStyle"] as Style;
+                e.Column.HeaderStyle = Application.Current.Resources["TemplateHeaderStyle"] as Style;
             }
             else if (value.Path.Path.Equals("Description"))
             {
                 e.Column.TextAlignment = TextAlignment.Left;
                 e.Column.HorizontalHeaderContentAlignment = HorizontalAlignment.Left;
                 e.Column.Width = 450;
-                e.Column.HeaderStyle = Resources["TemplateHeaderStyle"] as Style;
+                e.Column.HeaderStyle = Application.Current.Resources["TemplateHeaderStyle"] as Style;
             }
             else if (value.Path.Path.Equals("Completed"))
             {
                 e.Column.Width = 100;
-                e.Column.HeaderStyle = Resources["TemplateHeaderStyle"] as Style;
+                e.Column.HeaderStyle = Application.Current.Resources["TemplateHeaderStyle"] as Style;
                 (e.Column as GridDateTimeColumn).Pattern = DateTimePattern.CustomPattern;
                 (e.Column as GridDateTimeColumn).CustomPattern = "dd MMM yy hh:mm";
             }
             else if (value.Path.Path.Equals("Completed By"))
             {
                 e.Column.Width = 100;
-                e.Column.HeaderStyle = Resources["TemplateHeaderStyle"] as Style;
+                e.Column.HeaderStyle = Application.Current.Resources["TemplateHeaderStyle"] as Style;
             }
             else if (value.Path.Path.Equals("Processed"))
             {
                 e.Column.Width = 100;
-                e.Column.HeaderStyle = Resources["TemplateHeaderStyle"] as Style;
+                e.Column.HeaderStyle = Application.Current.Resources["TemplateHeaderStyle"] as Style;
             }
             else if (value.Path.Path.Equals("Created By"))
             {
                 e.Column.Width = 100;
-                e.Column.HeaderStyle = Resources["TemplateHeaderStyle"] as Style;
+                e.Column.HeaderStyle = Application.Current.Resources["TemplateHeaderStyle"] as Style;
             }
             else if (value.Path.Path.Equals("Created"))
             {
                 e.Column.Width = 100;
-                e.Column.HeaderStyle = Resources["TemplateHeaderStyle"] as Style;
+                e.Column.HeaderStyle = Application.Current.Resources["TemplateHeaderStyle"] as Style;
                 (e.Column as GridDateTimeColumn).Pattern = DateTimePattern.CustomPattern;
                 (e.Column as GridDateTimeColumn).CustomPattern = "dd MMM yy hh:mm";
             }
@@ -167,7 +167,7 @@ namespace PRSDesktop
                 //Style style = new Style(typeof(GridCell));
                 //e.Column.CellStyle = style;
                 e.Column.Width = 100;
-                e.Column.HeaderStyle = Resources["TemplateHeaderStyle"] as Style;
+                e.Column.HeaderStyle = Application.Current.Resources["TemplateHeaderStyle"] as Style;
                 e.Column.HeaderText = QuestionCodes[e.Column.MappingName];
             }
         }

+ 6 - 6
prs.desktop/Dashboards/Manufacturing/FactoryFloorAnalysis.xaml.cs

@@ -441,27 +441,27 @@ namespace PRSDesktop
             if (value.Path.Path.Equals("Serial"))
             {
                 e.Column.Width = 150;
-                e.Column.HeaderStyle = Resources["TemplateHeaderStyle"] as Style;
+                e.Column.HeaderStyle = Application.Current.Resources["TemplateHeaderStyle"] as Style;
             }
             else if (value.Path.Path.Equals("Job"))
             {
                 e.Column.Width = 60;
-                e.Column.HeaderStyle = Resources["TemplateHeaderStyle"] as Style;
+                e.Column.HeaderStyle = Application.Current.Resources["TemplateHeaderStyle"] as Style;
             }
             else if (value.Path.Path.Equals("Setout"))
             {
                 e.Column.Width = 120;
-                e.Column.HeaderStyle = Resources["TemplateHeaderStyle"] as Style;
+                e.Column.HeaderStyle = Application.Current.Resources["TemplateHeaderStyle"] as Style;
             }
             else if (value.Path.Path.Equals("Description"))
             {
                 e.Column.Width = 350;
-                e.Column.HeaderStyle = Resources["TemplateHeaderStyle"] as Style;
+                e.Column.HeaderStyle = Application.Current.Resources["TemplateHeaderStyle"] as Style;
             }
             else if (value.Path.Path.Equals("Template"))
             {
                 e.Column.Width = 80;
-                e.Column.HeaderStyle = Resources["TemplateHeaderStyle"] as Style;
+                e.Column.HeaderStyle = Application.Current.Resources["TemplateHeaderStyle"] as Style;
             }
 
             else
@@ -469,7 +469,7 @@ namespace PRSDesktop
                 var style = new Style(typeof(GridCell));
                 e.Column.CellStyle = style;
                 e.Column.Width = 50;
-                e.Column.HeaderStyle = Resources["TemplateHeaderStyle"] as Style;
+                e.Column.HeaderStyle = Application.Current.Resources["TemplateHeaderStyle"] as Style;
                 e.Column.HeaderText = e.Column.HeaderText.Split(':').Last(); //SectionDisplayNames[value.Path.Path];
             }
         }

+ 5 - 4
prs.desktop/Dashboards/Manufacturing/ManufacturingTemplateAnalysis.xaml.cs

@@ -244,17 +244,17 @@ namespace PRSDesktop
             if (value.Path.Path.Equals("Code"))
             {
                 e.Column.Width = 100;
-                e.Column.HeaderStyle = Resources["TemplateHeaderStyle"] as Style;
+                e.Column.HeaderStyle = Application.Current.Resources["TemplateHeaderStyle"] as Style;
             }
             else if (value.Path.Path.Equals("Description"))
             {
                 e.Column.Width = 300;
-                e.Column.HeaderStyle = Resources["TemplateHeaderStyle"] as Style;
+                e.Column.HeaderStyle = Application.Current.Resources["TemplateHeaderStyle"] as Style;
             }
             else if (value.Path.Path.Equals("Qty"))
             {
                 e.Column.Width = 60;
-                e.Column.HeaderStyle = Resources["TemplateHeaderStyle"] as Style;
+                e.Column.HeaderStyle = Application.Current.Resources["TemplateHeaderStyle"] as Style;
             }
             else
             {
@@ -265,7 +265,8 @@ namespace PRSDesktop
                 //style.Setters.Add(new Setter(GridCell.FontWeightProperty, new Binding(value.Path.Path) { Converter = new LeaveFontWeightConverter() }));
                 e.Column.CellStyle = style;
                 e.Column.Width = 50;
-                e.Column.HeaderStyle = Resources["DataHeaderStyle"] as Style;
+                e.Column.HeaderStyle = Application.Current.Resources["TemplateHeaderStyle"] as Style;
+                // e.Column.HeaderStyle = Resources["DataHeaderStyle"] as Style;
                 e.Column.HeaderText = SectionDisplayNames[value.Path.Path];
             }
         }