Артем Гавриленко 3 년 전
부모
커밋
0f9b43b114

+ 4 - 1
Kusach/App.config

@@ -7,4 +7,7 @@
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
   </startup>
-<connectionStrings><add name="EDMEntities" 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="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>

+ 1 - 0
Kusach/Dispatcher.cs

@@ -29,6 +29,7 @@ namespace Kusach
         public System.DateTime Birthday { get; set; }
         public string PhoneNumber { get; set; }
         public string Email { get; set; }
+        public int Permission { get; set; }
     
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<RouteList> RouteList { get; set; }

+ 4 - 3
Kusach/EDM.Context.cs

@@ -13,10 +13,10 @@ namespace Kusach
     using System.Data.Entity;
     using System.Data.Entity.Infrastructure;
     
-    public partial class EDMEntities : DbContext
+    public partial class EDM : DbContext
     {
-        public EDMEntities()
-            : base("name=EDMEntities")
+        public EDM()
+            : base("name=EDM")
         {
         }
     
@@ -32,6 +32,7 @@ namespace Kusach
         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; }
     }
 }

+ 53 - 16
Kusach/EDM.edmx

@@ -4,7 +4,7 @@
   <edmx:Runtime>
     <!-- SSDL content -->
     <edmx:StorageModels>
-    <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">
+      <Schema Namespace="Хранилище EDMModel" 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" />
@@ -18,6 +18,7 @@
           <Property Name="Birthday" Type="date" Nullable="false" />
           <Property Name="PhoneNumber" Type="nvarchar" MaxLength="10" Nullable="false" />
           <Property Name="Email" Type="nvarchar" MaxLength="50" Nullable="false" />
+          <Property Name="Permission" Type="int" Nullable="false" />
         </EntityType>
         <EntityType Name="Drivers">
           <Key>
@@ -68,6 +69,16 @@
           <Property Name="IdRoute" 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 +171,7 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
-        <EntityContainer Name="Хранилище gr692_gavModelContainer">
+        <EntityContainer Name="Хранилище EDMModelContainer">
           <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 +179,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,10 +210,11 @@
             <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">
+      <Schema Namespace="EDMModel" 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">
         <EntityType Name="Dispatcher">
           <Key>
             <PropertyRef Name="IdDispatcher" />
@@ -214,8 +227,9 @@
           <Property Name="Patronymic" Type="String" MaxLength="50" FixedLength="false" Unicode="true" Nullable="false" />
           <Property Name="Birthday" Type="DateTime" Nullable="false" Precision="0" />
           <Property Name="PhoneNumber" Type="String" MaxLength="10" FixedLength="false" Unicode="true" Nullable="false" />
+          <Property Name="Email" Type="String" MaxLength="50" FixedLength="false" Unicode="true" Nullable="false" />
+          <Property Name="Permission" Type="Int32" Nullable="false" />
           <NavigationProperty Name="RouteList" Relationship="Self.FK__RouteList__IdRou__6383C8BA" FromRole="Dispatcher" ToRole="RouteList" />
-          <Property Name="Email" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
         </EntityType>
         <EntityType Name="Drivers">
           <Key>
@@ -278,6 +292,16 @@
           <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 +395,7 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
-        <EntityContainer Name="EDMEntities" annotation:LazyLoadingEnabled="true">
+        <EntityContainer Name="EDM" annotation:LazyLoadingEnabled="true">
           <EntitySet Name="Dispatcher" EntityType="Self.Dispatcher" />
           <EntitySet Name="Drivers" EntityType="Self.Drivers" />
           <EntitySet Name="DriversList" EntityType="Self.DriversList" />
@@ -379,6 +403,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" />
@@ -414,11 +439,10 @@
     <!-- C-S mapping content -->
     <edmx:Mappings>
       <Mapping Space="C-S" xmlns="http://schemas.microsoft.com/ado/2009/11/mapping/cs">
-        <EntityContainerMapping StorageEntityContainer="Хранилище gr692_gavModelContainer" CdmEntityContainer="EDMEntities">
+        <EntityContainerMapping StorageEntityContainer="Хранилище EDMModelContainer" CdmEntityContainer="EDM">
           <EntitySetMapping Name="Dispatcher">
