0.80

kysect · Jan 14, 2019 · c01d566 · c01d566
1 parent 5554751
commit c01d566
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 55 deletions.
diff --git a/LimpStats.Client/CustomControls/Blocks/ResultGridBlock.xaml b/LimpStats.Client/CustomControls/Blocks/ResultGridBlock.xaml
@@ -6,7 +6,7 @@
              xmlns:local="clr-namespace:LimpStats.Client.CustomControls.Blocks"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="298">
-    <Canvas>
-        <DataGrid x:Name="ResGrid" Height="450" Width="298" AutoGenerateColumns="True"/>
+    <Canvas Margin="0,0,-315,0">
+        <DataGrid x:Name="ResGrid" Height="450" Width="613" AutoGenerateColumns="True"/>
     </Canvas>
 </UserControl>
diff --git a/LimpStats.Client/CustomControls/ForProblemTasks/ProblemTasksPreview.xaml b/LimpStats.Client/CustomControls/ForProblemTasks/ProblemTasksPreview.xaml
@@ -116,14 +116,14 @@
         <Button
             Name="UpdateButton"
             Canvas.Right="0"
-            Width="25"
+            Width="37"
             Height="33"
             HorizontalAlignment="Left"
             Click="ButtonClick_Update"
-            Content="🔄" Background="#FF993333" Foreground="#FFE8E8E8" Canvas.Left="175" />
+            Content="🔄" Background="#FF993333" Foreground="#FFE8E8E8" Canvas.Left="163" />
         <Button
             Name="CardTitle"
-            Width="160"
+            Width="163"
             Height="33"
             Background="#FF993333"
             Click="CardTitle_OnClick"
@@ -136,25 +136,5 @@
             Height="217"
             MinHeight="50" Background="#FF4F7BBA" Style="{DynamicResource ListBoxStyle1}" ItemContainerStyle="{DynamicResource ListBoxItemStyle1}" ItemTemplate="{DynamicResource DataTemplate1}" 
           />
-        <Menu
-            Canvas.Right="25"
-            Width="15"
-            Height="25"
-            VerticalAlignment="Top">
-            <MenuItem
-                Width="15"
-                Height="32"
-                Header="⋮"
-                RenderTransformOrigin="0.05,0.56" Background="#FF993333" Foreground="#FFE8E8E8">
-                <MenuItem Header="Rename" />
-                <MenuItem Header="Sort by">
-                    <MenuItem Header="Nickname" />
-                    <MenuItem Header="Name" />
-                    <MenuItem Header="Points" />
-                </MenuItem>
-                <Separator />
-                <MenuItem Click="ButtonDeleteCard" Header="Delete card" />
-            </MenuItem>
-        </Menu>
     </Canvas>
 </UserControl>
diff --git a/LimpStats.Client/CustomControls/ForProblemTasks/ProblemTasksPreview.xaml.cs b/LimpStats.Client/CustomControls/ForProblemTasks/ProblemTasksPreview.xaml.cs
@@ -95,9 +95,6 @@ private void CardTitle_OnClick(object sender, RoutedEventArgs e)
             ProblemPackInfo pack = _group.ProblemPackList.Find(p => p.PackTitle == packTitle);
             var resultGridBlock = new ResultGridBlock(_group.UserList, pack);
 
-            //TODO: check this
-            _studentPackBlock.Visibility = Visibility.Hidden;
-
             _navigateService.AddToViewList(CardTitle.DataContext.ToString(), resultGridBlock);
             _navigateService.OpenView(resultGridBlock);
 

diff --git a/LimpStats.Client/CustomControls/ForStudents/StudentGroupPreview.xaml b/LimpStats.Client/CustomControls/ForStudents/StudentGroupPreview.xaml
@@ -134,7 +134,7 @@
                         <Border
                             x:Name="Border"
                             CornerRadius="0,20,0,0"
-                            Background="#FFE2F9F1"/>
+                            Background="CadetBlue"/>
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsDefaulted" Value="true"/>
                             <Trigger Property="IsMouseOver" Value="true"/>
@@ -163,27 +163,9 @@
                     FontFamily="Century Gothic"
                     Foreground="#FFE8E8E8"
                     Style="{DynamicResource ButtonStyle1}" />
-                <Menu
-                    Width="30"
-                    Background="{x:Null}">
-                    <MenuItem
-                        Header="⋮"
-                        Background="#FF020C27"
-                        Foreground="#FFE8E8E8"
-                        Template="{DynamicResource MenuItemControlTemplate1}">
-                        <MenuItem Header="Rename" />
-                        <MenuItem Header="Sort by">
-                            <MenuItem Header="Nickname" />
-                            <MenuItem Header="Name" />
-                            <MenuItem Header="Points" />
-                        </MenuItem>
-                        <Separator />
-                        <MenuItem Click="ButtonDeleteCard" Header="Delete card" />
-                    </MenuItem>
-                </Menu>
-                <Button
+            <Button
                     x:Name="UpdateButton"
-                    Width="35"
+                    Width="64"
                     HorizontalAlignment="Left"
                     Click="ButtonClick_Update"
                     Content="🔄"

diff --git a/LimpStats.Client/CustomControls/ForStudents/StudentGroupPreview.xaml.cs b/LimpStats.Client/CustomControls/ForStudents/StudentGroupPreview.xaml.cs
@@ -132,8 +132,7 @@ private void ButtonDeleteCard(object sender, RoutedEventArgs e)
         private void CardTitle_OnClick(object sender, RoutedEventArgs e)
         {
             var studentPackBlock = new StudentPackBlock(_group, _studentGroupTitle, _navigateService);
-            //TODO: check this
-            _studentGroupBlock.Visibility = Visibility.Hidden;
+
 
             _navigateService.AddToViewList(_studentGroupTitle, studentPackBlock);
             _navigateService.OpenView(studentPackBlock);

diff --git a/LimpStats.Client/LimpStats.Client.csproj b/LimpStats.Client/LimpStats.Client.csproj
@@ -15,7 +15,7 @@
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
     <IsWebBootstrapper>false</IsWebBootstrapper>
-    <PublishUrl>C:\Users\Step1\Desktop\</PublishUrl>
+    <PublishUrl>C:\Users\Step1\Desktop\123\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
     <UpdateEnabled>false</UpdateEnabled>
@@ -25,7 +25,7 @@
     <UpdatePeriodically>false</UpdatePeriodically>
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationRevision>2</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
@@ -57,7 +57,7 @@
     <ManifestKeyFile>LimpStats.Client_TemporaryKey.pfx</ManifestKeyFile>
   </PropertyGroup>
   <PropertyGroup>
-    <GenerateManifests>false</GenerateManifests>
+    <GenerateManifests>true</GenerateManifests>
   </PropertyGroup>
   <PropertyGroup>
     <SignManifests>false</SignManifests>
@@ -239,7 +239,7 @@
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.7.1">
       <Visible>False</Visible>
-      <ProductName>Microsoft .NET Framework 4.7.1 %28x86 and x64%29</ProductName>
+      <ProductName>Microsoft .NET Framework 4.7.1 %28x86 и x64%29</ProductName>
       <Install>true</Install>
     </BootstrapperPackage>
     <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">