/

Kusach/App.config

@@ -7,6 +7,4 @@
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
   </startup>
-<connectionStrings><add name="EDM" connectionString="metadata=res://*/EDM.csdl|res://*/EDM.ssdl|res://*/EDM.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=(localdb)\MSSQLLocalDB;initial catalog=gr692_gav;integrated security=True;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" />
-</connectionStrings>
-</configuration>
+<connectionStrings><add name="gr692_gavEntities" connectionString="metadata=res://*/EDM.csdl|res://*/EDM.ssdl|res://*/EDM.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=(localdb)\MSSQLLocalDB;initial catalog=gr692_gav;integrated security=True;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" /></connectionStrings></configuration>

Kusach/DataWindow.xaml.cs

@@ -24,7 +24,7 @@ namespace Kusach
         private void RoutesDateView(object sender, RoutedEventArgs e)
         {
             var query = from Routes in cnt.db.Routes
-                        select new { Routes.IdRoute, Routes.IdDriver, Routes.Name };
+                        select new { Routes.IdRoute, Routes.Name };
             DataGrid.ItemsSource = query.ToList();
         }
         private void TransportDateView(object sender, RoutedEventArgs e)

Kusach/Dispatcher.cs

@@ -1,4 +1,3 @@
-
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     Этот код создан по шаблону.
@@ -8,47 +7,29 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-
 namespace Kusach
 {
-
-using System;
+    using System;
     using System.Collections.Generic;
     
-public partial class Dispatcher
-{
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
-    public Dispatcher()
+    public partial class Dispatcher
     {
-
-        this.RouteList = new HashSet<RouteList>();
-
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
+        public Dispatcher()
+        {
+            this.RouteList = new HashSet<RouteList>();
+        }
+    
+        public int IdDispatcher { get; set; }
+        public string Login { get; set; }
+        public string Password { get; set; }
+        public string FName { get; set; }
+        public string LName { get; set; }
+        public string MName { get; set; }
+        public System.DateTime Birthday { get; set; }
+        public string PhoneNumber { get; set; }
+    
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<RouteList> RouteList { get; set; }
     }
-
-
-    public int IdDispatcher { get; set; }
-
-    public string Login { get; set; }
-
-    public string Password { get; set; }
-
-    public string FName { get; set; }
-
-    public string LName { get; set; }
-
-    public string MName { get; set; }
-
-    public System.DateTime Birthday { get; set; }
-
-    public string PhoneNumber { get; set; }
-
-
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-
-    public virtual ICollection<RouteList> RouteList { get; set; }
-
-}
-
 }

Kusach/Drivers.cs

@@ -1,4 +1,3 @@
-
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     Этот код создан по шаблону.
@@ -8,43 +7,27 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-
 namespace Kusach
 {
-
-using System;
+    using System;
     using System.Collections.Generic;
     
-public partial class Drivers
-{
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
-    public Drivers()
+    public partial class Drivers
     {
-
-        this.DriversList = new HashSet<DriversList>();
-
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
+        public Drivers()
+        {
+            this.DriversList = new HashSet<DriversList>();
+        }
+    
+        public int IdDriver { get; set; }
+        public int IdTransport { get; set; }
+        public string Surname { get; set; }
+        public string Name { get; set; }
+        public string Patronymic { get; set; }
+    
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<DriversList> DriversList { get; set; }
+        public virtual Transport Transport { get; set; }
     }
-
-
-    public int IdDriver { get; set; }
-
-    public int IdTransport { get; set; }
-
-    public string Surname { get; set; }
-
-    public string Name { get; set; }
-
-    public string Patronymic { get; set; }
-
-
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-
-    public virtual ICollection<DriversList> DriversList { get; set; }
-
-    public virtual Transport Transport { get; set; }
-
-}
-
 }

Kusach/DriversList.cs

@@ -1,4 +1,3 @@
-
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     Этот код создан по шаблону.
@@ -8,28 +7,18 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-
 namespace Kusach
 {
-
-using System;
+    using System;
     using System.Collections.Generic;
     
-public partial class DriversList
-{
-
-    public int Id { get; set; }
-
-    public int IdDriver { get; set; }
-
-    public int IdRoute { get; set; }
-
-
-
-    public virtual Drivers Drivers { get; set; }
-
-    public virtual Routes Routes { get; set; }
-
-}
-
+    public partial class DriversList
+    {
+        public int Id { get; set; }
+        public int IdDriver { get; set; }
+        public int IdRoute { get; set; }
+    
+        public virtual Drivers Drivers { get; set; }
+        public virtual Routes Routes { get; set; }
+    }
 }

Kusach/EDM.Context.cs

@@ -1,6 +1,4 @@
-
-
-//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 // <auto-generated>
 //     Этот код создан по шаблону.
 //
@@ -9,46 +7,32 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-
 namespace Kusach
 {
-
-using System;
-using System.Data.Entity;
-using System.Data.Entity.Infrastructure;
-
-
-public partial class EDM : DbContext
-{
-    public EDM()
-        : base("name=EDM")
-    {
-
-    }
-
-    protected override void OnModelCreating(DbModelBuilder modelBuilder)
+    using System;
+    using System.Data.Entity;
+    using System.Data.Entity.Infrastructure;
+    
+    public partial class gr692_gavEntities : DbContext
     {
-        throw new UnintentionalCodeFirstException();
+        public gr692_gavEntities()
+            : base("name=gr692_gavEntities")
+        {
+        }
+    
+        protected override void OnModelCreating(DbModelBuilder modelBuilder)
+        {
+            throw new UnintentionalCodeFirstException();
+        }
+    
+        public virtual DbSet<Dispatcher> Dispatcher { get; set; }
+        public virtual DbSet<Drivers> Drivers { get; set; }
+        public virtual DbSet<DriversList> DriversList { get; set; }
+        public virtual DbSet<Points> Points { get; set; }
+        public virtual DbSet<PointsList> PointsList { get; set; }
+        public virtual DbSet<RouteList> RouteList { get; set; }
+        public virtual DbSet<Routes> Routes { get; set; }
+        public virtual DbSet<sysdiagrams> sysdiagrams { get; set; }
+        public virtual DbSet<Transport> Transport { get; set; }
     }
-
-
-    public virtual DbSet<Dispatcher> Dispatcher { get; set; }
-
-    public virtual DbSet<Drivers> Drivers { get; set; }
-
-    public virtual DbSet<DriversList> DriversList { get; set; }
-
-    public virtual DbSet<Points> Points { get; set; }
-
-    public virtual DbSet<PointsList> PointsList { get; set; }
-
-    public virtual DbSet<RouteList> RouteList { get; set; }
-
-    public virtual DbSet<Routes> Routes { get; set; }
-
-    public virtual DbSet<Transport> Transport { get; set; }
-
 }
-
-}
-

Kusach/EDM.cs

@@ -1,6 +1,4 @@
-
-
-//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 // <auto-generated>
 //     Этот код создан по шаблону.
 //
@@ -9,4 +7,3 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-

Kusach/EDM.edmx

@@ -4,7 +4,7 @@
   <edmx:Runtime>
     <!-- SSDL content -->
     <edmx:StorageModels>
