blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-01 12:19:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/FH-Complete/FHC-Core

Browse Source
This commit is contained in:
kindlm
2017-09-22 17:41:09 +02:00
parent c4a27c2112 1bd6e1c707
commit d1671fbe65
4 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cis/private/lehre/benotungstool/nachpruefungeintragen.php
+2 -2
View File
@@ -139,7 +139,7 @@ if (isset($_REQUEST["submit"]) && ($_REQUEST["student_uid"] != '') )
// Die Pruefung muss einer Lehreinheit zugeordnet werden
// deshalb wird hier versucht eine passende Lehreinheit zu ermitteln.
$le_arr = array();
$qry_stud = "SELECT DISTINCT lehreinheit_id, lehrform_kurzbz
$qry_stud = "SELECT lehreinheit_id, lehrform_kurzbz
FROM
campus.vw_student_lehrveranstaltung
JOIN campus.vw_student using(uid)
@@ -147,7 +147,7 @@ if (isset($_REQUEST["submit"]) && ($_REQUEST["student_uid"] != '') )
studiensemester_kurzbz = ".$db->db_add_param($stsem)."
AND lehrveranstaltung_id = ".$db->db_add_param($lvid, FHC_INTEGER)."
AND uid=".$db->db_add_param($student_uid)."
ORDER BY lehrform_kurzbz DESC";
ORDER BY CASE WHEN lehrform_kurzbz='PRF' THEN '0' ELSE lehrform_kurzbz END";
if($result_stud = $db->db_query($qry_stud))
{
cms/news.php
+2 -2
View File
@@ -179,7 +179,7 @@ function getStgContent($studiengang_kz, $semester, $sprache)
$p = new phrasen($sprache);
$xml = '<stg_extras>';
$xml .= '<stg_kz>'.$studiengang_kz.'</stg_kz>';
$studiengang = new studiengang();
$studiengang->load($studiengang_kz);
@@ -447,4 +447,4 @@ function getStgContent($studiengang_kz, $semester, $sprache)
$xml.='</stg_extras>';
return $xml;
}
?>
?>
system/dmsfaker.php
+1 -1
View File
@@ -35,7 +35,7 @@ if(!$rechte->isBerechtigt('system/developer',null,'suid'))
$anzahl_neu=0;
$anzahl_vorhanden=0;
$qry = "SELECT filename FROM campus.tbl_dms_version";
$path = '/var/fhcomplete/dms/';
$path = DMS_PATH;
chdir($path);
if($result = $db->db_query($qry))
{
vilesci/stammdaten/organisationseinheiten.php
+11 -7
View File
@@ -43,12 +43,11 @@ echo '
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link href="../../skin/vilesci.css" rel="stylesheet" type="text/css">
<link rel="stylesheet" type="text/css" href="../../skin/jquery-ui-1.9.2.custom.min.css">
<script type="text/javascript" src="../../vendor/jquery/jqueryV1/jquery-1.12.4.min.js"></script>
<script type="text/javascript" src="../../vendor/christianbach/tablesorter/jquery.tablesorter.min.js"></script>
<script type="text/javascript" src="../../vendor/components/jqueryui/jquery-ui.min.js"></script>
<script type="text/javascript" src="../../include/js/jquery.ui.datepicker.translation.js"></script>
<script type="text/javascript" src="../../vendor/jquery/sizzle/sizzle.js"></script>
<script src="../../vendor/components/jqueryui/jquery-ui.min.js" language="Javascript"></script>
<script type="text/javascript" src="../../vendor/jquery/jqueryV1/jquery-1.12.4.min.js"></script>
<script type="text/javascript" src="../../vendor/christianbach/tablesorter/jquery.tablesorter.min.js"></script>
<script type="text/javascript" src="../../vendor/components/jqueryui/jquery-ui.min.js"></script>
<script type="text/javascript" src="../../include/js/jquery.ui.datepicker.translation.js"></script>
<script type="text/javascript" src="../../vendor/jquery/sizzle/sizzle.js"></script>
<script language="Javascript">
$(function() {
@@ -62,7 +61,7 @@ echo '
},
drop: function(event, ui) {
$(this).css("color","#0086cc");
var kurzbz = encodeURIComponent(ui.helper[0].id);
var kurzbz = encodeURIComponent(ui.helper.context.id);
var parent_kurzbz = encodeURIComponent(this.id);
window.location.href="'.$_SERVER['PHP_SELF'].'?action=updateparent&kurzbz="+kurzbz+"&parent_kurzbz="+parent_kurzbz;
}
@@ -78,6 +77,11 @@ echo '
padding: 2px;
}
a.Item
{
background: none;
border: none;
}
a.Item:hover
{
color:#0086cc;