mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-06-01 20:29:29 +00:00
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
This commit is contained in:
kindlm
@@ -45,6 +45,7 @@ $uid=get_uid();
|
||||
<HEAD>
|
||||
<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
|
||||
<TITLE><?php echo $p->t('lvplan/lehrveranstaltungsplan').' '.CAMPUS_NAME;?></TITLE>
|
||||
<script src="../../../include/js/jquery1.9.min.js" type="text/javascript"></script>
|
||||
<script type="text/javascript">
|
||||
<!--
|
||||
function MM_jumpMenu(targ,selObj,restore)
|
||||
@@ -65,6 +66,86 @@ $uid=get_uid();
|
||||
e.checked = f.check_all.checked;
|
||||
}
|
||||
}
|
||||
|
||||
$(document).ready(function() {
|
||||
$("select[name='studiengang_kz']").change(function() {
|
||||
var studiengang_kz = $("select[name='studiengang_kz']").val();
|
||||
$.ajax({
|
||||
url: "lvplan_autocomplete.php",
|
||||
data: { 'autocomplete':'getSemester',
|
||||
'stg_kz':studiengang_kz
|
||||
},
|
||||
type: "POST",
|
||||
dataType: "json",
|
||||
success: function(data)
|
||||
{
|
||||
$("select[name='semester']").empty();
|
||||
$("select[name='semester']").append('<option value="">*</option>');
|
||||
$.each(data, function(i, data){
|
||||
$("select[name='semester']").append('<option value="'+data+'">'+data+'</option>');
|
||||
});
|
||||
},
|
||||
error: function(data)
|
||||
{
|
||||
alert("Fehler beim Laden der Daten");
|
||||
}
|
||||
});
|
||||
})
|
||||
|
||||
$("select[name='semester']").change(function() {
|
||||
var studiengang_kz = $("select[name='studiengang_kz']").val();
|
||||
var semester = $("select[name='semester']").val();
|
||||
$.ajax({
|
||||
url: "lvplan_autocomplete.php",
|
||||
data: { 'autocomplete':'getVerband',
|
||||
'stg_kz':studiengang_kz,
|
||||
'sem':semester
|
||||
},
|
||||
type: "POST",
|
||||
dataType: "json",
|
||||
success: function(data)
|
||||
{
|
||||
$("select[name='verband']").empty();
|
||||
$("select[name='verband']").append('<option value="">*</option>');
|
||||
$.each(data, function(i, data){
|
||||
$("select[name='verband']").append('<option value="'+data+'">'+data+'</option>');
|
||||
});
|
||||
},
|
||||
error: function(data)
|
||||
{
|
||||
alert("Fehler beim Laden der Daten");
|
||||
}
|
||||
});
|
||||
})
|
||||
|
||||
$("select[name='verband']").change(function() {
|
||||
var studiengang_kz = $("select[name='studiengang_kz']").val();
|
||||
var semester = $("select[name='semester']").val();
|
||||
var verband = $("select[name='verband']").val();
|
||||
$.ajax({
|
||||
url: "lvplan_autocomplete.php",
|
||||
data: { 'autocomplete':'getGruppe',
|
||||
'stg_kz':studiengang_kz,
|
||||
'sem':semester,
|
||||
'ver':verband
|
||||
},
|
||||
type: "POST",
|
||||
dataType: "json",
|
||||
success: function(data)
|
||||
{
|
||||
$("select[name='gruppe']").empty();
|
||||
$("select[name='gruppe']").append('<option value="">*</option>');
|
||||
$.each(data, function(i, data){
|
||||
$("select[name='gruppe']").append('<option value="'+data+'">'+data+'</option>');
|
||||
});
|
||||
},
|
||||
error: function(data)
|
||||
{
|
||||
alert("Fehler beim Laden der Daten");
|
||||
}
|
||||
});
|
||||
})
|
||||
});
|
||||
-->
|
||||
</script>
|
||||
<LINK rel="stylesheet" href="../../../skin/style.css.php" type="text/css">
|
||||
|
||||
@@ -225,6 +225,28 @@ echo '
|
||||
return val;
|
||||
}
|
||||
|
||||
function checkZeiten()
|
||||
{
|
||||
var von_el = document.getElementById("von_uhrzeit");
|
||||
var bis_el = document.getElementById("bis_uhrzeit");
|
||||
var von_zeit = von_el.value;
|
||||
var bis_zeit = bis_el.value;
|
||||
von_arr = von_zeit.split(":");
|
||||
bis_arr = bis_zeit.split(":");
|
||||
if (von_arr[0].length == 1)
|
||||
von_arr[0] = foo(von_arr[0]);
|
||||
if (von_arr[1].length == 1)
|
||||
von_arr[1] = foo(von_arr[1]);
|
||||
if (bis_arr[0].length == 1)
|
||||
bis_arr[0] = foo(bis_arr[0]);
|
||||
if (bis_arr[1].length == 1)
|
||||
bis_arr[1] = foo(bis_arr[1]);
|
||||
von_zeit = von_arr[0]+":"+von_arr[1];
|
||||
bis_zeit = bis_arr[0]+":"+bis_arr[1];
|
||||
von_el.value = von_zeit;
|
||||
bis_el.value = bis_zeit;
|
||||
|
||||
}
|
||||
function confdel()
|
||||
{
|
||||
return confirm("'.$p->t("global/warnungWirklichLoeschen").'");
|
||||
@@ -588,6 +610,7 @@ if($projekt->getProjekteMitarbeiter($user, true))
|
||||
{
|
||||
echo '<p><a href="../../../cms/dms.php?id='.$p->t("dms_link/handbuchZeitaufzeichnung").'" target="_blank">'.$p->t("zeitaufzeichnung/handbuchZeitaufzeichnung").'</a></p>';
|
||||
}
|
||||
echo '<p><a href="zeitsperre_resturlaub.php">'.$p->t("urlaubstool/meineZeitsperren").'</a></p>';
|
||||
echo "</td>
|
||||
</tr>
|
||||
</table>";
|
||||
@@ -759,7 +782,7 @@ if($projekt->getProjekteMitarbeiter($user, true))
|
||||
<td>'.$p->t("global/von").' - '.$p->t("global/bis").'</td>
|
||||
<td>
|
||||
<input type="text" class="datepicker_datum" id="von_datum" name="von_datum" value="'.$db->convert_html_chars($datum->formatDatum($von, $format='d.m.Y')).'" size="9">
|
||||
<input type="text" class="timepicker" id="von_uhrzeit" name="von_uhrzeit" value="'.$db->convert_html_chars($datum->formatDatum($von, $format='H:i')).'" size="4">
|
||||
<input onchange="checkZeiten()" type="text" class="timepicker" id="von_uhrzeit" name="von_uhrzeit" value="'.$db->convert_html_chars($datum->formatDatum($von, $format='H:i')).'" size="4">
|
||||
</td>';
|
||||
if ($za_simple == 0)
|
||||
{
|
||||
@@ -783,7 +806,7 @@ if($projekt->getProjekteMitarbeiter($user, true))
|
||||
echo '
|
||||
<td align="right">
|
||||
<input type="text" class="datepicker_datum" id="bis_datum" name="bis_datum" value="'.$db->convert_html_chars($datum->formatDatum($bis, $format='d.m.Y')).'" size="9">
|
||||
<input type="text" class="timepicker" id="bis_uhrzeit" name="bis_uhrzeit" value="'.$db->convert_html_chars($datum->formatDatum($bis, $format='H:i')).'" size="4">
|
||||
<input onchange="checkZeiten()" type="text" class="timepicker" id="bis_uhrzeit" name="bis_uhrzeit" value="'.$db->convert_html_chars($datum->formatDatum($bis, $format='H:i')).'" size="4">
|
||||
</td>
|
||||
<tr>';
|
||||
//Beschreibung
|
||||
@@ -801,7 +824,8 @@ if($projekt->getProjekteMitarbeiter($user, true))
|
||||
if (isset($_GET['csvimport']))
|
||||
{
|
||||
echo '<tr><td colspan="4"><hr></td></tr>';
|
||||
echo '<tr><td>CSV-Import</td><td colspan="2"><input type="file" name="csv" value="" /></td><td align="right"><input type="submit" value="Import" name="import"></td></tr>';
|
||||
echo '<tr><td>CSV-Import</td><td colspan="2"><input type="file" name="csv" value="" /></td><td align="right"><input type="submit" value="Import" name="import"></td></tr>';
|
||||
echo '<tr><td></td><td colspan="3">Informationen zum Format der CSV-Datei s. Leitfaden Arbeitszeitaufzeichnung</td></tr>';
|
||||
}
|
||||
else
|
||||
echo '<input type="file" name="csv" value="" style="visibility:hidden">';
|
||||
|
||||
@@ -184,7 +184,7 @@ if ($insert)
|
||||
else
|
||||
$qry.="NULL,";
|
||||
|
||||
$qry.=$db->db_add_param($leid, FHC_INTEGER).",'".$user." via LVPlanWartung','".$user." via LVPlanWartung');";
|
||||
$qry.=$db->db_add_param($leid, FHC_INTEGER).",'".$user."','".$user."');";
|
||||
|
||||
if(!$result_insert=$db->db_query($qry))
|
||||
die ("DB Fehler $qry" .' '.$db->db_last_error());
|
||||
|
||||
Reference in New Issue
Block a user