-    <Schema Namespace="gr692_gavModel.Store" Provider="System.Data.SqlClient" ProviderManifestToken="2012" Alias="Self" xmlns:store="http://schemas.microsoft.com/ado/2007/12/edm/EntityStoreSchemaGenerator" xmlns:customannotation="http://schemas.microsoft.com/ado/2013/11/edm/customannotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm/ssdl">
+      <Schema Namespace="Хранилище gr692_gavModel" Provider="System.Data.SqlClient" ProviderManifestToken="2012" Alias="Self" xmlns:store="http://schemas.microsoft.com/ado/2007/12/edm/EntityStoreSchemaGenerator" xmlns:customannotation="http://schemas.microsoft.com/ado/2013/11/edm/customannotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm/ssdl">
         <EntityType Name="Dispatcher">
           <Key>
             <PropertyRef Name="IdDispatcher" />
@@ -65,9 +65,18 @@
             <PropertyRef Name="IdRoute" />
           </Key>
           <Property Name="IdRoute" Type="int" Nullable="false" />
-          <Property Name="IdDriver" Type="int" Nullable="false" />
           <Property Name="Name" Type="nvarchar" MaxLength="50" Nullable="false" />
         </EntityType>
+        <EntityType Name="sysdiagrams">
+          <Key>
+            <PropertyRef Name="diagram_id" />
+          </Key>
+          <Property Name="name" Type="nvarchar" MaxLength="128" Nullable="false" />
+          <Property Name="principal_id" Type="int" Nullable="false" />
+          <Property Name="diagram_id" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
+          <Property Name="version" Type="int" />
+          <Property Name="definition" Type="varbinary(max)" />
+        </EntityType>
         <EntityType Name="Transport">
           <Key>
             <PropertyRef Name="IdTransport" />
@@ -160,7 +169,7 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
-        <EntityContainer Name="gr692_gavModelStoreContainer">
+        <EntityContainer Name="Хранилище gr692_gavModelContainer">
           <EntitySet Name="Dispatcher" EntityType="Self.Dispatcher" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="Drivers" EntityType="Self.Drivers" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="DriversList" EntityType="Self.DriversList" Schema="dbo" store:Type="Tables" />
@@ -168,6 +177,7 @@
           <EntitySet Name="PointsList" EntityType="Self.PointsList" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="RouteList" EntityType="Self.RouteList" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="Routes" EntityType="Self.Routes" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="sysdiagrams" EntityType="Self.sysdiagrams" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="Transport" EntityType="Self.Transport" Schema="dbo" store:Type="Tables" />
           <AssociationSet Name="FK__DriversLi__IdDri__0C85DE4D" Association="Self.FK__DriversLi__IdDri__0C85DE4D">
             <End Role="Drivers" EntitySet="Drivers" />
@@ -198,7 +208,8 @@
             <End Role="Drivers" EntitySet="Drivers" />
           </AssociationSet>
         </EntityContainer>
-      </Schema></edmx:StorageModels>
+      </Schema>
+    </edmx:StorageModels>
     <!-- CSDL content -->
     <edmx:ConceptualModels>
       <Schema Namespace="gr692_gavModel" Alias="Self" annotation:UseStrongSpatialTypes="false" xmlns:annotation="http://schemas.microsoft.com/ado/2009/02/edm/annotation" xmlns:customannotation="http://schemas.microsoft.com/ado/2013/11/edm/customannotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm">
@@ -209,12 +220,12 @@
           <Property Name="IdDispatcher" Type="Int32" Nullable="false" />
           <Property Name="Login" Type="String" MaxLength="50" FixedLength="false" Unicode="true" Nullable="false" />
           <Property Name="Password" Type="String" MaxLength="50" FixedLength="false" Unicode="true" Nullable="false" />
-          <NavigationProperty Name="RouteList" Relationship="Self.FK__RouteList__IdRou__6383C8BA" FromRole="Dispatcher" ToRole="RouteList" />
-          <Property Name="FName" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
-          <Property Name="LName" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
-          <Property Name="MName" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
+          <Property Name="FName" Type="String" MaxLength="50" FixedLength="false" Unicode="true" Nullable="false" />
+          <Property Name="LName" Type="String" MaxLength="50" FixedLength="false" Unicode="true" Nullable="false" />
+          <Property Name="MName" Type="String" MaxLength="50" FixedLength="false" Unicode="true" Nullable="false" />
           <Property Name="Birthday" Type="DateTime" Nullable="false" Precision="0" />
-          <Property Name="PhoneNumber" Type="String" Nullable="false" MaxLength="10" FixedLength="false" Unicode="true" />
+          <Property Name="PhoneNumber" Type="String" MaxLength="10" FixedLength="false" Unicode="true" Nullable="false" />
+          <NavigationProperty Name="RouteList" Relationship="Self.FK__RouteList__IdRou__6383C8BA" FromRole="Dispatcher" ToRole="RouteList" />
         </EntityType>
         <EntityType Name="Drivers">
           <Key>
@@ -272,12 +283,21 @@
             <PropertyRef Name="IdRoute" />
           </Key>
           <Property Name="IdRoute" Type="Int32" Nullable="false" />
-          <Property Name="IdDriver" Type="Int32" Nullable="false" />
           <Property Name="Name" Type="String" MaxLength="50" FixedLength="false" Unicode="true" Nullable="false" />
           <NavigationProperty Name="DriversList" Relationship="Self.FK__DriversLi__IdRou__68487DD7" FromRole="Routes" ToRole="DriversList" />
           <NavigationProperty Name="PointsList" Relationship="Self.FK__PointsLis__IdRou__66603565" FromRole="Routes" ToRole="PointsList" />
           <NavigationProperty Name="RouteList" Relationship="Self.FK__RouteList__IdRou__628FA481" FromRole="Routes" ToRole="RouteList" />
         </EntityType>
+        <EntityType Name="sysdiagrams">
+          <Key>
+            <PropertyRef Name="diagram_id" />
+          </Key>
+          <Property Name="name" Type="String" MaxLength="128" FixedLength="false" Unicode="true" Nullable="false" />
+          <Property Name="principal_id" Type="Int32" Nullable="false" />
+          <Property Name="diagram_id" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
+          <Property Name="version" Type="Int32" />
+          <Property Name="definition" Type="Binary" MaxLength="Max" FixedLength="false" />
+        </EntityType>
         <EntityType Name="Transport">
           <Key>
             <PropertyRef Name="IdTransport" />
@@ -371,7 +391,7 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
-        <EntityContainer Name="EDM" annotation:LazyLoadingEnabled="true">
+        <EntityContainer Name="gr692_gavEntities" annotation:LazyLoadingEnabled="true">
           <EntitySet Name="Dispatcher" EntityType="Self.Dispatcher" />
           <EntitySet Name="Drivers" EntityType="Self.Drivers" />
           <EntitySet Name="DriversList" EntityType="Self.DriversList" />
@@ -379,6 +399,7 @@
           <EntitySet Name="PointsList" EntityType="Self.PointsList" />
           <EntitySet Name="RouteList" EntityType="Self.RouteList" />
           <EntitySet Name="Routes" EntityType="Self.Routes" />
+          <EntitySet Name="sysdiagrams" EntityType="Self.sysdiagrams" />
           <EntitySet Name="Transport" EntityType="Self.Transport" />
           <AssociationSet Name="FK__RouteList__IdRou__6383C8BA" Association="Self.FK__RouteList__IdRou__6383C8BA">
             <End Role="Dispatcher" EntitySet="Dispatcher" />
