Notenupload mit Bemerkung und Status Streaminglizenz
This commit is contained in:
parent
687e45b7b0
commit
50297c1d25
@ -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
|
||||
|
@ -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");
|
||||
|
@ -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";
|
||||
|
@ -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]);
|
||||
}
|
||||
},
|
||||
|
@ -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
|
||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
media/file_upload/finanzen/20230724_200635_Leite_uns,_Herr.pdf
Normal file
BIN
media/file_upload/finanzen/20230724_200635_Leite_uns,_Herr.pdf
Normal file
Binary file not shown.
Binary file not shown.
BIN
media/file_upload/finanzen/20230725_070252_Hoeher.pdf
Normal file
BIN
media/file_upload/finanzen/20230725_070252_Hoeher.pdf
Normal file
Binary file not shown.
BIN
media/file_upload/finanzen/20230725_070353_Anker_in_der_Zeit.pdf
Normal file
BIN
media/file_upload/finanzen/20230725_070353_Anker_in_der_Zeit.pdf
Normal file
Binary file not shown.
BIN
media/file_upload/finanzen/20230725_070442_Leuchtturm.pdf
Normal file
BIN
media/file_upload/finanzen/20230725_070442_Leuchtturm.pdf
Normal file
Binary file not shown.
BIN
media/file_upload/finanzen/20230725_070513_Lighthosue.pdf
Normal file
BIN
media/file_upload/finanzen/20230725_070513_Lighthosue.pdf
Normal file
Binary file not shown.
BIN
media/file_upload/finanzen/20230725_070602_10000_Reasons.pdf
Normal file
BIN
media/file_upload/finanzen/20230725_070602_10000_Reasons.pdf
Normal file
Binary file not shown.
Binary file not shown.
BIN
media/file_upload/finanzen/20230725_070751_Still.pdf
Normal file
BIN
media/file_upload/finanzen/20230725_070751_Still.pdf
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
media/file_upload/finanzen/20230725_101338_In_dieser_Zeit.pdf
Normal file
BIN
media/file_upload/finanzen/20230725_101338_In_dieser_Zeit.pdf
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
media/file_upload/noten/20230725_100121_Wenn_Friede_mit_Gott.pdf
Normal file
BIN
media/file_upload/noten/20230725_100121_Wenn_Friede_mit_Gott.pdf
Normal file
Binary file not shown.
BIN
media/file_upload/noten/20230725_100830_In_Times_like_These.pdf
Normal file
BIN
media/file_upload/noten/20230725_100830_In_Times_like_These.pdf
Normal file
Binary file not shown.
BIN
media/file_upload/noten/20230725_101338_In_dieser_Zeit.pdf
Normal file
BIN
media/file_upload/noten/20230725_101338_In_dieser_Zeit.pdf
Normal file
Binary file not shown.
BIN
media/file_upload/noten/20230725_101437_Gemeinsam_unterwegs.pdf
Normal file
BIN
media/file_upload/noten/20230725_101437_Gemeinsam_unterwegs.pdf
Normal file
Binary file not shown.
Binary file not shown.
@ -23,6 +23,17 @@
|
||||
<script src="js/all.js" crossorigin="anonymous"></script>
|
||||
|
||||
<link rel="stylesheet" href="../bootstrap/node_modules/bootstrap-icons/font/bootstrap-icons.css">
|
||||
<script>
|
||||
$(document).ready(function(){
|
||||
$('[data-toggle="popover"]').popover();
|
||||
$
|
||||
});
|
||||
</script>
|
||||
<style>
|
||||
.popover {
|
||||
max-width: 800px;
|
||||
}
|
||||
</style>
|
||||
|
||||
</head>
|
||||
<body class="sb-nav-fixed">
|
||||
@ -69,13 +80,21 @@
|
||||
<tbody>
|
||||
{section name=table_data loop=$table_data}
|
||||
<tr>
|
||||
<td>{if $table_data[table_data].fileexists == 1}<a href="{$table_data[table_data].link}" target="_new">{$table_data[table_data].titel}</a>{else}{$table_data[table_data].titel}{/if}</td>
|
||||
<td>{if $table_data[table_data].fileexists == 1}<a href="{$table_data[table_data].link}" target="_new">{$table_data[table_data].titel}</a>{else}{$table_data[table_data].titel}{/if}
|
||||
{if $table_data[table_data].bemerkung != ''}
|
||||
<a href="javascript:void(0)" type="button" class="link-secondary" data-bs-toggle="popover" data-bs-html="true" data-bs-trigger="hover focus"
|
||||
title="Bemerkung"
|
||||
data-bs-content="{$table_data[table_data].bemerkung}">
|
||||
<i class="fa fa-info-circle"></i>
|
||||
</a>
|
||||
{/if}
|
||||
</td>
|
||||
<td class="d-none d-md-table-cell">{$table_data[table_data].verlag}</td>
|
||||
<td>{$table_data[table_data].songbook}</td>
|
||||
<td class="d-none d-md-table-cell">{$table_data[table_data].restlizenz}/{$table_data[table_data].anz_lizenzen}</td>
|
||||
<td class="d-none d-md-table-cell">{$table_data[table_data].streamlizenz_vorh}</td>
|
||||
<td>
|
||||
<a href="notenupload.php?editjndid={$table_data[table_data].jndid}" class="settings" title="Edit Member" data-toggle="tooltip"><i class="fas fa fa-cog"></i></a>
|
||||
<a href="notenupload.php?editjndid={$table_data[table_data].jndid}" class="settings" title="Edit Member" data-toggle="tooltip"><i class="fas fa fa-edit"></i></a>
|
||||
|
||||
<a class="btn btn-danger btn-rounded btn-icon btn-sm" onclick="delNoten({$table_data[table_data].jndid})"><i class="fa fa-trash" style="width:10px;"></i></a>
|
||||
</td>
|
||||
@ -95,7 +114,12 @@
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
|
||||
<script>
|
||||
var popoverTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="popover"]'))
|
||||
var popoverList = popoverTriggerList.map(function (popoverTriggerEl) {
|
||||
return new bootstrap.Popover(popoverTriggerEl)
|
||||
})
|
||||
</script>
|
||||
<script>
|
||||
$(document).ready(function () {
|
||||
$('#myTable').DataTable({
|
||||
|
@ -86,7 +86,7 @@
|
||||
<div class="row mt-2 mt-sm-4 mb-2 mb-sm-4">
|
||||
<div class="col-12 col-md-4">LiedNr:</div>
|
||||
<div class="col-12 col-md-8">
|
||||
<input type="text" id="liednr" class="form-control rounded-right" value="{$notenupload_liednr}" required>
|
||||
<input type="text" id="liednr" class="form-control rounded-right" value="{$notenupload_liednr}">
|
||||
</div>
|
||||
</div>
|
||||
<div class="row mt-2 mt-sm-4 mb-2 mb-sm-4">
|
||||
@ -102,11 +102,21 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="row mt-2 mt-sm-4 mb-2 mb-sm-4">
|
||||
<div class="col-8 col-md-4">Streamlizenz vorhanden:</div>
|
||||
<div class="col-8 col-md-4">Streamlizenz:</div>
|
||||
<div class="col-4 col-md-8">
|
||||
<input class="form-check-input" type="checkbox" name="streamlizenz" id="streamlizenz" value="1" {if $notenupload_streamlizenz == '1'}checked{/if}>
|
||||
<label><input class="form-check-input" type="radio" name="streamlizenz" {if $notenupload_streamlizenz == '1'}checked{/if} value="1" id="streamlizenz"> Ja</label><br>
|
||||
<label><input class="form-check-input" type="radio" name="streamlizenz" {if $notenupload_streamlizenz == '0'}checked{/if} value="0" id="streamlizenz"> Nein</label><br>
|
||||
<label><input class="form-check-input" type="radio" name="streamlizenz" {if $notenupload_streamlizenz == '2'}checked{/if} value="2" id="streamlizenz"> ungeklärt</label><br>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row mt-2 mt-sm-4 mb-2 mb-sm-4">
|
||||
<div class="col-12 col-md-4">Bemerkung:</div>
|
||||
<div class="col-12 col-md-8">
|
||||
<div class="form-group">
|
||||
<textarea id="bemerkung">{$notenupload_bemerkung}</textarea>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{if $create_edit != ''}
|
||||
<div class="row mt-2 mt-sm-4 mb-2 mb-sm-4">
|
||||
@ -178,6 +188,17 @@
|
||||
</form>
|
||||
</center>
|
||||
</main>
|
||||
<script src="../tinymce/js/tinymce/tinymce.min.js"></script>
|
||||
<script>
|
||||
tinymce.init({
|
||||
selector: 'textarea#bemerkung',
|
||||
height: 200,
|
||||
// skin: 'bootstrap',
|
||||
plugins: 'lists, link',
|
||||
toolbar: 'h1 h2 bold italic strikethrough blockquote bullist numlist backcolor | link | removeformat help',
|
||||
menubar: false,
|
||||
});
|
||||
</script>
|
||||
<!-- Livesearchscript muss nach den Textfelder sitzen-->
|
||||
<script src="../js/components/admin_notenupload.js"></script>
|
||||
<!-- footer -->
|
||||
|
Loading…
x
Reference in New Issue
Block a user