-            <EntityTypeMapping TypeName="gr692_gavModel.Dispatcher">
+            <EntityTypeMapping TypeName="EDMModel.Dispatcher">
               <MappingFragment StoreEntitySet="Dispatcher">
-                <ScalarProperty Name="Email" ColumnName="Email" />
                 <ScalarProperty Name="IdDispatcher" ColumnName="IdDispatcher" />
                 <ScalarProperty Name="Login" ColumnName="Login" />
                 <ScalarProperty Name="Password" ColumnName="Password" />
@@ -427,11 +451,13 @@
                 <ScalarProperty Name="Patronymic" ColumnName="Patronymic" />
                 <ScalarProperty Name="Birthday" ColumnName="Birthday" />
                 <ScalarProperty Name="PhoneNumber" ColumnName="PhoneNumber" />
+                <ScalarProperty Name="Email" ColumnName="Email" />
+                <ScalarProperty Name="Permission" ColumnName="Permission" />
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
           <EntitySetMapping Name="Drivers">
-            <EntityTypeMapping TypeName="gr692_gavModel.Drivers">
+            <EntityTypeMapping TypeName="EDMModel.Drivers">
               <MappingFragment StoreEntitySet="Drivers">
                 <ScalarProperty Name="IdDriver" ColumnName="IdDriver" />
                 <ScalarProperty Name="IdTransport" ColumnName="IdTransport" />
@@ -442,7 +468,7 @@
             </EntityTypeMapping>
           </EntitySetMapping>
           <EntitySetMapping Name="DriversList">
-            <EntityTypeMapping TypeName="gr692_gavModel.DriversList">
+            <EntityTypeMapping TypeName="EDMModel.DriversList">
               <MappingFragment StoreEntitySet="DriversList">
                 <ScalarProperty Name="Id" ColumnName="Id" />
                 <ScalarProperty Name="IdDriver" ColumnName="IdDriver" />
@@ -451,7 +477,7 @@
             </EntityTypeMapping>
           </EntitySetMapping>
           <EntitySetMapping Name="Points">
-            <EntityTypeMapping TypeName="gr692_gavModel.Points">
+            <EntityTypeMapping TypeName="EDMModel.Points">
               <MappingFragment StoreEntitySet="Points">
                 <ScalarProperty Name="IdPoint" ColumnName="IdPoint" />
                 <ScalarProperty Name="Name" ColumnName="Name" />
@@ -460,7 +486,7 @@
             </EntityTypeMapping>
           </EntitySetMapping>
           <EntitySetMapping Name="PointsList">
-            <EntityTypeMapping TypeName="gr692_gavModel.PointsList">
+            <EntityTypeMapping TypeName="EDMModel.PointsList">
               <MappingFragment StoreEntitySet="PointsList">
                 <ScalarProperty Name="Id" ColumnName="Id" />
                 <ScalarProperty Name="IdPoint" ColumnName="IdPoint" />
@@ -469,7 +495,7 @@
             </EntityTypeMapping>
           </EntitySetMapping>
           <EntitySetMapping Name="RouteList">
-            <EntityTypeMapping TypeName="gr692_gavModel.RouteList">
+            <EntityTypeMapping TypeName="EDMModel.RouteList">
               <MappingFragment StoreEntitySet="RouteList">
                 <ScalarProperty Name="Id" ColumnName="Id" />
                 <ScalarProperty Name="IdRoute" ColumnName="IdRoute" />
@@ -478,15 +504,26 @@
             </EntityTypeMapping>
           </EntitySetMapping>
           <EntitySetMapping Name="Routes">
-            <EntityTypeMapping TypeName="gr692_gavModel.Routes">
+            <EntityTypeMapping TypeName="EDMModel.Routes">
               <MappingFragment StoreEntitySet="Routes">
                 <ScalarProperty Name="IdRoute" ColumnName="IdRoute" />
                 <ScalarProperty Name="Name" ColumnName="Name" />
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
+          <EntitySetMapping Name="sysdiagrams">
+            <EntityTypeMapping TypeName="EDMModel.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">
+            <EntityTypeMapping TypeName="EDMModel.Transport">
               <MappingFragment StoreEntitySet="Transport">
                 <ScalarProperty Name="IdTransport" ColumnName="IdTransport" />
                 <ScalarProperty Name="NameOfTransport" ColumnName="NameOfTransport" />

