blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-22 09:22:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge origin/master

Browse Source 
Conflicts:
	cis/testtool/login.php
	vilesci/stammdaten/reihungstestverwaltung.php
This commit is contained in:
cris-technikum
2017-09-20 13:09:17 +02:00
parent 51a5bda923 81864b14b7
commit 750fcfd6a7
241 changed files with 9437 additions and 17491 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/pruefling.class.php
+9 -2
View File
@@ -110,7 +110,7 @@ class pruefling extends basis_db
$this->db_add_param($this->idnachweis).",".
$this->db_add_param($this->registriert).",".
$this->db_add_param($this->prestudent_id).",".
$this->db_add_param($this->semester).");";
$this->db_add_param($this->semester).");";
}
else
{
@@ -318,17 +318,21 @@ class pruefling extends basis_db
{
$qry = "SELECT * FROM testtool.vw_auswertung
WHERE person_id=".$this->db_add_param($person_id, FHC_INTEGER);
$ergebnis=0;
if(!is_null($reihungstest_id))
$qry.=" AND reihungstest_id=".$this->db_add_param($reihungstest_id, FHC_INTEGER);
$ergebnis=0;
if($result = $this->db_query($qry))
{
// Wenn keine Eintraege vorhanden dann false
if($this->db_num_rows($result)==0)
return false;
while($row = $this->db_fetch_object($result))
{
@@ -342,7 +346,10 @@ class pruefling extends basis_db
$prozent = ($row->punkte/$row->maxpunkte)*100;
if($punkte)
{
$ergebnis +=$row->punkte;
}
else
$ergebnis+=$prozent*$row->gewicht;
}