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

Änderungen von bis zur Messe eingecheckt

Browse Source
This commit is contained in:
staccatomamba
2016-11-03 15:26:12 +01:00
parent c640f416f1
commit 9db29abcf0
19 changed files with 534 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
Android/BewoMitarbeiterApp/app/src/main/java/Database/DatabaseHandler.java
View File

@@ -18,7 +18,6 @@ import java.util.Locale;
import beyondsoft.bewomitarbeiterapp.ContactListItem;
import entities.ChatMessage;
import soapConnection.SoapConnectionManager;
import util.BeWoLog;
/**
* Created by bib on 07.06.2016.
@@ -121,15 +120,15 @@ public class DatabaseHandler extends SQLiteOpenHelper {
public void onCreate(SQLiteDatabase db) {
String CREATE_CONTACTS_TABLE =
"CREATE TABLE " + TABLE_CONTACTS + "(" +
KEY_ID + " INTEGER PRIMARY KEY," +
KEY_KONTAKT_NAME + " TEXT,"+
KEY_PERSONOID + " INTEGER," +
KEY_PICTURE_BLOB + " BLOB, " +
KEY_IS_TEAM + " INTEGER, " +
KEY_TEAM_MEMBER_NAMES + " TEXT, " +
KEY_TEAM_MEMBER_OIDS + " TEXT, " +
KEY_VERSION + " INTEGER, " +
KEY_IS_EMPLOYEE + " INTEGER)";
KEY_ID + " INTEGER PRIMARY KEY," +
KEY_KONTAKT_NAME + " TEXT,"+
KEY_PERSONOID + " INTEGER," +
KEY_PICTURE_BLOB + " BLOB, " +
KEY_IS_TEAM + " INTEGER, " +
KEY_TEAM_MEMBER_NAMES + " TEXT, " +
KEY_TEAM_MEMBER_OIDS + " TEXT, " +
KEY_VERSION + " INTEGER, " +
KEY_IS_EMPLOYEE + " INTEGER)";
db.execSQL(CREATE_CONTACTS_TABLE);
@@ -335,7 +334,7 @@ public class DatabaseHandler extends SQLiteOpenHelper {
Date sendDate = null;
if(cursor.getString(9) != null) {
sendDate = getDateFromString(cursor.getString(9));
sendDate = getDateFromString(cursor.getString(9));
}
cursor.close();
@@ -356,16 +355,16 @@ public class DatabaseHandler extends SQLiteOpenHelper {
SQLiteDatabase readableDatabase = this.getReadableDatabase();
Cursor cursor = readableDatabase.query(
TABLE_CHATMESSAGE,
CHAT_MESSAGE_COLUMNS,
KEY_IS_TEAM_CHATMESSAGE + " = 0 AND ((" +
KEY_SENDER_PERSON_OID_CHATMESSAGE + "=? AND " +
KEY_RECIPIENT_PERSON_OID_CHATMESSAGE + "=?) OR (" +
KEY_RECIPIENT_PERSON_OID_CHATMESSAGE + "=? AND " +
KEY_SENDER_PERSON_OID_CHATMESSAGE + "=?))"
,
new String[] {String.valueOf(SoapConnectionManager.getUser().getPersonOid()), String.valueOf(recipientOid), String.valueOf(SoapConnectionManager.getUser().getPersonOid()), String.valueOf(recipientOid)},
null, null, null, null);
TABLE_CHATMESSAGE,
CHAT_MESSAGE_COLUMNS,
KEY_IS_TEAM_CHATMESSAGE + " = 0 AND ((" +
KEY_SENDER_PERSON_OID_CHATMESSAGE + "=? AND " +
KEY_RECIPIENT_PERSON_OID_CHATMESSAGE + "=?) OR (" +
KEY_RECIPIENT_PERSON_OID_CHATMESSAGE + "=? AND " +
KEY_SENDER_PERSON_OID_CHATMESSAGE + "=?))"
,
new String[] {String.valueOf(SoapConnectionManager.getUser().getPersonOid()), String.valueOf(recipientOid), String.valueOf(SoapConnectionManager.getUser().getPersonOid()), String.valueOf(recipientOid)},
null, null, null, null);
if(cursor.moveToFirst()) {
do{
@@ -445,15 +444,15 @@ public class DatabaseHandler extends SQLiteOpenHelper {
if(cursor != null) {
cursor.moveToFirst();
int contactId = cursor.getInt(0);
String contactName = cursor.getString(1);
int contactPersonOid = cursor.getInt(2);
byte[] contactPicture = cursor.getBlob(3);
boolean contactIsTeam = cursor.getInt(4) == 1;
String teamMemberOids = cursor.getString(5);
int contactId = cursor.getInt(0);
String contactName = cursor.getString(1);
int contactPersonOid = cursor.getInt(2);
byte[] contactPicture = cursor.getBlob(3);
boolean contactIsTeam = cursor.getInt(4) == 1;
String teamMemberOids = cursor.getString(5);
String teamMemberNames = cursor.getString(6);
int contactVersion = cursor.getInt(7);
boolean isEmployee = cursor.getInt(8) == 1;
int contactVersion = cursor.getInt(7);
boolean isEmployee = cursor.getInt(8) == 1;
ContactListItem contact = new ContactListItem(contactId, contactName, contactPersonOid, contactPicture, contactIsTeam, teamMemberOids, teamMemberNames, contactVersion, isEmployee);
@@ -631,8 +630,6 @@ public class DatabaseHandler extends SQLiteOpenHelper {
}
public ArrayList<ChatMessage> getUnsentChatMessages() {
BeWoLog.writeToLogFile("Lade unverschickte Nachrichten aus der Datenbank. (getUnsentMessages)");
ArrayList<ChatMessage> messages = new ArrayList<>();
SQLiteDatabase readableDatabase = this.getReadableDatabase();
@@ -657,8 +654,6 @@ public class DatabaseHandler extends SQLiteOpenHelper {
cursor.getString(8)
);
BeWoLog.writeToLogFile("MessageId: " + message.MessageId + "; IsDelivered: " + message.IsDelivered + "; Name der IsDelivered-Spalte: " + cursor.getColumnName(5) + ". (getUnsentMessages)");
if(cursor.getString(9) != null) {
message.SendDate = getDateFromString(cursor.getString(9));
}
@@ -673,15 +668,6 @@ public class DatabaseHandler extends SQLiteOpenHelper {
}
public ArrayList<ChatMessage> getChatMessagesByMessageIds(ArrayList<String> messageIds) {
String abc = "";
for(String mid : messageIds) {
abc += messageIds;
if(messageIds.indexOf(mid) != (messageIds.size() - 1)) {
abc += "\n";
}
}
BeWoLog.writeToLogFile(abc);
ArrayList<ChatMessage> result = new ArrayList<>();
SQLiteDatabase readableDatabase = this.getReadableDatabase();
@@ -717,8 +703,6 @@ public class DatabaseHandler extends SQLiteOpenHelper {
blubb += "" + i + ". " + cursor.getColumnName(i) + "; ";
}
BeWoLog.writeToLogFile(blubb);
if(cursor.getString(9) != null) {
message.SendDate = getDateFromString(cursor.getString(9));
}