Преглед на файлове

Исправил отображение тс

Igor преди 5 месеца
родител
ревизия
6d9e0ecdba
променени са 3 файла, в които са добавени 14 реда и са изтрити 8 реда
  1. 2 2
      src/SASDesktop/Models/SASExt.cs
  2. 7 1
      src/SASDesktop/SASDesktop.csproj
  3. 5 5
      src/SASDesktop/Views/Transport/List.xaml

+ 2 - 2
src/SASDesktop/Models/SASExt.cs

@@ -91,7 +91,7 @@ namespace SASDesktop.Models
         {
             get
             {
-                return Model1.Name + " " + RelaseYear.ToString();
+                return Model1.Brand1.Name + " " + Model1.Name + " " + RelaseYear.ToString();
             }
         }
 
@@ -105,7 +105,7 @@ namespace SASDesktop.Models
                 }
                 
                 var currentOwner = TransportOwnerships.OrderByDescending(to => to.CreatedAt).FirstOrDefault();
-                return currentOwner.GetHumanName;
+                return currentOwner.Citizen1.GetHumanName;
             }
         }
     }

+ 7 - 1
src/SASDesktop/SASDesktop.csproj

@@ -208,7 +208,7 @@
     <Compile Include="Views\Drivers\DriverListOutput.xaml.cs">
       <DependentUpon>DriverListOutput.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\Portal.cs" >
+    <Compile Include="Views\Portal.cs">
       <DependentUpon>Portal.xaml</DependentUpon>
     </Compile>
     <Compile Include="Views\Transport\Create.xaml.cs">
@@ -320,5 +320,11 @@
   <ItemGroup>
     <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\VINlib\VINlib.csproj">
+      <Project>{e38515da-3ce4-4b1c-a9f5-40c506bf29eb}</Project>
+      <Name>VINlib</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

+ 5 - 5
src/SASDesktop/Views/Transport/List.xaml

@@ -33,15 +33,15 @@
 
                 <ListView.ItemTemplate>
                     <DataTemplate>
-                        <Grid Width="256">
+                        <Grid Width="310">
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="48"/>
+                                <ColumnDefinition Width="80"/>
                                 <ColumnDefinition Width="*"/>
                             </Grid.ColumnDefinitions>
                             <Grid.RowDefinitions>
-                                <RowDefinition Height="64"/>
-                                <RowDefinition Height="64"/>
-                                <RowDefinition Height="64"/>
+                                <RowDefinition Height="20"/>
+                                <RowDefinition Height="20"/>
+                                <RowDefinition Height="20"/>
                             </Grid.RowDefinitions>
 
                             <TextBlock