mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-07-20 00:12:15 +00:00
Merge branch 'feature-4026/TabulatorWidget' into feature-3994/Digitaler_Lehrauftrag
# Conflicts: # system/dbupdate_3.3.php
This commit is contained in:
hainberg
+7
-7
@@ -110,7 +110,7 @@ foreach($addon_obj->result as $addon)
|
||||
<command id="menu-statistic-notenspiegel:command" oncommand="StatistikPrintNotenspiegel('html');"/>
|
||||
<command id="menu-statistic-notenspiegel-excel:command" oncommand="StatistikPrintNotenspiegel('xls');"/>
|
||||
<command id="menu-statistic-notenspiegel-excel-erweitert:command" oncommand="StatistikPrintNotenspiegelErweitert('xls');"/>
|
||||
<command id="menu-statistic-notenspiegel-student:command" oncommand="StatistikPrintNotenspiegelStudent();"/>
|
||||
<command id="menu-statistic-studienverlauf-student:command" oncommand="StatistikPrintStudienverlaufStudent();"/>
|
||||
<command id="menu-statistic-substatistik-studentenprosemester-excel:command" oncommand="StatistikPrintStudentenProSemester('xls');"/>
|
||||
<command id="menu-statistic-substatistik-studentenprosemester-html:command" oncommand="StatistikPrintStudentenProSemester('');"/>
|
||||
<command id="menu-statistic-substatistik-alvsstatistik-excel:command" oncommand="StatistikPrintALVSStatistik('xls');"/>
|
||||
@@ -377,14 +377,14 @@ foreach($addon_obj->result as $addon)
|
||||
label = "&menu-statistic-notenspiegel.label;"
|
||||
command = "menu-statistic-notenspiegel:command"
|
||||
accesskey = "&menu-statistic-notenspiegel.accesskey;"/>
|
||||
<menuitem
|
||||
id = "menu-statistic-notenspiegel-student"
|
||||
key = "menu-statistic-notenspiegel-student:key"
|
||||
label = "&menu-statistic-notenspiegel-student.label;"
|
||||
command = "menu-statistic-notenspiegel-student:command"
|
||||
accesskey = "&menu-statistic-notenspiegel-student.accesskey;"/>
|
||||
</menupopup>
|
||||
</menu>
|
||||
<menuitem
|
||||
id = "menu-statistic-studienverlauf-student"
|
||||
key = "menu-statistic-studienverlauf-student:key"
|
||||
label = "&menu-statistic-studienverlauf-student.label;"
|
||||
command = "menu-statistic-studienverlauf-student:command"
|
||||
accesskey = "&menu-statistic-studienverlauf-student.accesskey;"/>
|
||||
</menupopup>
|
||||
</menu>
|
||||
<!-- *** Statistik *** -->
|
||||
|
||||
@@ -503,6 +503,56 @@ function onVerbandSelect(event)
|
||||
}
|
||||
}
|
||||
|
||||
// ****
|
||||
// * Wenn im Suchfeld Enter gedrueckt wird, dann die Suchfunktion starten
|
||||
// ****
|
||||
function LehrveranstaltungSearchFieldKeyPress(event)
|
||||
{
|
||||
if(event.keyCode==13) //Enter
|
||||
LehrveranstaltungSuche();
|
||||
}
|
||||
|
||||
function LehrveranstaltungSuche()
|
||||
{
|
||||
var filter = document.getElementById("lehrveranstaltung-toolbar-textbox-suche").value;
|
||||
// Lehrveranstaltung
|
||||
document.getElementById('statusbar-progressmeter').setAttribute('mode','undetermined');
|
||||
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
||||
try
|
||||
{
|
||||
url = '<?php echo APP_ROOT; ?>rdf/lehrveranstaltung_einheiten.rdf.php?filter='+encodeURIComponent(filter)+'&'+gettimestamp();
|
||||
var treeLV=document.getElementById('lehrveranstaltung-tree');
|
||||
|
||||
try
|
||||
{
|
||||
LvTreeDatasource.removeXMLSinkObserver(LvTreeSinkObserver);
|
||||
treeLV.builder.removeListener(LvTreeListener);
|
||||
}
|
||||
catch(e)
|
||||
{}
|
||||
|
||||
//Alte DS entfernen
|
||||
var oldDatasources = treeLV.database.GetDataSources();
|
||||
while(oldDatasources.hasMoreElements())
|
||||
{
|
||||
treeLV.database.RemoveDataSource(oldDatasources.getNext());
|
||||
}
|
||||
|
||||
var rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
|
||||
LvTreeDatasource = rdfService.GetDataSource(url);
|
||||
LvTreeDatasource.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
|
||||
LvTreeDatasource.QueryInterface(Components.interfaces.nsIRDFXMLSink);
|
||||
treeLV.database.AddDataSource(LvTreeDatasource);
|
||||
LvTreeDatasource.addXMLSinkObserver(LvTreeSinkObserver);
|
||||
treeLV.builder.addListener(LvTreeListener);
|
||||
document.getElementById('lehrveranstaltung-toolbar-lehrauftrag').hidden=true;
|
||||
}
|
||||
catch(e)
|
||||
{
|
||||
debug(e);
|
||||
}
|
||||
}
|
||||
|
||||
function onFachbereichSelect(event)
|
||||
{
|
||||
var tree=document.getElementById('tree-fachbereich');
|
||||
@@ -1077,7 +1127,7 @@ function StatistikPrintNotenspiegelErweitert(typ)
|
||||
window.open('<?php echo APP_ROOT ?>content/statistik/notenspiegel_erweitert.php?studiengang_kz='+studiengang_kz+'&semester='+semester+'&typ='+typ+'&orgform='+orgform,'Notenspiegel');
|
||||
}
|
||||
|
||||
function StatistikPrintNotenspiegelStudent()
|
||||
function StatistikPrintStudienverlaufStudent()
|
||||
{
|
||||
var tree = document.getElementById('student-tree');
|
||||
var data='';
|
||||
@@ -1094,7 +1144,7 @@ function StatistikPrintNotenspiegelStudent()
|
||||
alert('Markierte Person ist kein Student');
|
||||
return;
|
||||
}
|
||||
window.open('<?php echo APP_ROOT ?>index.ci.php/person/gradelist/index/'+student_uid,'Notenspiegel');
|
||||
window.open('<?php echo APP_ROOT ?>index.ci.php/person/gradelist/index/'+student_uid,'Studienverlauf');
|
||||
}
|
||||
|
||||
// ****
|
||||
|
||||
@@ -79,6 +79,8 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/lvplanung/lehrveranstaltungnotenov
|
||||
<menuitem id="lehrveranstaltung-toolbar-filter-ausbildungssemester-10" type="radio" label="10. Semester" oncommand="FilterLehrveranstaltungAusbsem('10')" disabled="false"/>
|
||||
</menupopup>
|
||||
</toolbarbutton>
|
||||
<textbox id="lehrveranstaltung-toolbar-textbox-suche" control="lehrveranstaltung-toolbar-button-search" onkeypress="LehrveranstaltungSearchFieldKeyPress(event)" style="width: 300px" />
|
||||
<button id="lehrveranstaltung-toolbar-button-search" oncommand="LehrveranstaltungSuche()" label="Suchen"/>
|
||||
<spacer flex="1" />
|
||||
<toolbarbutton id="lehrveranstaltung-toolbar-opensubtrees" label="Aufklappen" tooltiptext="Klappt die Untermenüs auf - mehrmaliges klicken möglich um weiter aufzuklappen" oncommand="LvTreeOpenAllSubtrees()" disabled="false" image="../skin/images/tree-diagramm.png" />
|
||||
</toolbar>
|
||||
|
||||
@@ -384,18 +384,6 @@ elseif ($aktion=='stpl_delete_single' || $aktion=='stpl_delete_block')
|
||||
$logdata = var_export($logdata_reservierung, true);
|
||||
$reservierung->delete($reservierung_id);
|
||||
$error_msg.=$reservierung->errormsg;
|
||||
// Logeintrag zum mitloggen von geloeschten Reservierungen
|
||||
if($error_msg=='')
|
||||
{
|
||||
$log = new log();
|
||||
$log->executetime = date('Y-m-d H:i:s');
|
||||
$log->sqlundo = '';
|
||||
$log->sql = 'DELETE FROM campus.tbl_reservierung WHERE reservierung_id='.$reservierung_id.'; LogData:'.$logdata;
|
||||
$log->beschreibung = 'Löschen der Reservierung '.$reservierung_id;
|
||||
$log->mitarbeiter_uid = $uid;
|
||||
if(!$log->save(true))
|
||||
$error_msg.='Fehler: '.$log->errormsg;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -410,18 +398,6 @@ elseif ($aktion=='stpl_delete_single' || $aktion=='stpl_delete_block')
|
||||
$logdata = var_export($logdata_reservierung, true);
|
||||
$reservierung->delete($reservierung_id);
|
||||
$error_msg.=$reservierung->errormsg;
|
||||
// Logeintrag zum mitloggen von geloeschten Reservierungen
|
||||
if($error_msg=='')
|
||||
{
|
||||
$log = new log();
|
||||
$log->executetime = date('Y-m-d H:i:s');
|
||||
$log->sqlundo = '';
|
||||
$log->sql = 'DELETE FROM campus.tbl_reservierung WHERE reservierung_id='.$reservierung_id.'; LogData:'.$logdata;
|
||||
$log->beschreibung = 'Löschen der Reservierung '.$reservierung_id;
|
||||
$log->mitarbeiter_uid = $uid;
|
||||
if(!$log->save(true))
|
||||
$error_msg.='Fehler: '.$log->errormsg;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -52,52 +52,64 @@ if($studiensemester_kurzbz != -1)
|
||||
{
|
||||
$summe_m=0;
|
||||
$summe_w=0;
|
||||
$rest_m=0;
|
||||
$rest_m=0;
|
||||
$rest_w=0;
|
||||
|
||||
|
||||
//Studiengaenge, die zuvor abgeschlossen wurden
|
||||
|
||||
$qry_master="SELECT DISTINCT count(*)as count ,studiengang_kz, typ, geschlecht, tbl_studiengang.bezeichnung as bez, tbl_studiengang.kurzbz
|
||||
FROM public.tbl_person JOIN public.tbl_prestudent ON(public.tbl_person.person_id=public.tbl_prestudent.person_id)
|
||||
JOIN public.tbl_prestudentstatus ON(public.tbl_prestudent.prestudent_id=public.tbl_prestudentstatus.prestudent_id)
|
||||
JOIN public.tbl_studiengang USING(studiengang_kz)
|
||||
WHERE status_kurzbz='Absolvent' AND typ!='m' AND studiengang_kz<10000
|
||||
AND public.tbl_person.person_id IN(SELECT public.tbl_person.person_id FROM public.tbl_person
|
||||
JOIN public.tbl_prestudent ON(public.tbl_person.person_id=public.tbl_prestudent.person_id)
|
||||
JOIN public.tbl_prestudentstatus ON(public.tbl_prestudent.prestudent_id=public.tbl_prestudentstatus.prestudent_id)
|
||||
WHERE studiengang_kz='".addslashes($row_stg->studiengang_kz)."'
|
||||
AND studiensemester_kurzbz='".addslashes($studiensemester_kurzbz)."'
|
||||
AND status_kurzbz='Student'
|
||||
AND ausbildungssemester='1')
|
||||
GROUP BY studiengang_kz, typ, geschlecht, public.tbl_studiengang.bezeichnung, tbl_studiengang.kurzbz ORDER BY count desc";
|
||||
|
||||
|
||||
$qry_master = "
|
||||
SELECT
|
||||
DISTINCT count(*) as count , studiengang_kz, typ, geschlecht,
|
||||
tbl_studiengang.bezeichnung as bez, tbl_studiengang.kurzbz
|
||||
FROM
|
||||
public.tbl_person JOIN public.tbl_prestudent ON(public.tbl_person.person_id=public.tbl_prestudent.person_id)
|
||||
JOIN public.tbl_prestudentstatus ON(public.tbl_prestudent.prestudent_id=public.tbl_prestudentstatus.prestudent_id)
|
||||
JOIN public.tbl_studiengang USING(studiengang_kz)
|
||||
WHERE
|
||||
status_kurzbz='Absolvent'
|
||||
AND typ!='m' AND studiengang_kz<10000
|
||||
AND public.tbl_person.person_id IN(
|
||||
SELECT
|
||||
public.tbl_person.person_id
|
||||
FROM
|
||||
public.tbl_person
|
||||
JOIN public.tbl_prestudent ON(public.tbl_person.person_id=public.tbl_prestudent.person_id)
|
||||
JOIN public.tbl_prestudentstatus ON(public.tbl_prestudent.prestudent_id=public.tbl_prestudentstatus.prestudent_id)
|
||||
WHERE studiengang_kz=".$db->db_add_param($row_stg->studiengang_kz)."
|
||||
AND studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz)."
|
||||
AND status_kurzbz='Student'
|
||||
AND ausbildungssemester='1'
|
||||
)
|
||||
GROUP BY studiengang_kz, typ, geschlecht, public.tbl_studiengang.bezeichnung, tbl_studiengang.kurzbz
|
||||
ORDER BY count desc";
|
||||
|
||||
//Anzahl der Studenten ohne Abschluss an der FHTW
|
||||
|
||||
|
||||
//Anzahl der Studenten im 1.Semester des MasterStg
|
||||
$qry_anzahl="SELECT count(*) as anzahl FROM public.tbl_person
|
||||
JOIN public.tbl_prestudent ON(public.tbl_person.person_id=public.tbl_prestudent.person_id)
|
||||
JOIN public.tbl_prestudentstatus ON(public.tbl_prestudent.prestudent_id=public.tbl_prestudentstatus.prestudent_id)
|
||||
WHERE studiengang_kz='".addslashes($row_stg->studiengang_kz)."'
|
||||
AND studiensemester_kurzbz='".addslashes($studiensemester_kurzbz)."'
|
||||
AND status_kurzbz='Student'
|
||||
$qry_anzahl="SELECT count(*) as anzahl FROM public.tbl_person
|
||||
JOIN public.tbl_prestudent ON(public.tbl_person.person_id=public.tbl_prestudent.person_id)
|
||||
JOIN public.tbl_prestudentstatus ON(public.tbl_prestudent.prestudent_id=public.tbl_prestudentstatus.prestudent_id)
|
||||
WHERE studiengang_kz=".$db->db_add_param($row_stg->studiengang_kz)."
|
||||
AND studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz)."
|
||||
AND status_kurzbz='Student'
|
||||
AND ausbildungssemester='1'
|
||||
AND geschlecht='m'";
|
||||
if(!$result_anzahl=$db->db_query($qry_anzahl))
|
||||
die($db->db_last_error());
|
||||
$row_anzahl_m=$db->db_fetch_object($result_anzahl);
|
||||
|
||||
$qry_anzahl="SELECT count(*) as anzahl FROM public.tbl_person
|
||||
JOIN public.tbl_prestudent ON(public.tbl_person.person_id=public.tbl_prestudent.person_id)
|
||||
JOIN public.tbl_prestudentstatus ON(public.tbl_prestudent.prestudent_id=public.tbl_prestudentstatus.prestudent_id)
|
||||
WHERE studiengang_kz='".addslashes($row_stg->studiengang_kz)."'
|
||||
AND studiensemester_kurzbz='".addslashes($studiensemester_kurzbz)."'
|
||||
AND status_kurzbz='Student'
|
||||
|
||||
$qry_anzahl="SELECT count(*) as anzahl FROM public.tbl_person
|
||||
JOIN public.tbl_prestudent ON(public.tbl_person.person_id=public.tbl_prestudent.person_id)
|
||||
JOIN public.tbl_prestudentstatus ON(public.tbl_prestudent.prestudent_id=public.tbl_prestudentstatus.prestudent_id)
|
||||
WHERE studiengang_kz=".$db->db_add_param($row_stg->studiengang_kz)."
|
||||
AND studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz)."
|
||||
AND status_kurzbz='Student'
|
||||
AND ausbildungssemester='1'
|
||||
AND geschlecht='w'";
|
||||
if(!$result_anzahl=$db->db_query($qry_anzahl))
|
||||
die($db->db_last_error());
|
||||
$row_anzahl_w=$db->db_fetch_object($result_anzahl);
|
||||
|
||||
|
||||
$ausgabe .= "<TABLE width=90% style='border:3px solid #D3DCE3;border-spacing:0pt;-moz-border-radius-topleft:10px;-moz-border-radius-topright:10px;-khtml-border-radius-topleft:10px;-khtml-border-radius-topright:10px;' align='center'>";
|
||||
$ausgabe .= "<TR style='color:#000000; background-color:#D3DCE3;font: bold 1.2em arial;'><TD colspan='4'> ";
|
||||
$ausgabe .= "<a href='bama_studentenstrom.svg.php?stsem=WS2008&studiengang_kz=".$row_stg->studiengang_kz."&typ=m&kurz=".$row_stg->kurzbz."' target='_blank'>";
|
||||
@@ -111,7 +123,7 @@ if($studiensemester_kurzbz != -1)
|
||||
$ausgabe .= "<TH width='5%' style='background-color:#dddddd;border:1px solid #D3DCE3;'>Gesamt</TH>";
|
||||
$ausgabe .= "<TH width='10%' style='background-color:#dddddd;border:1px solid #D3DCE3;'>Prozent M</TH>";
|
||||
$ausgabe .= "<TH width='10%' style='background-color:#dddddd;border:1px solid #D3DCE3;'>Prozent W</TH>";
|
||||
|
||||
|
||||
$result_master=$db->db_query($qry_master);
|
||||
$i=0;
|
||||
$help=array();
|
||||
@@ -121,10 +133,10 @@ if($studiensemester_kurzbz != -1)
|
||||
$help[$row_master->studiengang_kz]['bez']=$row_master->bez;
|
||||
if($row_master->geschlecht=='m')
|
||||
$help[$row_master->studiengang_kz]['count_m']=$row_master->count;
|
||||
else
|
||||
else
|
||||
$help[$row_master->studiengang_kz]['count_w']=$row_master->count;
|
||||
}
|
||||
foreach ($help AS $key=>$row)
|
||||
foreach ($help AS $key=>$row)
|
||||
{
|
||||
if (!isset($row['count_m']))
|
||||
$row['count_m']=0;
|
||||
@@ -140,12 +152,12 @@ if($studiensemester_kurzbz != -1)
|
||||
$ausgabe .= "<TD style='border:1px solid #D3DCE3;'align='center'>".($row['count_w']+$row['count_m'])."</TD>";
|
||||
if ($row_anzahl_m->anzahl==0)
|
||||
$prozent=0;
|
||||
else
|
||||
else
|
||||
$prozent=round((100/$row_anzahl_m->anzahl)*$row['count_m'],2);
|
||||
$ausgabe .= "<TD style='border:1px solid #D3DCE3;'align='center'>".$prozent."%</TD>";
|
||||
if ($row_anzahl_w->anzahl==0)
|
||||
$prozent=0;
|
||||
else
|
||||
else
|
||||
$prozent=round((100/$row_anzahl_w->anzahl)*$row['count_w'],2);
|
||||
$ausgabe .= "<TD style='border:1px solid #D3DCE3;'align='center'>".$prozent."%</TD>";
|
||||
$ausgabe .= "</TR>";
|
||||
@@ -166,12 +178,12 @@ if($studiensemester_kurzbz != -1)
|
||||
$ausgabe .= "<TD style='border:1px solid #D3DCE3;' align='center'>".($rest_w+$rest_m)."</TD>";
|
||||
if ($row_anzahl_m->anzahl==0)
|
||||
$prozent=0;
|
||||
else
|
||||
else
|
||||
$prozent=round((100/$row_anzahl_m->anzahl)*$rest_m,2);
|
||||
$ausgabe .= "<TD style='border:1px solid #D3DCE3;' align='center'>".$prozent."%</TD>";
|
||||
if ($row_anzahl_w->anzahl==0)
|
||||
$prozent=0;
|
||||
else
|
||||
else
|
||||
$prozent=round((100/$row_anzahl_w->anzahl)*$rest_w,2);
|
||||
$ausgabe .= "<TD style='border:1px solid #D3DCE3;' align='center'>".$prozent."%</TD>";
|
||||
$ausgabe .= "</TR>";
|
||||
@@ -179,7 +191,7 @@ if($studiensemester_kurzbz != -1)
|
||||
//$ausgabe .="</TABLE>".$summe."+".$rest."=".($summe+$rest)."=".$row_anzahl->anzahl."?<BR><BR>";
|
||||
$ausgabe .="</TABLE><BR><BR>";
|
||||
}
|
||||
|
||||
|
||||
$ausgabe .= "<BR><BR><H2>Bachelor-Studiengänge: (SS".substr($studiensemester_kurzbz,-4)."/$studiensemester_kurzbz)</H2>";
|
||||
$qry_stg="SELECT * FROM public.tbl_studiengang WHERE typ='b' ORDER by bezeichnung,studiengang_kz";
|
||||
$result_stg=$db->db_query($qry_stg);
|
||||
@@ -187,48 +199,51 @@ if($studiensemester_kurzbz != -1)
|
||||
{
|
||||
$summe_m=0;
|
||||
$summe_w=0;
|
||||
$rest_m=0;
|
||||
$rest_m=0;
|
||||
$rest_w=0;
|
||||
|
||||
|
||||
//Master-Studiengänge, die noch besucht wurden
|
||||
$qry_bachelor="SELECT DISTINCT count(*)as count, studiengang_kz, typ, geschlecht, bezeichnung as bez, kurzbz FROM
|
||||
(SELECT DISTINCT ON(public.tbl_person.person_id, studiengang_kz) studiengang_kz,typ,geschlecht,tbl_studiengang.bezeichnung, tbl_studiengang.kurzbz
|
||||
FROM public.tbl_person JOIN public.tbl_prestudent ON(public.tbl_person.person_id=public.tbl_prestudent.person_id)
|
||||
JOIN public.tbl_prestudentstatus ON(public.tbl_prestudent.prestudent_id=public.tbl_prestudentstatus.prestudent_id)
|
||||
JOIN public.tbl_studiengang USING(studiengang_kz)
|
||||
WHERE status_kurzbz='Student' AND typ='m'
|
||||
AND public.tbl_person.person_id IN(SELECT public.tbl_person.person_id FROM public.tbl_person
|
||||
JOIN public.tbl_prestudent ON(public.tbl_person.person_id=public.tbl_prestudent.person_id)
|
||||
JOIN public.tbl_prestudentstatus ON(public.tbl_prestudent.prestudent_id=public.tbl_prestudentstatus.prestudent_id)
|
||||
WHERE studiengang_kz='".addslashes($row_stg->studiengang_kz)."'
|
||||
$qry_bachelor="SELECT DISTINCT count(*)as count, studiengang_kz, typ, geschlecht, bezeichnung as bez, kurzbz FROM
|
||||
(SELECT DISTINCT ON(public.tbl_person.person_id, studiengang_kz) studiengang_kz,typ,geschlecht,tbl_studiengang.bezeichnung, tbl_studiengang.kurzbz
|
||||
FROM public.tbl_person JOIN public.tbl_prestudent ON(public.tbl_person.person_id=public.tbl_prestudent.person_id)
|
||||
JOIN public.tbl_prestudentstatus ON(public.tbl_prestudent.prestudent_id=public.tbl_prestudentstatus.prestudent_id)
|
||||
JOIN public.tbl_studiengang USING(studiengang_kz)
|
||||
WHERE status_kurzbz='Student' AND typ='m'
|
||||
AND public.tbl_person.person_id IN(SELECT public.tbl_person.person_id FROM public.tbl_person
|
||||
JOIN public.tbl_prestudent ON(public.tbl_person.person_id=public.tbl_prestudent.person_id)
|
||||
JOIN public.tbl_prestudentstatus ON(public.tbl_prestudent.prestudent_id=public.tbl_prestudentstatus.prestudent_id)
|
||||
WHERE studiengang_kz=".$db->db_add_param($row_stg->studiengang_kz)."
|
||||
AND status_kurzbz='Absolvent'
|
||||
AND (studiensemester_kurzbz='".addslashes($studiensemester_kurzbz)."' OR studiensemester_kurzbz='SS".substr($studiensemester_kurzbz,-4)."') )) as b
|
||||
AND (studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz)."
|
||||
OR studiensemester_kurzbz='SS".substr($studiensemester_kurzbz,-4)."') )) as b
|
||||
GROUP BY studiengang_kz, typ, geschlecht, bezeichnung, kurzbz ORDER BY count desc";
|
||||
|
||||
|
||||
//Anzahl der Studenten ohne weitere Masterstudien am FHTW
|
||||
|
||||
|
||||
|
||||
//Anzahl der Absolventen des Studiengangs
|
||||
$qry_anzahl="SELECT count(*) as anzahl FROM public.tbl_person
|
||||
JOIN public.tbl_prestudent ON(public.tbl_person.person_id=public.tbl_prestudent.person_id)
|
||||
JOIN public.tbl_prestudentstatus ON(public.tbl_prestudent.prestudent_id=public.tbl_prestudentstatus.prestudent_id)
|
||||
WHERE studiengang_kz='".addslashes($row_stg->studiengang_kz)."'
|
||||
$qry_anzahl="SELECT count(*) as anzahl FROM public.tbl_person
|
||||
JOIN public.tbl_prestudent ON(public.tbl_person.person_id=public.tbl_prestudent.person_id)
|
||||
JOIN public.tbl_prestudentstatus ON(public.tbl_prestudent.prestudent_id=public.tbl_prestudentstatus.prestudent_id)
|
||||
WHERE studiengang_kz=".$db->db_add_param($row_stg->studiengang_kz)."
|
||||
AND status_kurzbz='Absolvent'
|
||||
AND (studiensemester_kurzbz='".addslashes($studiensemester_kurzbz)."' OR studiensemester_kurzbz='SS".substr($studiensemester_kurzbz,-4)."')
|
||||
AND (studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz)."
|
||||
OR studiensemester_kurzbz='SS".substr($studiensemester_kurzbz,-4)."')
|
||||
AND geschlecht='m'";
|
||||
$result_anzahl=$db->db_query($qry_anzahl);
|
||||
$row_anzahl_m=$db->db_fetch_object($result_anzahl);
|
||||
|
||||
$qry_anzahl="SELECT count(*) as anzahl FROM public.tbl_person
|
||||
JOIN public.tbl_prestudent ON(public.tbl_person.person_id=public.tbl_prestudent.person_id)
|
||||
JOIN public.tbl_prestudentstatus ON(public.tbl_prestudent.prestudent_id=public.tbl_prestudentstatus.prestudent_id)
|
||||
WHERE studiengang_kz='".addslashes($row_stg->studiengang_kz)."'
|
||||
|
||||
$qry_anzahl="SELECT count(*) as anzahl FROM public.tbl_person
|
||||
JOIN public.tbl_prestudent ON(public.tbl_person.person_id=public.tbl_prestudent.person_id)
|
||||
JOIN public.tbl_prestudentstatus ON(public.tbl_prestudent.prestudent_id=public.tbl_prestudentstatus.prestudent_id)
|
||||
WHERE studiengang_kz=".$db->db_add_param($row_stg->studiengang_kz)."
|
||||
AND status_kurzbz='Absolvent'
|
||||
AND (studiensemester_kurzbz='".addslashes($studiensemester_kurzbz)."' OR studiensemester_kurzbz='SS".substr($studiensemester_kurzbz,-4)."')
|
||||
AND (studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz)."
|
||||
OR studiensemester_kurzbz='SS".substr($studiensemester_kurzbz,-4)."')
|
||||
AND geschlecht='w'";
|
||||
$result_anzahl=$db->db_query($qry_anzahl);
|
||||
$row_anzahl_w=$db->db_fetch_object($result_anzahl);
|
||||
|
||||
|
||||
$ausgabe .= "<TABLE width=90% style='border:3px solid #D3DCE3;border-spacing:0pt;-moz-border-radius-topleft:10px;-moz-border-radius-topright:10px;-khtml-border-radius-topleft:10px;-khtml-border-radius-topright:10px;' align='center'>";
|
||||
$ausgabe .= "<TR style='color:#000000; background-color:#D3DCE3;font: bold 1.2em arial;'>";
|
||||
$ausgabe .= "<TD colspan='4'> ";
|
||||
@@ -254,10 +269,10 @@ if($studiensemester_kurzbz != -1)
|
||||
$help[$row_bachelor->studiengang_kz]['bez']=$row_bachelor->bez;
|
||||
if($row_bachelor->geschlecht=='m')
|
||||
$help[$row_bachelor->studiengang_kz]['count_m']=$row_bachelor->count;
|
||||
else
|
||||
else
|
||||
$help[$row_bachelor->studiengang_kz]['count_w']=$row_bachelor->count;
|
||||
}
|
||||
foreach ($help AS $key=>$row)
|
||||
foreach ($help AS $key=>$row)
|
||||
{
|
||||
if (!isset($row['count_m']))
|
||||
$row['count_m']=0;
|
||||
@@ -273,12 +288,12 @@ if($studiensemester_kurzbz != -1)
|
||||
$ausgabe .= "<TD style='border:1px solid #D3DCE3;'align='center'>".($row['count_w']+$row['count_m'])."</TD>";
|
||||
if ($row_anzahl_m->anzahl==0)
|
||||
$prozent=0;
|
||||
else
|
||||
else
|
||||
$prozent=round((100/$row_anzahl_m->anzahl)*$row['count_m'],2);
|
||||
$ausgabe .= "<TD style='border:1px solid #D3DCE3;'align='center'>".$prozent."%</TD>";
|
||||
if ($row_anzahl_w->anzahl==0)
|
||||
$prozent=0;
|
||||
else
|
||||
else
|
||||
$prozent=round((100/$row_anzahl_w->anzahl)*$row['count_w'],2);
|
||||
$ausgabe .= "<TD style='border:1px solid #D3DCE3;'align='center'>".$prozent."%</TD>";
|
||||
$ausgabe .= "</TR>";
|
||||
@@ -286,7 +301,7 @@ if($studiensemester_kurzbz != -1)
|
||||
$summe_w += $row['count_w'];
|
||||
$i++;
|
||||
}
|
||||
|
||||
|
||||
//$rest=$row_rest->rest;
|
||||
$rest_m=$row_anzahl_m->anzahl-$summe_m;
|
||||
$rest_w=$row_anzahl_w->anzahl-$summe_w;
|
||||
@@ -300,22 +315,22 @@ if($studiensemester_kurzbz != -1)
|
||||
$ausgabe .= "<TD style='border:1px solid #D3DCE3;' align='center'>".($rest_w+$rest_m)."</TD>";
|
||||
if ($row_anzahl_m->anzahl==0)
|
||||
$prozent=0;
|
||||
else
|
||||
else
|
||||
$prozent=round((100/$row_anzahl_m->anzahl)*$rest_m,2);
|
||||
$ausgabe .= "<TD style='border:1px solid #D3DCE3;' align='center'>".$prozent."%</TD>";
|
||||
if ($row_anzahl_w->anzahl==0)
|
||||
$prozent=0;
|
||||
else
|
||||
else
|
||||
$prozent=round((100/$row_anzahl_w->anzahl)*$rest_w,2);
|
||||
$ausgabe .= "<TD style='border:1px solid #D3DCE3;' align='center'>".$prozent."%</TD>";
|
||||
$ausgabe .= "</TR>";
|
||||
|
||||
$ausgabe .="</TABLE><BR><BR>";
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
echo '
|
||||
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
|
||||
<html>
|
||||
@@ -340,20 +355,20 @@ while ($row_sem=$db->db_fetch_object($result_sem))
|
||||
{
|
||||
$selected="selected='selected'";
|
||||
}
|
||||
else
|
||||
else
|
||||
{
|
||||
$selected='';
|
||||
}
|
||||
$htmlstr .= "<option $selected value='".$row_sem->studiensemester_kurzbz."'>".$row_sem->bezeichnung."</option>";
|
||||
}
|
||||
}
|
||||
$htmlstr .= "</select>\n";
|
||||
$htmlstr .= "<input type='submit' name='speichern' value='OK' title='Studiensemester bestimmen'>";
|
||||
$htmlstr .= "</form>\n";
|
||||
|
||||
echo $htmlstr;
|
||||
echo $ausgabe;
|
||||
|
||||
|
||||
echo "Anmerkungen:<br><br>Doppelvorkommen von Studierenden führt zu Verfaelschungen bei der Anzahl der 'Externen':<br>
|
||||
- AbsolventInnen bzw. Studierende in verschiedenen Studiengaengen.<br>
|
||||
- Doppelteintragungen: z.B. nach Abbruch neu inskribiert";
|
||||
?>
|
||||
?>
|
||||
|
||||
@@ -198,8 +198,10 @@ $worksheet->write($zeile,$spalte,"Studiengang", $format_bold);
|
||||
$maxlength[$spalte]=11;
|
||||
$worksheet->write($zeile,++$spalte,"Organisationseinheit", $format_bold);
|
||||
$maxlength[$spalte]=25;
|
||||
$worksheet->write($zeile,++$spalte,"Lektor", $format_bold);
|
||||
$worksheet->write($zeile,++$spalte,"LektorIn", $format_bold);
|
||||
$maxlength[$spalte]=6;
|
||||
$worksheet->write($zeile,++$spalte,"Fixangestellt", $format_bold);
|
||||
$maxlength[$spalte]=10;
|
||||
$worksheet->write($zeile,++$spalte,"Bezeichnung", $format_bold);
|
||||
$maxlength[$spalte]=25;
|
||||
$worksheet->write($zeile,++$spalte,"Semester", $format_bold);
|
||||
@@ -268,6 +270,11 @@ if($result = $db->db_query($qry))
|
||||
if($maxlength[$spalte]<mb_strlen($mitarbeiter->nachname.' '.$mitarbeiter->vorname))
|
||||
$maxlength[$spalte]=mb_strlen($mitarbeiter->nachname.' '.$mitarbeiter->vorname);
|
||||
|
||||
//Fixangestellt
|
||||
$worksheet->write($zeile,++$spalte,($mitarbeiter->fixangestellt ? 'Ja' : 'Nein'));
|
||||
if($maxlength[$spalte]<mb_strlen($mitarbeiter->fixangestellt ? 'Ja' : 'Nein'))
|
||||
$maxlength[$spalte]=mb_strlen($mitarbeiter->fixangestellt ? 'Ja' : 'Nein');
|
||||
|
||||
//Lehrfach
|
||||
$worksheet->write($zeile,++$spalte,$row->lf_bezeichnung);
|
||||
//if($maxlength[$spalte]<mb_strlen($row->lf_bezeichnung))
|
||||
@@ -380,7 +387,8 @@ if($result = $db->db_query($qry))
|
||||
student_uid,
|
||||
stunden,
|
||||
tbl_projektbetreuer.stundensatz,
|
||||
tbl_projektbetreuer.faktor
|
||||
tbl_projektbetreuer.faktor,
|
||||
tbl_projektbetreuer.person_id
|
||||
FROM lehre.tbl_projektarbeit,
|
||||
lehre.tbl_lehreinheit,
|
||||
lehre.tbl_lehrveranstaltung,
|
||||
@@ -419,6 +427,39 @@ if($result = $db->db_query($qry))
|
||||
$spalte=0;
|
||||
$zeile++;
|
||||
|
||||
$benutzer = new benutzer();
|
||||
$benutzer->getBenutzerFromPerson($row->person_id, false);
|
||||
if (count($benutzer->result) > 0)
|
||||
{
|
||||
foreach ($benutzer->result AS $bn)
|
||||
{
|
||||
$mitarbeiter = new mitarbeiter($bn->uid);
|
||||
if ($mitarbeiter->load($bn->uid))
|
||||
{
|
||||
if ($mitarbeiter->fixangestellt)
|
||||
{
|
||||
$fixangestellt = 'Ja';
|
||||
break;
|
||||
}
|
||||
else
|
||||
{
|
||||
$fixangestellt = 'Nein';
|
||||
break;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
$fixangestellt = 'Extern';
|
||||
}
|
||||
|
||||
|
||||
//Studiengang
|
||||
$worksheet->write($zeile,$spalte,$stg_obj->kuerzel_arr[$row->studiengang_kz]);
|
||||
if($maxlength[$spalte]<mb_strlen($stg_obj->kuerzel_arr[$row->studiengang_kz]))
|
||||
@@ -434,6 +475,9 @@ if($result = $db->db_query($qry))
|
||||
//if($maxlength[$spalte]<mb_strlen($row->nachname.' '.$row->vorname))
|
||||
//$maxlength[$spalte]=mb_strlen($row->nachname.' '.$row->vorname);
|
||||
|
||||
//Fixangestellt
|
||||
$worksheet->write($zeile,++$spalte,$fixangestellt);
|
||||
|
||||
//Lehrfach
|
||||
$worksheet->write($zeile,++$spalte,$row->bezeichnung);
|
||||
//if($maxlength[$spalte]<mb_strlen($row->bezeichnung))
|
||||
|
||||
@@ -1826,10 +1826,17 @@ function StudentPrestudentRolleBestaetigen()
|
||||
var studiensemester_kurzbz = getTreeCellText(tree, 'student-prestudent-tree-rolle-studiensemester_kurzbz', tree.currentIndex);
|
||||
var prestudent_id = getTreeCellText(tree, 'student-prestudent-tree-rolle-prestudent_id', tree.currentIndex);
|
||||
var ausbildungssemester = getTreeCellText(tree, 'student-prestudent-tree-rolle-ausbildungssemester', tree.currentIndex);
|
||||
var bewerbung_abgeschicktamum = getTreeCellText(tree, 'student-prestudent-tree-rolle-bewerbung_abgeschicktamum', tree.currentIndex);
|
||||
|
||||
studiengang_kz = document.getElementById('student-prestudent-menulist-studiengang_kz').value;
|
||||
if(confirm('Diesen Status bestaetigen?'))
|
||||
{
|
||||
// Status darf nur bestaetig werden, wenn Bewerbung schon abgeschickt wurde
|
||||
if (bewerbung_abgeschicktamum=='')
|
||||
{
|
||||
alert('Die Bewerbung wurde noch nicht abgeschickt und kann deshalb nicht bestätigt werden');
|
||||
return false;
|
||||
}
|
||||
var url = '<?php echo APP_ROOT ?>content/student/studentDBDML.php';
|
||||
var req = new phpRequest(url,'','');
|
||||
|
||||
|
||||
@@ -233,7 +233,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
|
||||
<template>
|
||||
<menupopup>
|
||||
<menuitem value="rdf:http://www.technikum-wien.at/lehrveranstaltung/rdf#lehrveranstaltung_id"
|
||||
label="rdf:http://www.technikum-wien.at/lehrveranstaltung/rdf#bezeichnung rdf:http://www.technikum-wien.at/lehrveranstaltung/rdf#orgform_kurzbz (rdf:http://www.technikum-wien.at/lehrveranstaltung/rdf#semester Sem)"
|
||||
label="rdf:http://www.technikum-wien.at/lehrveranstaltung/rdf#bezeichnung rdf:http://www.technikum-wien.at/lehrveranstaltung/rdf#orgform_kurzbz (rdf:http://www.technikum-wien.at/lehrveranstaltung/rdf#semester Sem) ID: rdf:http://www.technikum-wien.at/lehrveranstaltung/rdf#lehrveranstaltung_id"
|
||||
uri="rdf:*"/>
|
||||
</menupopup>
|
||||
</template>
|
||||
@@ -247,7 +247,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
|
||||
<template>
|
||||
<menupopup>
|
||||
<menuitem value="rdf:http://www.technikum-wien.at/lehreinheit/rdf#lehreinheit_id"
|
||||
label="rdf:http://www.technikum-wien.at/lehreinheit/rdf#bezeichnung rdf:http://www.technikum-wien.at/lehreinheit/rdf#studiensemester_kurzbz"
|
||||
label="rdf:http://www.technikum-wien.at/lehreinheit/rdf#bezeichnung rdf:http://www.technikum-wien.at/lehreinheit/rdf#studiensemester_kurzbz ID: rdf:http://www.technikum-wien.at/lehreinheit/rdf#lehreinheit_id"
|
||||
uri="rdf:*"/>
|
||||
</menupopup>
|
||||
</template>
|
||||
|
||||
@@ -40,6 +40,7 @@ require_once('../include/studiengang.class.php');
|
||||
require_once('../include/benutzerfunktion.class.php');
|
||||
require_once('../include/organisationseinheit.class.php');
|
||||
require_once('../include/dokument_export.class.php');
|
||||
require_once('../include/person.class.php');
|
||||
|
||||
$user = get_uid();
|
||||
$db = new basis_db();
|
||||
@@ -232,6 +233,8 @@ foreach ($uid_arr as $uid)
|
||||
$konto = new konto();
|
||||
$studiengang = new studiengang();
|
||||
$studiengang->load($student->studiengang_kz);
|
||||
$person = new person();
|
||||
$person->getPersonFromBenutzer($uid);
|
||||
|
||||
$stsem_obj = new studiensemester();
|
||||
$stsem = $stsem_obj->getaktorNext();
|
||||
@@ -265,6 +268,7 @@ foreach ($uid_arr as $uid)
|
||||
'studiengang' => $studiengang->kurzbzlang,
|
||||
'gebdatum' => $datum_obj->formatDatum($bn->gebdatum, 'd.m.Y'),
|
||||
'matrikelnummer' => $student->matrikelnr,
|
||||
'matr_nr' => $person->matr_nr,
|
||||
'ausstellungsdatum' => date('M.Y'),
|
||||
'gueltigbis' => $datum_obj->formatDatum($gueltigbis, 'd.m.Y')
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user