+ 17 - 16
Kusach/EDM.edmx.diagram

@@ -4,22 +4,23 @@
   <edmx:Designer xmlns="http://schemas.microsoft.com/ado/2009/11/edmx">
     <!-- Diagram content (shape and connector positions) -->
     <edmx:Diagrams>
-      <Diagram DiagramId="b8240537cd7c460697af7edf661a78ae" Name="Diagram1">
-        <EntityTypeShape EntityType="gr692_gavModel.Dispatcher" Width="1.5" PointX="6.375" PointY="3.375" IsExpanded="true" />
-        <EntityTypeShape EntityType="gr692_gavModel.Drivers" Width="1.5" PointX="0.75" PointY="6.5" IsExpanded="true" />
-        <EntityTypeShape EntityType="gr692_gavModel.DriversList" Width="1.5" PointX="0.5" PointY="3.875" IsExpanded="true" />
-        <EntityTypeShape EntityType="gr692_gavModel.Points" Width="1.5" PointX="6.625" PointY="0.875" IsExpanded="true" />
-        <EntityTypeShape EntityType="gr692_gavModel.PointsList" Width="1.5" PointX="3.875" PointY="0.875" IsExpanded="true" />
-        <EntityTypeShape EntityType="gr692_gavModel.RouteList" Width="1.5" PointX="3.625" PointY="3.875" IsExpanded="true" />
-        <EntityTypeShape EntityType="gr692_gavModel.Routes" Width="1.5" PointX="0.875" PointY="0.875" IsExpanded="true" />
-        <EntityTypeShape EntityType="gr692_gavModel.Transport" Width="1.5" PointX="3.625" PointY="6.5" 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>
-        <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" />
+      <Diagram DiagramId="82fb6c82068d472697811e1a8b69e0b5" Name="Diagram1">
+        <EntityTypeShape EntityType="EDMModel.Dispatcher" Width="1.5" PointX="0.75" PointY="13.375" IsExpanded="true" />
+        <EntityTypeShape EntityType="EDMModel.Drivers" Width="1.5" PointX="0.75" PointY="6.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="EDMModel.DriversList" Width="1.5" PointX="3" PointY="3.875" IsExpanded="true" />
+        <EntityTypeShape EntityType="EDMModel.Points" Width="1.5" PointX="0.75" PointY="1" IsExpanded="true" />
+        <EntityTypeShape EntityType="EDMModel.PointsList" Width="1.5" PointX="3" PointY="0.875" IsExpanded="true" />
+        <EntityTypeShape EntityType="EDMModel.RouteList" Width="1.5" PointX="3" PointY="6.875" IsExpanded="true" />
+        <EntityTypeShape EntityType="EDMModel.Routes" Width="1.5" PointX="0.75" PointY="3.875" IsExpanded="true" />
+        <EntityTypeShape EntityType="EDMModel.sysdiagrams" Width="1.5" PointX="5.75" PointY="0.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="EDMModel.Transport" Width="1.5" PointX="1.5" PointY="10" IsExpanded="true" />
+        <AssociationConnector Association="EDMModel.FK__RouteList__IdRou__6383C8BA" ManuallyRouted="false" />
+        <AssociationConnector Association="EDMModel.FK__DriversLi__IdDri__0C85DE4D" ManuallyRouted="false" />
+        <AssociationConnector Association="EDMModel.FK_Drivers_Transport" ManuallyRouted="false" />
+        <AssociationConnector Association="EDMModel.FK__DriversLi__IdRou__68487DD7" ManuallyRouted="false" />
+        <AssociationConnector Association="EDMModel.FK__PointsLis__IdPoi__6477ECF3" ManuallyRouted="false" />
+        <AssociationConnector Association="EDMModel.FK__PointsLis__IdRou__66603565" ManuallyRouted="false" />
+        <AssociationConnector Association="EDMModel.FK__RouteList__IdRou__628FA481" ManuallyRouted="false" />
       </Diagram>
     </edmx:Diagrams>
   </edmx:Designer>