@@ -413,89 +434,100 @@
     </edmx:ConceptualModels>
     <!-- C-S mapping content -->
     <edmx:Mappings>
-    <Mapping Space="C-S" xmlns="http://schemas.microsoft.com/ado/2009/11/mapping/cs">
-  <EntityContainerMapping StorageEntityContainer="gr692_gavModelStoreContainer" CdmEntityContainer="EDM">
-    <EntitySetMapping Name="Dispatcher">
-      <EntityTypeMapping TypeName="IsTypeOf(gr692_gavModel.Dispatcher)">
-        <MappingFragment StoreEntitySet="Dispatcher">
-          <ScalarProperty Name="PhoneNumber" ColumnName="PhoneNumber" />
-                <ScalarProperty Name="Birthday" ColumnName="Birthday" />
-                <ScalarProperty Name="MName" ColumnName="MName" />
-                <ScalarProperty Name="LName" ColumnName="LName" />
+      <Mapping Space="C-S" xmlns="http://schemas.microsoft.com/ado/2009/11/mapping/cs">
+        <EntityContainerMapping StorageEntityContainer="Хранилище gr692_gavModelContainer" CdmEntityContainer="gr692_gavEntities">
+          <EntitySetMapping Name="Dispatcher">
+            <EntityTypeMapping TypeName="gr692_gavModel.Dispatcher">
+              <MappingFragment StoreEntitySet="Dispatcher">
+                <ScalarProperty Name="IdDispatcher" ColumnName="IdDispatcher" />
+                <ScalarProperty Name="Login" ColumnName="Login" />
+                <ScalarProperty Name="Password" ColumnName="Password" />
                 <ScalarProperty Name="FName" ColumnName="FName" />
+                <ScalarProperty Name="LName" ColumnName="LName" />
+                <ScalarProperty Name="MName" ColumnName="MName" />
+                <ScalarProperty Name="Birthday" ColumnName="Birthday" />
+                <ScalarProperty Name="PhoneNumber" ColumnName="PhoneNumber" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
+          <EntitySetMapping Name="Drivers">
+            <EntityTypeMapping TypeName="gr692_gavModel.Drivers">
+              <MappingFragment StoreEntitySet="Drivers">
+                <ScalarProperty Name="IdDriver" ColumnName="IdDriver" />
+                <ScalarProperty Name="IdTransport" ColumnName="IdTransport" />
+                <ScalarProperty Name="Surname" ColumnName="Surname" />
+                <ScalarProperty Name="Name" ColumnName="Name" />
+                <ScalarProperty Name="Patronymic" ColumnName="Patronymic" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
+          <EntitySetMapping Name="DriversList">
+            <EntityTypeMapping TypeName="gr692_gavModel.DriversList">
+              <MappingFragment StoreEntitySet="DriversList">
+                <ScalarProperty Name="Id" ColumnName="Id" />
+                <ScalarProperty Name="IdDriver" ColumnName="IdDriver" />
+                <ScalarProperty Name="IdRoute" ColumnName="IdRoute" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
+          <EntitySetMapping Name="Points">
+            <EntityTypeMapping TypeName="gr692_gavModel.Points">
+              <MappingFragment StoreEntitySet="Points">
+                <ScalarProperty Name="IdPoint" ColumnName="IdPoint" />
+                <ScalarProperty Name="Name" ColumnName="Name" />
+                <ScalarProperty Name="location" ColumnName="location" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
+          <EntitySetMapping Name="PointsList">
+            <EntityTypeMapping TypeName="gr692_gavModel.PointsList">
+              <MappingFragment StoreEntitySet="PointsList">
+                <ScalarProperty Name="Id" ColumnName="Id" />
+                <ScalarProperty Name="IdPoint" ColumnName="IdPoint" />
+                <ScalarProperty Name="IdRoute" ColumnName="IdRoute" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
+          <EntitySetMapping Name="RouteList">
+            <EntityTypeMapping TypeName="gr692_gavModel.RouteList">
+              <MappingFragment StoreEntitySet="RouteList">
+                <ScalarProperty Name="Id" ColumnName="Id" />
+                <ScalarProperty Name="IdRoute" ColumnName="IdRoute" />
                 <ScalarProperty Name="IdDispatcher" ColumnName="IdDispatcher" />
-          <ScalarProperty Name="Login" ColumnName="Login" />
-          <ScalarProperty Name="Password" ColumnName="Password" />
-        </MappingFragment>
-      </EntityTypeMapping>
-    </EntitySetMapping>
-    <EntitySetMapping Name="Drivers">
-      <EntityTypeMapping TypeName="IsTypeOf(gr692_gavModel.Drivers)">
-        <MappingFragment StoreEntitySet="Drivers">
-          <ScalarProperty Name="IdDriver" ColumnName="IdDriver" />
-          <ScalarProperty Name="IdTransport" ColumnName="IdTransport" />
-          <ScalarProperty Name="Surname" ColumnName="Surname" />
-          <ScalarProperty Name="Name" ColumnName="Name" />
-          <ScalarProperty Name="Patronymic" ColumnName="Patronymic" />
-        </MappingFragment>
-      </EntityTypeMapping>
-    </EntitySetMapping>
-    <EntitySetMapping Name="DriversList">
-      <EntityTypeMapping TypeName="IsTypeOf(gr692_gavModel.DriversList)">
-        <MappingFragment StoreEntitySet="DriversList">
-          <ScalarProperty Name="Id" ColumnName="Id" />
-          <ScalarProperty Name="IdDriver" ColumnName="IdDriver" />
-          <ScalarProperty Name="IdRoute" ColumnName="IdRoute" />
-        </MappingFragment>
-      </EntityTypeMapping>
-    </EntitySetMapping>
-    <EntitySetMapping Name="Points">
-      <EntityTypeMapping TypeName="IsTypeOf(gr692_gavModel.Points)">
-        <MappingFragment StoreEntitySet="Points">
-          <ScalarProperty Name="IdPoint" ColumnName="IdPoint" />
-          <ScalarProperty Name="Name" ColumnName="Name" />
-          <ScalarProperty Name="location" ColumnName="location" />
-        </MappingFragment>
-      </EntityTypeMapping>
-    </EntitySetMapping>
-    <EntitySetMapping Name="PointsList">
-      <EntityTypeMapping TypeName="IsTypeOf(gr692_gavModel.PointsList)">
-        <MappingFragment StoreEntitySet="PointsList">
-          <ScalarProperty Name="Id" ColumnName="Id" />
-          <ScalarProperty Name="IdPoint" ColumnName="IdPoint" />
-          <ScalarProperty Name="IdRoute" ColumnName="IdRoute" />
-        </MappingFragment>
-      </EntityTypeMapping>
-    </EntitySetMapping>
-    <EntitySetMapping Name="RouteList">
-      <EntityTypeMapping TypeName="IsTypeOf(gr692_gavModel.RouteList)">
-        <MappingFragment StoreEntitySet="RouteList">
-          <ScalarProperty Name="Id" ColumnName="Id" />
-          <ScalarProperty Name="IdRoute" ColumnName="IdRoute" />
-          <ScalarProperty Name="IdDispatcher" ColumnName="IdDispatcher" />
-        </MappingFragment>
-      </EntityTypeMapping>
-    </EntitySetMapping>
-    <EntitySetMapping Name="Routes">
-      <EntityTypeMapping TypeName="IsTypeOf(gr692_gavModel.Routes)">
-        <MappingFragment StoreEntitySet="Routes">
-          <ScalarProperty Name="IdRoute" ColumnName="IdRoute" />
-          <ScalarProperty Name="IdDriver" ColumnName="IdDriver" />
-          <ScalarProperty Name="Name" ColumnName="Name" />
-        </MappingFragment>
-      </EntityTypeMapping>
-    </EntitySetMapping>
-    <EntitySetMapping Name="Transport">
-      <EntityTypeMapping TypeName="IsTypeOf(gr692_gavModel.Transport)">
-        <MappingFragment StoreEntitySet="Transport">
-          <ScalarProperty Name="IdTransport" ColumnName="IdTransport" />
-          <ScalarProperty Name="NameOfTransport" ColumnName="NameOfTransport" />
-          <ScalarProperty Name="NumberPlate" ColumnName="NumberPlate" />
-        </MappingFragment>
-      </EntityTypeMapping>
-    </EntitySetMapping>
-  </EntityContainerMapping>
-</Mapping></edmx:Mappings>
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
+          <EntitySetMapping Name="Routes">
+            <EntityTypeMapping TypeName="gr692_gavModel.Routes">
+              <MappingFragment StoreEntitySet="Routes">
+                <ScalarProperty Name="IdRoute" ColumnName="IdRoute" />
+                <ScalarProperty Name="Name" ColumnName="Name" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
+          <EntitySetMapping Name="sysdiagrams">
+            <EntityTypeMapping TypeName="gr692_gavModel.sysdiagrams">
+              <MappingFragment StoreEntitySet="sysdiagrams">
+                <ScalarProperty Name="name" ColumnName="name" />
+                <ScalarProperty Name="principal_id" ColumnName="principal_id" />
+                <ScalarProperty Name="diagram_id" ColumnName="diagram_id" />
+                <ScalarProperty Name="version" ColumnName="version" />
+                <ScalarProperty Name="definition" ColumnName="definition" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
+          <EntitySetMapping Name="Transport">
+            <EntityTypeMapping TypeName="gr692_gavModel.Transport">
+              <MappingFragment StoreEntitySet="Transport">
+                <ScalarProperty Name="IdTransport" ColumnName="IdTransport" />
+                <ScalarProperty Name="NameOfTransport" ColumnName="NameOfTransport" />
+                <ScalarProperty Name="NumberPlate" ColumnName="NumberPlate" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
+        </EntityContainerMapping>
+      </Mapping>
+    </edmx:Mappings>
   </edmx:Runtime>
   <!-- EF Designer content (DO NOT EDIT MANUALLY BELOW HERE) -->
   <Designer xmlns="http://schemas.microsoft.com/ado/2009/11/edmx">
