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

Diverse Bugfixes Statistik

Browse Source
This commit is contained in:
Andreas Österreicher
2014-10-14 09:12:54 +00:00
parent d31aeaf1fe
commit b9b8195999
5 changed files with 38 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/statistik.class.php
+18 -18
View File
@@ -75,7 +75,7 @@ class statistik extends basis_db
FROM
public.tbl_statistik
WHERE
statistik_kurzbz='".addslashes($statistik_kurzbz)."'";
statistik_kurzbz=".$this->db_add_param($statistik_kurzbz);
if($result = $this->db_query($qry))
{
@@ -89,7 +89,7 @@ class statistik extends basis_db
$this->php = $row->php;
$this->r = $row->r;
$this->gruppe = $row->gruppe;
$this->publish = $row->publish;
$this->publish = $this->db_parse_bool($row->publish);
$this->insertamum = $row->insertamum;
$this->insertvon = $row->insertvon;
$this->updateamum = $row->updateamum;
@@ -133,7 +133,7 @@ class statistik extends basis_db
$obj->php = $row->php;
$obj->r = $row->r;
$obj->gruppe = $row->gruppe;
$obj->publish = $row->publish;
$obj->publish = $this->db_parse_bool($row->publish);
$obj->insertamum = $row->insertamum;
$obj->insertvon = $row->insertvon;
$obj->updateamum = $row->updateamum;
@@ -158,9 +158,9 @@ class statistik extends basis_db
public function getAnzahlGruppe($publish=null)
{
$qry = 'SELECT gruppe, count(*) AS anzahl FROM public.tbl_statistik ';
if ($publish=='true')
if ($publish==true)
$qry.='WHERE publish ';
elseif ($publish=='false')
elseif ($publish==false)
$qry.='WHERE NOT publish ';
$qry.=' GROUP BY gruppe ORDER BY gruppe;';
// echo $qry;
@@ -206,7 +206,7 @@ class statistik extends basis_db
$this->db_add_param($this->php).','.
$this->db_add_param($this->r).','.
$this->db_add_param($this->gruppe).','.
$this->db_add_param($this->publish).','.
$this->db_add_param($this->publish, FHC_BOOLEAN).','.
$this->db_add_param($this->insertamum).','.
$this->db_add_param($this->insertvon).','.
$this->db_add_param($this->updateamum).','.
@@ -226,7 +226,7 @@ class statistik extends basis_db
' php='.$this->db_add_param($this->php).','.
' r='.$this->db_add_param($this->r).','.
' gruppe='.$this->db_add_param($this->gruppe).','.
' publish='.$this->db_add_param($this->publish).','.
' publish='.$this->db_add_param($this->publish, FHC_BOOLEAN).','.
' insertamum='.$this->db_add_param($this->insertamum).','.
' insertvon='.$this->db_add_param($this->insertvon).','.
' updateamum='.$this->db_add_param($this->updateamum).','.
@@ -297,7 +297,7 @@ class statistik extends basis_db
*/
public function delete($statistik_kurzbz)
{
$qry = "DELETE FROM public.tbl_statistik WHERE statistik_kurzbz='".addslashes($statistik_kurzbz)."';";
$qry = "DELETE FROM public.tbl_statistik WHERE statistik_kurzbz=".$this->db_add_param($statistik_kurzbz).";";
if($this->db_query($qry))
{
@@ -345,17 +345,17 @@ class statistik extends basis_db
WHERE
status_kurzbz='Student'
AND NOT EXISTS(SELECT 1 FROM public.tbl_prestudentstatus WHERE status_kurzbz='Student' AND datum<status.datum AND prestudent_id=status.prestudent_id)
AND studiengang_kz=".$studiengang_kz;
AND studiengang_kz=".$this->db_add_param($studiengang_kz);
if($ausbildungssemester!='')
$qry.=" AND ausbildungssemester=".$ausbildungssemester;
$qry.=" AND ausbildungssemester=".$this->db_add_param($ausbildungssemester);
$qry.=" AND ((studiensemester_kurzbz='".$studiensemester_kurzbz."'";
$qry.=" AND ((studiensemester_kurzbz=".$this->db_add_param($studiensemester_kurzbz);
if (!is_null($datum_stichtag))
$qry.=" AND datum <='".$datum_stichtag."'";
$qry.=" AND datum <=".$this->db_add_param($datum_stichtag);
$qry.=') ';
$qry.=" OR (studiensemester_kurzbz='".$studiensemester_kurzbz."'";
$qry.=" OR (studiensemester_kurzbz=".$this->db_add_param($studiensemester_kurzbz);
if (!is_null($datum_stichtag))
$qry.=" AND datum <='".$datum_stichtag."'";
$qry.=" AND datum <=".$this->db_add_param($datum_stichtag);
$qry.="))";
$qry.=" ORDER BY prestudent_id;";
@@ -409,13 +409,13 @@ class statistik extends basis_db
$qry="SELECT DISTINCT prestudent_id, geschlecht, studiengang_kz, ausbildungssemester, studiensemester_kurzbz
FROM tbl_prestudent JOIN tbl_prestudentstatus USING (prestudent_id) JOIN tbl_person USING (person_id)
WHERE (status_kurzbz='Abbrecher')
AND studiengang_kz=".$studiengang_kz;
AND studiengang_kz=".$this->db_add_param($studiengang_kz);
if($ausbildungssemester!='')
$qry.=" AND ausbildungssemester=".$ausbildungssemester;
$qry.=" AND ausbildungssemester=".$this->db_add_param($ausbildungssemester);
$qry.=" AND (studiensemester_kurzbz='".$studiensemester_kurzbz."'";
$qry.=" AND (studiensemester_kurzbz=".$this->db_add_param($studiensemester_kurzbz);
if (!is_null($datum_stichtag))
$qry.=" AND datum <='".$datum_stichtag."'";
$qry.=" AND datum <=".$this->db_add_param($datum_stichtag);
$qry.=') ';
$qry.=" ORDER BY prestudent_id;";
include/tw/vilesci_menu_main.inc.php
+6 -17
View File
@@ -226,23 +226,12 @@ $menu=array
(
'name'=>'Auswertung', 'opener'=>'true', 'hide'=>'true', 'permissions'=>array('admin','lv-plan','support','assistenz','wawi/inventar','basis/statistik'), 'image'=>'vilesci_statistik.png',
'link'=>'left.php?categorie=Auswertung', 'target'=>'nav',
/*
'Raumauslastung'=>array('name'=>'Raumauslastung...', 'link'=>'lehre/raumauslastung.php', 'target'=>'main'),
'Verplanungsuebersicht'=>array('name'=>'Verplanungsübersicht...', 'link'=>'lehre/check/verplanungsuebersicht.php', 'target'=>'main'),
'Zeitwünsche'=>array('name'=>'Zeitwünsche', 'link'=>'lehre/zeitwuensche.php', 'target'=>'main'),
'Institute'=>array('name'=>'Institute (+)', 'link'=>'personen/institutsliste.php', 'target'=>'main'),
'Student/Semester'=>array('name'=>'Student/Semester', 'link'=>'https://vilesci.technikum-wien.at/content/statistik/studentenprosemester.php', 'target'=>'main'),
'ALVS-Statistik'=>array('name'=>'ALVS-Statistik', 'link'=>'https://vilesci.technikum-wien.at/content/statistik/alvsstatistik.php', 'target'=>'main'),
'LV-Planung Gesamt'=>array('name'=>'LV-Planung Gesamt (+)', 'link'=>'https://vilesci.technikum-wien.at/content/statistik/lvplanunggesamtsj.php', 'target'=>'main'),
'Bewerberstatistik'=>array('name'=>'Bewerberstatistik (+)', 'link'=>'https://vilesci.technikum-wien.at/content/statistik/bewerberstatistik.php', 'target'=>'main'),
'Abgängerstatistik'=>array('name'=>'Abgängerstatistik... (~)', 'link'=>'https://vilesci.technikum-wien.at/content/statistik/abgaengerstatistik.php', 'target'=>'main'),
'Absolventenstatistik'=>array('name'=>'Absolventenstatistik(~)', 'link'=>'https://vilesci.technikum-wien.at/content/statistik/absolventenstatistik.php', 'target'=>'main'),
'Absolventenzahlen'=>array('name'=>'Absolventenzahlen', 'link'=>'https://vilesci.technikum-wien.at/content/statistik/absolventenzahlen.php', 'target'=>'main'),
'Studentenstatistik'=>array('name'=>'Studentenstatistik (+)', 'link'=>'https://vilesci.technikum-wien.at/content/statistik/studentenstatistik.php', 'target'=>'main'),
'Lektorenstatistik'=>array('name'=>'Lektorenstatistik', 'link'=>'https://vilesci.technikum-wien.at/content/statistik/lektorenstatistik.php', 'target'=>'main'),
'Mitarbeiterstatistik'=>array('name'=>'Mitarbeiterstatistik', 'link'=>'https://vilesci.technikum-wien.at/content/statistik/mitarbeiterstatistik.php', 'target'=>'main'),
'Stromanalyse'=>array('name'=>'Stromanalyse...', 'link'=>'https://vilesci.technikum-wien.at/content/statistik/bama_stromanalyse.php', 'target'=>'main'),
*/
'Administration'=> array
(
'name'=>'Administration', 'permissions'=>array('basis/statistik'),
'Statistik'=>array('name'=>'Statistik', 'link'=>'stammdaten/statistik_frameset.html', 'target'=>'main','permissions'=>array('basis/statistik')),
'Filter'=>array('name'=>'Filter', 'link'=>'statistik/filter_frameset.html', 'target'=>'main','permissions'=>array('basis/statistik')),
),
),
'Inventar'=> array
(