ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

EmployeeImage

Browse Source
This commit is contained in:
Waldi
2016-07-18 09:15:00 +02:00
parent b66d85c7dc
commit 07b5f2ccdc
23 changed files with 252 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Android/BewoMitarbeiterApp/.idea/compiler.xml generated
View File

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<option name="DEFAULT_COMPILER" value="Javac" />
<resourceExtensions />
<wildcardResourcePatterns>
<entry name="!?*.java" />
@@ -11,7 +12,6 @@
<entry name="!?*.flex" />
<entry name="!?*.kt" />
<entry name="!?*.clj" />
<entry name="!?*.aj" />
</wildcardResourcePatterns>
<annotationProcessing>
<profile default="true" name="Default" enabled="false">

17
Android/BewoMitarbeiterApp/.idea/gradle.xml generated
View File

@@ -3,23 +3,8 @@
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<option name="distributionType" value="LOCAL" />
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleHome" value="C:\Program Files\Android\Android Studio\gradle\gradle-2.10" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
<option value="$PROJECT_DIR$/app" />
<option value="$PROJECT_DIR$/volley" />
</set>
</option>
<option name="myModules">
<set>
<option value="$PROJECT_DIR$" />
<option value="$PROJECT_DIR$/app" />
<option value="$PROJECT_DIR$/volley" />
</set>
</option>
</GradleProjectSettings>
</option>
</component>

8
Android/BewoMitarbeiterApp/.idea/misc.xml generated
View File

@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="EntryPointsManager">
<entry_points version="2.0" />
</component>
<component name="NullableNotNullManager">
<option name="myDefaultNullable" value="android.support.annotation.Nullable" />
<option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
@@ -37,13 +34,10 @@
<ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
<option name="id" value="Android" />
</component>
<component name="SvnBranchConfigurationManager">
<option name="mySupportsUserInfoFilter" value="true" />
</component>
</project>

2
Android/BewoMitarbeiterApp/.idea/modules.xml generated
View File

@@ -3,8 +3,6 @@
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/BewoMitarbeiterApp.iml" filepath="$PROJECT_DIR$/BewoMitarbeiterApp.iml" />
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
<module fileurl="file://$PROJECT_DIR$/volley/volley.iml" filepath="$PROJECT_DIR$/volley/volley.iml" />
</modules>
</component>
</project>

6
Android/BewoMitarbeiterApp/.idea/vcs.xml generated
View File

@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="svn" />
</component>
</project>

12
Android/BewoMitarbeiterApp/BewoMitarbeiterApp.iml
View File

@@ -7,13 +7,23 @@
<option name="BUILDABLE" value="false" />
</configuration>
</facet>
<facet type="android-gradle" name="Android-Gradle">
<configuration>
<option name="GRADLE_PROJECT_PATH" value=":" />
</configuration>
</facet>
<facet type="android" name="Android">
<configuration>
<option name="ALLOW_USER_CONFIGURATION" value="false" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

41
Android/BewoMitarbeiterApp/app/app.iml
View File

@@ -64,14 +64,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -80,44 +72,27 @@
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.3/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/21.0.3/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
<orderEntry type="library" exported="" name="ksoap2-android-assembly-3.6.0-jar-with-dependencies" level="project" />
<orderEntry type="library" exported="" name="gson-2.6.2" level="project" />
<orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
<orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
<orderEntry type="library" exported="" name="commons-lang3-3.3.2" level="project" />
<orderEntry type="library" exported="" name="commons-io-1.3.2" level="project" />
<orderEntry type="library" exported="" name="robospice-1.4.14" level="project" />
<orderEntry type="library" exported="" name="robospice-cache-1.4.14" level="project" />
<orderEntry type="module" module-name="volley" exported="" />
<orderEntry type="library" exported="" name="android-android-21" level="project" />
</component>
</module>

41
Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/ChatActiviti.java
View File