@@ -509,7 +541,7 @@
         <DesignerProperty Name="ValidateOnBuild" Value="true" />
         <DesignerProperty Name="EnablePluralization" Value="false" />
         <DesignerProperty Name="IncludeForeignKeysInModel" Value="true" />
-        <DesignerProperty Name="UseLegacyProvider" Value="False" />
+        <DesignerProperty Name="UseLegacyProvider" Value="false" />
         <DesignerProperty Name="CodeGenerationStrategy" Value="Нет" />
       </DesignerInfoPropertySet>
     </Options>

Kusach/EDM.edmx.diagram

@@ -4,19 +4,21 @@
   <edmx:Designer xmlns="http://schemas.microsoft.com/ado/2009/11/edmx">
     <!-- Diagram content (shape and connector positions) -->
     <edmx:Diagrams>
-      <Diagram DiagramId="dabec44b8a634331ae1f79524a76b8ac" Name="Diagram1" ZoomLevel="94">
-        <EntityTypeShape EntityType="gr692_gavModel.Dispatcher" Width="1.5" PointX="4.5" PointY="5.125" IsExpanded="true" />
-        <EntityTypeShape EntityType="gr692_gavModel.Drivers" Width="1.5" PointX="7.875" PointY="7.875" IsExpanded="true" />
-        <EntityTypeShape EntityType="gr692_gavModel.DriversList" Width="1.5" PointX="7.875" PointY="5.25" IsExpanded="true" />
-        <EntityTypeShape EntityType="gr692_gavModel.Points" Width="1.5" PointX="7.25" PointY="2.125" IsExpanded="true" />
-        <EntityTypeShape EntityType="gr692_gavModel.PointsList" Width="1.5" PointX="4.375" PointY="2" IsExpanded="true" />
-        <EntityTypeShape EntityType="gr692_gavModel.RouteList" Width="1.5" PointX="1.125" PointY="5.375" IsExpanded="true" />
-        <EntityTypeShape EntityType="gr692_gavModel.Routes" Width="1.5" PointX="1.25" PointY="2" IsExpanded="true" />
-        <EntityTypeShape EntityType="gr692_gavModel.Transport" Width="1.5" PointX="4.375" PointY="8.125" IsExpanded="true" />
+      <Diagram DiagramId="38901bcb7be948d8a17031ad142ca7d0" Name="Diagram1" ZoomLevel="72">
+        <EntityTypeShape EntityType="gr692_gavModel.Dispatcher" Width="1.5" PointX="3.75" PointY="6" IsExpanded="true" />
+        <EntityTypeShape EntityType="gr692_gavModel.Drivers" Width="1.5" PointX="6.625" PointY="3.375" IsExpanded="true" />
+        <EntityTypeShape EntityType="gr692_gavModel.DriversList" Width="1.5" PointX="3.75" PointY="3.5" IsExpanded="true" />
+        <EntityTypeShape EntityType="gr692_gavModel.Points" Width="1.5" PointX="7" PointY="0.875" IsExpanded="true" />
+        <EntityTypeShape EntityType="gr692_gavModel.PointsList" Width="1.5" PointX="4.125" PointY="0.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="gr692_gavModel.RouteList" Width="1.5" PointX="0.875" PointY="6" IsExpanded="true" />
+        <EntityTypeShape EntityType="gr692_gavModel.Routes" Width="1.5" PointX="0.875" PointY="1" IsExpanded="true" />
+        <EntityTypeShape EntityType="gr692_gavModel.sysdiagrams" Width="1.5" PointX="10.25" PointY="1" IsExpanded="true" />
+        <EntityTypeShape EntityType="gr692_gavModel.Transport" Width="1.5" PointX="6.625" PointY="6.375" IsExpanded="true" />
         <AssociationConnector Association="gr692_gavModel.FK__RouteList__IdRou__6383C8BA" ManuallyRouted="false" />
         <AssociationConnector Association="gr692_gavModel.FK__DriversLi__IdDri__0C85DE4D" ManuallyRouted="false" />
         <AssociationConnector Association="gr692_gavModel.FK_Drivers_Transport" ManuallyRouted="false" />
-        <AssociationConnector Association="gr692_gavModel.FK__DriversLi__IdRou__68487DD7" ManuallyRouted="false" />
+        <AssociationConnector Association="gr692_gavModel.FK__DriversLi__IdRou__68487DD7" ManuallyRouted="false" >
+        </AssociationConnector>
         <AssociationConnector Association="gr692_gavModel.FK__PointsLis__IdPoi__6477ECF3" ManuallyRouted="false" />
         <AssociationConnector Association="gr692_gavModel.FK__PointsLis__IdRou__66603565" ManuallyRouted="false" />
         <AssociationConnector Association="gr692_gavModel.FK__RouteList__IdRou__628FA481" ManuallyRouted="false" />

