Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 0 additions & 40 deletions Lab_rab_1.1_Kirichenko/Book.cs

This file was deleted.

35 changes: 0 additions & 35 deletions Lab_rab_1.1_Kirichenko/MainWindow.xaml

This file was deleted.

68 changes: 0 additions & 68 deletions Lab_rab_1.1_Kirichenko/MainWindow.xaml.cs

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

This file was deleted.

This file was deleted.

Binary file removed Lab_rab_1.1_Kirichenko/obj/Debug/MainWindow.baml
Binary file not shown.
10 changes: 5 additions & 5 deletions Lab_rab_1.1_Kirichenko.sln → Lab_rab_4Kirichenko.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.12.35707.178 d17.12
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lab_rab_1.1_Kirichenko", "Lab_rab_1.1_Kirichenko\Lab_rab_1.1_Kirichenko.csproj", "{09BD7C5C-BAAE-4EFB-8D3F-CF2D671B78B5}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lab_rab_4Kirichenko", "Lab_rab_4Kirichenko\Lab_rab_4Kirichenko.csproj", "{9D6B9DBF-0114-4CEB-BBAE-D96799FF5647}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{09BD7C5C-BAAE-4EFB-8D3F-CF2D671B78B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{09BD7C5C-BAAE-4EFB-8D3F-CF2D671B78B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{09BD7C5C-BAAE-4EFB-8D3F-CF2D671B78B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{09BD7C5C-BAAE-4EFB-8D3F-CF2D671B78B5}.Release|Any CPU.Build.0 = Release|Any CPU
{9D6B9DBF-0114-4CEB-BBAE-D96799FF5647}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9D6B9DBF-0114-4CEB-BBAE-D96799FF5647}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9D6B9DBF-0114-4CEB-BBAE-D96799FF5647}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9D6B9DBF-0114-4CEB-BBAE-D96799FF5647}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Application x:Class="Lab_rab_1._1_Kirichenko.App"
<Application x:Class="Lab_rab_4Kirichenko.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:Lab_rab_1._1_Kirichenko"
xmlns:local="clr-namespace:Lab_rab_4Kirichenko"
StartupUri="MainWindow.xaml">
<Application.Resources>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using System.Threading.Tasks;
using System.Windows;

namespace Lab_rab_1._1_Kirichenko
namespace Lab_rab_4Kirichenko
{
/// <summary>
/// Логика взаимодействия для App.xaml
Expand Down
25 changes: 25 additions & 0 deletions Lab_rab_4Kirichenko/Helper/FindRole.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Lab_rab_4Kirichenko.Model;

namespace Lab_rab_4Kirichenko.Helper
{
public class FindRole
{
int id;

public FindRole(int id)
{
this.id = id;
}


public bool RolePredicate(Role role)
{
return role.Id == id;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{09BD7C5C-BAAE-4EFB-8D3F-CF2D671B78B5}</ProjectGuid>
<ProjectGuid>{9D6B9DBF-0114-4CEB-BBAE-D96799FF5647}</ProjectGuid>
<OutputType>WinExe</OutputType>
<RootNamespace>Lab_rab_1._1_Kirichenko</RootNamespace>
<AssemblyName>Lab_rab_1.1_Kirichenko</AssemblyName>
<RootNamespace>Lab_rab_4Kirichenko</RootNamespace>
<AssemblyName>Lab_rab_4Kirichenko</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
Expand Down Expand Up @@ -55,6 +55,16 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</ApplicationDefinition>
<Compile Include="Helper\FindRole.cs" />
<Compile Include="Model\PersonDPO.cs" />
<Compile Include="ViewModel\PersonViewModel.cs" />
<Compile Include="ViewModel\RoleViewModel.cs" />
<Compile Include="View\WindowEmployee.xaml.cs">
<DependentUpon>WindowEmployee.xaml</DependentUpon>
</Compile>
<Compile Include="View\WindowRole.xaml.cs">
<DependentUpon>WindowRole.xaml</DependentUpon>
</Compile>
<Page Include="MainWindow.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
Expand All @@ -63,13 +73,22 @@
<DependentUpon>App.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Compile Include="Book.cs" />
<Compile Include="MainWindow.xaml.cs">
<DependentUpon>MainWindow.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Page Include="View\WindowEmployee.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="View\WindowRole.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup>
<ItemGroup>
<Compile Include="Model\Person.cs" />
<Compile Include="Model\Role.cs" />
<Compile Include="Properties\AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>
Expand All @@ -95,5 +114,6 @@
<ItemGroup>
<None Include="App.config" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
11 changes: 11 additions & 0 deletions Lab_rab_4Kirichenko/MainWindow.xaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<Window x:Class="Lab_rab_4Kirichenko.MainWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Title="MainWindow" Height="350" Width="525">
<Grid>
<Menu>
<MenuItem x:Name="Employee" Header="Сотрудники" Click="Employee_OnClick"/>
<MenuItem x:Name="Role" Header="Должности" Click="Role_OnClick"/>
</Menu>
</Grid>
</Window>
Loading