From 376170cce74cc0e9fa384b99fe30d9dfbaabb848 Mon Sep 17 00:00:00 2001 From: aschwarz Date: Tue, 11 Apr 2023 13:42:33 +0200 Subject: [PATCH] Songbook entfernt --- controller/admin_notenupload.php | 65 +-------------------- controller/admin_suche.php | 26 --------- dashboard/edit_noten.php | 7 +-- dashboard/notenupload.php | 8 +-- js/components/admin_notenupload.js | 20 +------ js/file_upload/vpb_uploader.js | 5 -- templates/modern/dashboard/notenupload.html | 8 +-- 7 files changed, 9 insertions(+), 130 deletions(-) diff --git a/controller/admin_notenupload.php b/controller/admin_notenupload.php index 1529964..58f299b 100644 --- a/controller/admin_notenupload.php +++ b/controller/admin_notenupload.php @@ -10,7 +10,6 @@ if ($function == 'save_with_files') ## Dieses Script wird für jede Datei einzeln aufgerufen durch vpb_uploader.js. Bei 3 Dateien, 3x $titel = $_POST['titel']; $liednr = $_POST['liednr']; - $songbook = $_POST['songbook']; $verlag = $_POST['verlag']; #csid gesetzt, wenn Member bearbeitet wird $jndid_edit = $_POST['jndid_edit']; @@ -61,19 +60,7 @@ if ($function == 'save_with_files') $vpb_final_location = $vpb_uploaded_files_location . $vpb_file_name; //Directory to save file plus the file to be saved //Without Validation and does not save filenames in the database - # Wenn Songbook nicht vorhanden, dann neu anlegen - $result_sb = $db->query("SELECT sbid - FROM jumi_noten_songbook - WHERE bezeichnung = '$songbook' - LIMIT 1 - "); - $row_sb = $result_sb->fetch_array(); - if($row_sb['sbid'] == ''){ - $sql1 = $db->query("INSERT INTO jumi_noten_songbook ( bezeichnung ) VALUES ( '$songbook' )"); - $sbid = $db->insert_id; - }else{ - $sbid=$row_sb['sbid']; - } + # Wenn Verlag nicht vorhanden, dann neu anlegen $result_vg = $db->query("SELECT vid FROM jumi_noten_verlag @@ -97,7 +84,6 @@ if ($function == 'save_with_files') WHERE titel = '$titel' AND liednr = '$liednr' AND vid = '$vid' - AND sbid = '$sbid' AND anz_lizenzen = '$anz_lizenzen' AND streamlizenz = '$streamlizenz' "); @@ -107,7 +93,6 @@ if ($function == 'save_with_files') $sql1 = $db->query("INSERT INTO jumi_noten_daten ( titel , liednr , vid - , sbid , anz_lizenzen , streamlizenz , uid @@ -117,7 +102,6 @@ if ($function == 'save_with_files') ( '$titel' , '$liednr' , '$vid' - , '$sbid' , '$anz_lizenzen' , '$streamlizenz' , $uid @@ -132,7 +116,6 @@ if ($function == 'save_with_files') SET titel = '$titel' ,liednr = '$liednr' ,vid = '$vid' - ,sbid = '$sbid' ,anz_lizenzen = '$anz_lizenzen' ,streamlizenz = '$streamlizenz' ,uid = '$uid' @@ -151,14 +134,6 @@ if ($function == 'save_with_files') } - # Nicht verwendetes Songbok löschen - $query2 = "SELECT sbid FROM jumi_noten_songbook a WHERE sbid NOT IN (SELECT sbid FROM jumi_noten_daten b WHERE a.sbid=b.sbid); "; - $result2 = $db->query( $query2 ) - or die ("Cannot execute query2"); - - while ($row2 = $result2->fetch_array()){ - $de12 = $db->query( "DELETE FROM jumi_noten_songbook WHERE sbid=$row2[sbid]" ); - } } else @@ -206,7 +181,6 @@ if ($function == 'save_without_files') { $titel = $_POST['titel']; $liednr = $_POST['liednr']; - $songbook = $_POST['songbook']; $verlag = $_POST['verlag']; $jndid_edit = $_POST['jndid_edit']; $anz_lizenzen = $_POST['anz_lizenzen']; @@ -230,21 +204,6 @@ if ($function == 'save_without_files') $db = dbconnect(); - # Wenn Songbook nicht vorhanden, dann neu anlegen - $result_sb = $db->query("SELECT sbid - FROM jumi_noten_songbook - WHERE bezeichnung = '$songbook' - LIMIT 1 - "); - $row_sb = $result_sb->fetch_array(); - if($row_sb['sbid'] == ''){ - $sql1 = $db->query("INSERT INTO jumi_noten_songbook ( bezeichnung ) VALUES ( '$songbook' )"); - $sbid = $db->insert_id; - }else{ - $sbid=$row_sb['sbid']; - } - - # Wenn Verlag nicht vorhanden, dann neu anlegen $result_vg = $db->query("SELECT vid FROM jumi_noten_verlag @@ -265,7 +224,6 @@ if ($function == 'save_without_files') $sql1 = $db->query("INSERT INTO jumi_noten_daten ( titel , liednr , vid - , sbid , anz_lizenzen , streamlizenz , uid @@ -275,7 +233,6 @@ if ($function == 'save_without_files') ( '$titel' , '$liednr' , '$vid' - , '$sbid' , '$anz_lizenzen' , '$streamlizenz' , $uid @@ -297,7 +254,6 @@ if ($function == 'save_without_files') SET titel = '$titel' ,liednr = '$liednr' ,vid = '$vid' - ,sbid = '$sbid' ,anz_lizenzen = '$anz_lizenzen' ,streamlizenz = '$streamlizenz' ,uid = '$uid' @@ -315,16 +271,6 @@ if ($function == 'save_without_files') } - # Nicht verwendetes Songbok löschen - $query2 = "SELECT sbid FROM jumi_noten_songbook a WHERE sbid NOT IN (SELECT sbid FROM jumi_noten_daten b WHERE a.sbid=b.sbid); "; - $result2 = $db->query( $query2 ) - or die ("Cannot execute query2"); - - while ($row2 = $result2->fetch_array()){ - $de12 = $db->query( "DELETE FROM jumi_noten_songbook WHERE sbid=$row2[sbid]" ); - } - - if ($sql1) { echo '
Noten wurden bearbeitet!
|***|success|***|'; @@ -387,15 +333,6 @@ if ($function == 'delNoten') { } - # Nicht verwendetes Songbok löschen - $query2 = "SELECT sbid FROM jumi_noten_songbook a WHERE sbid NOT IN (SELECT sbid FROM jumi_noten_daten b WHERE a.sbid=b.sbid); "; - $result2 = $db->query( $query2 ) - or die ("Cannot execute query2"); - - while ($row2 = $result2->fetch_array()){ - $de12 = $db->query( "DELETE FROM jumi_noten_songbook WHERE sbid=$row2[sbid]" ); - } - if ($stmt1 AND $stmt2) { echo '
SägerIn wurde gelöscht!
|***|success'; exit; diff --git a/controller/admin_suche.php b/controller/admin_suche.php index bba6dd4..57c4aad 100644 --- a/controller/admin_suche.php +++ b/controller/admin_suche.php @@ -56,32 +56,6 @@ if ($function == 'verlag') } } -if ($function == 'songbook') -{ - if (isset($_POST["term"])) - { - $term = mb_strtoupper(trim($_POST["term"])); - - $query = "SELECT distinct bezeichnung FROM jumi_noten_songbook WHERE upper(bezeichnung) LIKE '%" . $term . "%'"; - $result = $db->query($query) or die("Cannot execute verlag"); - - if (mysqli_num_rows($result) > 0) - { - while ($row = $result->fetch_array()) - { - $output[] = array( - "label" => $row['bezeichnung'], - "value" => $row['bezeichnung'] - ); - } - #}else{ - # $output[] = array("label" => "keine Treffer"); - - } - - echo json_encode($output); - } -} ?> diff --git a/dashboard/edit_noten.php b/dashboard/edit_noten.php index 7c35911..fe15ef8 100644 --- a/dashboard/edit_noten.php +++ b/dashboard/edit_noten.php @@ -36,10 +36,9 @@ if(isset($_GET['action'])){ if($action == ''){ - $query = "SELECT a. jndid, titel, anz_lizenzen, streamlizenz, b.bezeichnung songbook, c.bezeichnung verlag - FROM jumi_noten_daten a, jumi_noten_songbook b, jumi_noten_verlag c - WHERE a.sbid=b.sbid - AND a.vid=c.vid + $query = "SELECT a. jndid, titel, anz_lizenzen, streamlizenz, c.bezeichnung verlag + FROM jumi_noten_daten a, jumi_noten_verlag c + WHERE a.vid=c.vid ORDER BY titel ASC;"; $result = $db->query( $query) or die ("Cannot execute query1"); diff --git a/dashboard/notenupload.php b/dashboard/notenupload.php index 8c95b24..664c423 100644 --- a/dashboard/notenupload.php +++ b/dashboard/notenupload.php @@ -20,10 +20,9 @@ require_once "../language/german.inc.php"; $jndid = $_GET['editjndid']; $smarty->assign('create_edit', $jndid); - $result0 = $db->query("SELECT a. jndid, titel, liednr, anz_lizenzen, streamlizenz, b.bezeichnung songbook, c.bezeichnung verlag - FROM jumi_noten_daten a, jumi_noten_songbook b, jumi_noten_verlag c - WHERE a.sbid=b.sbid - AND a.vid=c.vid + $result0 = $db->query("SELECT a. jndid, titel, liednr, anz_lizenzen, streamlizenz, c.bezeichnung verlag + FROM jumi_noten_daten a, jumi_noten_verlag c + WHERE a.vid=c.vid AND a.jndid = $jndid ORDER BY titel ASC;"); $row0 = $result0->fetch_array(); @@ -31,7 +30,6 @@ require_once "../language/german.inc.php"; $smarty->assign('notenupload_liednr', $row0['liednr']); $smarty->assign('notenupload_anz_lizenzen', $row0['anz_lizenzen']); $smarty->assign('notenupload_streamlizenz', $row0['streamlizenz']); - $smarty->assign('notenupload_songbook', $row0['songbook']); $smarty->assign('notenupload_verlag', $row0['verlag']); $query = "SELECT id, filename, originalname, date_format(datum, '%d.%m.%y - %H:%i') uploaddatum FROM jumi_noten_uploads WHERE jndid='$jndid' ORDER BY datum DESC"; diff --git a/js/components/admin_notenupload.js b/js/components/admin_notenupload.js index 8eb16dd..d8b62d6 100644 --- a/js/components/admin_notenupload.js +++ b/js/components/admin_notenupload.js @@ -35,22 +35,4 @@ $("#verlag").autocomplete({ } }, { minLength: 2 -}); - -$("#songbook").autocomplete({ - source: function(request, response) { - $.ajax({ - type: "POST", - url: "../controller/admin_suche.php", - data: { - term: request.term, - function: "songbook" - }, - success: response, - dataType: 'json', - delay: 10 - }); - } -}, { - minLength: 2 -}); +}); \ No newline at end of file diff --git a/js/file_upload/vpb_uploader.js b/js/file_upload/vpb_uploader.js index d9e7411..75871ad 100644 --- a/js/file_upload/vpb_uploader.js +++ b/js/file_upload/vpb_uploader.js @@ -191,7 +191,6 @@ function vpb_multiple_file_uploader(vpb_configuration_settings) { var titel = document.getElementById("titel").value; var liednr = document.getElementById("liednr").value; - var songbook = document.getElementById("songbook").value; var verlag = document.getElementById("verlag").value; var anz_lizenzen = document.getElementById("anz_lizenzen").value; var chk_streamlizenz = document.getElementById("streamlizenz"); @@ -205,7 +204,6 @@ function vpb_multiple_file_uploader(vpb_configuration_settings) { } dataString.append('titel', titel); dataString.append('liednr', liednr); - dataString.append('songbook', songbook); dataString.append('verlag', verlag); dataString.append('anz_lizenzen', anz_lizenzen); dataString.append('streamlizenz', streamlizenz); @@ -305,7 +303,6 @@ function vpb_multiple_file_uploader(vpb_configuration_settings) { vpb_multiple_file_uploader.prototype.vasINSERT = function() { var titel = document.getElementById("titel").value; var liednr = document.getElementById("liednr").value; - var songbook = document.getElementById("songbook").value; var verlag = document.getElementById("verlag").value; var anz_lizenzen = document.getElementById("anz_lizenzen").value; var chk_streamlizenz = document.getElementById("streamlizenz"); @@ -325,7 +322,6 @@ function vpb_multiple_file_uploader(vpb_configuration_settings) { 'function': 'save_without_files', 'titel': titel, 'liednr': liednr, - 'songbook': songbook, 'verlag': verlag, 'anz_lizenzen': anz_lizenzen, 'streamlizenz': streamlizenz, @@ -336,7 +332,6 @@ function vpb_multiple_file_uploader(vpb_configuration_settings) { var a = response.split('|***|'); if (a[1] == "success") { //document.getElementById("titel").value = ""; - //document.getElementById("songbook").value = ""; //document.getElementById("verlag").value = ""; //document.getElementById("anz_lizenzen").value = ""; //document.getElementById("vasplus_multiple_files").value = ""; diff --git a/templates/modern/dashboard/notenupload.html b/templates/modern/dashboard/notenupload.html index dce99c4..55ce442 100644 --- a/templates/modern/dashboard/notenupload.html +++ b/templates/modern/dashboard/notenupload.html @@ -89,12 +89,6 @@ -
-
Songbookname:
-
- -
-
Verlag:
@@ -104,7 +98,7 @@
Anzahl Lizenzen:
- +