Kusach/EDM.edmx.sql

@@ -1,304 +0,0 @@
-
-
-SET QUOTED_IDENTIFIER OFF;
-GO
-USE [gr692_gav];
-GO
-IF SCHEMA_ID(N'dbo') IS NULL EXECUTE(N'CREATE SCHEMA [dbo]');
-GO
-
-
-IF OBJECT_ID(N'[dbo].[FK__DriversLi__IdDri__0C85DE4D]', 'F') IS NOT NULL
-    ALTER TABLE [dbo].[DriversList] DROP CONSTRAINT [FK__DriversLi__IdDri__0C85DE4D];
-GO
-IF OBJECT_ID(N'[dbo].[FK__DriversLi__IdRou__68487DD7]', 'F') IS NOT NULL
-    ALTER TABLE [dbo].[DriversList] DROP CONSTRAINT [FK__DriversLi__IdRou__68487DD7];
-GO
-IF OBJECT_ID(N'[dbo].[FK__PointsLis__IdPoi__6477ECF3]', 'F') IS NOT NULL
-    ALTER TABLE [dbo].[PointsList] DROP CONSTRAINT [FK__PointsLis__IdPoi__6477ECF3];
-GO
-IF OBJECT_ID(N'[dbo].[FK__PointsLis__IdRou__66603565]', 'F') IS NOT NULL
-    ALTER TABLE [dbo].[PointsList] DROP CONSTRAINT [FK__PointsLis__IdRou__66603565];
-GO
-IF OBJECT_ID(N'[dbo].[FK__RouteList__IdRou__628FA481]', 'F') IS NOT NULL
-    ALTER TABLE [dbo].[RouteList] DROP CONSTRAINT [FK__RouteList__IdRou__628FA481];
-GO
-IF OBJECT_ID(N'[dbo].[FK__RouteList__IdRou__6383C8BA]', 'F') IS NOT NULL
-    ALTER TABLE [dbo].[RouteList] DROP CONSTRAINT [FK__RouteList__IdRou__6383C8BA];
-GO
-IF OBJECT_ID(N'[dbo].[FK_Drivers_Transport]', 'F') IS NOT NULL
-    ALTER TABLE [dbo].[Drivers] DROP CONSTRAINT [FK_Drivers_Transport];
-GO
-
-
-IF OBJECT_ID(N'[dbo].[Dispatcher]', 'U') IS NOT NULL
-    DROP TABLE [dbo].[Dispatcher];
-GO
-IF OBJECT_ID(N'[dbo].[Drivers]', 'U') IS NOT NULL
-    DROP TABLE [dbo].[Drivers];
-GO
-IF OBJECT_ID(N'[dbo].[DriversList]', 'U') IS NOT NULL
-    DROP TABLE [dbo].[DriversList];
-GO
-IF OBJECT_ID(N'[dbo].[Points]', 'U') IS NOT NULL
-    DROP TABLE [dbo].[Points];
-GO
-IF OBJECT_ID(N'[dbo].[PointsList]', 'U') IS NOT NULL
-    DROP TABLE [dbo].[PointsList];
-GO
-IF OBJECT_ID(N'[dbo].[RouteList]', 'U') IS NOT NULL
-    DROP TABLE [dbo].[RouteList];
-GO
-IF OBJECT_ID(N'[dbo].[Routes]', 'U') IS NOT NULL
-    DROP TABLE [dbo].[Routes];
-GO
-IF OBJECT_ID(N'[dbo].[Transport]', 'U') IS NOT NULL
-    DROP TABLE [dbo].[Transport];
-GO
-
-
-CREATE TABLE [dbo].[Dispatcher] (
-    [IdDispatcher] int  NOT NULL,
-    [Login] nvarchar(50)  NOT NULL,
-    [Password] nvarchar(50)  NOT NULL
-);
-GO
-
-CREATE TABLE [dbo].[Drivers] (
-    [IdDriver] int  NOT NULL,
-    [IdTransport] int  NOT NULL,
-    [Surname] nvarchar(50)  NOT NULL,
-    [Name] nvarchar(50)  NOT NULL,
-    [Patronymic] nvarchar(50)  NOT NULL
-);
-GO
-
-CREATE TABLE [dbo].[DriversList] (
-    [Id] int  NOT NULL,
-    [IdDriver] int  NOT NULL,
-    [IdRoute] int  NOT NULL
-);
-GO
-
-CREATE TABLE [dbo].[Points] (
-    [IdPoint] int  NOT NULL,
-    [Name] nvarchar(50)  NOT NULL,
-    [location] nvarchar(150)  NOT NULL
-);
-GO
-
-CREATE TABLE [dbo].[PointsList] (
-    [Id] int  NOT NULL,
-    [IdPoint] int  NOT NULL,
-    [IdRoute] int  NOT NULL
-);
-GO
-
-CREATE TABLE [dbo].[RouteList] (
-    [Id] int  NOT NULL,
-    [IdRoute] int  NOT NULL,
-    [IdDispatcher] int  NOT NULL
-);
-GO
-
-CREATE TABLE [dbo].[Routes] (
-    [IdRoute] int  NOT NULL,
-    [IdDriver] int  NOT NULL,
-    [Name] nvarchar(50)  NOT NULL
-);
-GO
-
-CREATE TABLE [dbo].[Transport] (
-    [IdTransport] int  NOT NULL,
-    [NameOfTransport] nvarchar(50)  NOT NULL,
-    [NumberPlate] nvarchar(10)  NOT NULL
-);
-GO
-
-
-ALTER TABLE [dbo].[Dispatcher]
-ADD CONSTRAINT [PK_Dispatcher]
-    PRIMARY KEY CLUSTERED ([IdDispatcher] ASC);
-GO
-
-ALTER TABLE [dbo].[Drivers]
-ADD CONSTRAINT [PK_Drivers]
-    PRIMARY KEY CLUSTERED ([IdDriver] ASC);
-GO
-
-ALTER TABLE [dbo].[DriversList]
-ADD CONSTRAINT [PK_DriversList]
-    PRIMARY KEY CLUSTERED ([Id] ASC);
-GO
-
-ALTER TABLE [dbo].[Points]
-ADD CONSTRAINT [PK_Points]
-    PRIMARY KEY CLUSTERED ([IdPoint] ASC);
-GO
-
-ALTER TABLE [dbo].[PointsList]
-ADD CONSTRAINT [PK_PointsList]
-    PRIMARY KEY CLUSTERED ([Id] ASC);
-GO
-
-ALTER TABLE [dbo].[RouteList]
-ADD CONSTRAINT [PK_RouteList]
-    PRIMARY KEY CLUSTERED ([Id] ASC);
-GO
-
-ALTER TABLE [dbo].[Routes]
-ADD CONSTRAINT [PK_Routes]
-    PRIMARY KEY CLUSTERED ([IdRoute] ASC);
-GO
-
-ALTER TABLE [dbo].[Transport]
-ADD CONSTRAINT [PK_Transport]
-    PRIMARY KEY CLUSTERED ([IdTransport] ASC);
-GO
-
-
-ALTER TABLE [dbo].[RouteList]
-ADD CONSTRAINT [FK__RouteList__IdRou__6383C8BA]
-    FOREIGN KEY ([IdRoute])
-    REFERENCES [dbo].[Dispatcher]
-        ([IdDispatcher])
-    ON DELETE NO ACTION ON UPDATE NO ACTION;
-GO
-
-CREATE INDEX [IX_FK__RouteList__IdRou__6383C8BA]
-ON [dbo].[RouteList]
-    ([IdRoute]);
-GO
-
-ALTER TABLE [dbo].[DriversList]
-ADD CONSTRAINT [FK__DriversLi__IdDri__0C85DE4D]
-    FOREIGN KEY ([IdDriver])
-    REFERENCES [dbo].[Drivers]
-        ([IdDriver])
-    ON DELETE NO ACTION ON UPDATE NO ACTION;
-GO
-
-CREATE INDEX [IX_FK__DriversLi__IdDri__0C85DE4D]
-ON [dbo].[DriversList]
-    ([IdDriver]);
-GO
-
-ALTER TABLE [dbo].[Drivers]
-ADD CONSTRAINT [FK_Drivers_Transport]
-    FOREIGN KEY ([IdTransport])
-    REFERENCES [dbo].[Transport]
-        ([IdTransport])
-    ON DELETE NO ACTION ON UPDATE NO ACTION;
-GO
-
-CREATE INDEX [IX_FK_Drivers_Transport]
-ON [dbo].[Drivers]
-    ([IdTransport]);
-GO
-
-ALTER TABLE [dbo].[DriversList]
-ADD CONSTRAINT [FK__DriversLi__IdRou__68487DD7]
-    FOREIGN KEY ([IdRoute])
-    REFERENCES [dbo].[Routes]
-        ([IdRoute])
-    ON DELETE NO ACTION ON UPDATE NO ACTION;
-GO
-
-CREATE INDEX [IX_FK__DriversLi__IdRou__68487DD7]
-ON [dbo].[DriversList]
-    ([IdRoute]);
-GO
-
-ALTER TABLE [dbo].[PointsList]
-ADD CONSTRAINT [FK__PointsLis__IdPoi__6477ECF3]
-    FOREIGN KEY ([IdPoint])
-    REFERENCES [dbo].[Points]
-        ([IdPoint])
-    ON DELETE NO ACTION ON UPDATE NO ACTION;
-GO
-
-CREATE INDEX [IX_FK__PointsLis__IdPoi__6477ECF3]
-ON [dbo].[PointsList]
-    ([IdPoint]);
-GO
-
-ALTER TABLE [dbo].[PointsList]
-ADD CONSTRAINT [FK__PointsLis__IdRou__66603565]
-    FOREIGN KEY ([IdRoute])
-    REFERENCES [dbo].[Routes]
-        ([IdRoute])
-    ON DELETE NO ACTION ON UPDATE NO ACTION;
-GO
-
-CREATE INDEX [IX_FK__PointsLis__IdRou__66603565]
-ON [dbo].[PointsList]
-    ([IdRoute]);
-GO
-
-ALTER TABLE [dbo].[RouteList]
-ADD CONSTRAINT [FK__RouteList__IdRou__628FA481]
-    FOREIGN KEY ([IdRoute])
-    REFERENCES [dbo].[Routes]
-        ([IdRoute])
-    ON DELETE NO ACTION ON UPDATE NO ACTION;
-GO
-
-CREATE INDEX [IX_FK__RouteList__IdRou__628FA481]
-ON [dbo].[RouteList]
-    ([IdRoute]);
-GO
-