BIN
Kusach/Images/pesik.png


+ 36 - 31
Kusach/Kusach.csproj

@@ -67,34 +67,6 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
-    <Compile Include="Functions.cs" />
-    <Compile Include="Pages\DispatcherListPage.xaml.cs">
-      <DependentUpon>DispatcherListPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Pages\DriversListPage.xaml.cs">
-      <DependentUpon>DriversListPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Pages\PointsListPage.xaml.cs">
-      <DependentUpon>PointsListPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Pages\TransportListPage.xaml.cs">
-      <DependentUpon>TransportListPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="TestWindow.xaml.cs">
-      <DependentUpon>TestWindow.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Windows\AddDriverWindow.xaml.cs">
-      <DependentUpon>AddDriverWindow.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Windows\AddDriverToRouteWindow.xaml.cs">
-      <DependentUpon>AddDriverToRouteWindow.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Windows\AddPointToRouteWindow.xaml.cs">
-      <DependentUpon>AddPointToRouteWindow.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Windows\AddPointWindow.xaml.cs">
-      <DependentUpon>AddPointWindow.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Dispatcher.cs">
       <DependentUpon>EDM.tt</DependentUpon>
     </Compile>
@@ -119,21 +91,53 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>EDM.edmx</DependentUpon>
     </Compile>
+    <Compile Include="Functions.cs" />
+    <Compile Include="Pages\DispatcherListPage.xaml.cs">
+      <DependentUpon>DispatcherListPage.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Pages\DriversListPage.xaml.cs">
+      <DependentUpon>DriversListPage.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Pages\PointsListPage.xaml.cs">
+      <DependentUpon>PointsListPage.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Pages\ProfilePage.xaml.cs">
+      <DependentUpon>ProfilePage.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Pages\TransportListPage.xaml.cs">
+      <DependentUpon>TransportListPage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Points.cs">
       <DependentUpon>EDM.tt</DependentUpon>
     </Compile>
     <Compile Include="PointsList.cs">
       <DependentUpon>EDM.tt</DependentUpon>
     </Compile>
+    <Compile Include="profile.cs" />
     <Compile Include="RouteList.cs">
       <DependentUpon>EDM.tt</DependentUpon>
     </Compile>
     <Compile Include="Routes.cs">
       <DependentUpon>EDM.tt</DependentUpon>
     </Compile>
+    <Compile Include="sysdiagrams.cs">
+      <DependentUpon>EDM.tt</DependentUpon>
+    </Compile>
     <Compile Include="Transport.cs">
       <DependentUpon>EDM.tt</DependentUpon>
     </Compile>
+    <Compile Include="Windows\AddDriverWindow.xaml.cs">
+      <DependentUpon>AddDriverWindow.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Windows\AddDriverToRouteWindow.xaml.cs">
+      <DependentUpon>AddDriverToRouteWindow.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Windows\AddPointToRouteWindow.xaml.cs">
+      <DependentUpon>AddPointToRouteWindow.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Windows\AddPointWindow.xaml.cs">
+      <DependentUpon>AddPointWindow.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Windows\AddRouteWindow.xaml.cs">
       <DependentUpon>AddRouteWindow.xaml</DependentUpon>
     </Compile>
@@ -178,11 +182,11 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Pages\TransportListPage.xaml">
+    <Page Include="Pages\ProfilePage.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="TestWindow.xaml">
+    <Page Include="Pages\TransportListPage.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -287,14 +291,15 @@
   <ItemGroup>
     <Content Include="EDM.Context.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
-      <DependentUpon>EDM.edmx</DependentUpon>
       <LastGenOutput>EDM.Context.cs</LastGenOutput>
+      <DependentUpon>EDM.edmx</DependentUpon>
     </Content>
     <Content Include="EDM.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
       <DependentUpon>EDM.edmx</DependentUpon>
       <LastGenOutput>EDM.cs</LastGenOutput>
     </Content>
+    <Resource Include="Images\pesik.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

+ 8 - 1
Kusach/MainWindow.xaml

