Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo
This commit is contained in:
staccatomamba
BIN
BeWo/Ressources/Icons/WeitereNachrichtLaden.png
Normal file
BIN
BeWo/Ressources/Icons/WeitereNachrichtLaden.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.4 KiB |
@@ -241,106 +241,104 @@
|
||||
</Style>
|
||||
</ListBox.Resources>
|
||||
<ListBox.ItemTemplate>
|
||||
<DataTemplate>
|
||||
<Border BorderBrush="{Binding ChatColor}" BorderThickness="1,1,1,1" CornerRadius="8,8,8,8" Background="{Binding ChatColor}">
|
||||
|
||||
<DockPanel MinHeight="15" Margin="5" LastChildFill="True" Background="{Binding ChatColor}" >
|
||||
|
||||
<StackPanel DockPanel.Dock="Bottom" Visibility="{Binding ChatVisibility}" >
|
||||
<TextBlock VerticalAlignment="Center" Text="{Binding UserMessage}" MinWidth="0" MaxWidth="500" TextWrapping="Wrap" />
|
||||
<DataTemplate>
|
||||
|
||||
<StackPanel>
|
||||
|
||||
<!--Lade Weitere Nachrichten anzeige || Das Könnte auch auserhalb der Chatview Angezeigt werden -->
|
||||
<StackPanel Visibility="{Binding LoadNextVisibility}" >
|
||||
<Image ToolTip="Weitere Nachrichten Laden" Source="/BeWoPlaner;component/Ressources/Icons/WeitereNachrichtLaden.png" Width="25" Height="25" Stretch="Uniform" RenderOptions.BitmapScalingMode="HighQuality" VerticalAlignment="Center" Tag="{Binding LoadObject}" HorizontalAlignment="Center" MouseDown="WeitereNachrichten_OnMouse" />
|
||||
</StackPanel>
|
||||
|
||||
|
||||
<Border BorderBrush="{Binding ChatColor}" BorderThickness="1,1,1,1" CornerRadius="8,8,8,8" Background="{Binding ChatColor}" Visibility="{Binding MainVisibility}" >
|
||||
<DockPanel MinHeight="15" Margin="5" LastChildFill="True" Background="{Binding ChatColor}" Visibility="{Binding MainVisibility}" >
|
||||
|
||||
|
||||
<StackPanel DockPanel.Dock="Bottom" Visibility="{Binding ChatVisibility}" >
|
||||
<TextBlock VerticalAlignment="Center" Text="{Binding UserMessage}" MinWidth="0" MaxWidth="500" TextWrapping="Wrap" />
|
||||
</StackPanel>
|
||||
|
||||
<!-- ################################## Button Für Weitere Items Laden / Prototyp ############################### -->
|
||||
<StackPanel DockPanel.Dock="Bottom" Visibility="{Binding LoadNextVisibility}" >
|
||||
<Button Content="Lade weitere Nachrichten" ToolTip="weitere Nachrichten Herunterladen" HorizontalAlignment="Center" VerticalAlignment="Center" Width="150" Height="25" Tag="{Binding LoadObject}" Click="LadeWeitereBase_OnClick" />
|
||||
</StackPanel>
|
||||
|
||||
<!-- ################################## Ende Prototyp ########################################### -->
|
||||
|
||||
|
||||
<!--############################### Neu versuch ein Button in den Chat hinein zu packen ###############################################-->
|
||||
|
||||
<!--Sound bereich
|
||||
<Border BorderThickness="1" BorderBrush="Black" DockPanel.Dock="Bottom" Visibility="{Binding SoundVisibility}">-->
|
||||
<!-- <DockPanel DockPanel.Dock="Bottom" Visibility="{Binding SoundVisibility}" >
|
||||
<!--############################### Media Bereich ###############################################-->
|
||||
<!--Sound bereich
|
||||
<Border BorderThickness="1" BorderBrush="Black" DockPanel.Dock="Bottom" Visibility="{Binding SoundVisibility}">-->
|
||||
<!-- <DockPanel DockPanel.Dock="Bottom" Visibility="{Binding SoundVisibility}" >
|
||||
|
||||
<Button HorizontalAlignment="Left" VerticalAlignment="Center" Click="PlayAufnahme_OnClick" Height="25" Width="25" Margin="0,0,5,0" Tag="{Binding SoundArray}">
|
||||
<Image Name="image" ToolTip="Smiley einfügen" Source="/BeWoPlaner;component/Ressources/Icons/glucklicher.png" Stretch="Uniform" VerticalAlignment="Center" HorizontalAlignment="Center" RenderOptions.BitmapScalingMode="HighQuality" />
|
||||
<Button HorizontalAlignment="Left" VerticalAlignment="Center" Click="PlayAufnahme_OnClick" Height="25" Width="25" Margin="0,0,5,0" Tag="{Binding SoundArray}">
|
||||
<Image Name="image" ToolTip="Smiley einfügen" Source="/BeWoPlaner;component/Ressources/Icons/glucklicher.png" Stretch="Uniform" VerticalAlignment="Center" HorizontalAlignment="Center" RenderOptions.BitmapScalingMode="HighQuality" />
|
||||
|
||||
</Button>-->
|
||||
</Button>-->
|
||||
|
||||
|
||||
<!--Hier slider einbauen
|
||||
<Slider HorizontalAlignment="Left" Margin="2,0,0,0" VerticalAlignment="Center" Width="100" ValueChanged="AudioSlider_OnValueChanged"/>-->
|
||||
<!-- <Grid Width="200">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="110"/>
|
||||
<ColumnDefinition Width="*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="25" />
|
||||
<RowDefinition Height="15" />
|
||||
</Grid.RowDefinitions>
|
||||
<Border BorderThickness="1" Grid.Row="0" Grid.ColumnSpan="2" BorderBrush="Black" Visibility="{Binding SoundVisibility}">
|
||||
<Slider Grid.Row="0" Grid.ColumnSpan="2" Value="{Binding Path=position, FallbackValue=0}" Maximum="{Binding Path=sliderMaximum, FallbackValue=0, Mode=TwoWay}" Minimum="0" Margin="5,0" VerticalAlignment="Center" />
|
||||
</Border>
|
||||
<TextBlock Grid.Row="1" Grid.Column="1" Text="{Binding Path=time, StringFormat={}{0:hh}:{0:mm}:{0:ss}, FallbackValue=00:00:00, Mode=TwoWay}" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="5,0" />
|
||||
<!--Hier slider einbauen
|
||||
<Slider HorizontalAlignment="Left" Margin="2,0,0,0" VerticalAlignment="Center" Width="100" ValueChanged="AudioSlider_OnValueChanged"/>-->
|
||||
<!-- <Grid Width="200">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="110"/>
|
||||
<ColumnDefinition Width="*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="25" />
|
||||
<RowDefinition Height="15" />
|
||||
</Grid.RowDefinitions>
|
||||
<Border BorderThickness="1" Grid.Row="0" Grid.ColumnSpan="2" BorderBrush="Black" Visibility="{Binding SoundVisibility}">
|
||||
<Slider Grid.Row="0" Grid.ColumnSpan="2" Value="{Binding Path=position, FallbackValue=0}" Maximum="{Binding Path=sliderMaximum, FallbackValue=0, Mode=TwoWay}" Minimum="0" Margin="5,0" VerticalAlignment="Center" />
|
||||
</Border>
|
||||
<TextBlock Grid.Row="1" Grid.Column="1" Text="{Binding Path=time, StringFormat={}{0:hh}:{0:mm}:{0:ss}, FallbackValue=00:00:00, Mode=TwoWay}" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="5,0" />
|
||||
|
||||
<TextBlock Grid.Row="1" Grid.Column="0" Name="text" Margin="5,0" VerticalAlignment="Center" HorizontalAlignment="Left" Text="{Binding UserMessage}" />
|
||||
</Grid>
|
||||
<TextBlock Grid.Row="1" Grid.Column="0" Name="text" Margin="5,0" VerticalAlignment="Center" HorizontalAlignment="Left" Text="{Binding UserMessage}" />
|
||||
</Grid>
|
||||
|
||||
</DockPanel>-->
|
||||
</DockPanel>-->
|
||||
|
||||
|
||||
<!--Herunterlade bereich für Bild und Dokumente Mach ne binding auf die Visibility und zeige diese zuerst an die visibility wird dan geändert -->
|
||||
<DockPanel DockPanel.Dock="Bottom" Visibility="{Binding Herunterladen}" >
|
||||
<Grid >
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="25" />
|
||||
<RowDefinition Height="25" />
|
||||
</Grid.RowDefinitions>
|
||||
<!--Herunterlade bereich für Bild und Dokumente Mach ne binding auf die Visibility und zeige diese zuerst an die visibility wird dan geändert || Umbauen-->
|
||||
<DockPanel DockPanel.Dock="Bottom" Visibility="{Binding Herunterladen}" >
|
||||
<Grid >
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="25" />
|
||||
<RowDefinition Height="25" />
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
|
||||
<!-- Name Der Datei -->
|
||||
<TextBlock Text="{Binding UserMessage}" Grid.Row="0" VerticalAlignment="Center" HorizontalAlignment="Center"/>
|
||||
<!-- Herunterlade Button Hole die Datei aus der Neuen Database | binding herunterladbares erstellen und beim auslesen aus der Datenbank dise dan binden -->
|
||||
<Button Content="Herunterladen" Grid.Row="1" ToolTip="Datei Herunterladen" HorizontalAlignment="Center" VerticalAlignment="Center" Width="125" Height="25" Tag="{Binding Herunterladbares}" Click="DatenRunterladen_OnClick" />
|
||||
</Grid>
|
||||
</DockPanel>
|
||||
<!-- #++++++++++++++++++++++++++++++++++++++++++++++# -->
|
||||
<!-- Name Der Datei -->
|
||||
<TextBlock Text="{Binding UserMessage}" Grid.Row="0" VerticalAlignment="Center" HorizontalAlignment="Center"/>
|
||||
<!-- Herunterlade Button Hole die Datei aus der Neuen Database | binding herunterladbares erstellen und beim auslesen aus der Datenbank dise dan binden -->
|
||||
<Button Content="Herunterladen" Grid.Row="1" ToolTip="Datei Herunterladen" HorizontalAlignment="Center" VerticalAlignment="Center" Width="125" Height="25" Tag="{Binding Herunterladbares}" Click="DatenRunterladen_OnClick" />
|
||||
</Grid>
|
||||
</DockPanel>
|
||||
<!-- #++++++++++++++++++++++++++++++++++++++++++++++# -->
|
||||
|
||||
<!-- Picture bereich-->
|
||||
<DockPanel DockPanel.Dock="Bottom" Visibility="{Binding PictureVisibility}" >
|
||||
<Image Stretch="Uniform" MaxHeight="200" MaxWidth="300" Source="{Binding ImageSources}" RenderOptions.BitmapScalingMode="HighQuality" />
|
||||
</DockPanel>
|
||||
<!-- Picture bereich-->
|
||||
<DockPanel DockPanel.Dock="Bottom" Visibility="{Binding PictureVisibility}" >
|
||||
<Image Stretch="Uniform" MaxHeight="200" MaxWidth="300" Source="{Binding ImageSources}" RenderOptions.BitmapScalingMode="HighQuality" />
|
||||
</DockPanel>
|
||||
|
||||
|
||||
<!--Documentation bereich -->
|
||||
<DockPanel DockPanel.Dock="Bottom" Visibility="{Binding DokumentVisibility}" >
|
||||
<Button HorizontalAlignment="Center" VerticalAlignment="Center" Click="OpenDokument_OnClick" Height="25" Width="25" Tag="{Binding Dokpfad}" >
|
||||
<Image ToolTip="Dokument öffnen" Source="/BeWoPlaner;component/Ressources/Icons/ClipboardDisabled.png" Stretch="Uniform" VerticalAlignment="Center" HorizontalAlignment="Center" />
|
||||
</Button>
|
||||
<TextBlock Margin="2,0,0,0" VerticalAlignment="Center" HorizontalAlignment="Center" Text="{Binding UserMessage}"/>
|
||||
</DockPanel>
|
||||
<!--Documentation bereich -->
|
||||
<DockPanel DockPanel.Dock="Bottom" Visibility="{Binding DokumentVisibility}" >
|
||||
<Button HorizontalAlignment="Center" VerticalAlignment="Center" Click="OpenDokument_OnClick" Height="25" Width="25" Tag="{Binding Dokpfad}" >
|
||||
<Image ToolTip="Dokument öffnen" Source="/BeWoPlaner;component/Ressources/Icons/ClipboardDisabled.png" Stretch="Uniform" VerticalAlignment="Center" HorizontalAlignment="Center" />
|
||||
</Button>
|
||||
<TextBlock Margin="2,0,0,0" VerticalAlignment="Center" HorizontalAlignment="Center" Text="{Binding UserMessage}"/>
|
||||
</DockPanel>
|
||||
|
||||
|
||||
<!--#################################################################################################################################################################-->
|
||||
<!--#################################################################################################################################################################-->
|
||||
|
||||
<StackPanel DockPanel.Dock="Left" Margin="0,0,0,5">
|
||||
<TextBlock Text="{Binding Username}" FontWeight="Bold" MaxWidth="150" HorizontalAlignment="Left" TextAlignment="Left" VerticalAlignment="Center"/>
|
||||
</StackPanel>
|
||||
<StackPanel DockPanel.Dock="Left" Margin="0,0,0,5" >
|
||||
<TextBlock Text="{Binding Username}" FontWeight="Bold" MaxWidth="150" HorizontalAlignment="Left" TextAlignment="Left" VerticalAlignment="Center"/>
|
||||
</StackPanel>
|
||||
|
||||
<StackPanel DockPanel.Dock="Right" Margin="5,0,0,5">
|
||||
<TextBlock Text="{Binding SendTime}" MaxWidth="350" HorizontalAlignment="Right" TextAlignment="Right" VerticalAlignment="Center"/>
|
||||
</StackPanel>
|
||||
<StackPanel DockPanel.Dock="Right" Margin="5,0,0,5" >
|
||||
<TextBlock Text="{Binding SendTime}" MaxWidth="350" HorizontalAlignment="Right" TextAlignment="Right" VerticalAlignment="Center"/>
|
||||
</StackPanel>
|
||||
|
||||
</DockPanel>
|
||||
</Border>
|
||||
</DockPanel>
|
||||
</Border>
|
||||
</StackPanel>
|
||||
</DataTemplate>
|
||||
</ListBox.ItemTemplate>
|
||||
</ListBox>
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1201,7 +1201,7 @@ namespace BeWo.View
|
||||
|
||||
private void ChatLinkOnRequestNavigate(object sender, RequestNavigateEventArgs e)
|
||||
{
|
||||
if (chatView == null) //#################### neu ########## <--
|
||||
if (chatView == null)
|
||||
{
|
||||
chatView = new ChatView("BeWo Chat", chat.Text, clientSocket);
|
||||
|
||||
@@ -1239,7 +1239,6 @@ namespace BeWo.View
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
Dispatcher.Invoke(
|
||||
DispatcherPriority.Normal,
|
||||
(ThreadStart)delegate
|
||||
@@ -1249,7 +1248,7 @@ namespace BeWo.View
|
||||
});
|
||||
|
||||
chatView.Visibility = Visibility.Visible;
|
||||
} //#################### neu ########## <--
|
||||
}
|
||||
else
|
||||
{
|
||||
if(chatView.Visibility == Visibility.Collapsed){
|
||||
|
||||
@@ -1542,13 +1542,14 @@ namespace BeWo.Data.Access
|
||||
Restrictions.Eq(ChatMessage.PropertyName_SenderPersonOid, empfaengerOid),
|
||||
Restrictions.Eq(ChatMessage.PropertyName_EmpfaengerPersonOid, senderOid))));
|
||||
|
||||
c.Add(Restrictions.IsNull(ChatMessage.PropertyName_TeamOid));
|
||||
|
||||
c.AddOrder(Order.Desc(ChatMessage.PropertyName_Uhrzeit));
|
||||
c.SetMaxResults(maxNachrichten);
|
||||
|
||||
return c.List<ChatMessage>();
|
||||
}
|
||||
|
||||
//neue funktion für weitere laden
|
||||
|
||||
public IEnumerable<ChatMessage> FindNextChatMessages(long senderOid, long empfaengerOid, int messlateZahl, List<string> list,bool isteam )
|
||||
{
|
||||
var c = CreateCriteriaIsActive<ChatMessage>();
|
||||
@@ -1561,7 +1562,7 @@ namespace BeWo.Data.Access
|
||||
Restrictions.Eq(ChatMessage.PropertyName_EmpfaengerPersonOid, empfaengerOid)),
|
||||
Restrictions.And(
|
||||
Restrictions.Eq(ChatMessage.PropertyName_SenderPersonOid, empfaengerOid),
|
||||
Restrictions.Eq(ChatMessage.PropertyName_EmpfaengerPersonOid, senderOid))));
|
||||
Restrictions.Eq(ChatMessage.PropertyName_EmpfaengerPersonOid, senderOid)))).Add(Restrictions.IsNull(ChatMessage.PropertyName_TeamOid));
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -1569,7 +1570,6 @@ namespace BeWo.Data.Access
|
||||
c.Add(Restrictions.Eq(ChatMessage.PropertyName_TeamOid, empfaengerOid));
|
||||
}
|
||||
|
||||
//geht
|
||||
c.Add(Restrictions.Not(Restrictions.In(ChatMessage.PropertyName_MessageId, list)));
|
||||
|
||||
c.AddOrder(Order.Desc(ChatMessage.PropertyName_Uhrzeit));
|
||||
|
||||
3336
ReportImp/KetteReports/QueryListReport.Designer.cs
generated
3336
ReportImp/KetteReports/QueryListReport.Designer.cs
generated
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user