Kusach/Kusach.csproj

@@ -73,7 +73,7 @@
     <Compile Include="AddPointWindow.xaml.cs">
       <DependentUpon>AddPointWindow.xaml</DependentUpon>
     </Compile>
-    <Compile Include="AddRouteWindow.xaml.cs">
+    <Compile Include="Windows\AddRouteWindow.xaml.cs">
       <DependentUpon>AddRouteWindow.xaml</DependentUpon>
     </Compile>
     <Compile Include="AddTransportWindow.xaml.cs">
@@ -120,6 +120,9 @@
     <Compile Include="MainWindow.xaml.cs">
       <DependentUpon>MainWindow.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Pages\RoutesListPage.xaml.cs">
+      <DependentUpon>RoutesListPage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Points.cs">
       <DependentUpon>EDM.tt</DependentUpon>
     </Compile>
@@ -135,12 +138,12 @@
     <Compile Include="Routes.cs">
       <DependentUpon>EDM.tt</DependentUpon>
     </Compile>
+    <Compile Include="sysdiagrams.cs">
+      <DependentUpon>EDM.tt</DependentUpon>
+    </Compile>
     <Compile Include="TestPGPage.xaml.cs">
       <DependentUpon>TestPGPage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="TestPGWindow.xaml.cs">
-      <DependentUpon>TestPGWindow.xaml</DependentUpon>
-    </Compile>
     <Compile Include="TestRouteEditWindow.xaml.cs">
       <DependentUpon>TestRouteEditWindow.xaml</DependentUpon>
     </Compile>
@@ -158,7 +161,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="AddRouteWindow.xaml">
+    <Page Include="Windows\AddRouteWindow.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -190,15 +193,15 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="RegWindow.xaml">
+    <Page Include="Pages\RoutesListPage.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="TestPGPage.xaml">
+    <Page Include="RegWindow.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="TestPGWindow.xaml">
+    <Page Include="TestPGPage.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -248,23 +251,19 @@
   <ItemGroup>
     <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
   </ItemGroup>
+  <ItemGroup />
   <ItemGroup>
     <Content Include="EDM.Context.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
       <DependentUpon>EDM.edmx</DependentUpon>
       <LastGenOutput>EDM.Context.cs</LastGenOutput>
     </Content>
-    <Content Include="EDM.edmx.sql" />
     <Content Include="EDM.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
       <DependentUpon>EDM.edmx</DependentUpon>
       <LastGenOutput>EDM.cs</LastGenOutput>
     </Content>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Pages\" />
-    <Folder Include="Windows\" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>

Kusach/MainWindow.xaml

@@ -16,7 +16,9 @@
             <ColumnDefinition Width="25*" />
             <ColumnDefinition Width="173*"/>
         </Grid.ColumnDefinitions>
-        <Grid Grid.Column="0">
+        <Grid 
+            Grid.Column="0"
+            Background="#FFECECF3">
             <Button 
             x:Name="BackButton"
             VerticalAlignment="Top"
@@ -32,25 +34,26 @@
                 Margin="0,0,0,10"
                 Content="Маршруты"
                 Height="40"
-                Click="BackButton_Click"/>
+                Click="RoutesButton_Click"/>
                 <Button
                 Margin="0,0,0,10"
                 Content="Водители"
                 Height="40"
-                Click="BackButton_Click"/>
+                Click="DriversButton_Click"/>
                 <Button
                 Margin="0,0,0,10"
-                Content="Пользователи"
+                Content="Транспорт"
                 Height="40"
-                Click="BackButton_Click"/>
+                Click="VehButton_Click"/>
                 <Button
-                Content="Транспорт"
+                Content="Пользователи"
                 Height="40"
-                Click="BackButton_Click"/>
+                Click="UsersButton_Click"/>
             </StackPanel>
         </Grid>
-        <Frame 
+        <Frame
             Name="MainFrame"
-            />
+            NavigationUIVisibility="Hidden"
+            Grid.Column="1"/>
     </Grid>
 </Window>

Kusach/MainWindow.xaml.cs

