();
+ while (rs.next()) {
+ outUserList.add(rs.getString(1));
+ }
+
+ if (outUserList.contains(username)) {
+ return true;
+ } else {
+ return false;
+ }
+
+
+ }
+
/**
* Verbindet sich mit dem Server
* Holt die eigenen Shoppinglisten vom Server. Und speichert diese in eine List mit Shoppinglist Objekten
@@ -94,6 +204,7 @@ public class Database {
/**
* Hoolt alle groups und items der list und erstelt ein Detail objekt von jeder group. Die detail objekte kommen in eine List
+ *
* @param sl_id Shoppinglist Id mit der gearbeitet wird
* @return Eine List mit Details über jede Shoppinglist
* @throws SQLException
@@ -121,6 +232,24 @@ public class Database {
}
+ /**
+ * Generiert eine neue 8 stellige sl_id
+ *
+ * @return Neue Sl_id
+ */
+ private String generateSL_Id() {
+ String possible = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+ String output = "";
+
+ for (int i = 0; i < 8; i++) {
+ output += possible.charAt((int) Math.floor(Math.random() * possible.length()));
+ }
+
+ System.out.println("Generate SL_ID: " + output);
+
+ return output;
+ }
+
/**
* Holt alle Items einer bestimmten shoppingliste, angegeben durch die shoppinglist id
*
@@ -191,6 +320,84 @@ public class Database {
}
+ /**
+ * Bearbeitet die Eigenschaften einer Shoppingliste
+ * @param sl_id Shoppinglist Id welche zu bearbeiten ist
+ * @param newname Neuer Shoppinglistname
+ * @param newdescription Neue Shoppinglist Beschreibung
+ * @param newColor Neue Shoppinglist Farbe
+ * @throws SQLException
+ * @throws JSONException
+ */
+ public void editShoppinglist(String sl_id, String newname, String newdescription, String newColor) throws SQLException, JSONException {
+ Shoppinglist oldShoppinglist = getShoppinglist(sl_id);
+
+ if(!oldShoppinglist.getname().equals(newname) && newname != null){
+ sqlUpdate2Param("UPDATE \"Shoppinglist\" SET name = ? WHERE sl_id = ?", newname, sl_id);
+ }
+
+ if(!oldShoppinglist.getdescription().equals(newdescription) && newdescription != null){
+ sqlUpdate2Param("UPDATE \"Shoppinglist\" SET description = ? WHERE sl_id = ?", newdescription, sl_id);
+ }
+
+ if(!oldShoppinglist.getcolor().equals(newColor) && newColor != null){
+ sqlUpdate2Param("UPDATE \"Shoppinglist\" SET color = ? WHERE sl_id = ?", newColor, sl_id);
+ }
+ }
+
+
+ /**
+ * Führt einen SQL Befehl durch der keine rückgabe hat.
+ *
+ * @param SQL Der SQL befehl
+ * @param param ein Parameter
+ * @param param2 ein 2. Parameter
+ * @throws SQLException
+ */
+ private void sqlUpdate2Param(String SQL, String param, String param2) throws SQLException {
+ connectDatabase();
+ PreparedStatement pstmt = conect.prepareStatement(SQL);
+ pstmt.setString(1, param);
+ pstmt.setString(2, param2);
+ pstmt.executeUpdate();
+ }
+ /**
+ * Führt einen SQL Befehl durch der keine rückgabe hat.
+ *
+ * @param SQL Der SQL befehl
+ * @param param ein Parameter
+ * @throws SQLException
+ */
+ private void sqlUpdate(String SQL, String param) throws SQLException {
+ connectDatabase();
+ PreparedStatement pstmt = conect.prepareStatement(SQL);
+ pstmt.setString(1, param);
+ pstmt.executeUpdate();
+ }
+
+ /**
+ * Hollt eine Shoppingliste vom server
+ * @param sl_id Shoppingliste welche heruntergelanden werden soll
+ * @return Ein Shoppinglist Objekt
+ * @throws SQLException
+ * @throws JSONException
+ */
+ public Shoppinglist getShoppinglist(String sl_id) throws SQLException, JSONException {
+ String SQL = "SELECT row_to_json(\"Shoppinglist\") AS obj FROM \"Shoppinglist\" JOIN \"Shoppinglist_admin\" USING (sl_id) WHERE sl_id = ?";
+ connectDatabase();
+
+ PreparedStatement pstmt = conect.prepareStatement(SQL);
+ System.out.println(sl_id);
+ pstmt.setString(1, sl_id);
+ ResultSet rs = pstmt.executeQuery();
+ rs.next();
+ String resultString = rs.getString(1);
+ JSONObject jsonObject = new JSONObject(resultString);
+
+ return new Shoppinglist(sl_id, jsonObject.getString("name"), jsonObject.getString("description"), jsonObject.getString("invitelink"), jsonObject.getString("color"));
+ }
+
+
/**
* NICHT VERWENDEN FUNKTIONIERT NICHT!!
*
@@ -206,19 +413,15 @@ public class Database {
private ResultSet databaseRequest(String SQL, String uid) throws SQLException {
connectDatabase();
- ResultSet rs = null;
- try (PreparedStatement pstmt = conect.prepareStatement(SQL)) {
- pstmt.setString(1, uid);
- rs = pstmt.executeQuery();
- System.out.println(uid);
+ PreparedStatement pstmt = conect.prepareStatement(SQL);
+ pstmt.setString(1, uid);
+ ResultSet rs = pstmt.executeQuery();
+ System.out.println(uid);
- //HIER
- //WEITER
- //PROGRAMMIEREN
+ //HIER
+ //WEITER
+ //PROGRAMMIEREN
- } catch (SQLException ex) {
- System.out.println(ex.getMessage());
- }
return rs;
}
}
diff --git a/app/src/main/java/at/smartshopper/smartshopper/shoppinglist/ShoppinglistAdapter.java b/app/src/main/java/at/smartshopper/smartshopper/shoppinglist/ShoppinglistAdapter.java
index d93f45b..1dee8f7 100644
--- a/app/src/main/java/at/smartshopper/smartshopper/shoppinglist/ShoppinglistAdapter.java
+++ b/app/src/main/java/at/smartshopper/smartshopper/shoppinglist/ShoppinglistAdapter.java
@@ -2,12 +2,16 @@ package at.smartshopper.smartshopper.shoppinglist;
import android.content.Context;
import android.content.Intent;
+import android.graphics.Color;
+import android.media.Image;
import android.net.Uri;
import android.os.Bundle;
+import android.support.v7.widget.CardView;
import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.TextView;
@@ -15,14 +19,19 @@ import com.google.firebase.auth.FirebaseAuth;
import com.google.firebase.auth.FirebaseUser;
import com.squareup.picasso.Picasso;
+import java.sql.SQLException;
import java.util.List;
import at.smartshopper.smartshopper.R;
import at.smartshopper.smartshopper.activitys.ShoppinglistDetails;
import at.smartshopper.smartshopper.customViews.RoundCornersTransformation;
+import at.smartshopper.smartshopper.db.Database;
public class ShoppinglistAdapter extends RecyclerView.Adapter {
+ private OnChangeItemClick onChangeClick;
+ private OnItemClicked onClick;
+ private at.smartshopper.smartshopper.db.Database db;
//this context we will use to inflate the layout
private Context mCtx;
@@ -38,6 +47,7 @@ public class ShoppinglistAdapter extends RecyclerView.Adapter0-ExD9iP0NlCeB%!N*R!qRyFSd8T=%Vjz1~Sj?;B6m&;YvEk^+I
zKe<;HOw2LoNGqX2$$jN`pfKkGGcTa5O6rUg3N@$$M?>zYatGG6$qFb9BWz=fp}^)a
zmO`=@%s;*mz;BRr=R864!wMBBbUaX?rY|tzD4^5|P;*zNVfqq>nEF@S@7`%m4Mt0$
z&7l~NEA6Fct{*)Lb0L_NzMw^Lwk%iJ*wT`J_rH?M<*Minwv?0?d%Y*+00000NkvXX
Hu0mjfV*_jY
literal 0
HcmV?d00001
diff --git a/app/src/main/res/drawable-mdpi/close.png b/app/src/main/res/drawable-mdpi/close.png
new file mode 100644
index 0000000000000000000000000000000000000000..30350ed1f6271d2b6c54f95e76d55f33b3405fa9
GIT binary patch
literal 263
zcmV+i0r>ujP)yzS|xj_6Mh_3*#A|ADhP&FX6bAXtaSWD!9
z_$*Z8795r+LgoHL)yk0?ObS4}3CREjG`R~e>j$}f~
z^eiRGl+=s{N?Eex6crapC@N-?QdGbSJ7pqM*kY(2nibdl45MJs0sss(LDIpq2HOAt
N002ovPDHLkV1f#IWLE$H
literal 0
HcmV?d00001
diff --git a/app/src/main/res/drawable-xhdpi/close.png b/app/src/main/res/drawable-xhdpi/close.png
new file mode 100644
index 0000000000000000000000000000000000000000..55b6d753aff5bae22896b27c7b4e40be9d4c8e94
GIT binary patch
literal 544
zcmV+*0^j|KP)RCX3LG&DYigoKa~9|6$Tb2gbv
zHk&;n$L?h>>?G3wJKs0Q?(OUbfrp2Ohlj_O;S?-e&@EHj8cN_H_zYfwHG|qUYCeGn
ztYsXc`8F7XA7Bd%4d{l{5}LnYlO~Mf7<^>&31?u>fOd~svi1XbWYWMccnS8UBHt|B
z0IL}^s~kI{R-!9vT!1^K|Al=p0w>^7DmVn|YnrHX%uv!s2bA-XLQGui#V}JD_H6sDQUAQ=rc8bz|ymeyKEnlQPCCl0~R%NS((OHaSoX
zPgfYu4Z11Or-@ZlZpyJvpvjF$Zt#;k>kByEaM4?bhywSDi8)P(<`>fE;x~60_YUhO
zL?rkEf0QRKZ+tBqQNa{Mu6d)0I3;?7fx`$>vP~fjBvVMuHiei%X^VJ7&Rt)`y4R>^
zyhDy$evSTTBa4(M?!-p6PLxQZxHC~=lQ1`NA&su-ys75*27yh
ze%x*AlUC63vhvb8=b3TOY~q?30@c?~_I!ydvkf|QtMED_P&W`9sIt_OUTPNheSyLX
zQAhEm;c;HNfnmpA)lJ#lv|vS3nb-Ud(-^7MlV2sTR?wKG@Oa%4sT!@~p$iC}xCt
z>1G%%5-=%b+-fJ&_WMcC0>MRbaT^+i9Rpe4ioSQ$d&8>5k~(SEk(Z@CNz*OX>X!>l
n@to5AL|s*eg9+lr28J5O@XrC|kDkfC0*QFK`njxgN@xNAjkttD
literal 0
HcmV?d00001
diff --git a/app/src/main/res/drawable-xxxhdpi/close.png b/app/src/main/res/drawable-xxxhdpi/close.png
new file mode 100644
index 0000000000000000000000000000000000000000..270041db3950afe2db117b447ebb647bdc67b420
GIT binary patch
literal 865
zcmV-n1D^beP)