From 3b133f6a41977ca3d5f83d19607e56418af5d678 Mon Sep 17 00:00:00 2001
From: Georg Reisinger <43533139+GeorgReisinger@users.noreply.github.com>
Date: Tue, 29 Jan 2019 17:33:34 +0100
Subject: [PATCH] fix

---
 express-server/public/javascripts/ajax.js | 60 +++++++++++++++++------
 1 file changed, 46 insertions(+), 14 deletions(-)

diff --git a/express-server/public/javascripts/ajax.js b/express-server/public/javascripts/ajax.js
index 3abdd961..631a5654 100644
--- a/express-server/public/javascripts/ajax.js
+++ b/express-server/public/javascripts/ajax.js
@@ -68,6 +68,7 @@ $(document).ready(function() {
 
         // let name = $("#groupname").val();
         // let color = $("#groupfarbe").val();
+        $("#ListenDetailAdd").modal("hide");
         
         $.ajax({
             type: "POST",
@@ -79,7 +80,7 @@ $(document).ready(function() {
             },
             success(res){
                 console.log("groupadd funktioniert");
-                $("#mySmallModalLabel").modal("hide");
+                
             },
             error(err){
                 console.log("error");
@@ -126,7 +127,7 @@ function eigeneEinkaufslisten(){
                 
                                 $(".listen-ausgabe").append(`<div class="col-md-12 karten">
                                 <div class="card border-light mb-3" style="max-width: 18rem;" id="${el.sl_id}">
-                                    <div class="card-header">
+                                    <div class="card-header" style="background-color: #b3b3b3;">
                                     <span>
                                     <img src="${picture}" alt="Avatar" style="width:10%; border-radius: 50%;">
                                         ${userinfo}</span>
@@ -210,6 +211,7 @@ function lala(){
         let card = $(this).closest(".card");
         let id = card.attr("id");
         globaleAddZwischenID = id;
+        $("#groupname").val("");
     });
 }
 
@@ -253,10 +255,7 @@ function Detail(){
 
                                     var link = "/dash/"+idtoken;
 
-                                    //ITEM ADD
-                                    // von Card Header Kopiert
-
-                                    $(".card-header").append(`<div class="shoplistid" id="${id}">
+                                    $(".card-header").append(`<div class="shoplistid" id="${id}" style="background-color:#b3b3b3">
                                         <a href="${link}" style="left: 5px; margin-top: -50px">
                                             <i class="fas fa-caret-left"></i>
                                         </a>
@@ -269,12 +268,15 @@ function Detail(){
                                     `);
                                     for (let i = 0; i < res.groups.length; i++) {
                                         const el = res.groups[i];
-                                        $(".gruppeninhalt").append(`<div class="card mb-3" style="max-width: 18rem;background-color:#${el.color};">
-                                        <div class="card-header"><h5 class="card-title">${el.name}</h5><button class="btn seemore" type="button" data-toggle="collapse" data-target="#${el.name}" aria-expanded="false" aria-controls="${el.name}"><i class="fas fa-caret-down"></i></button>
-                                        <div class="${el.name}">
-                                        </div>
-                                        </div>
-                                      </div>
+                                        $(".gruppeninhalt").append(`<div class="col-md-6 col-lg-4 shoplisteid" id="${res.sl_id}">
+                                        <div class="card mb-3 groupid ${el.group_id}" id="${el.group_id}" style="max-width: 18rem;background-color:#${el.color};">
+
+                                            <div class="card-header"><h5 class="card-title">${el.name}</h5><button class="btn trashgroup"><i class="far fa-trash-alt"></i></button><button class="btn seemore" type="button" data-toggle="collapse" data-target="#${el.name}" aria-expanded="false" aria-controls="${el.name}"><i class="fas fa-caret-down"></i></button>
+                                                <div class="${el.name}">
+                                                </div>
+                                            </div>
+
+                                        </div></div>
                                         `);
                                         for(let x = 0; x < el.content.length; x++){
                                             const el2 = el.content[x]
@@ -283,7 +285,8 @@ function Detail(){
                                         `);
                                     }
                                     }
-                                    ItemAdden()
+                                    ItemAdden();
+                                    groupdelete();
                                 },
                                 error(err){
                                     console.log("Detail error userinfo_json: ", err);
@@ -368,4 +371,33 @@ $(".itemhinzu").click(function(){
 
     Detail();
 
-});
\ No newline at end of file
+});
+
+function groupdelete(){
+    $('.trashgroup').click(function(){
+        
+        let getid = $(this).closest('.shoplisteid');
+        let shoplistid = getid.attr('id');
+        let getid2 = $(this).closest('.groupid');
+        let groupid = getid2.attr('id');
+
+        console.log(shoplistid);
+        console.log(groupid);
+
+        $.ajax({
+            type: "DELETE",
+            url: "/group",
+            data: {
+                sl_id: shoplistid,
+                group_id: groupid},
+            success(res){
+                console.log("card gelöscht");
+                $(`.${groupid}`).remove();
+            },
+            error(err){
+                console.log("error");
+            }
+        });
+
+    });
+};
\ No newline at end of file