@@ -32,7 +32,28 @@ namespace Kusach
         }
         private void OnLoad(object sender, RoutedEventArgs e)
         {
-            MessageBox.Show("loaded");
+            MainFrame.Content = new Pages.RoutesListPage();
         }
+        #region LeftPanelButtons
+        private void RoutesButton_Click(object sender, RoutedEventArgs e)
+        {
+            MainFrame.Content = new TestPGPage();
+        }
+
+        private void DriversButton_Click(object sender, RoutedEventArgs e)
+        {
+
+        }
+        private void VehButton_Click(object sender, RoutedEventArgs e)
+        {
+
+        }
+
+        private void UsersButton_Click(object sender, RoutedEventArgs e)
+        {
+
+        }
+        #endregion
+
     }
 }

Kusach/Pages/RoutesListPage.xaml

@@ -0,0 +1,63 @@
+<Page x:Class="Kusach.Pages.RoutesListPage"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+      xmlns:local="clr-namespace:Kusach.Pages"
+      mc:Ignorable="d" 
+      d:DesignHeight="450"
+      d:DesignWidth="800"
+      Title="RoutesListPage">
+    <Grid 
+        Background="White" 
+        Margin="25">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="4*"/>
+            <RowDefinition Height="21*"/>
+        </Grid.RowDefinitions>
+        <StackPanel Orientation="Horizontal">
+            <TextBox 
+                TextWrapping="Wrap"
+                Text="Поиск..." 
+                Width="120"/>
+            <Button
+                Width="120"
+                Content="Добавить"
+                Click="AddRouteButton_Click"/>
+            <Button
+                Width="120"
+                Content="Удалить"
+                Click="DeleteRouteButton_Click"/>
+            <Button
+                Width="120"
+                Content="Обновить"
+                Click="UpdateRoutesButton_Click"/>
+        </StackPanel>
+        <DataGrid
+            Name="RoutesList" 
+            Grid.Row="1"
+            AutoGenerateColumns="False" 
+            VerticalAlignment="Top" 
+            HorizontalAlignment="Left" 
+            Width="760">
+            <DataGrid.ItemContainerStyle>
+                <Style TargetType="DataGridRow">
+                    <EventSetter 
+                        Event="MouseDoubleClick" 
+                        Handler="DataGridRow_MouseDoubleClick"/>
+                </Style>
+            </DataGrid.ItemContainerStyle>
+            <DataGrid.Columns>
+                <DataGridTextColumn 
+                    Binding="{Binding IdRoute}" 
+                    Header="Номер"  
+                    Width="70"
+                    IsReadOnly="True"/>
+                <DataGridTextColumn 
+                    Binding="{Binding Name}" 
+                    Header="Название"
+                    IsReadOnly="True"/>
+            </DataGrid.Columns>
+        </DataGrid>
+    </Grid>
+</Page>

Kusach/Pages/RoutesListPage.xaml.cs

@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Kusach.Pages
+{
+    /// <summary>
+    /// Логика взаимодействия для RoutesListPage.xaml
+    /// </summary>
+    public partial class RoutesListPage : Page
+    {
+        public RoutesListPage()
+        {
+            InitializeComponent();
+            RoutesList.ItemsSource = cnt.db.Routes.ToList();
+        }
+        private void DataGridRow_MouseDoubleClick(object sender, MouseButtonEventArgs e)
+        {
+            TestRouteEditWindow trew = new TestRouteEditWindow(((Routes)RoutesList.SelectedItem).IdRoute);
+            trew.Show();
+        }
+
+        private void Find_Click(object sender, RoutedEventArgs e)
+        {
+            //if (SearchBox.Text != "")
+            //    RoutesList.ItemsSource = cnt.db.Routes.Where(item => (item.IdRoute + " " + item.Name).Contains(SearchBox.Text)).ToList();
+            //else
+            //    RoutesList.ItemsSource = cnt.db.Routes.ToList();
+        }
+
+        private void AddRouteButton_Click(object sender, RoutedEventArgs e)
+        {
+            AddRouteWindow arw = new AddRouteWindow();
+            arw.Show();
+        }
+
+        private void DeleteRouteButton_Click(object sender, RoutedEventArgs e)
+        {
+
+        }
+
+        private void UpdateRoutesButton_Click(object sender, RoutedEventArgs e)
+        {
+
+        }
+    }
+}

Kusach/Points.cs

@@ -1,4 +1,3 @@
-
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     Этот код создан по шаблону.
@@ -8,37 +7,24 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-
 namespace Kusach
 {
-
-using System;
+    using System;
     using System.Collections.Generic;
     
-public partial class Points
-{
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
-    public Points()
+    public partial class Points
     {
-
-        this.PointsList = new HashSet<PointsList>();
-
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
+        public Points()
+        {
+            this.PointsList = new HashSet<PointsList>();
+        }
+    
+        public int IdPoint { get; set; }
+        public string Name { get; set; }
+        public string location { get; set; }
+    
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<PointsList> PointsList { get; set; }
     }
-
-
-    public int IdPoint { get; set; }
-
-    public string Name { get; set; }
-
-    public string location { get; set; }
-
-
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-
-    public virtual ICollection<PointsList> PointsList { get; set; }
-
-}
-
 }

Kusach/PointsList.cs

@@ -1,4 +1,3 @@
-
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     Этот код создан по шаблону.
@@ -8,28 +7,18 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-
 namespace Kusach
 {
-
-using System;
+    using System;
     using System.Collections.Generic;
     
-public partial class PointsList
-{
-
-    public int Id { get; set; }
-
-    public int IdPoint { get; set; }
-
-    public int IdRoute { get; set; }
-
-
-
-    public virtual Points Points { get; set; }
-
-    public virtual Routes Routes { get; set; }
-
-}
-
+    public partial class PointsList
+    {
+        public int Id { get; set; }
+        public int IdPoint { get; set; }
+        public int IdRoute { get; set; }
+    
+        public virtual Points Points { get; set; }
+        public virtual Routes Routes { get; set; }
+    }
 }

Kusach/RouteList.cs

@@ -1,4 +1,3 @@
-
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     Этот код создан по шаблону.
@@ -8,28 +7,18 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-
 namespace Kusach
 {
-
-using System;
+    using System;
     using System.Collections.Generic;
     
-public partial class RouteList
-{
-
-    public int Id { get; set; }
-
-    public int IdRoute { get; set; }
-
-    public int IdDispatcher { get; set; }
-
-
-
-    public virtual Dispatcher Dispatcher { get; set; }
-
-    public virtual Routes Routes { get; set; }
-
-}
-
+    public partial class RouteList
+    {
+        public int Id { get; set; }
+        public int IdRoute { get; set; }
+        public int IdDispatcher { get; set; }
+    
+        public virtual Dispatcher Dispatcher { get; set; }
+        public virtual Routes Routes { get; set; }
+    }
 }

Kusach/Routes.cs

