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

mlists: tbl_student replaced

Browse Source
This commit is contained in:
Andreas Moik
2016-05-10 14:17:27 +02:00
parent 1185c68fb6
commit 068bcddb07
15 changed files with 131 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
content/statistik/studentenexportextended.xls.php
+2 -2
View File
@@ -186,7 +186,7 @@ loadVariables($user);
{
// Student holen
$qry = "SELECT *, tbl_prestudent.studiengang_kz as prestgkz, (SELECT UPPER(typ || kurzbz) FROM public.tbl_studiengang WHERE studiengang_kz=tbl_prestudent.studiengang_kz) as stgbez
FROM public.tbl_prestudent JOIN public.tbl_person USING(person_id) LEFT JOIN public.tbl_student USING(prestudent_id)
FROM public.tbl_prestudent JOIN public.tbl_person USING(person_id)
WHERE prestudent_id in($prestudent_ids) ORDER BY nachname, vorname";
if($db->db_query($qry))
@@ -305,7 +305,7 @@ loadVariables($user);
$worksheet->write($zeile,$i, $row->stgbez);
$i++;
$qry = "SELECT tbl_studentlehrverband.semester AS semester_studiensemester, tbl_student.semester AS semester_aktuell,* FROM public.tbl_studentlehrverband JOIN public.tbl_student USING(prestudent_id)
$qry = "SELECT tbl_studentlehrverband.semester AS semester_studiensemester, tbl_student.semester AS semester_aktuell,* FROM public.tbl_studentlehrverband
WHERE prestudent_id=".$db->db_add_param($row->prestudent_id)."
AND studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz);
if($db->db_query($qry))
content/statistik/studentenstatistik_lehrgaenge.php
+6 -5
View File
@@ -16,8 +16,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*
* Authors: Christian Paminger <christian.paminger@technikum-wien.at>,
* Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at> and
* Rudolf Hangl <rudolf.hangl@technikum-wien.at>.
* Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at>,
* Rudolf Hangl <rudolf.hangl@technikum-wien.at> and
* Andreas Moik <moik@technikum-wien.at>.
*/
/*
* Erstellt eine Liste der Studenten eines Studiensemesters
@@ -110,7 +111,7 @@ if($stsem!='')
(SELECT count(*) FROM (SELECT distinct prestudent_id FROM public.tbl_prestudent JOIN public.tbl_prestudentstatus USING (prestudent_id)
WHERE studiengang_kz=stg.studiengang_kz AND status_kurzbz='Incoming' AND studiensemester_kurzbz='".addslashes($stsem)."'
) a) AS inc,
(SELECT count(*) FROM (SELECT distinct student_uid FROM public.tbl_student JOIN bis.tbl_bisio USING (student_uid)
(SELECT count(*) FROM (SELECT distinct uid FROM public.tbl_prestudent JOIN bis.tbl_bisio USING (prestudent_id)
WHERE studiengang_kz=stg.studiengang_kz AND (bis>='".addslashes($stsem_obj->start)."' OR bis is null) AND von<='".addslashes($stsem_obj->ende)."'
) a) AS out,
(SELECT count(*) FROM (SELECT distinct prestudent_id FROM public.tbl_prestudent JOIN public.tbl_prestudentstatus USING (prestudent_id)
@@ -264,7 +265,7 @@ if($stsem!='')
(SELECT count(*) FROM (SELECT distinct prestudent_id FROM public.tbl_prestudent JOIN public.tbl_prestudentstatus USING (prestudent_id)
WHERE studiengang_kz=stg.studiengang_kz AND status_kurzbz='Incoming' AND studiensemester_kurzbz='".addslashes($stsem)."'
) a) AS inc,
(SELECT count(*) FROM (SELECT distinct student_uid FROM public.tbl_student JOIN bis.tbl_bisio USING (student_uid)
(SELECT count(*) FROM (SELECT distinct uid FROM public.tbl_prestudent JOIN bis.tbl_bisio USING (prestudent_id)
WHERE studiengang_kz=stg.studiengang_kz AND (bis>='".addslashes($stsem_obj->start)."' OR bis is null) AND von<='".addslashes($stsem_obj->ende)."'
) a) AS out,
(SELECT count(*) FROM (SELECT distinct prestudent_id FROM public.tbl_prestudent JOIN public.tbl_prestudentstatus USING (prestudent_id)
@@ -407,4 +408,4 @@ if($stsem!='')
}
?>
</body>
</html>
</html>
content/statistik/vertragsuebersicht.xls.php
+28 -28
View File
@@ -45,7 +45,7 @@ $datum_obj = new datum();
if($studiensemester_kurzbz=='')
{
$stsem = new studiensemester();
$studiensemester_kurzbz = $stsem->getAktOrNext();
$studiensemester_kurzbz = $stsem->getaktorNext();
}
if($studiensemester_kurzbz!='')
@@ -64,8 +64,8 @@ if($studiensemester_kurzbz!='')
$format_bold =& $workbook->addFormat();
$format_bold->setBold();
$format_number =& $workbook->addFormat();
$format_number->setNumFormat('0,0.00');
$format_number =& $workbook->addFormat();
$format_number->setNumFormat('0,0.00');
$spalte=0;
@@ -175,30 +175,30 @@ else
';
}
function BerechneGesamtTage($startdatum, $endedatum)
{
$gesamttage=0;
$datum = new DateTime($startdatum);
$ende = new DateTime($endedatum);
$i=0;
while($datum<$ende)
{
$i++;
if($i>100)
die('Rekursion? Abbruch');
$tag = $datum->format('d');
if($tag==31)
$gesamttage+=1;
else
$gesamttage+=31-$tag;
$datum = new DateTime(date('Y-m-t',$datum->getTimestamp())); // Letzten Tag im Monat
$datum->add(new DateInterval('P1D')); // 1 Tag dazuzaehlen
}
return $gesamttage;
function BerechneGesamtTage($startdatum, $endedatum)
{
$gesamttage=0;
$datum = new DateTime($startdatum);
$ende = new DateTime($endedatum);
$i=0;
while($datum<$ende)
{
$i++;
if($i>100)
die('Rekursion? Abbruch');
$tag = $datum->format('d');
if($tag==31)
$gesamttage+=1;
else
$gesamttage+=31-$tag;
$datum = new DateTime(date('Y-m-t',$datum->getTimestamp())); // Letzten Tag im Monat
$datum->add(new DateInterval('P1D')); // 1 Tag dazuzaehlen
}
return $gesamttage;
}
?>