dergeorg/SmartShopper
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "colorpicker fertig und gruppen löschbar"

Browse Source 
This reverts commit eb9a230d69.
This commit is contained in:
Georg Reisinger
2019-01-26 21:08:38 +01:00
parent e26dbb7998
commit d9c3d422d7
4 changed files with 44 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
express-server/public/javascripts/ajax.js
View File

@@ -68,7 +68,6 @@ $(document).ready(function() {
// let name = $("#groupname").val();
// let color = $("#groupfarbe").val();
$("#ListenDetailAdd").modal("hide");
$.ajax({
type: "POST",
@@ -80,7 +79,7 @@ $(document).ready(function() {
},
success(res){
console.log("groupadd funktioniert");
$("#mySmallModalLabel").modal("hide");
},
error(err){
console.log("error");
@@ -127,7 +126,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" style="background-color: #b3b3b3;">
<div class="card-header">
<span>
<img src="${picture}" alt="Avatar" style="width:10%; border-radius: 50%;">
${userinfo}</span>
@@ -211,7 +210,6 @@ function lala(){
let card = $(this).closest(".card");
let id = card.attr("id");
globaleAddZwischenID = id;
$("#groupname").val("");
});
}
@@ -255,7 +253,10 @@ function Detail(){
var link = "/dash/"+idtoken;
$(".card-header").append(`<div class="shoplistid" id="${id}" style="background-color:#b3b3b3">
//ITEM ADD
// von Card Header Kopiert
$(".card-header").append(`<div class="shoplistid" id="${id}">
<a href="${link}" style="left: 5px; margin-top: -50px">
<i class="fas fa-caret-left"></i>
</a>
@@ -268,15 +269,12 @@ function Detail(){
`);
for (let i = 0; i < res.groups.length; i++) {
const el = res.groups[i];
$(".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>
$(".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>
`);
for(let x = 0; x < el.content.length; x++){
const el2 = el.content[x]
@@ -285,8 +283,7 @@ function Detail(){
`);
}
}
ItemAdden();
groupdelete();
ItemAdden()
},
error(err){
console.log("Detail error userinfo_json: ", err);
@@ -371,33 +368,4 @@ $(".itemhinzu").click(function(){
Detail();
});
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");
}
});
});
};
});