@@ -1,4 +1,3 @@
-
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     Этот код создан по шаблону.
@@ -8,49 +7,29 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-
 namespace Kusach
 {
-
-using System;
+    using System;
     using System.Collections.Generic;
     
-public partial class Routes
-{
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
-    public Routes()
+    public partial class Routes
     {
-
-        this.DriversList = new HashSet<DriversList>();
-
-        this.PointsList = new HashSet<PointsList>();
-
-        this.RouteList = new HashSet<RouteList>();
-
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
+        public Routes()
+        {
+            this.DriversList = new HashSet<DriversList>();
+            this.PointsList = new HashSet<PointsList>();
+            this.RouteList = new HashSet<RouteList>();
+        }
+    
+        public int IdRoute { get; set; }
+        public string Name { get; set; }
+    
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<DriversList> DriversList { get; set; }
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<PointsList> PointsList { get; set; }
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<RouteList> RouteList { get; set; }
     }
-
-
-    public int IdRoute { get; set; }
-
-    public int IdDriver { get; set; }
-
-    public string Name { get; set; }
-
-
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-
-    public virtual ICollection<DriversList> DriversList { get; set; }
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-
-    public virtual ICollection<PointsList> PointsList { get; set; }
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-
-    public virtual ICollection<RouteList> RouteList { get; set; }
-
-}
-
 }

Kusach/TestPGWindow.xaml

@@ -1,19 +0,0 @@
-<Window x:Class="Kusach.TestPGWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:Kusach"
-        mc:Ignorable="d"
-        Title="TestPGWindow" Height="450" Width="800">
-    <Grid>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="127*"/>
-            <ColumnDefinition Width="665*"/>
-        </Grid.ColumnDefinitions>
-        <Frame
-            Name="Main"
-            Grid.Column="1">
-        </Frame>
-    </Grid>
-</Window>

Kusach/TestPGWindow.xaml.cs

@@ -1,27 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
-
-namespace Kusach
-{
-    /// <summary>
-    /// Логика взаимодействия для TestPGWindow.xaml
-    /// </summary>
-    public partial class TestPGWindow : Window
-    {
-        public TestPGWindow()
-        {
-            InitializeComponent();
-        }
-    }
-}

Kusach/TestWindow.xaml

@@ -49,11 +49,6 @@
                     Width="100" 
                     IsReadOnly="True"/>
                 <DataGridTextColumn 
-                    Binding="{Binding IdDriver}" 
-                    Header="IdDriver" 
-                    Width="100" 
-                    IsReadOnly="True"/>
-                <DataGridTextColumn 
                     Binding="{Binding Name}" 
                     Header="Name" 
                     Width="100"

Kusach/TestWindow.xaml.cs

@@ -35,7 +35,7 @@ namespace Kusach
         private void Find_Click(object sender, RoutedEventArgs e)
         {
             if(SearchBox.Text != "")
-                RoutesList.ItemsSource = cnt.db.Routes.Where(item => (item.IdRoute + " " + item.IdDriver + " " + item.Name).Contains(SearchBox.Text)).ToList();
+                RoutesList.ItemsSource = cnt.db.Routes.Where(item => (item.IdRoute + " " + item.Name).Contains(SearchBox.Text)).ToList();
             else
                 RoutesList.ItemsSource = cnt.db.Routes.ToList();
         }

Kusach/Transport.cs

@@ -1,4 +1,3 @@
-
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     Этот код создан по шаблону.
@@ -8,37 +7,24 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-
 namespace Kusach
 {
-
-using System;
+    using System;
     using System.Collections.Generic;
     
-public partial class Transport
-{
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
-    public Transport()
+    public partial class Transport
     {
-
-        this.Drivers = new HashSet<Drivers>();
-
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
+        public Transport()
+        {
+            this.Drivers = new HashSet<Drivers>();
+        }
+    
+        public int IdTransport { get; set; }
+        public string NameOfTransport { get; set; }
+        public string NumberPlate { get; set; }
+    
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<Drivers> Drivers { get; set; }
     }
-
-
-    public int IdTransport { get; set; }
-
-    public string NameOfTransport { get; set; }
-
-    public string NumberPlate { get; set; }
-
-
-
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-
-    public virtual ICollection<Drivers> Drivers { get; set; }
-
-}
-
 }

Kusach/AddRouteWindow.xaml

@@ -6,7 +6,7 @@
         xmlns:local="clr-namespace:Kusach"
         mc:Ignorable="d"
         Title="AddRouteWindow" 
-        Height="250" 
+        Height="150" 
         Width="300"
         ResizeMode="NoResize"
         WindowStyle="None"
@@ -17,18 +17,6 @@
             HorizontalAlignment="Center"
             VerticalAlignment="Top">
             <Label 
-            Content="IdDriver" 
-            HorizontalAlignment="Left" 
-            VerticalAlignment="Top" 
-            Height="30" 
-            Width="190"/>
-            <TextBox 
-            x:Name="IdDriverBox"
-            HorizontalAlignment="Left" 
-            VerticalAlignment="Top" 
-            Height="30" 
-            Width="190"/>
-            <Label 
             Content="Название" 
             HorizontalAlignment="Left" 
             VerticalAlignment="Top" 
@@ -44,7 +32,7 @@
         <Button 
             Content="Создать &#xD;&#xA;маршрут" 
             HorizontalAlignment="Left"
-            Margin="170,200,0,0" 
+            Margin="170,100,0,0" 
             VerticalAlignment="Top" 
             Height="40" 
             Width="120" 
@@ -52,7 +40,7 @@
         <Button 
             Content="Отмена"
             HorizontalAlignment="Left" 
-            Margin="10,200,0,0" 
+            Margin="10,100,0,0" 
             VerticalAlignment="Top" 
             Height="40" 
             Width="120" 

Kusach/AddRouteWindow.xaml.cs

@@ -31,20 +31,27 @@ namespace Kusach
 
         private void AddUserButton_Click(object sender, RoutedEventArgs e)
         {
-            if (IdDriverBox.Text == "" || RouteNameBox.Text == "")
+            if (RouteNameBox.Text == "")
                 MessageBox.Show("Поля не могут быть пустыми.");
             else
             {
-                Routes newRoute = new Routes()
+                try
                 {
-                    IdRoute = cnt.db.Routes.Count() + 1,
-                    IdDriver = Convert.ToInt32(IdDriverBox.Text),
-                    Name = RouteNameBox.Text
-                };
-                cnt.db.Routes.Add(newRoute);
-                cnt.db.SaveChanges();
-                MessageBox.Show("Маршрут успешно создан.");
-                this.Close();
+                    Routes newRoute = new Routes()
+                    {
+                        IdRoute = cnt.db.Routes.Count() + 1,
+                        Name = RouteNameBox.Text
+                    };
+                    cnt.db.Routes.Add(newRoute);
+                    cnt.db.SaveChanges();
+                    MessageBox.Show("Маршрут успешно создан.");
+                    this.Close();
+                }
+                catch
+                {
+                    MessageBox.Show("Ошибка создания маршрута.");
+                    this.Close();
+                }
             }
         }
     }

Kusach/cnt.cs

@@ -2,6 +2,6 @@
 {
     class cnt
     {
-        public static EDM db = new EDM();
+        public static gr692_gavEntities db = new gr692_gavEntities();
     }
 }

Kusach/sysdiagrams.cs

@@ -0,0 +1,23 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     Этот код создан по шаблону.
+//
+//     Изменения, вносимые в этот файл вручную, могут привести к непредвиденной работе приложения.
+//     Изменения, вносимые в этот файл вручную, будут перезаписаны при повторном создании кода.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Kusach
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class sysdiagrams
+    {
+        public string name { get; set; }
+        public int principal_id { get; set; }
+        public int diagram_id { get; set; }
+        public Nullable<int> version { get; set; }
+        public byte[] definition { get; set; }
+    }
+}