12.03 fiks

ProjectAnalogParus/EncouragementSummaPage.xaml

@@ -10,12 +10,29 @@
 
     <Grid>
         <Button Content="Расчитать" HorizontalAlignment="Left" Margin="154,355,0,0" VerticalAlignment="Top" Width="75" Click="SummaClick"/>
-        <ComboBox Name="cmbStudent" HorizontalAlignment="Left" Margin="302,60,0,0" VerticalAlignment="Top" Width="120" Loaded="combobox1_load"/>
+        <ComboBox Name="cmbStudent" HorizontalAlignment="Left" Margin="302,60,0,0" VerticalAlignment="Top" Width="120">
+            <ComboBox.ItemTemplate>
+                <DataTemplate>
+                    <TextBlock DataContext="{Binding}">
+                        <TextBlock.Text>
+                            <MultiBinding StringFormat="{}{0} {1} {2}">
+                                <Binding Path="LastName" />
+                                <Binding Path="FirstName" />
+                                <Binding Path="Middlename" />
+                            </MultiBinding>
+                        </TextBlock.Text>
+                    </TextBlock>
+                </DataTemplate>
+            </ComboBox.ItemTemplate>
+        </ComboBox>
+
         <ComboBox Name="cmbUser" HorizontalAlignment="Left" Margin="302,112,0,0" VerticalAlignment="Top" Width="120"/>
         <ComboBox Name="cmbScholarship" HorizontalAlignment="Left" Margin="304,181,0,0" VerticalAlignment="Top" Width="120"/>
         <ComboBox Name="cmbEncoragement" HorizontalAlignment="Left" Margin="304,221,0,0" VerticalAlignment="Top" Width="120"/>
         <TextBlock Name="AmoutSumma" HorizontalAlignment="Left" Margin="304,254,0,0" TextWrapping="Wrap"  VerticalAlignment="Top" Height="24" Width="120"/>
         <DatePicker HorizontalAlignment="Left" Margin="302,143,0,0" VerticalAlignment="Top" Height="29" Width="120"/>
+       
+            
 
     </Grid>
 </Page>

ProjectAnalogParus/EncouragementSummaPage.xaml.cs

@@ -28,9 +28,7 @@ namespace ProjectAnalogParus
         {
             InitializeComponent();
 
-
-            cmbStudent.ItemsSource = db.Student.ToList();
-            cmbStudent.DisplayMemberPath = "LastName";
+            cmbStudent.ItemsSource = db.Student.ToList();         
             cmbStudent.SelectedValuePath = "IdStudent";
 
             cmbScholarship.ItemsSource = db.Scholarship.ToList();
@@ -43,12 +41,12 @@ namespace ProjectAnalogParus
 
             cmbEncoragement.ItemsSource = db.TypeEncouragement.ToList();
             cmbEncoragement.DisplayMemberPath = "NameTypeEncouragement";
-            cmbEncoragement.SelectedValuePath = "IdEncouragement";
+            cmbEncoragement.SelectedValuePath = "IdTypeEncouragement";
         }        
 
         private void SummaClick(object sender, RoutedEventArgs e)
         {
-
+           
         }
     }
 }

ProjectAnalogParus/InsertEncouragementWindow.xaml.cs

@@ -28,7 +28,7 @@ namespace ProjectAnalogParus
         private void InsertClick(object sender, RoutedEventArgs e)
         {
             gr672_bdaEntities db = new gr672_bdaEntities();
-            Encouragement encouragement = new Encouragement();
+            Encouragement encouragement = new Encouragement();  
             TypeEncouragement NameEncouragement = new TypeEncouragement();
             encouragement.Amount = Convert.ToDecimal(txtAmount.Text);
             NameEncouragement.NameTypeEncouragement = txtNameEncouragement.Text;