@@ -11,7 +11,9 @@
         Width="800"
         MinHeight="450"
         MinWidth="800"
-        WindowStartupLocation="CenterScreen">
+        WindowStartupLocation="CenterScreen" 
+        ResizeMode="NoResize"
+        WindowStyle="SingleBorderWindow">
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="25*" />
@@ -33,6 +35,11 @@
             VerticalAlignment="Center">
                 <Button 
                 Margin="0,0,0,10"
+                Content="Профиль"
+                Height="40"
+                Click="ProfileButton_Click"/>
+                <Button 
+                Margin="0,0,0,10"
                 Content="Маршруты"
                 Height="40"
                 Click="RoutesButton_Click"/>

+ 5 - 0
Kusach/MainWindow.xaml.cs

@@ -47,5 +47,10 @@ namespace Kusach
         {
             MainFrame.Content = new Pages.PointsListPage();
         }
+
+        private void ProfileButton_Click(object sender, RoutedEventArgs e)
+        {
+            MainFrame.Content = new Pages.ProfilePage();
+        }
     }
 }

+ 99 - 0
Kusach/Pages/ProfilePage.xaml

@@ -0,0 +1,99 @@
+<Page x:Class="Kusach.Pages.ProfilePage"
+      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="419"
+      d:DesignWidth="692"
+      Title="ProfilePage">
+
+    <Grid Background="White">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="45*"/>
+            <ColumnDefinition Width="128*"/>
+        </Grid.ColumnDefinitions>
+        <Grid Grid.Column="0">
+            <StackPanel
+                Orientation="Vertical" 
+                Grid.Column="0"
+                VerticalAlignment="Top"
+                HorizontalAlignment="Center">
+                <Image 
+                    HorizontalAlignment="Left" 
+                    Height="150"
+                    Width="150"
+                    VerticalAlignment="Top" 
+                    Margin="0,20,0,20"
+                    Source="/Kusach;component/Images/pesik.png"/>
+            <Button 
+                Content="Изменить"
+                HorizontalAlignment="Left" 
+                Height="30"
+                Width="150"
+                VerticalAlignment="Top"/>
+        </StackPanel>
+            <Border 
+                BorderBrush="Black" 
+                BorderThickness="1"/>
+        </Grid>
+        <Grid
+            Margin="25,25,25,25"
+            Grid.Column = "1">
+            <StackPanel Orientation="Vertical">
+                <Label
+                    Name="NameSurnameBox"
+                    Content="Markus Bodhi"
+                    FontSize="30"
+                    VerticalAlignment="Top" 
+                    Height="55" 
+                    Width="462"/>
+                <Label
+                    Content="День рождения:"
+                    FontSize="20"
+                    VerticalAlignment="Top" 
+                    Height="40" 
+                    Width="462"/>
+                <Label
+                    Name="BirthdayBox"
+                    Content="20-20-2020"
+                    FontSize="20"
+                    VerticalAlignment="Top" 
+                    Height="40" 
+                    Width="462"/>
+                <Label
+                    Content="Номер телефона:"
+                    FontSize="20"
+                    VerticalAlignment="Top" 
+                    Height="40" 
+                    Width="462"/>
+                <Label
+                    Name="PhoneNumBox"
+                    Content="7(999)619-99-99"
+                    FontSize="20"
+                    VerticalAlignment="Top" 
+                    Height="40" 
+                    Width="462"/>
+                <Label
+                    Content="Электронная почта:"
+                    FontSize="20"
+                    VerticalAlignment="Top" 
+                    Height="40" 
+                    Width="462"/>
+                <Label
+                    Name="EmailBox"
+                    Content="pesik@gmail.com"
+                    FontSize="20"
+                    VerticalAlignment="Top" 
+                    Height="40" 
+                    Width="462"/>
+            </StackPanel>
+            <Border 
+            BorderBrush="Black" 
+            BorderThickness="1"/>
+        </Grid>
+
+
+    </Grid>
+</Page>

+ 34 - 0
Kusach/Pages/ProfilePage.xaml.cs

