diff --git a/controller/admin_notenupload.php b/controller/admin_notenupload.php index b65e109..1c4a652 100644 --- a/controller/admin_notenupload.php +++ b/controller/admin_notenupload.php @@ -8,6 +8,7 @@ if ($function == 'save_with_files') if (isset($_POST) && $_SERVER['REQUEST_METHOD'] == "POST") { ## Dieses Script wird für jede Datei einzeln aufgerufen durch vpb_uploader.js. Bei 3 Dateien, 3x + $db = dbconnect(); $titel = $_POST['titel']; $liednr = $_POST['liednr']; $verlag = $_POST['verlag']; @@ -15,22 +16,8 @@ if ($function == 'save_with_files') $jndid_edit = $_POST['jndid_edit']; $anz_lizenzen = $_POST['anz_lizenzen']; $streamlizenz = $_POST['streamlizenz']; + $bemerkung = $db->real_escape_string(stripslashes( $_POST['bemerkung'] )); - if (isset($streamlizenz)) - { - if ($streamlizenz == '1') - { - $streamlizenz = '1'; - } - else - { - $streamlizenz = '0'; - } - } - else - { - $streamlizenz = '0'; - } $datum_file = date("Ymd_His_"); #$vpb_file_name = strip_tags($_FILES['upload_file']['name']); //File Name $vpb_file_name = str_replace(array( @@ -95,6 +82,7 @@ if ($function == 'save_with_files') , vid , anz_lizenzen , streamlizenz + , bemerkung , uid , datum ) @@ -104,6 +92,7 @@ if ($function == 'save_with_files') , '$vid' , '$anz_lizenzen' , '$streamlizenz' + , '$bemerkung' , $uid , '$datum' ) @@ -118,6 +107,7 @@ if ($function == 'save_with_files') ,vid = '$vid' ,anz_lizenzen = '$anz_lizenzen' ,streamlizenz = '$streamlizenz' + ,bemerkung = '$bemerkung' ,uid = '$uid' ,datum = '$datum' WHERE jndid_ = $jndid_edit @@ -179,30 +169,17 @@ if ($function == 'save_with_files') if ($function == 'save_without_files') { + $db = dbconnect(); $titel = $_POST['titel']; $liednr = $_POST['liednr']; $verlag = $_POST['verlag']; $jndid_edit = $_POST['jndid_edit']; $anz_lizenzen = $_POST['anz_lizenzen']; $streamlizenz = $_POST['streamlizenz']; + $bemerkung = $db->real_escape_string(stripslashes( $_POST['bemerkung'] )); - if (isset($streamlizenz)) - { - if ($streamlizenz == '1') - { - $streamlizenz = '1'; - } - else - { - $streamlizenz = '0'; - } - } - else - { - $streamlizenz = '0'; - } - - $db = dbconnect(); + + # Wenn Verlag nicht vorhanden, dann neu anlegen $result_vg = $db->query("SELECT vid @@ -226,6 +203,7 @@ if ($function == 'save_without_files') , vid , anz_lizenzen , streamlizenz + , bemerkung , uid , datum ) @@ -235,6 +213,7 @@ if ($function == 'save_without_files') , '$vid' , '$anz_lizenzen' , '$streamlizenz' + , '$bemerkung' , $uid , '$datum' ) @@ -256,6 +235,7 @@ if ($function == 'save_without_files') ,vid = '$vid' ,anz_lizenzen = '$anz_lizenzen' ,streamlizenz = '$streamlizenz' + ,bemerkung = '$bemerkung' ,uid = '$uid' ,datum = '$datum' WHERE jndid = $jndid_edit diff --git a/dashboard/edit_noten.php b/dashboard/edit_noten.php index 210752b..45b73f2 100644 --- a/dashboard/edit_noten.php +++ b/dashboard/edit_noten.php @@ -28,15 +28,9 @@ require_once "../language/german.inc.php"; #if(!rore($user_admin,'a_admanleg','RE')){require("lib/rechte.php");exit;} #// Rechteüberprüfung ende -if(isset($_GET['action'])){ - $action = $_GET['action']; -}else{ - $action = ''; -} -if($action == ''){ - $query = "SELECT a.jndid, titel, anz_lizenzen, streamlizenz, c.bezeichnung verlag + $query = "SELECT a.jndid, titel, anz_lizenzen, streamlizenz, bemerkung, c.bezeichnung verlag FROM jumi_noten_daten a, jumi_noten_verlag c WHERE a.vid=c.vid ORDER BY titel ASC;"; @@ -46,8 +40,10 @@ if($action == ''){ while ($row = $result->fetch_array()){ if($row['streamlizenz'] == '1'){ $streamlizenz_vorh = "Ja"; - }else{ - $streamlizenz_vorh = "Nein"; + }elseif($row['streamlizenz'] == '2'){ + $streamlizenz_vorh = "ungeklärt"; + }elseif($row['streamlizenz'] == '0'){ + $streamlizenz_vorh = "nein"; } $result_link = $db->query("SELECT filename @@ -87,8 +83,6 @@ if($action == ''){ } $smarty->assign('table_data', $value); -} - $smarty->assign('action', "$action"); diff --git a/dashboard/notenupload.php b/dashboard/notenupload.php index deaec00..6c4e334 100644 --- a/dashboard/notenupload.php +++ b/dashboard/notenupload.php @@ -20,7 +20,7 @@ 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, c.bezeichnung verlag + $result0 = $db->query("SELECT a. jndid, titel, liednr, anz_lizenzen, streamlizenz, c.bezeichnung verlag, bemerkung FROM jumi_noten_daten a, jumi_noten_verlag c WHERE a.vid=c.vid AND a.jndid = $jndid @@ -30,6 +30,7 @@ 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_bemerkung', $row0['bemerkung']); $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_changepwd.js b/js/components/admin_changepwd.js index af123b5..fed94bb 100644 --- a/js/components/admin_changepwd.js +++ b/js/components/admin_changepwd.js @@ -21,7 +21,7 @@ function changepwd(){ document.getElementById("password_new2").value =""; } - $('#msg').show().delay(10000).fadeOut(500); + $('#msg').show().delay(2000).fadeOut(500); $('#msg').html(a[0]); } }, diff --git a/js/file_upload/vpb_uploader.js b/js/file_upload/vpb_uploader.js index fc8f8b7..3fa23ab 100644 --- a/js/file_upload/vpb_uploader.js +++ b/js/file_upload/vpb_uploader.js @@ -193,20 +193,16 @@ function vpb_multiple_file_uploader(vpb_configuration_settings) { var liednr = document.getElementById("liednr").value; var verlag = document.getElementById("verlag").value; var anz_lizenzen = document.getElementById("anz_lizenzen").value; - var chk_streamlizenz = document.getElementById("streamlizenz"); + var streamlizenz = $("input[type='radio'][name='streamlizenz']:checked").val(); + var bemerkung =tinyMCE.get('bemerkung').getContent() // jndid beim Bearbeiten von Noten var jndid_edit = document.getElementById("jndid").value; - - if (chk_streamlizenz.checked == true) { - var streamlizenz = 1; - } else { - var streamlizenz = 0; - } dataString.append('titel', titel); dataString.append('liednr', liednr); dataString.append('verlag', verlag); dataString.append('anz_lizenzen', anz_lizenzen); dataString.append('streamlizenz', streamlizenz); + dataString.append('bemerkung', bemerkung); dataString.append('jndid_edit', jndid_edit); dataString.append('function', 'save_with_files'); @@ -305,16 +301,11 @@ function vpb_multiple_file_uploader(vpb_configuration_settings) { var liednr = document.getElementById("liednr").value; var verlag = document.getElementById("verlag").value; var anz_lizenzen = document.getElementById("anz_lizenzen").value; - var chk_streamlizenz = document.getElementById("streamlizenz"); + var streamlizenz = $("input[type='radio'][name='streamlizenz']:checked").val(); + var bemerkung =tinyMCE.get('bemerkung').getContent() // jndid beim Bearbeiten von Noten var jndid_edit = document.getElementById("jndid").value; - if (chk_streamlizenz.checked == true) { - var streamlizenz = 1; - } else { - var streamlizenz = 0; - } - $.ajax({ type: 'POST', url: this.vpb_settings.vpb_server_url, @@ -325,6 +316,7 @@ function vpb_multiple_file_uploader(vpb_configuration_settings) { 'verlag': verlag, 'anz_lizenzen': anz_lizenzen, 'streamlizenz': streamlizenz, + 'bemerkung': bemerkung, 'jndid_edit': jndid_edit }, success: function(response) { //we got the response diff --git a/media/file_upload/finanzen/20230420_111236_RG_100121618035.pdf b/media/file_upload/finanzen/20230420_111236_RG_100121618035.pdf deleted file mode 100644 index ea2fadd..0000000 Binary files a/media/file_upload/finanzen/20230420_111236_RG_100121618035.pdf and /dev/null differ diff --git a/media/file_upload/finanzen/20230420_111413_RG_100119951099.pdf b/media/file_upload/finanzen/20230420_111413_RG_100119951099.pdf deleted file mode 100644 index 42a5af5..0000000 Binary files a/media/file_upload/finanzen/20230420_111413_RG_100119951099.pdf and /dev/null differ diff --git a/media/file_upload/finanzen/20230420_111614_RG_100117336090.pdf b/media/file_upload/finanzen/20230420_111614_RG_100117336090.pdf deleted file mode 100644 index 7956d69..0000000 Binary files a/media/file_upload/finanzen/20230420_111614_RG_100117336090.pdf and /dev/null differ diff --git a/media/file_upload/finanzen/20230429_172205_2023-04-29_Druckhaeusle.pdf b/media/file_upload/finanzen/20230429_172205_2023-04-29_Druckhaeusle.pdf deleted file mode 100644 index e36f01c..0000000 Binary files a/media/file_upload/finanzen/20230429_172205_2023-04-29_Druckhaeusle.pdf and /dev/null differ diff --git a/media/file_upload/finanzen/20230509_110649_R24308502.pdf b/media/file_upload/finanzen/20230509_110649_R24308502.pdf deleted file mode 100644 index 3b85837..0000000 Binary files a/media/file_upload/finanzen/20230509_110649_R24308502.pdf and /dev/null differ diff --git a/media/file_upload/finanzen/20230518_080235_RG_100123294592.pdf b/media/file_upload/finanzen/20230518_080235_RG_100123294592.pdf deleted file mode 100644 index 0baa6ca..0000000 Binary files a/media/file_upload/finanzen/20230518_080235_RG_100123294592.pdf and /dev/null differ diff --git a/media/file_upload/finanzen/20230620_075137_RG_100124947326.pdf b/media/file_upload/finanzen/20230620_075137_RG_100124947326.pdf deleted file mode 100644 index 04f4de0..0000000 Binary files a/media/file_upload/finanzen/20230620_075137_RG_100124947326.pdf and /dev/null differ diff --git a/media/file_upload/finanzen/20230714_083733_RG_100126596951.pdf b/media/file_upload/finanzen/20230714_083733_RG_100126596951.pdf deleted file mode 100644 index 3d2f27c..0000000 Binary files a/media/file_upload/finanzen/20230714_083733_RG_100126596951.pdf and /dev/null differ diff --git a/media/file_upload/finanzen/20230724_200635_Leite_uns,_Herr.pdf b/media/file_upload/finanzen/20230724_200635_Leite_uns,_Herr.pdf new file mode 100644 index 0000000..32da1c0 Binary files /dev/null and b/media/file_upload/finanzen/20230724_200635_Leite_uns,_Herr.pdf differ diff --git a/media/file_upload/finanzen/20230724_210148_Rechnung_Noten_Jugendchor.pdf b/media/file_upload/finanzen/20230724_210148_Rechnung_Noten_Jugendchor.pdf deleted file mode 100644 index d27cce1..0000000 Binary files a/media/file_upload/finanzen/20230724_210148_Rechnung_Noten_Jugendchor.pdf and /dev/null differ diff --git a/media/file_upload/finanzen/20230725_070252_Hoeher.pdf b/media/file_upload/finanzen/20230725_070252_Hoeher.pdf new file mode 100644 index 0000000..066c495 Binary files /dev/null and b/media/file_upload/finanzen/20230725_070252_Hoeher.pdf differ diff --git a/media/file_upload/finanzen/20230725_070353_Anker_in_der_Zeit.pdf b/media/file_upload/finanzen/20230725_070353_Anker_in_der_Zeit.pdf new file mode 100644 index 0000000..f921d24 Binary files /dev/null and b/media/file_upload/finanzen/20230725_070353_Anker_in_der_Zeit.pdf differ diff --git a/media/file_upload/finanzen/20230725_070442_Leuchtturm.pdf b/media/file_upload/finanzen/20230725_070442_Leuchtturm.pdf new file mode 100644 index 0000000..30fb2c4 Binary files /dev/null and b/media/file_upload/finanzen/20230725_070442_Leuchtturm.pdf differ diff --git a/media/file_upload/finanzen/20230725_070513_Lighthosue.pdf b/media/file_upload/finanzen/20230725_070513_Lighthosue.pdf new file mode 100644 index 0000000..ff30308 Binary files /dev/null and b/media/file_upload/finanzen/20230725_070513_Lighthosue.pdf differ diff --git a/media/file_upload/finanzen/20230725_070602_10000_Reasons.pdf b/media/file_upload/finanzen/20230725_070602_10000_Reasons.pdf new file mode 100644 index 0000000..1c5ec63 Binary files /dev/null and b/media/file_upload/finanzen/20230725_070602_10000_Reasons.pdf differ diff --git a/media/file_upload/finanzen/20230725_070729_Anker_in_der_Zeit_einstimmig.pdf b/media/file_upload/finanzen/20230725_070729_Anker_in_der_Zeit_einstimmig.pdf new file mode 100644 index 0000000..20c38cf Binary files /dev/null and b/media/file_upload/finanzen/20230725_070729_Anker_in_der_Zeit_einstimmig.pdf differ diff --git a/media/file_upload/finanzen/20230725_070751_Still.pdf b/media/file_upload/finanzen/20230725_070751_Still.pdf new file mode 100644 index 0000000..4d4be8a Binary files /dev/null and b/media/file_upload/finanzen/20230725_070751_Still.pdf differ diff --git a/media/file_upload/finanzen/20230725_100121_Wenn_Friede_mit_Gott.pdf b/media/file_upload/finanzen/20230725_100121_Wenn_Friede_mit_Gott.pdf new file mode 100644 index 0000000..27c6c4d Binary files /dev/null and b/media/file_upload/finanzen/20230725_100121_Wenn_Friede_mit_Gott.pdf differ diff --git a/media/file_upload/finanzen/20230725_100830_In_Times_like_These.pdf b/media/file_upload/finanzen/20230725_100830_In_Times_like_These.pdf new file mode 100644 index 0000000..2288362 Binary files /dev/null and b/media/file_upload/finanzen/20230725_100830_In_Times_like_These.pdf differ diff --git a/media/file_upload/finanzen/20230725_101338_In_dieser_Zeit.pdf b/media/file_upload/finanzen/20230725_101338_In_dieser_Zeit.pdf new file mode 100644 index 0000000..38356ab Binary files /dev/null and b/media/file_upload/finanzen/20230725_101338_In_dieser_Zeit.pdf differ diff --git a/media/file_upload/finanzen/20230725_101437_Gemeinsam_unterwegs.pdf b/media/file_upload/finanzen/20230725_101437_Gemeinsam_unterwegs.pdf new file mode 100644 index 0000000..8188705 Binary files /dev/null and b/media/file_upload/finanzen/20230725_101437_Gemeinsam_unterwegs.pdf differ diff --git a/media/file_upload/finanzen/20230725_110732_Rechnung_Noten_Jugendchor.pdf b/media/file_upload/finanzen/20230725_110732_Rechnung_Noten_Jugendchor.pdf new file mode 100644 index 0000000..3d37693 Binary files /dev/null and b/media/file_upload/finanzen/20230725_110732_Rechnung_Noten_Jugendchor.pdf differ diff --git a/media/file_upload/noten/20230725_100121_Wenn_Friede_mit_Gott.pdf b/media/file_upload/noten/20230725_100121_Wenn_Friede_mit_Gott.pdf new file mode 100644 index 0000000..27c6c4d Binary files /dev/null and b/media/file_upload/noten/20230725_100121_Wenn_Friede_mit_Gott.pdf differ diff --git a/media/file_upload/noten/20230725_100830_In_Times_like_These.pdf b/media/file_upload/noten/20230725_100830_In_Times_like_These.pdf new file mode 100644 index 0000000..2288362 Binary files /dev/null and b/media/file_upload/noten/20230725_100830_In_Times_like_These.pdf differ diff --git a/media/file_upload/noten/20230725_101338_In_dieser_Zeit.pdf b/media/file_upload/noten/20230725_101338_In_dieser_Zeit.pdf new file mode 100644 index 0000000..38356ab Binary files /dev/null and b/media/file_upload/noten/20230725_101338_In_dieser_Zeit.pdf differ diff --git a/media/file_upload/noten/20230725_101437_Gemeinsam_unterwegs.pdf b/media/file_upload/noten/20230725_101437_Gemeinsam_unterwegs.pdf new file mode 100644 index 0000000..8188705 Binary files /dev/null and b/media/file_upload/noten/20230725_101437_Gemeinsam_unterwegs.pdf differ diff --git a/media/file_upload/noten/20230725_110732_Rechnung_Noten_Jugendchor.pdf b/media/file_upload/noten/20230725_110732_Rechnung_Noten_Jugendchor.pdf new file mode 100644 index 0000000..3d37693 Binary files /dev/null and b/media/file_upload/noten/20230725_110732_Rechnung_Noten_Jugendchor.pdf differ diff --git a/templates/modern/dashboard/edit_noten.html b/templates/modern/dashboard/edit_noten.html index c59c061..fa5b175 100644 --- a/templates/modern/dashboard/edit_noten.html +++ b/templates/modern/dashboard/edit_noten.html @@ -23,6 +23,17 @@ + +
@@ -69,13 +80,21 @@ {section name=table_data loop=$table_data}