HistoryView 수정

Dev/OHV/OHV.Module.MainViews/Views/HistoryView.xaml

@@ -23,7 +23,7 @@
             <Grid Margin="15,15" Background="#263238">
                 <DockPanel>
                     <DataGrid ItemsSource="{Binding AlarmList}" CanUserSortColumns="True" CanUserAddRows="False" AutoGenerateColumns="False" materialDesign:DataGridAssist.CellPadding="13 8 8 8" 
-                                  materialDesign:DataGridAssist.ColumnHeaderPadding="8" Background="{x:Null}" IsReadOnly="True">
+                                  materialDesign:DataGridAssist.ColumnHeaderPadding="8" Background="{x:Null}" Foreground="White" IsReadOnly="True">
                         <DataGrid.Resources>
                             <Style TargetType="{x:Type DataGridRow}">
                                 <Style.Triggers>
@@ -45,6 +45,16 @@
                                 </DataGridTemplateColumn.CellTemplate>
                             </DataGridTemplateColumn>-->
 
+                            <materialDesign:DataGridTextColumn Header="OccurTime" Width="150" Binding="{Binding OccurTime }" EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnPopupEditingStyle}">
+                                <DataGridTextColumn.HeaderStyle>
+                                    <Style TargetType="{x:Type DataGridColumnHeader}" BasedOn="{StaticResource MaterialDesignDataGridColumnHeader}">
+                                        <Setter Property="VerticalContentAlignment" Value="Center"/>
+                                        <Setter Property="HorizontalContentAlignment" Value="Center"/>
+                                        <Setter Property="Foreground" Value="White"/>
+                                    </Style>
+                                </DataGridTextColumn.HeaderStyle>
+                            </materialDesign:DataGridTextColumn>
+
                             <materialDesign:DataGridTextColumn Header="Level" Width="150" Binding="{Binding Level}" EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnPopupEditingStyle}">
                                 <DataGridTextColumn.HeaderStyle>
                                     <Style TargetType="{x:Type DataGridColumnHeader}" BasedOn="{StaticResource MaterialDesignDataGridColumnHeader}">

Dev/OHV/OHV.Module.MainViews/Views/HistoryViewModel.cs

@@ -16,8 +16,8 @@ namespace OHV.Module.MainViews.Views
     {
         SqliteManager sql;
 
-        ObservableCollection<Alarm> _alarmList;
-        public ObservableCollection<Alarm> AlarmList
+        List<HisAlarm> _alarmList;
+        public List<HisAlarm> AlarmList
         {
             get { return this._alarmList; }
             set { this.SetProperty( ref this._alarmList , value ); }
@@ -28,20 +28,29 @@ namespace OHV.Module.MainViews.Views
         public HistoryViewModel( SqliteManager _sql )
         {
             this.sql = _sql;
-            this.AlarmList = new ObservableCollection<Alarm>( sql.AlarmDAL.All );
+            this.sql.HisAlarmDAL.ChangedProperty += HisAlarmDAL_ChangedProperty;
+            this.AlarmList = new List<HisAlarm>( sql.HisAlarmDAL.All );
             this.AlarmResetCommand = new DelegateCommand( ExecuteAlarmResetCommand );
         }
 
+        private void HisAlarmDAL_ChangedProperty()
+        {
+            this.AlarmList.Clear();
+            this.AlarmList = null;
+
+            this.AlarmList = sql.HisAlarmDAL.All;
+        }
+
         async private void ExecuteAlarmResetCommand( )
         {
             //Grid Refresh 대안 찾을것
-            var backupList = this.AlarmList.ToList();
-            this.AlarmList.Clear();
+            //var backupList = this.AlarmList.ToList();
+            //this.AlarmList.Clear();
 
-            await Task.Delay( 1000 );
+            //await Task.Delay( 1000 );
 
-            var e = new ObservableCollection<Alarm>( backupList );
-            this.AlarmList = e;
+            //var e = new ObservableCollection<Alarm>( backupList );
+            //this.AlarmList = e;
         }
 
         public void Init( ) { }

Dev/OHV/VehicleControlSystem/VehicleControlSystem.csproj

@@ -18,7 +18,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;SIMULATION</DefineConstants>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>