@@ -379,9 +379,9 @@ public class ChatActiviti extends ActionBarActivity{
WriteMessagesfromStorage(str+"/"+determind+"%"+formattedDate+"\n");
chatMessage = new ChatMessageFormat(str, determind, formattedDate);
chatMessage = new ChatMessageFormat(str, determind, formattedDate); //<---------- rausnehmen am besten alles
chatMessages.add(chatMessage);
adapter.notifyDataSetChanged();
adapter.notifyDataSetChanged(); //<----------
Log.v("","");
@@ -580,11 +580,26 @@ public class ChatActiviti extends ActionBarActivity{
//################ Activit abfragen ############################################################
public void onStart(){
SharedPreferences sp = getSharedPreferences("OURINFO", MODE_PRIVATE);
Editor ed = sp.edit();
ed.putBoolean("active", true);
ed.commit();
super.onStart();
}
public void onResume() {
// Log.v("Stuss","Hier nochmals on creat aufrufen");
isOnStop = false;
// isOnStop = false;
// MainActivityMitarbeiter.isThreadPause = true;
SharedPreferences sp = getSharedPreferences("OURINFO", MODE_PRIVATE);
Editor ed = sp.edit();
ed.putBoolean("active", true);
ed.commit();
MainActivityMitarbeiter.isThreadPause = true;
super.onResume();
}
@@ -593,9 +608,16 @@ public class ChatActiviti extends ActionBarActivity{
// Thread t = new Thread(new ConnectionClose());
// t.start();
MainActivityMitarbeiter.isThreadPause = false;
// MainActivityMitarbeiter.isThreadPause = false;
//isOnStop = true;
SharedPreferences sp = getSharedPreferences("OURINFO", MODE_PRIVATE);
Editor ed = sp.edit();
ed.putBoolean("active", false);
ed.commit();
isOnStop = true;
super.onStop();
}
@@ -603,7 +625,12 @@ public class ChatActiviti extends ActionBarActivity{
// Thread t = new Thread(new ConnectionClose());
// t.start();
// currentlisten = null;
MainActivityMitarbeiter.isThreadPause = false;
// MainActivityMitarbeiter.isThreadPause = false;
SharedPreferences sp = getSharedPreferences("OURINFO", MODE_PRIVATE);
Editor ed = sp.edit();
ed.putBoolean("active", false);
ed.commit();
super.onDestroy();
}

22
Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/MainActivityMitarbeiter.java
View File

@@ -220,15 +220,29 @@ public class MainActivityMitarbeiter extends Activity {
Log.v("MESSAGE",splitt[0]);
CreateFile(splitt[0]);
//<<<<<<------------ Du ab nach oben
//##############-----------------
//##############----------------- Abfrage im welche view man sich befindet
Log.v("MESSAGE", "Komme ich den in den Save Bereich Hinein");
WriteMessagesfromStorage(splitt[1] + "/" + determind + "%" + formattedDate + "\n");
SetNotifi(splitt[0], splitt[1]);
// adapter.notifyDataSetChanged();
//#############------------------ mmmmmmmmmaaaaaaaaaaaannnnnnnnn
//#############------------------
/* Shared preferenz abfragen wenn ja dann -->*
if(){
SharedPreferences sp = getSharedPreferences("OURINFO", MODE_PRIVATE);
Editor ed = sp.edit();
ed.putBoolean("active", true);
ed.commit();
-->*
chatMessage = new ChatMessageFormat(str, determind, formattedDate); //<----------
chatMessages.add(chatMessage);
adapter.notifyDataSetChanged(); //<----------
}*/
}
} else {
if (in != null)
@@ -289,7 +303,7 @@ public class MainActivityMitarbeiter extends Activity {
if(Unsendfile.canRead() && socket.isConnected()){
try{
Log.v("Info","Eine ungesendete NAchricht wurde gefunden");
Log.v("Info","Eine ungesendete Nachricht wurde gefunden");
FileInputStream stream = new FileInputStream(Unsendfile);
InputStreamReader in = new InputStreamReader(stream);

16
Android/BewoMitarbeiterApp/app/src/main/java/beyondsoft/bewomitarbeiterapp/MessageAdapter.java
View File

@@ -47,22 +47,16 @@ public class MessageAdapter extends ArrayAdapter<ChatMessageFormat> {
String[] splitt = line.split(":");
//Server nachricht kenntlich machen
//Sortierung der Chatdesigns
if (chatMessage.getIsME()) {
layoutResource = R.layout.item_chat_right;
} else if(splitt[0].equals("Server")) {
layoutResource = R.layout.item_chat_sever_right;
// } else if(splitt[0].equals("Server")) { ---> Die Nachricht vom Server wird kenntlich gemacht
// layoutResource = R.layout.item_chat_sever_right;
}else {
layoutResource = R.layout.item_chat_left;
}
/* Original
if (chatMessage.getIsME()) {
layoutResource = R.layout.item_chat_left;
} else {
layoutResource = R.layout.item_chat_right;
}
*/
/* if (convertView != null) {
holder = (ViewHolder) convertView.getTag();
Log.v("Status","Bin ich hier ?? ");
@@ -76,7 +70,7 @@ public class MessageAdapter extends ArrayAdapter<ChatMessageFormat> {
holder.msg.setText(chatMessage.getMessage());
//TODO eine weitere option für Chatmessage hinzufügen zum abfragen wegen send Message
//TODO eine weitere option für Chatmessage hinzufügen zum abfragen wegen send Message --< Damit sind die häkchen gemeint
if(holder.send_tick != null)
holder.send_tick.setText(Html.fromHtml("&#x2713;")+""+Html.fromHtml("&#x2713;"));

1
Android/BewoMitarbeiterApp/settings.gradle
View File

@@ -1 +1,2 @@
include ':app', ':volley'

4
BeWo/View/ChatServiceEmployee.xaml.cs
View File

@@ -26,8 +26,6 @@ namespace BeWo.View
public partial class ChatServiceEmployee
{
private CustomerVM _ViewModel;
long? employeeOid;
@@ -78,7 +76,7 @@ namespace BeWo.View
}
//################### Bugs Vorhanden / statt new Create ein Update genügt ###########################################
//################### Bugs Vorhanden / statt new Create, ein Update genügt ###########################################
private void CheckBox_Checked(object sender, RoutedEventArgs e)
{
//hehe nö nicht funkt weil statt update passiert ein insert

64
BeWo/View/ChatView.xaml.cs
View File

@@ -49,20 +49,8 @@ namespace BeWo.View
rootGroupBox.Header = nameinf;
// AktChatUser.Background = Color.Transparent;
// Chat.Items.Add(new KontakMessageBuilder(nameinf,Chatinf));
//this.m_mainSocket = m_mainSocket;
//this.m_workerSocket = m_workerSocket;
this.m_workerSocketList = m_workerSocketList;
//chat.VerticalScrollBarVisibility = ScrollBarVisibility.Visible;
// chat.IsReadOnly = true;
// chat.IsEnabled = true;
SetChatSetting();
closeWindow();
@@ -144,7 +132,6 @@ namespace BeWo.View
SaveChatMessageinDB(personoid, i);
}
}
}
}
else
@@ -165,8 +152,6 @@ namespace BeWo.View
curitem.Receivems = anzRec++.ToString();
}
}
SaveChatMessageinDB(personoid, i);
}
}
@@ -230,18 +215,22 @@ namespace BeWo.View
{
try
{
// var person = ServiceFacade.DoCustomerServiceSync(s => s.GetPersonsById(personoid)); person[0].PersonOid.Value
// var person = ServiceFacade.DoCustomerServiceSync(s => s.GetPersonsById(personoid)); person[0].PersonOid.Value
// Möglichkeit : mit perosnoid die person rausholen und dann die mitarbeiter oder klienten oid dazu benutzen um infos heraus zu holen.
String alfa = chatSettingControll.SelectionBoxItem as string;
if (alfa.Equals("Gerade Online"))
Clientlist.Items.Add(new KontaktlistBuilder(clientname, "Online", null, personoid, workerid));
Clientlist.Items.Add(new KontaktlistBuilder(clientname, "Online", null, personoid, workerid)); //<------ Null = Hier Sollte der service aufruf sein für das auf der db liegende bild.
saveOnlineList.Items.Add(new KontaktlistBuilder(clientname, "Online", null, personoid, workerid));
saveOnlineList.Items.Add(new KontaktlistBuilder(clientname, "Online", null, personoid, workerid)); //<------ Null = Hier Sollte der service aufruf sein für das auf der db liegende bild.
}
catch (Exception)
{
//Wenn im Catch bereich dann NoName Chat Nachbar
Clientlist.Items.Add(new KontaktlistBuilder(clientname, "Online", null, personoid, workerid));
Clientlist.Items.Add(new KontaktlistBuilder(clientname, "Online", null, personoid, workerid)); // hier ggf. eine andere Catch methode wählen
}
}
@@ -254,21 +243,19 @@ namespace BeWo.View
if (curItem.EmpfaengerOid == clientid)
{
/* if (AktChatUser.Items.Count != 0) Loscht akt user und akt chat von der view
/* if (AktChatUser.Items.Count != 0) Löscht akt user und akt chat von der view
{
KontaktlistBuilder aktItem = (KontaktlistBuilder)AktChatUser.Items[0];
if (aktItem.EmpfaengerOid == curItem.EmpfaengerOid)
{
AktChatUser.Items.Clear();
Chat.Items.Clear();
}
} */
//Item auslesen und nach der passenden oid suchen wenn equal dann delet
//Item auslesen und nach der passenden oid suchen wenn equal dann deleteeeee
saveOnlineList.Items.Remove(abc);
@@ -276,16 +263,16 @@ namespace BeWo.View
Clientlist.Items.Clear();
if (saveOnlineList.Items.Count == 0)
{
break;
}
else
{
foreach (var xyz in saveOnlineList.Items)
foreach (var xyz in saveOnlineList.Items)
{
Clientlist.Items.Add(xyz);
}
}
}
}
}
@@ -319,7 +306,7 @@ namespace BeWo.View
else
{
// gebe eine Nachricht aus das man éinen Chat partner wählen muss
Console.WriteLine("Kein Akteur Ausgewählt");
MessageBox.Show("Bitte wählen Sie einen Chatpartner aus.", "Fehler", MessageBoxButton.OK);
}
}
@@ -342,8 +329,8 @@ namespace BeWo.View
}
else
{
// gebe eine NAchricht aus das man éinen Chat partner wählen muss
Console.WriteLine("Kein Akteur Ausgewählt");
// gebe eine Nachricht aus das man éinen Chat partner wählen muss
MessageBox.Show("Bitte wählen Sie einen Chatpartner aus.", "Fehler", MessageBoxButton.OK);
}
}
}
@@ -382,7 +369,7 @@ namespace BeWo.View
}
foreach (var list in offmitarbeiter)
{
Clientlist.Items.Add(new KontaktlistBuilder(list.FirstName, Goff, BuildImg(null),list.PersonOid));
Clientlist.Items.Add(new KontaktlistBuilder(list.FirstName, Goff, BuildImg(ServiceFacade.DoEmployeeServiceSync(s => s.GetEmployeeImage(list.EmployeeOid))), list.PersonOid));
}
foreach (var list in offklienten)
{
@@ -438,7 +425,7 @@ namespace BeWo.View
KontaktlistBuilder curItem = (KontaktlistBuilder)abc;
if (curItem.EmpfaengerOid == list.PersonOid)
Clientlist.Items.Add(new KontaktlistBuilder(list.FirstName, Mon, BuildImg(null), list.PersonOid));
Clientlist.Items.Add(new KontaktlistBuilder(list.FirstName, Mon, BuildImg(ServiceFacade.DoEmployeeServiceSync(s => s.GetEmployeeImage(list.EmployeeOid))), list.PersonOid));
}
}
@@ -563,7 +550,7 @@ namespace BeWo.View
{
Dispatcher.Invoke(
DispatcherPriority.Normal,
(ThreadStart)delegate { ServerStats.Text = "Ein Fehler im Bereich Message"; });
(ThreadStart)delegate { ServerStats.Text = "Fehler: Die Nachricht konnte nicht gesendet werden."; });
}
}
@@ -577,6 +564,7 @@ namespace BeWo.View
catch (InvalidOperationException e)
{
Console.WriteLine("Invalid SaveChatMessage Operation");
MessageBox.Show("Es ist ein fehler aufgetreten. Bitte Kontaktieren sie den Support", "Fehler: Hier Fehler code", MessageBoxButton.OK);
}
}
@@ -588,12 +576,12 @@ namespace BeWo.View
foreach (var list in allitems)
{
// list.SenderPersonOid
// ServiceFacade.
if(list.SenderPersonOid == BeWoApp.LoggedOnEmployee.PersonOid.Value)
Chat.Items.Add(new KontakMessageBuilder(BeWoApp.LoggedOnUser.LoginName, list.ChatText,list.Uhrzeit.ToString()));
// list.SenderPersonOid
if (list.SenderPersonOid == BeWoApp.LoggedOnEmployee.PersonOid.Value)
Chat.Items.Add(new KontakMessageBuilder(BeWoApp.LoggedOnUser.LoginName, list.ChatText,
list.Uhrzeit.ToString()));
else
Chat.Items.Add(new KontakMessageBuilder("Fanko", list.ChatText, DateTime.Now.ToString()));
Chat.Items.Add(new KontakMessageBuilder("Unknown User", list.ChatText, DateTime.Now.ToString()));
}
}
@@ -683,4 +671,6 @@ namespace BeWo.View
//######################################################################################################################################
}

