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

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

Browse Source
This commit is contained in:
Andreas Österreicher
2022-02-25 12:23:25 +01:00
parent 8ee2dbbe66 4a509fa9d0
commit 1cd5a943c4
4 changed files with 51 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cis/infoterminal/informationsbildschirm.php
+11 -3
View File
@@ -37,6 +37,11 @@ else
$ip = $_SERVER["REMOTE_ADDR"];
}
if(isset($_GET['norefresh']))
$norefresh = true;
else
$norefresh = false;
$infoscreen = new infoscreen();
$i=-1;
$refreshzeit = 40; // Default Refreshzeit
@@ -90,9 +95,12 @@ if(isset($infoscreen_content) && isset($infoscreen_content[$aktuellerContentIdx]
echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta http-equiv="refresh" content="',$refreshzeit,'">
<link href="../../skin/infoscreen.css" rel="stylesheet" type="text/css">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">';
if (!$norefresh)
{
echo '<meta http-equiv="refresh" content="',$refreshzeit,'">';
}
echo ' <link href="../../skin/infoscreen.css" rel="stylesheet" type="text/css">
';
//Skript fuer den automatischen bildlauf
include/statistik.class.php
+6
View File
@@ -553,6 +553,12 @@ class statistik extends basis_db
{
$name = $this->db_field_name($this->data,$spalte);
$this->html.= '<td>'.$this->convert_html_chars($row->$name).'</td>';
// Umwandeln von Punkt in Komma bei Float-Werten
if (is_numeric($row->$name))
{
if (strpos($row->$name,'.') != false)
$row->$name = number_format($row->$name,2,",","");
}
$this->csv.= '"'.$row->$name.'",';
}
rdf/studienblatt.xml.php
+1 -1
View File
@@ -158,7 +158,7 @@ foreach($uid_arr as $uid)
echo "\t\t<ects_pro_semester_studienplan><![CDATA[".($studienplan->regelstudiendauer!=0?$studienplan->ects_stpl/$studienplan->regelstudiendauer:0)."]]></ects_pro_semester_studienplan>";
echo "\t\t<aktuellesJahr><![CDATA[".date('Y')."]]></aktuellesJahr>";
$status_aktuell = ($prestudent->getLastStatus($student->prestudent_id,null,null))?$prestudent->status_kurzbz:'';
$status_aktuell = ($prestudent->getLastStatus($student->prestudent_id,$studiensemester,null))?$prestudent->status_kurzbz:'';
$abbrecher = false;
$absolvent = false;
vilesci/stammdaten/benutzerberechtigung_uebersicht.php
+33 -25
View File
@@ -86,9 +86,22 @@ $(document).ready(function()
$("#t3").tablesorter(
{
sortList: [[1,0],[2,0],[3,0]],
widgets: ["zebra"],
widgets: ["zebra", "filter", "stickyHeaders"],
headers: {8:{sorter:false}},
emptyTo: "emptyMax"
emptyTo: "emptyMax",
widgetOptions : { filter_functions:
{
// Add select menu to this column
6 : {
"Ja" : function(e, n, f, i, $r, c, data) { return /Ja/.test(e); },
"Nein" : function(e, n, f, i, $r, c, data) { return /Nein/.test(e); }
},
7 : {
"Aktiv" : function(e, n, f, i, $r, c, data) { return $r.find("div").hasClass( "buttonGreen" ); },
"Inaktiv" : function(e, n, f, i, $r, c, data) { return $r.find("div").hasClass( "buttonRed" ) || $r.find("div").hasClass( "buttonYellow" ); }
}
}
}
});
$("#t4").tablesorter(
{
@@ -528,8 +541,22 @@ if($rolle_kurzbz != '')
if(isset($rollen->result) && count($rollen->result) != 0)
{
// Anzahl uniquer UIDs ermitteln
$berechtigungen_array_uids = sizeof(array_column($rollen->result, null, 'uid'));
$htmlstr .= "<h3>".$berechtigung_kurzbz."</h3>\n";
$htmlstr .= "<div style='font-size: 9pt'>".count($rollen->result)." Einträge</div>";
$htmlstr .= "<div style='font-size: 9pt'>".$berechtigungen_array_uids." UIDs</div>";
$htmlstr .= "<table id='t3' class='tablesorter'><thead><tr>\n";
$htmlstr .= "<th>Rolle</th><th>Funktion</th><th>Nachname</th><th>Vorname</th><th>UID</th><th>Art</th><th>Benutzer Aktiv</th><th>Status</th><th>Aktion</th>";
$htmlstr .= " <th>Rolle</th>
<th>Funktion</th>
<th>Nachname</th>
<th>Vorname</th>
<th>UID</th>
<th>Art</th>
<th>Benutzer Aktiv</th>
<th>Status</th>
<th>Aktion</th>";
$htmlstr .= "</tr></thead><tbody>\n";
foreach($rollen->result as $row)
@@ -541,35 +568,16 @@ if($rolle_kurzbz != '')
if ($row->ende!='' && strtotime($row->ende) < $heute)
{
$color1 = '#f79c9c';
$color2 = '#cc0202';
$status = '<div class="buttonRed"></div>';
}
elseif ($row->start!='' && strtotime($row->start) > $heute)
{
$color1 = '#faf7b9';
$color2 = '#cfde00';
$status = '<div class="buttonYellow"></div>';
}
else
{
$color1 = '#d1fab9';
$color2 = '#00de00';
$status = '<div class="buttonGreen"></div>';
}
$status='<div style="
width: 10px;
height: 10px;
background: '.$color1.';
background-image: -webkit-linear-gradient(top, '.$color1.', '.$color2.');
background-image: -moz-linear-gradient(top, '.$color1.', '.$color2.');
background-image: -ms-linear-gradient(top, '.$color1.', '.$color2.');
background-image: -o-linear-gradient(top, '.$color1.', '.$color2.');
background-image: linear-gradient(to bottom, '.$color1.', '.$color2.');
-webkit-border-radius: 10;
-moz-border-radius: 10;
border-radius: 10px;
border: solid #999 1px;
text-decoration: none;
"></div>';
$htmlstr .= ' <tr>';
$htmlstr .= ' <td>'.$row->rolle_kurzbz.'</td>';