Merge branch 'master' of http://192.168.0.12:13000/sc/Audit_APP

View/QueryView.xaml

@@ -5,10 +5,9 @@
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
       xmlns:local="clr-namespace:Audit.View"
       mc:Ignorable="d" 
-      d:DesignHeight="450" d:DesignWidth="800"
+      d:DesignHeight="450" d:DesignWidth="800">
-      Title="QueryView">
 
     <Grid>
-        
+        <TextBlock Text="QueryView" FontSize="100"/>
     </Grid>
 </Page>

View/StatisticsView.xaml

@@ -7,6 +7,6 @@
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid>
-            
+        <TextBlock Text="StatisticsViewModel" FontSize="100"/>
     </Grid>
 </UserControl>

ViewModel/QueryViewModel.cs

@@ -6,7 +6,10 @@ using System.Threading.Tasks;
 
 namespace Audit.ViewModel
 {
-    internal class QueryViewModel
+    ///<Summary>
+    /// QueryViewModel
+    ///</Summary>
+    public class QueryViewModel
     {
     }
 }

ViewModel/StatisticsViewModel.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace Audit.ViewModel
 {
-    internal class StatisticsViewModel
+    public class StatisticsViewModel
     {
     }
 }

ViewModel/ViewModelLocator.cs

@@ -45,6 +45,8 @@ namespace Audit.ViewModel
 
             SimpleIoc.Default.Register<MainViewModel>();
             SimpleIoc.Default.Register<LogViewModel>();
+            SimpleIoc.Default.Register<StatisticsViewModel>();
+            SimpleIoc.Default.Register<QueryViewModel>();
         }
 
         ///<Summary>
@@ -69,6 +71,28 @@ namespace Audit.ViewModel
             }
         }
 
+        ///<Summary>
+        /// StatisticsViewModel
+        ///</Summary>
+        public StatisticsViewModel Statistics
+        {
+            get 
+            {
+                return ServiceLocator.Current.GetInstance<StatisticsViewModel>();
+            }
+         }
+
+        ///<Summary>
+        /// QueryViewModel
+        ///</Summary>
+        public QueryViewModel Query
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<QueryViewModel>();
+            }
+        }
+
         ///<Summary>
         /// Cleanup
         ///</Summary>