.
This commit is contained in:
InesSuess
parent
650e0bbd9e
commit
1f7faeda55
@ -64,7 +64,7 @@ $(document).ready(function () {
|
||||
$(".listen-ausgabe").html("");
|
||||
eigeneEinkaufslisten();
|
||||
geteilteEinkaufslisten();
|
||||
$("#EigeneListeAdd").modal("hide");
|
||||
$(".EigeneListeAdd").modal("hide");
|
||||
},
|
||||
error(err) {
|
||||
console.log("/shoppinglist error", err);
|
||||
@ -85,6 +85,7 @@ $(document).ready(function () {
|
||||
});
|
||||
|
||||
var globaleAddZwischenID = "";
|
||||
var globalegraddid = "";
|
||||
// var globaleGetZwischenID = "";
|
||||
|
||||
function eigeneEinkaufslisten() {
|
||||
@ -223,7 +224,7 @@ function gruppenhinzu() {
|
||||
|
||||
let name = $("#groupname").val();
|
||||
let color = $("input:checked").val();
|
||||
$("#ListenDetailAdd").modal("hide");
|
||||
// $("#ListenDetailAdd").modal("hide");
|
||||
console.log(globaleAddZwischenID);
|
||||
|
||||
firebase.auth().onAuthStateChanged(async function (user) {
|
||||
@ -241,10 +242,16 @@ function gruppenhinzu() {
|
||||
hidden: false
|
||||
},
|
||||
success(res) {
|
||||
|
||||
console.log(res);
|
||||
$("input:checked").val("");
|
||||
$("#groupname").val("");
|
||||
$(".ListenDetailAdd").modal("hide");
|
||||
|
||||
$(".gruppeninhalt").append(`<div class="col-md-6 col-lg-4 shoplisteid" id="${globaleAddZwischenID}">
|
||||
<div class="card mb-3 groupid" id="" style="max-width: 18rem;background-color:#${color};">
|
||||
|
||||
<div class="card-header"><h5 class="card-title">${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="#${name}" aria-expanded="false" aria-controls="${name}"><i class="fas fa-caret-down"></i></button>
|
||||
<div class="card-header"><h5 class="card-title">${name}</h5><button class="btn itemadd"><i class="fas fa-plus"></i></button><button class="btn trashgroup"><i class="far fa-trash-alt"></i></button><button class="btn seemore" type="button" data-toggle="collapse" data-target="#${name}" aria-expanded="false" aria-controls="${name}"><i class="fas fa-caret-down"></i></button>
|
||||
<div class="${name}">
|
||||
</div>
|
||||
</div>
|
||||
@ -326,7 +333,11 @@ function Detail() {
|
||||
$(".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="card-header">
|
||||
<h5 class="card-title">${el.name}</h5>
|
||||
<button class="btn itemadd"><i class="fas fa-plus"></i></button>
|
||||
<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>
|
||||
@ -368,45 +379,46 @@ function Detail() {
|
||||
function ItemAdden() {
|
||||
$(".itemadd").click(function () {
|
||||
|
||||
let getid = $(this).closest('.shoplistid');
|
||||
let id = getid.attr('id');
|
||||
console.log(id);
|
||||
globaleAddZwischenID = id;
|
||||
console.log(id);
|
||||
$('.select').remove();
|
||||
|
||||
let getslid = $(this).closest('.shoplisteid');
|
||||
let slid = getslid.attr('id');
|
||||
console.log(slid);
|
||||
let getgrid = $(this).closest('.groupid');
|
||||
let grid = getgrid.attr('id');
|
||||
globalegraddid = grid;
|
||||
globaleAddZwischenID = slid;
|
||||
$('.GroupItemAdd').modal('show');
|
||||
|
||||
firebase.auth().onAuthStateChanged(async function (user) {
|
||||
if (user) {
|
||||
firebase.auth().currentUser.getIdToken( /* forceRefresh */ true).then(function (idtoken) {
|
||||
$.ajax({
|
||||
type: "GET",
|
||||
url: "/shoppinglist_json/" + id,
|
||||
data: {
|
||||
idtoken: idtoken
|
||||
},
|
||||
success(result) {
|
||||
// firebase.auth().onAuthStateChanged(async function (user) {
|
||||
// if (user) {
|
||||
// firebase.auth().currentUser.getIdToken( /* forceRefresh */ true).then(function (idtoken) {
|
||||
// $.ajax({
|
||||
// type: "GET",
|
||||
// url: "/shoppinglist_json/" + id,
|
||||
// data: {
|
||||
// idtoken: idtoken
|
||||
// },
|
||||
// success(result) {
|
||||
|
||||
console.log(result.groups);
|
||||
// console.log(result);
|
||||
|
||||
for (let i = 0; i < result.groups.length; i++) {
|
||||
const el = result.groups[i];
|
||||
$(".custom-select-groups").append(`
|
||||
<option class="select" value="${el.group_id}">${el.name}</option>
|
||||
`);
|
||||
}
|
||||
// for (let i = 0; i < result.groups.length; i++) {
|
||||
// const el = result.groups[i];
|
||||
|
||||
// $(".custom-select-groups").append(`
|
||||
// <option class="select" value="${el.group_id}">${el.name}</option>
|
||||
// `);
|
||||
// }
|
||||
|
||||
},
|
||||
error(err) {
|
||||
console.log(err);
|
||||
}
|
||||
});
|
||||
}).catch((error) => console.error("Get id token client error: ", error));
|
||||
} else {
|
||||
console.log("Check Auth error", user)
|
||||
}
|
||||
});
|
||||
// },
|
||||
// error(err) {
|
||||
// console.log(err);
|
||||
// }
|
||||
// });
|
||||
// }).catch((error) => console.error("Get id token client error: ", error));
|
||||
// } else {
|
||||
// console.log("Check Auth error", user)
|
||||
// }
|
||||
// });
|
||||
});
|
||||
}
|
||||
|
||||
@ -414,10 +426,8 @@ $(".itemhinzu").click(function () {
|
||||
|
||||
var name = $('#itemname').val();
|
||||
var zahl = $('#inputGroupSelect01').val();
|
||||
var gruppe = $('#inputGroupSelect02').val();
|
||||
console.log(name);
|
||||
console.log(zahl);
|
||||
console.log(gruppe);
|
||||
|
||||
|
||||
firebase.auth().onAuthStateChanged(async function (user) {
|
||||
@ -427,12 +437,13 @@ $(".itemhinzu").click(function () {
|
||||
type: "POST",
|
||||
url: "/item",
|
||||
data: {
|
||||
group_id: $('#inputGroupSelect02').val(),
|
||||
group_id: globalegraddid,
|
||||
sl_id: globaleAddZwischenID,
|
||||
name: $('#itemname').val(),
|
||||
count: $('#inputGroupSelect01').val()
|
||||
},
|
||||
success(result) {
|
||||
$('.GroupItemAdd').modal('hide');
|
||||
console.log("post item");
|
||||
},
|
||||
error(err) {
|
||||
|
||||
@ -22,14 +22,14 @@
|
||||
.trash{
|
||||
background: transparent;
|
||||
position:absolute;
|
||||
right: 29px;
|
||||
right: 5px;
|
||||
margin-top:-7px;
|
||||
}
|
||||
|
||||
.edit{
|
||||
background: transparent;
|
||||
position: absolute;
|
||||
right: 60px;
|
||||
right: 29px;
|
||||
margin-top:-7px;
|
||||
}
|
||||
|
||||
@ -47,7 +47,8 @@
|
||||
.itemadd{
|
||||
background: transparent;
|
||||
position: absolute;
|
||||
right:5px;
|
||||
right:47px;
|
||||
margin-top:-40px;
|
||||
border: 0px;
|
||||
}
|
||||
.seemore{
|
||||
@ -69,7 +70,7 @@
|
||||
.trashgroup{
|
||||
background: transparent;
|
||||
position: absolute;
|
||||
right:23px;
|
||||
right:25px;
|
||||
margin-top:-40px;
|
||||
}
|
||||
|
||||
|
||||
@ -145,18 +145,7 @@
|
||||
|
||||
<div class="form-group layout">
|
||||
<label for="Anzahl-example">Anzahl</label>
|
||||
<select class="custom-select" id="inputGroupSelect01">
|
||||
<option value="1">1</option>
|
||||
<option value="2">2</option>
|
||||
<option value="3">3</option>
|
||||
<option value="4">4</option>
|
||||
<option value="5">5</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="form-group layout">
|
||||
<label for="Group-select">Group</label>
|
||||
<select class="custom-select custom-select-groups" id="inputGroupSelect02">
|
||||
</select>
|
||||
<input type="number" class="form-control" id="inputGroupSelect01" placeholder="zB: 2" maxlength="3">
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user