@@ -0,0 +1,34 @@
+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>
+    /// Логика взаимодействия для ProfilePage.xaml
+    /// </summary>
+    public partial class ProfilePage : Page
+    {
+        public ProfilePage()
+        {
+            InitializeComponent();
+            NameSurnameBox.Content = cnt.db.Dispatcher.Where(item => item.IdDispatcher == profile.DispatcherId).Select(item => item.Name + " " + item.Surname).FirstOrDefault();
+            DateTime Birthday = cnt.db.Dispatcher.Where(item => item.IdDispatcher == profile.DispatcherId).Select(item => item.Birthday).FirstOrDefault();
+            BirthdayBox.Content = Birthday.ToLongDateString();
+            string phone = cnt.db.Dispatcher.Where(item => item.IdDispatcher == profile.DispatcherId).Select(item => item.PhoneNumber).FirstOrDefault();
+            PhoneNumBox.Content = "+7(" + phone.Substring(0, 3) + ")" + phone.Substring(3, 3) + "-" + phone.Substring(6, 2) + "-" + phone.Substring(8, 2);
+            EmailBox.Content = cnt.db.Dispatcher.Where(item => item.IdDispatcher == profile.DispatcherId).Select(item => item.Email).FirstOrDefault();
+        }
+    }
+}

+ 0 - 15
Kusach/TestWindow.xaml

@@ -1,15 +0,0 @@
-<Window x:Class="Kusach.TestWindow"
-        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="TestWindow" Height="450" Width="800">
-    <Grid>
-        <Button
-            Click="Button_Click">
-            
-        </Button>
-    </Grid>
-</Window>

+ 0 - 37
Kusach/TestWindow.xaml.cs

@@ -1,37 +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>
-    /// Логика взаимодействия для TestWindow.xaml
-    /// </summary>
-    public partial class TestWindow : Window
-    {
-        public TestWindow()
-        {
-            InitializeComponent();
-        }
-
-        private void Button_Click(object sender, RoutedEventArgs e)
-        {
-            int routeId = 1;
-            string expected = "Маршрут #1";
-            if (expected == Functions.GetRouteName(routeId))
-                MessageBox.Show($"true");
-            else
-                MessageBox.Show($"false");
-        }
-    }
-}

+ 4 - 2
Kusach/Windows/LogWindow.xaml.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Linq;
+using System.Linq;
 using System.Windows;
 
 namespace Kusach
@@ -21,8 +20,11 @@ namespace Kusach
         {
             if(!Functions.IsValidLogAndPass(logbox.Text, passbox.Password))
                 MessageBox.Show("Поля не могут быть пустыми.");
+            else
             if (Functions.LoginCheck(logbox.Text, passbox.Password))
             {
+                profile.DispatcherId = cnt.db.Dispatcher.First(item => item.Login == logbox.Text).IdDispatcher;
+                profile.Permission = cnt.db.Dispatcher.First(item => item.Login == logbox.Text).Permission;
                 MainWindow mw = new MainWindow();
                 mw.Show();
                 this.Close();

+ 2 - 1
Kusach/Windows/RegWindow.xaml.cs

@@ -38,7 +38,8 @@ namespace Kusach
                         Patronymic = MNameBox.Text,
                         Birthday = Convert.ToDateTime(BirthdayBox.Text),
                         PhoneNumber = PhoneBox.Text,
-                        Email = EmailBox.Text
+                        Email = EmailBox.Text,
+                        Permission = 1
                     };
                     cnt.db.Dispatcher.Add(newUser);
                     cnt.db.SaveChanges();

+ 1 - 12
Kusach/Windows/TransportEditWindow.xaml.cs

@@ -1,16 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Linq;
 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.Windows
 {

+ 1 - 1
Kusach/cnt.cs

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

+ 1 - 0
Kusach/packages.config

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="EntityFramework" version="6.4.4" targetFramework="net472" />
+  <package id="EntityFramework.ru" version="6.2.0" targetFramework="net472" />
 </packages>

+ 14 - 0
Kusach/profile.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Kusach
+{
+    public class profile
+    {
+        static public int DispatcherId { get; set; }
+        static public int Permission { get; set; }
+    }
+}

+ 23 - 0
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; }
+    }
+}