27
BeWo/View/Detail/EmployeeView.xaml.cs
View File

@@ -1,11 +1,13 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Reflection;
using System.ServiceModel;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using BeWo.Core;
using BeWo.Core.Service;
using BeWo.ServiceProxy;
@@ -114,8 +116,33 @@ namespace BeWo.View.Detail
{
tabitem_documents.Visibility = Visibility.Visible;
}
/*Employee Picture
if (_ViewModel.EmployeeImage != null)
{
var biImg = new BitmapImage();
var ms = new MemoryStream(_ViewModel.EmployeeImage);
biImg.BeginInit();
biImg.StreamSource = ms;
biImg.EndInit();
var imgSrc = biImg as ImageSource;
Img.Source = biImg;
}
Img.EditValueChanged += Image_EditValueChanged;*/
}
public void Image_EditValueChanged(object sender, DevExpress.Xpf.Editors.EditValueChangedEventArgs e)
{
// _ViewModel.CustomerImage = Img.EditValue as byte[];
}
public override bool IsDirty
{
get { return ViewModel != null && ViewModel.IsDirty; }

33
BeWo/View/HomeDragPanelView.xaml.cs
View File

@@ -1227,6 +1227,37 @@ namespace BeWo.View
}
}
//############# Sever wurde ausgelagert
// hier soll der Client aufruf hin der rest bleibt so wie es ist ( Tcp Gedöns )
// Erhalte msg, splitte die objekte, und weise dies der DB und dem Chat zu.
//nachricht schreiben funktioniert dann auf die Änliche weise also person oid wird mitgegeben im string mit der msg.
//die nachricht schreib funktion muss dann nur ein wenig in der ChatView Klasse angepast werden.
/*
private void ConnectWithServer()
{
try
{
TcpClient clientSocket = new TcpClient();
int port = 8888; //<----- Port Hier hinein Schreiben
clientSocket.Connect("Ipadresse hier rein schreiben", port);
}
catch (Exception e)
{
MessageBox.Show("Die Verbindung zum Server konnte nicht aufgebaut werden.", "FehlerCode: Hier Fehlercode", MessageBoxButton.OK);
//Hier den Code zum weiteren Connect versuch auffordern.
}
}
*
*
*
*
*
*/
//#####################################
//#################### Serveranwendung System ##################################################
public void onConnectionStart()
@@ -1551,7 +1582,7 @@ namespace BeWo.View
}
catch (ObjectDisposedException)
{
System.Diagnostics.Debugger.Log(0, "1", "\nOnReceiveData: Socket has been closed\n");
System.Diagnostics.Debugger.Log(0, "1", "\n OnReceiveData: Socket has been closed \n");
}
catch (SocketException se)
{

50
BeWo/View/MiniChatView.xaml.cs
View File

@@ -26,21 +26,20 @@ namespace BeWo.View
//protected ArrayList m_workerSocketList;
protected ChatView viewChat;
String incommingString;
protected String incommingString;
String incommingName;
protected String incommingName;
long incommingEmpfangOid;
protected long incommingEmpfangOid;
String namenInfo;
Boolean AppendTrue = false;
List<string> myListDS = new List<string>();
protected String namenInfo;
protected Boolean AppendTrue = false;
protected List<string> myListDS = new List<string>();
//################## Variablen zum Zählen aktueller nachricht ###########
protected int anzahlDS = 0;
//#######################################################################
public MiniChatView(String CLientName, String chat/*, ArrayList m_workerSocketList*/, ChatView view , long oid)
public MiniChatView(String CLientName, String chat /*, ArrayList m_workerSocketList*/, ChatView view , long oid)
{
InitializeComponent();
@@ -67,7 +66,6 @@ namespace BeWo.View
Minichat.IsReadOnly = true;
Minichat.IsEnabled = true;
}
@@ -102,10 +100,11 @@ namespace BeWo.View
//Close();
if (Visibility != Visibility.Collapsed)
{
var myArray = myListDS.ToArray();
anzahlDS = 0;
//abfrage ob viewchat gesetzt ist
//abfrage ob viewchat gesetzt ist <--- Warum nochmal
viewChat.SetTextFromMiniV(myArray, incommingName,incommingEmpfangOid);
viewChat.Visibility = Visibility.Visible;
myListDS.Clear();
@@ -126,11 +125,11 @@ namespace BeWo.View
incommingString = text;
myListDS.Add(incommingString);
Minichat.Text = namenInfo+text+"\n"; // may the fehler hier sein
Minichat.Text = namenInfo+": "+text+"\n";
Minichat.ScrollToEnd();
}
//Wenn noch offen append Text zu kur text
//Wenn noch offen append Text zu current text
public void AppendTextwhileViewOpen(String text, int nac)
{
AppendTrue = true;
@@ -140,34 +139,35 @@ namespace BeWo.View
//Setzte die anzahl der aktuellen nachrichten
Title = anzahlDS + " " + namenInfo;
incommingString = text;
myListDS.Add(incommingString);
Minichat.AppendText(namenInfo+": "+text+"\n"); // may the fehler hier sein
Minichat.AppendText(namenInfo+": "+text+"\n");
Minichat.ScrollToEnd();
}
private void Minichat_OnGotFocus(object sender, RoutedEventArgs e)
{
var myArray = myListDS.ToArray();
anzahlDS = 0;
//abfrage ob viewchat gesetzt ist
viewChat.SetTextFromMiniV(myArray, incommingName,incommingEmpfangOid);
viewChat.Visibility = Visibility.Visible;
myListDS.Clear();
Visibility = Visibility.Collapsed;
if(viewChat.Visibility != Visibility.Visible){
var myArray = myListDS.ToArray();
anzahlDS = 0;
viewChat.SetTextFromMiniV(myArray, incommingName,incommingEmpfangOid);
viewChat.Visibility = Visibility.Visible;
myListDS.Clear();
Visibility = Visibility.Collapsed;
}
}
/*
* Sollte der Wunsch bestehen das man im kleinen fenster antworten möchte
* ##### ***** Sollte der Wunsch bestehen das man im kleinen fenster antworten möchte ***** #####
*
* private void SendButton_Click(object sender, RoutedEventArgs e)
{
//Minichat.AppendText("Server: "+MiniChatbox.Text+"\n");
@@ -179,8 +179,6 @@ namespace BeWo.View
}
//############################## Serveranwendungsgedöns ########################
//Sendet eine Nachricht zum Clienten

20
BeWo/ViewModel/EmployeeVM.cs
View File

@@ -74,6 +74,7 @@ namespace BeWo.ViewModel
public static string PropertyName_WeeklyTotalHours = "WeeklyTotalHours";
public static String PropertyName_EmployeeColor = "EmployeeColor";
public static String PropertyName_EmployeeBrush = "EmployeeBrush";
public static string PropertyName_EmployeeImage = "EmployeeImage";
#endregion
@@ -123,6 +124,7 @@ namespace BeWo.ViewModel
private string _Town;
private String _EmployeeColor;
private SolidColorBrush _EmployeeBrush;
private byte[] _EmployeeImage;
public EmployeeVM(
EmployeeDC pEmployeeDC, IList<EmploymentTypeDC> pPossibleTypes, IEnumerable<ValueListEntryDC> pPossibleQualifications,
@@ -1021,6 +1023,22 @@ namespace BeWo.ViewModel
}
}
public Byte[] EmployeeImage
{
get { return _EmployeeImage; }
set
{
if (AreDifferent(_EmployeeImage, value))
{
_EmployeeImage = value;
StoreDirtyInformation(AreDifferent(DataContract.EmployeeImage, value), PropertyName_EmployeeImage);
FirePropertyChanged(PropertyName_EmployeeImage);
}
}
}
protected override void InitByDataContract(EmployeeDC pDataContract)
{
if (!IsNew)
@@ -1055,6 +1073,7 @@ namespace BeWo.ViewModel
_Text5 = pDataContract.Text5;
_Notice2 = pDataContract.Notice2;
_EmployeeColor = pDataContract.EmployeeColor;
_EmployeeImage = pDataContract.EmployeeImage;
_IsArchived = pDataContract.ActivationType == ActivationTypeId.Archived;
@@ -1153,6 +1172,7 @@ namespace BeWo.ViewModel
pDataContract.Text5 = _Text5;
pDataContract.Notice2 = _Notice2;
pDataContract.EmployeeColor = _EmployeeColor;
pDataContract.EmployeeImage = _EmployeeImage;
pDataContract.ActivationType = _IsArchived ? ActivationTypeId.Archived : ActivationTypeId.Active;
//pDataContract.CancellationPeriod = this._CancellationPeriod;

16
Data/Entities/Employee.cs
View File

@@ -50,6 +50,7 @@ namespace BeWo.Data.Entities
public static String PropertyName_EmployeeColor = "EmployeeColor";
public static string PropertyName_EmployeeImage = "EmployeeImage";
private IList<AbsenceTime> _AbsenceTimes;
@@ -96,6 +97,8 @@ namespace BeWo.Data.Entities
private String _EmployeeColor;
private byte[] _EmployeeImage;
public Employee()
{
@@ -458,5 +461,18 @@ namespace BeWo.Data.Entities
{
return Person.LastName + ", " + Person.FirstName;
}
public virtual Byte[] EmployeeImage
{
get { return _EmployeeImage; }
set
{
if (AreDifferent(_EmployeeImage, value))
{
_EmployeeImage = value;
}
}
}
}
}

1
Data/Mappings/Employee.hbm.xml
View File

@@ -22,6 +22,7 @@
<property column="Notice2" type="String" name="Notice2" />
<property column="EmployeeColor" type="String" name="EmployeeColor" />
<property column="EmployeeImage" name="EmployeeImage" />
<property column="InsTs" type="DateTime" name="InsTs" />
<property column="InsUser" type="String" name="InsUser" length="256" />

4
Service/DCEntityMapper/EmployeeDC_Employee.cs
View File

@@ -47,6 +47,8 @@ namespace BeWo.Service.DCEntityMapper
pDataContract.Notice2 = pEntity.Notice2;
pDataContract.ActivationType = pEntity.IsActive;
pDataContract.EmployeeImage = pEntity.EmployeeImage;
//pDataContract.ProbationPeriod = pEntity.ProbationPeriod;
//pDataContract.CancellationPeriod = pEntity.CancellationPeriod;
//pDataContract.EntryDate = pEntity.EntryDate;
@@ -154,6 +156,8 @@ namespace BeWo.Service.DCEntityMapper
pEntity.IsActive = pDataContract.ActivationType;
pEntity.EmployeeImage = pDataContract.EmployeeImage;
//pEntity.CancellationPeriod = pDataContract.CancellationPeriod;
//pEntity.EntryDate = pDataContract.EntryDate;
//pEntity.ProbationPeriod = pDataContract.ProbationPeriod;

4
Service/ServiceContracts/IEmployeeService.cs
View File

@@ -314,5 +314,9 @@ namespace BeWo.Service.ServiceContracts
[FaultContract(typeof(BeWoFault))]
[OperationContract]
List<EmployeeAPPCodeDC> GetAllEmployeeAppCodes(long pEmployeeOid);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
Byte[] GetEmployeeImage(long employeeOid);
}
}

13
Service/ServiceImplementations/EmployeeServiceImp.cs
View File

@@ -1169,6 +1169,19 @@ namespace BeWo.Service.ServiceImplementations
}
public Byte[] GetEmployeeImage(long employeeOid)
{
try
{
var employee = DAOFactory.GenericDAO.GetByID<Employee>(employeeOid);
return employee.EmployeeImage;
}
catch (Exception e)
{
throw Utils.CreateBeWoFaultException(e);
}
}

3
Shared/DataContracts/EmployeeDC.cs
View File

@@ -110,5 +110,8 @@ namespace BS.Shared.DataContracts
{
return new SolidColorBrush((Color) ColorConverter.ConvertFromString(EmployeeColor));
}
[DataMember]
public byte[] EmployeeImage { get; set; }
}
}