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

- tbl_bisio prestudent_id hinzugefuegt

Browse Source 
- betroffene seiten angepasst
This commit is contained in:
ma0048
2023-03-15 14:17:04 +01:00
parent c411b826d9
commit 90aeb00d3c
19 changed files with 238 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/models/education/Lehrveranstaltung_model.php
+4 -3
View File
@@ -125,7 +125,7 @@ class Lehrveranstaltung_model extends DB_Model
public function getStudentsByLv($studiensemester_kurzbz, $lehrveranstaltung_id, $active = null)
{
$query = "SELECT
distinct on(nachname, vorname, person_id) vorname, nachname, matrikelnr,
distinct on(nachname, vorname, tbl_person.person_id) vorname, nachname, matrikelnr,
tbl_studentlehrverband.semester, tbl_studentlehrverband.verband, tbl_studentlehrverband.gruppe,
(SELECT status_kurzbz FROM public.tbl_prestudentstatus WHERE prestudent_id=tbl_student.prestudent_id ORDER BY datum DESC, insertamum DESC, ext_id DESC LIMIT 1) as status,
tbl_bisio.bisio_id, tbl_bisio.von, tbl_bisio.bis, tbl_student.studiengang_kz AS stg_kz_student,
@@ -136,11 +136,12 @@ class Lehrveranstaltung_model extends DB_Model
campus.vw_student_lehrveranstaltung
JOIN public.tbl_benutzer USING(uid)
JOIN public.tbl_person USING(person_id)
LEFT JOIN public.tbl_prestudent ON tbl_person.person_id = tbl_prestudent.person_id
LEFT JOIN public.tbl_student ON(uid=student_uid)
LEFT JOIN public.tbl_mitarbeiter ON(uid=mitarbeiter_uid)
LEFT JOIN public.tbl_studentlehrverband USING(student_uid,studiensemester_kurzbz)
LEFT JOIN lehre.tbl_zeugnisnote on(vw_student_lehrveranstaltung.lehrveranstaltung_id=tbl_zeugnisnote.lehrveranstaltung_id AND tbl_zeugnisnote.student_uid=tbl_student.student_uid AND tbl_zeugnisnote.studiensemester_kurzbz=tbl_studentlehrverband.studiensemester_kurzbz)
LEFT JOIN bis.tbl_bisio ON(uid=tbl_bisio.student_uid)
LEFT JOIN bis.tbl_bisio ON(tbl_prestudent.prestudent_id = tbl_bisio.prestudent_id)
LEFT JOIN public.tbl_studiengang ON(vw_student_lehrveranstaltung.studiengang_kz=tbl_studiengang.studiengang_kz)
WHERE
vw_student_lehrveranstaltung.studiensemester_kurzbz=?
@@ -156,7 +157,7 @@ class Lehrveranstaltung_model extends DB_Model
}
$query .=
" ORDER BY nachname, vorname, person_id, tbl_bisio.bis DESC";
" ORDER BY nachname, vorname, tbl_person.person_id, tbl_bisio.bis DESC";
return $this->execQuery($query, array($studiensemester_kurzbz, $lehrveranstaltung_id));
}
cis/private/lehre/fotoliste.pdf.php
+2 -1
View File
@@ -186,6 +186,7 @@ $qry = 'SELECT DISTINCT ON
campus.vw_student_lehrveranstaltung
JOIN public.tbl_benutzer USING(uid)
JOIN public.tbl_person USING(person_id)
LEFT JOIN public.tbl_prestudent ON tbl_person.person_id = tbl_prestudent.person_id
LEFT JOIN public.tbl_student ON(uid=student_uid)
LEFT JOIN public.tbl_studiengang ON(tbl_studiengang.studiengang_kz=tbl_student.studiengang_kz)
LEFT JOIN public.tbl_mitarbeiter ON(uid=mitarbeiter_uid)
@@ -193,7 +194,7 @@ $qry = 'SELECT DISTINCT ON
LEFT JOIN lehre.tbl_zeugnisnote ON(vw_student_lehrveranstaltung.lehrveranstaltung_id=tbl_zeugnisnote.lehrveranstaltung_id
AND tbl_zeugnisnote.student_uid=tbl_student.student_uid
AND tbl_zeugnisnote.studiensemester_kurzbz=tbl_studentlehrverband.studiensemester_kurzbz)
LEFT JOIN bis.tbl_bisio ON(uid=tbl_bisio.student_uid)
LEFT JOIN bis.tbl_bisio ON(tbl_bisio.prestudent_id = tbl_prestudent.prestudent_id)
WHERE
vw_student_lehrveranstaltung.lehrveranstaltung_id=' . $db->db_add_param($lvid, FHC_INTEGER) . ' AND
vw_student_lehrveranstaltung.studiensemester_kurzbz=' . $db->db_add_param($studiensemester);
cis/private/lehre/notenliste.xls.php
+10 -7
View File
@@ -210,8 +210,8 @@ else
$qry = "
SELECT
distinct on(nachname, vorname, person_id)
vorname, nachname, wahlname, matrikelnr, person_id, tbl_student.student_uid as uid,
distinct on(nachname, vorname, tbl_person.person_id)
vorname, nachname, wahlname, matrikelnr, tbl_person.person_id, tbl_student.student_uid as uid,
tbl_studentlehrverband.semester, tbl_studentlehrverband.verband, tbl_studentlehrverband.gruppe,
(SELECT status_kurzbz
FROM public.tbl_prestudentstatus
@@ -222,14 +222,17 @@ else
(CASE WHEN bis.tbl_mobilitaet.studiensemester_kurzbz = vw_student_lehrveranstaltung.studiensemester_kurzbz THEN '1' ELSE '' END) as doubledegree,
tbl_note.lkt_ueberschreibbar, tbl_note.anmerkung
FROM
campus.vw_student_lehrveranstaltung JOIN public.tbl_benutzer USING(uid)
JOIN public.tbl_person USING(person_id) JOIN public.tbl_student ON(uid=student_uid)
campus.vw_student_lehrveranstaltung
JOIN public.tbl_benutzer USING(uid)
JOIN public.tbl_person ON(tbl_benutzer.person_id = tbl_person.person_id)
JOIN public.tbl_prestudent ON (tbl_person.person_id = tbl_prestudent.person_id)
JOIN public.tbl_student ON(uid=student_uid)
LEFT JOIN public.tbl_studentlehrverband USING(student_uid,studiensemester_kurzbz)
LEFT JOIN lehre.tbl_zeugnisnote on(vw_student_lehrveranstaltung.lehrveranstaltung_id=tbl_zeugnisnote.lehrveranstaltung_id
AND tbl_zeugnisnote.student_uid=tbl_student.student_uid
AND tbl_zeugnisnote.studiensemester_kurzbz=tbl_studentlehrverband.studiensemester_kurzbz)
LEFT JOIN bis.tbl_bisio ON(uid=tbl_bisio.student_uid)
LEFT JOIN bis.tbl_mobilitaet USING(prestudent_id)
LEFT JOIN bis.tbl_bisio ON(tbl_bisio.prestudent_id = tbl_prestudent.prestudent_id)
LEFT JOIN bis.tbl_mobilitaet ON(tbl_mobilitaet.prestudent_id = tbl_prestudent.prestudent_id)
LEFT JOIN lehre.tbl_note USING(note)
WHERE
vw_student_lehrveranstaltung.lehrveranstaltung_id=".$db->db_add_param($lvid, FHC_INTEGER)."
@@ -238,7 +241,7 @@ else
if($lehreinheit_id!='')
$qry.=" AND vw_student_lehrveranstaltung.lehreinheit_id=".$db->db_add_param($lehreinheit_id, FHC_INTEGER);
$qry.=' ORDER BY nachname, vorname, person_id, tbl_bisio.bis, doubledegree DESC';
$qry.=' ORDER BY nachname, vorname, tbl_person.person_id, tbl_bisio.bis, doubledegree DESC';
if($result = $db->db_query($qry))
{
content/statistik/studentenstatistik.php
+2 -2
View File
@@ -124,7 +124,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=".$db->db_add_param($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 prestudent_id FROM public.tbl_prestudent JOIN bis.tbl_bisio USING (prestudent_id)
WHERE studiengang_kz=stg.studiengang_kz AND (bis>=".$db->db_add_param($stsem_obj->start)." OR bis is null) AND von<=".$db->db_add_param($stsem_obj->ende)."
) a) AS out,";
@@ -272,7 +272,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=".$db->db_add_param($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 prestudent_id FROM public.tbl_prestudent JOIN bis.tbl_bisio USING (prestudent_id)
WHERE studiengang_kz=stg.studiengang_kz AND (bis>=".$db->db_add_param($stsem_obj->start)." OR bis is null) AND von<=".$db->db_add_param($stsem_obj->ende)."
) a) AS out,";
content/student/studentDBDML.php
+21 -21
View File
@@ -3157,7 +3157,7 @@ if(!$error)
$bisio->herkunftsland_code = $_POST['herkunftsland_code'];
$bisio->von = $_POST['von'];
$bisio->bis = $_POST['bis'];
$bisio->student_uid = $_POST['student_uid'];
$bisio->prestudent_id = $_POST['prestudent_id'];
$bisio->lehreinheit_id = $_POST['lehreinheit_id'];
$bisio->ort = $_POST['ort'];
$bisio->universitaet = $_POST['universitaet'];
@@ -3186,13 +3186,13 @@ if(!$error)
$bisio = new bisio();
if($bisio->load($_POST['bisio_id']))
{
$student = new student();
if($student->load($bisio->student_uid))
$prestudent = new prestudent();
if($prestudent->load($bisio->prestudent_id))
{
//Speichert einen BisIO Eintrag
if(!$rechte->isBerechtigt('assistenz',$student->studiengang_kz,'suid') &&
!$rechte->isBerechtigt('admin',$student->studiengang_kz, 'suid'))
if(!$rechte->isBerechtigt('assistenz',$prestudent->studiengang_kz,'suid') &&
!$rechte->isBerechtigt('admin',$prestudent->studiengang_kz, 'suid'))
{
$error = true;
$return = false;
@@ -3223,7 +3223,7 @@ if(!$error)
}
else
{
$errormsg = $student->errormsg;
$errormsg = $prestudent->errormsg;
$return = false;
}
}
@@ -3238,12 +3238,12 @@ if(!$error)
$bisio = new bisio();
if($bisio->load($_POST['bisio_id']))
{
$student = new student();
if($student->load($bisio->student_uid))
$prestudent = new prestudent();
if($prestudent->load($bisio->prestudent_id))
{
//Speichert einen BisIO Eintrag
if(!$rechte->isBerechtigt('assistenz',$student->studiengang_kz,'suid') &&
!$rechte->isBerechtigt('admin',$student->studiengang_kz, 'suid'))
if(!$rechte->isBerechtigt('assistenz',$prestudent->studiengang_kz,'suid') &&
!$rechte->isBerechtigt('admin',$prestudent->studiengang_kz, 'suid'))
{
$error = true;
$return = false;
@@ -3273,7 +3273,7 @@ if(!$error)
}
else
{
$errormsg = $student->errormsg;
$errormsg = $prestudent->errormsg;
$return = false;
}
}
@@ -3288,13 +3288,13 @@ if(!$error)
$bisio = new bisio();
if($bisio->load($_POST['bisio_id']))
{
$student = new student();
if($student->load($bisio->student_uid))
$prestudent = new prestudent();
if($prestudent->load($bisio->prestudent_id))
{
//Speichert einen BisIO Eintrag
if(!$rechte->isBerechtigt('assistenz',$student->studiengang_kz,'suid') &&
!$rechte->isBerechtigt('admin',$student->studiengang_kz, 'suid'))
if(!$rechte->isBerechtigt('assistenz',$prestudent->studiengang_kz,'suid') &&
!$rechte->isBerechtigt('admin',$prestudent->studiengang_kz, 'suid'))
{
$error = true;
$return = false;
@@ -3325,7 +3325,7 @@ if(!$error)
}
else
{
$errormsg = $student->errormsg;
$errormsg = $prestudent->errormsg;
$return = false;
}
}
@@ -3340,12 +3340,12 @@ if(!$error)
$bisio = new bisio();
if($bisio->load($_POST['bisio_id']))
{
$student = new student();
if($student->load($bisio->student_uid))
$prestudent = new prestudent();
if($prestudent->load($bisio->prestudent_id))
{
//Speichert einen BisIO Eintrag
if(!$rechte->isBerechtigt('assistenz',$student->studiengang_kz,'suid') &&
!$rechte->isBerechtigt('admin',$student->studiengang_kz, 'suid'))
if(!$rechte->isBerechtigt('assistenz',$prestudent->studiengang_kz,'suid') &&
!$rechte->isBerechtigt('admin',$prestudent->studiengang_kz, 'suid'))
{
$error = true;
$return = false;
@@ -3375,7 +3375,7 @@ if(!$error)
}
else
{
$errormsg = $student->errormsg;
$errormsg = $prestudent->errormsg;
$return = false;
}
}
content/student/studentiooverlay.xul.php
+2 -2
View File
@@ -105,8 +105,8 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
<vbox hidden="true">
<label value="Neu"/>
<checkbox id="student-io-detail-checkbox-neu" checked="true" />
<label value="Uid"/>
<textbox id="student-io-detail-textbox-uid" disabled="true"/>
<label value="Prestudent ID"/>
<textbox id="student-io-detail-textbox-prestudent_id" disabled="true"/>
<label value="BisIO ID"/>
<textbox id="student-io-detail-textbox-bisio_id" disabled="true"/>
</vbox>
content/student/studentoverlay.js.php
+9 -9
View File
@@ -1504,12 +1504,12 @@ function StudentAuswahl()
StudentAkteTreeDatasource.addXMLSinkObserver(StudentAkteTreeSinkObserver);
}
if(uid!='')
if(prestudent_id!='')
{
// *** Incomming/Outgoing ***
bisiotree = document.getElementById('student-io-tree');
url='<?php echo APP_ROOT;?>rdf/bisio.rdf.php?uid='+uid+"&"+gettimestamp();
url='<?php echo APP_ROOT;?>rdf/bisio.rdf.php?prestudent_id='+prestudent_id+"&"+gettimestamp();
try
{
@@ -3529,7 +3529,7 @@ function StudentIOAuswahl()
von = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#von" ));
bis = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#bis" ));
zweck_code = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zweck_code" ));
student_uid = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#student_uid" ));
prestudent_id=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#prestudent_id" ));
lehreinheit_id = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#lehreinheit_id" ));
lehrveranstaltung_id = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#lehrveranstaltung_id" ));
studiensemester_kurzbz = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#studiensemester_kurzbz" ));
@@ -3603,7 +3603,7 @@ function StudentIOAuswahl()
document.getElementById('student-io-menulist-herkunftsland').value=herkunftsland_code;
document.getElementById('student-io-textbox-von').value=von;
document.getElementById('student-io-textbox-bis').value=bis;
document.getElementById('student-io-detail-textbox-uid').value=student_uid;
document.getElementById('student-io-detail-textbox-prestudent_id').value=prestudent_id;
document.getElementById('student-io-detail-checkbox-neu').checked=false;
document.getElementById('student-io-detail-textbox-bisio_id').value=bisio_id;
document.getElementById('student-io-textbox-ort').value=ort;
@@ -3881,7 +3881,7 @@ function StudentIODetailSpeichern()
nation_code = document.getElementById('student-io-menulist-nation').value;
herkunftsland_code = document.getElementById('student-io-menulist-herkunftsland').value;
zweck_code = document.getElementById('student-io-menulist-zweck').value;
uid = document.getElementById('student-io-detail-textbox-uid').value;
prestudent_id = document.getElementById('student-io-detail-textbox-prestudent_id').value;
neu = document.getElementById('student-io-detail-checkbox-neu').checked;
bisio_id = document.getElementById('student-io-detail-textbox-bisio_id').value;
lehreinheit_id = document.getElementById('student-io-menulist-lehreinheit').value;
@@ -3919,7 +3919,7 @@ function StudentIODetailSpeichern()
req.add('nation_code', nation_code);
req.add('herkunftsland_code', herkunftsland_code);
req.add('zweck_code', zweck_code);
req.add('student_uid', uid);
req.add('prestudent_id', prestudent_id);
req.add('studiengang_kz', studiengang_kz);
req.add('lehreinheit_id', lehreinheit_id);
req.add('ort', ort);
@@ -4019,12 +4019,12 @@ function StudentIONeu()
if(tag<10)
tag='0'+tag;
var uid = document.getElementById('student-detail-textbox-uid').value;
var prestudent_id = document.getElementById('student-io-detail-textbox-prestudent_id').value;
var defaultdatum = tag+'.'+monat+'.'+jahr;
var mobilitaetsprogramm = 7; // ERASMUS
//UID ins Textfeld schreiben
document.getElementById('student-io-detail-textbox-uid').value = uid;
document.getElementById('student-io-detail-textbox-prestudent_id').value = prestudent_id;
document.getElementById('student-io-detail-checkbox-neu').checked = true;
document.getElementById('student-io-textbox-von').value = defaultdatum;
document.getElementById('student-io-textbox-bis').value = defaultdatum;
@@ -4056,7 +4056,7 @@ function StudentIONeu()
req.add('mobilitaetsprogramm_code', mobilitaetsprogramm);
req.add('nation_code', 'A');
req.add('herkunftsland_code', 'A');
req.add('student_uid', uid);
req.add('prestudent_id', prestudent_id);
req.add('studiengang_kz', stg_kz);
req.add('lehreinheit_id', '');
req.add('ort', '');
include/bisio.class.php
+14 -20
View File
@@ -38,7 +38,7 @@ class bisio extends basis_db
public $von; // date
public $bis; // date
public $zweck_code; // varchar(20)
public $student_uid; // varchar(16)
public $prestudent_id; // integer
public $updateamum; // timestamp
public $updatevon; // varchar(32)
public $insertamum; // timestamp
@@ -90,7 +90,7 @@ class bisio extends basis_db
$this->nation_code = $row->nation_code;
$this->von = $row->von;
$this->bis = $row->bis;
$this->student_uid = $row->student_uid;
$this->prestudent_id = $row->prestudent_id;
$this->updateamum = $row->updateamum;
$this->updatevon = $row->updatevon;
$this->insertamum = $row->insertamum;
@@ -142,12 +142,6 @@ class bisio extends basis_db
return false;
}
if (mb_strlen($this->student_uid) > 32)
{
$this->errormsg = 'Student_UID ist ungueltig';
return false;
}
if ($this->von != '' && !mb_ereg("([0-9]{4})-([0-9]{2})-([0-9]{2})", $this->von))
{
$this->errormsg = 'VON-Datum hat ein ungueltiges Format';
@@ -203,13 +197,13 @@ class bisio extends basis_db
//Neuen Datensatz einfuegen
$qry='BEGIN;INSERT INTO bis.tbl_bisio (mobilitaetsprogramm_code, nation_code, von, bis,
student_uid, updateamum, updatevon, insertamum, insertvon, ort, universitaet, lehreinheit_id,
prestudent_id, updateamum, updatevon, insertamum, insertvon, ort, universitaet, lehreinheit_id,
ects_angerechnet, ects_erworben, herkunftsland_code) VALUES('.
$this->db_add_param($this->mobilitaetsprogramm_code, FHC_INTEGER).', '.
$this->db_add_param($this->nation_code).', '.
$this->db_add_param($this->von).', '.
$this->db_add_param($this->bis).', '.
$this->db_add_param($this->student_uid).', '.
$this->db_add_param($this->prestudent_id, FHC_INTEGER).', '.
$this->db_add_param($this->updateamum).', '.
$this->db_add_param($this->updatevon).', '.
$this->db_add_param($this->insertamum).', '.
@@ -229,7 +223,7 @@ class bisio extends basis_db
' nation_code='.$this->db_add_param($this->nation_code).','.
' von='.$this->db_add_param($this->von).','.
' bis='.$this->db_add_param($this->bis).','.
' student_uid='.$this->db_add_param($this->student_uid).','.
' prestudent_id='.$this->db_add_param($this->prestudent_id, FHC_INTEGER).','.
' updateamum='.$this->db_add_param($this->updateamum).','.
' updatevon='.$this->db_add_param($this->updatevon).','.
' ort='.$this->db_add_param($this->ort).','.
@@ -303,10 +297,10 @@ class bisio extends basis_db
/**
* Liefert alle Incomming/Outgoing
* Eintraege eines Studenten
* @param $uid
* @param $prestudent_id
* @return true wenn ok, false wenn fehler
*/
public function getIO($uid)
public function getIO($prestudent_id)
{
$qry = "SELECT tbl_bisio.*,
tbl_mobilitaetsprogramm.kurzbz as mobilitaetsprogramm_kurzbz
@@ -314,7 +308,7 @@ class bisio extends basis_db
bis.tbl_bisio,
bis.tbl_mobilitaetsprogramm
WHERE
student_uid=".$this->db_add_param($uid)." AND
prestudent_id=".$this->db_add_param($prestudent_id)." AND
tbl_mobilitaetsprogramm.mobilitaetsprogramm_code=tbl_bisio.mobilitaetsprogramm_code
ORDER BY bis;";
@@ -330,7 +324,7 @@ class bisio extends basis_db
$io->nation_code = $row->nation_code;
$io->von = $row->von;
$io->bis = $row->bis;
$io->student_uid = $row->student_uid;
$io->prestudent_id = $row->prestudent_id;
$io->updateamum = $row->updateamum;
$io->updatevon = $row->updatevon;
$io->insertamum = $row->insertamum;
@@ -356,15 +350,15 @@ class bisio extends basis_db
/**
* Liefert alle Incoming/Outgoing
* Eintraege eines Studenten, die
* Eintraege eines Prestudenten, die
* innerhalb des gewuenschten
* Zeitraums beginnen
* @param $uid
* @param $prestudent_id
* @param $von
* @param $bis
* @return true wenn ok, false wenn fehler
*/
public function getIOForPeriod($uid, $von, $bis)
public function getIOForPeriod($prestudent_id, $von, $bis)
{
$qry = "SELECT tbl_bisio.*,
tbl_mobilitaetsprogramm.kurzbz as mobilitaetsprogramm_kurzbz
@@ -372,7 +366,7 @@ class bisio extends basis_db
bis.tbl_bisio,
bis.tbl_mobilitaetsprogramm
WHERE
student_uid=".$this->db_add_param($uid)." AND
prestudent_id=".$this->db_add_param($prestudent_id)." AND
tbl_mobilitaetsprogramm.mobilitaetsprogramm_code=tbl_bisio.mobilitaetsprogramm_code AND
tbl_bisio.von BETWEEN ".$this->db_add_param($von)." AND ".$this->db_add_param($bis)."
ORDER BY bis;";
@@ -389,7 +383,7 @@ class bisio extends basis_db
$io->nation_code = $row->nation_code;
$io->von = $row->von;
$io->bis = $row->bis;
$io->student_uid = $row->student_uid;
$io->prestudent_id = $row->prestudent_id;
$io->updateamum = $row->updateamum;
$io->updatevon = $row->updatevon;
$io->insertamum = $row->insertamum;
include/lehrelisthelper.class.php
+7 -5
View File
@@ -200,7 +200,7 @@ class LehreListHelper
//Studierende der LV laden und in ein Array schreiben
$qry = 'SELECT
distinct on(nachname, vorname, person_id) vorname, nachname, wahlname, matrikelnr, public.tbl_student.student_uid,
distinct on(nachname, vorname, tbl_person.person_id) vorname, nachname, wahlname, matrikelnr, public.tbl_student.student_uid,
tbl_studentlehrverband.semester, tbl_studentlehrverband.verband, tbl_studentlehrverband.gruppe,
(SELECT status_kurzbz FROM public.tbl_prestudentstatus
WHERE prestudent_id=tbl_student.prestudent_id
@@ -213,16 +213,18 @@ class LehreListHelper
FROM
campus.vw_student_lehrveranstaltung
JOIN public.tbl_benutzer USING(uid)
JOIN public.tbl_person USING(person_id) LEFT JOIN public.tbl_student ON(uid=student_uid)
JOIN public.tbl_person USING(person_id)
LEFT JOIN public.tbl_prestudent ON (tbl_person.person_id = tbl_prestudent.person_id)
LEFT JOIN public.tbl_student ON(uid=student_uid)
LEFT JOIN public.tbl_mitarbeiter ON(uid=mitarbeiter_uid)
LEFT JOIN public.tbl_studentlehrverband USING(student_uid,studiensemester_kurzbz)
LEFT JOIN lehre.tbl_zeugnisnote on(vw_student_lehrveranstaltung.lehrveranstaltung_id=tbl_zeugnisnote.lehrveranstaltung_id
AND tbl_zeugnisnote.student_uid=tbl_student.student_uid
AND tbl_zeugnisnote.studiensemester_kurzbz=tbl_studentlehrverband.studiensemester_kurzbz)
LEFT JOIN lehre.tbl_note USING (note)
LEFT JOIN bis.tbl_bisio ON(uid=tbl_bisio.student_uid)
LEFT JOIN bis.tbl_bisio ON(tbl_prestudent.prestudent_id = tbl_bisio.prestudent_id)
LEFT JOIN public.tbl_studiengang ON(tbl_student.studiengang_kz=tbl_studiengang.studiengang_kz)
LEFT JOIN bis.tbl_mobilitaet USING(prestudent_id)
LEFT JOIN bis.tbl_mobilitaet ON(tbl_prestudent.prestudent_id = tbl_mobilitaet.prestudent_id)
WHERE
vw_student_lehrveranstaltung.lehrveranstaltung_id='.$this->db->db_add_param($this->lvid, FHC_INTEGER).' AND
vw_student_lehrveranstaltung.studiensemester_kurzbz='.$this->db->db_add_param($this->studiensemester);
@@ -231,7 +233,7 @@ class LehreListHelper
if($this->lehreinheit!='')
$qry.=' AND vw_student_lehrveranstaltung.lehreinheit_id='.$this->db->db_add_param($this->lehreinheit, FHC_INTEGER);
$qry.=' ORDER BY nachname, vorname, person_id, daysout DESC, doubledegree DESC';
$qry.=' ORDER BY nachname, vorname, tbl_person.person_id, daysout DESC, doubledegree DESC';
$stsem_obj = new studiensemester();
$stsem_obj->load($this->studiensemester);
rdf/anwesenheitsliste.xml.php
+3 -3
View File
@@ -123,10 +123,10 @@ foreach($data as $key => $value)
. "LEFT JOIN lehre.tbl_zeugnisnote zn ON (zn.lehrveranstaltung_id = stlv.lehrveranstaltung_id AND zn.student_uid = stlv.uid AND zn.studiensemester_kurzbz = " . $db->db_add_param($studiensemester) . ") "
. "WHERE stlv.lehreinheit_id = " . $db->db_add_param($key) . " "
. "AND get_rolle_prestudent(tbl_student.prestudent_id, " . $db->db_add_param($studiensemester) . ") NOT IN ('Abbrecher', 'Unterbrecher') "
. "AND tbl_student.student_uid NOT IN ("
. "SELECT stud.student_uid "
. "AND tbl_student.prestudent_id NOT IN ("
. "SELECT bis.prestudent_id "
. "FROM bis.tbl_bisio bis "
. "JOIN public.tbl_student stud ON bis.student_uid = stud.student_uid "
. "JOIN public.tbl_student stud ON bis.prestudent_id = stud.prestudent_id "
. "WHERE bis.von <= " . $db->db_add_param($currentDay) . "::DATE AND bis.bis >= " . $db->db_add_param($currentDay) . "::DATE) "
. "ORDER BY nachname ASC";
rdf/bisio.rdf.php
+7 -7
View File
@@ -36,10 +36,10 @@ require_once('../include/datum.class.php');
echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
if(isset($_GET['uid']))
$uid = $_GET['uid'];
if(isset($_GET['prestudent_id']))
$prestudent_id = $_GET['prestudent_id'];
else
$uid = null;
$prestudent_id = null;
if(isset($_GET['bisio_id']))
$bisio_id = $_GET['bisio_id'];
@@ -61,11 +61,11 @@ echo '
//Daten holen
$ioobj = new bisio();
//Wenn die UID uebergeben wurde, dann werden alle
//Wenn die prestudent_id uebergeben wurde, dann werden alle
//Eintraege dieser Person geladen
if($uid)
if($prestudent_id)
{
if($ioobj->getIO($uid))
if($ioobj->getIO($prestudent_id))
{
foreach ($ioobj->result as $row)
draw_content($row);
@@ -116,7 +116,7 @@ function draw_content($row)
<IO:von><![CDATA['.$datum->convertISODate($row->von).']]></IO:von>
<IO:bis_iso><![CDATA['.$row->bis.']]></IO:bis_iso>
<IO:bis><![CDATA['.$datum->convertISODate($row->bis).']]></IO:bis>
<IO:student_uid><![CDATA['.$row->student_uid.']]></IO:student_uid>
<IO:prestudent_id><![CDATA['.$row->prestudent_id.']]></IO:prestudent_id>
<IO:lehreinheit_id><![CDATA['.$row->lehreinheit_id.']]></IO:lehreinheit_id>
<IO:ort><![CDATA['.$row->ort.']]></IO:ort>
<IO:universitaet><![CDATA['.$row->universitaet.']]></IO:universitaet>
rdf/diplomasupplement.xml.php
+4 -4
View File
@@ -375,7 +375,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
WHERE tbl_bisio_zweck.bisio_id = tbl_bisio.bisio_id
) zweck, ort, universitaet
FROM bis.tbl_bisio
WHERE student_uid=".$db->db_add_param($uid_arr[$i]);
WHERE prestudent_id=".$db->db_add_param($row->prestudent_id, FHC_INTEGER);
if($db->db_query($qry))
{
@@ -661,7 +661,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
$qry .= "
AND NOT EXISTS(SELECT 1 FROM bis.tbl_bisio JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
WHERE lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id
AND student_uid=".$db->db_add_param($uid_arr[$i])."
AND prestudent_id=".$db->db_add_param($row->prestudent_id, FHC_INTEGER)."
AND tbl_lehreinheit.studiensemester_kurzbz in(".$sqlStudent->implode4SQL($aktuellesSemester)."))
ORDER BY sort, tbl_lehrveranstaltung.bezeichnung;";
@@ -836,7 +836,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
FROM bis.tbl_bisio
JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
WHERE lehrveranstaltung_id=".$db->db_add_param($row_stud->lehrveranstaltung_id)."
AND student_uid=".$db->db_add_param($uid_arr[$i]).")
AND prestudent_id=".$db->db_add_param($row->prestudent_id, FHC_INTEGER).")
ORDER BY beginn DESC, projektarbeit_id DESC LIMIT 1;";
if($result_thesis = $db->db_query($qry))
@@ -899,7 +899,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
WHERE
student_uid = ".$db->db_add_param($uid_arr[$i]);
prestudent_id = ".$db->db_add_param($row->prestudent_id, FHC_INTEGER);
if($result_outgoing = $db->db_query($qry_outgoing))
{
rdf/student.rdf.php
+3 -3
View File
@@ -656,9 +656,9 @@ if($xmlformat=='rdf')
{
$stsem_obj = new studiensemester();
$stsem_obj->load($studiensemester_kurzbz);
$qry = "SELECT prestudent_id
$qry = "SELECT bis.tbl_bisio.prestudent_id
FROM
bis.tbl_bisio JOIN public.tbl_student USING(student_uid)
bis.tbl_bisio
WHERE
(
(tbl_bisio.von>=".$db->db_add_param($stsem_obj->start)." AND tbl_bisio.von<=".$db->db_add_param($stsem_obj->ende).")
@@ -667,7 +667,7 @@ if($xmlformat=='rdf')
OR
(tbl_bisio.von<=".$db->db_add_param($stsem_obj->start)." AND tbl_bisio.bis>=".$db->db_add_param($stsem_obj->ende).")
)
AND NOT EXISTS(SELECT 1 FROM public.tbl_prestudentstatus WHERE status_kurzbz='Incoming' AND prestudent_id=tbl_student.prestudent_id)
AND NOT EXISTS(SELECT 1 FROM public.tbl_prestudentstatus WHERE status_kurzbz='Incoming' AND prestudent_id = tbl_bisio.prestudent_id)
";
}
if($db->db_query($qry))
rdf/zeugnis.rdf.php
+1 -1
View File
@@ -364,7 +364,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
$qry = "SELECT tbl_bisio.* FROM bis.tbl_bisio JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
WHERE tbl_lehreinheit.lehrveranstaltung_id='$row->lehrveranstaltung_id'
AND student_uid=".$db->db_add_param($uid_arr[$i]);
AND prestudent_id=".$db->db_add_param($prestudent_id);
if($result_bisio = $db->db_query($qry))
{
if($row_bisio = $db->db_fetch_object($result_bisio))
system/dbupdate_3.4.php
+1
View File
@@ -31,6 +31,7 @@ require_once('dbupdate_3.4/example2.php');
require_once('dbupdate_3.4/26173_index_webservicelog.php');
require_once('dbupdate_3.4/24682_reihungstest_zugangscode_fuer_login.php');
require_once('dbupdate_3.4/17512_fehlercode_constraints.php');
require_once('dbupdate_3.4/28276_eine_uid_tbl_bisio.php');
// *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
echo '<H2>Pruefe Tabellen und Attribute!</H2>';
system/dbupdate_3.4/28276_eine_uid_tbl_bisio.php
+18
View File
@@ -0,0 +1,18 @@
<?php
if (! defined('DB_NAME')) exit('No direct script access allowed');
if(!$result = @$db->db_query("SELECT prestudent_id FROM bis.tbl_bisio LIMIT 1"))
{
$qry = "ALTER TABLE bis.tbl_bisio ADD COLUMN prestudent_id int;
UPDATE bis.tbl_bisio
SET prestudent_id = student.prestudent_id
FROM tbl_student student
WHERE tbl_bisio.student_uid = student.student_uid;";
if(!$db->db_query($qry))
echo '<strong>bis.tbl_bisio: '.$db->db_last_error().'</strong><br>';
else
echo '<br>bis.tbl_bisio: Spalte prestudent_id hinzugefuegt';
}
system/konsistenzpruefung.php
+1 -1
View File
@@ -494,7 +494,7 @@ $qry = "SELECT
JOIN public.tbl_prestudent USING(prestudent_id)
JOIN public.tbl_person USING(person_id)
WHERE
NOT EXISTS(SELECT 1 FROM bis.tbl_bisio WHERE student_uid=tbl_student.student_uid)
NOT EXISTS(SELECT 1 FROM bis.tbl_bisio WHERE tbl_bisio.prestudent_id = tbl_prestudent.prestudent_id)
AND EXISTS(SELECT 1 FROM public.tbl_prestudentstatus WHERE prestudent_id=tbl_student.prestudent_id AND status_kurzbz='Incoming')";
if($result = $db->db_query($qry))
vilesci/personen/suche.php
+1 -1
View File
@@ -929,7 +929,7 @@ function casDeletePrestudent($db, $prestudent_id, $trans=true)
{
$qry = '
DELETE FROM bis.tbl_bisio
WHERE student_uid IN (SELECT student_uid FROM public.tbl_student WHERE prestudent_id='.$db->db_add_param($prestudent_id, FHC_INTEGER).')';
WHERE prestudent_id ='.$db->db_add_param($prestudent_id, FHC_INTEGER).')';
if(!$db->db_query($qry))
$error = true;
}
vilesci/statistik/outgoing.php
+128 -128
View File
@@ -1,134 +1,134 @@
<?php
/* Copyright (C) 2011 FH Technikum-Wien
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* 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 >
* Karl Burkhart <burkhart@technikum-wien.at>
*/
require_once('../../config/vilesci.config.inc.php');
require_once('../../include/functions.inc.php');
require_once('../../include/studiengang.class.php');
require_once('../../include/studiensemester.class.php');
if (!$db = new basis_db())
die('Es konnte keine Verbindung zum Server aufgebaut werden.');
$user = get_uid();
echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
<title>Outgoing</title>
<link rel="stylesheet" href="../../skin/tablesort.css" type="text/css"/>
<link rel="stylesheet" href="../../skin/fhcomplete.css" type="text/css">
<link rel="stylesheet" href="../../skin/vilesci.css" type="text/css">
<?php
/* Copyright (C) 2011 FH Technikum-Wien
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* 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 >
* Karl Burkhart <burkhart@technikum-wien.at>
*/
require_once('../../config/vilesci.config.inc.php');
require_once('../../include/functions.inc.php');
require_once('../../include/studiengang.class.php');
require_once('../../include/studiensemester.class.php');
if (!$db = new basis_db())
die('Es konnte keine Verbindung zum Server aufgebaut werden.');
$user = get_uid();
echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
<title>Outgoing</title>
<link rel="stylesheet" href="../../skin/tablesort.css" type="text/css"/>
<link rel="stylesheet" href="../../skin/fhcomplete.css" type="text/css">
<link rel="stylesheet" href="../../skin/vilesci.css" type="text/css">
<link rel="stylesheet" type="text/css" href="../../skin/jquery-ui-1.9.2.custom.min.css">
<script type="text/javascript" src="../../vendor/jquery/jquery1/jquery-1.12.4.min.js"></script>
<script type="text/javascript" src="../../vendor/christianbach/tablesorter/jquery.tablesorter.min.js"></script>
<script type="text/javascript" src="../../vendor/components/jqueryui/jquery-ui.min.js"></script>
<script type="text/javascript" src="../../include/js/jquery.ui.datepicker.translation.js"></script>
<script type="text/javascript" src="../../vendor/jquery/sizzle/sizzle.js"></script>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
</head>
<body>
<h2>Outgoing</h2>';
$studiengang_kz = isset($_REQUEST['studiengang_kz'])?$_REQUEST['studiengang_kz']:'';
echo '<form action="'.$_SERVER['PHP_SELF'].'" method="POST">';
$stg_obj = new studiengang();
$stg_obj->getAll('typ, kurzbz');
echo "\n",'Studiengang <SELECT name="studiengang_kz">
<OPTION value="">-- Alle --</OPTION>';
foreach($stg_obj->result as $row)
{
if($row->studiengang_kz==$studiengang_kz)
$selected='selected';
else
$selected='';
echo '<OPTION value="'.$row->studiengang_kz.'" '.$selected.'>'.$row->kuerzel.' ('.$row->kurzbzlang.')</OPTION>';
}
echo '</SELECT>';
echo '&nbsp;&nbsp;<input type="submit" name="show" value="OK"></form>';
$stsem = new studiensemester();
$stsem->getFinished();
foreach($stsem->studiensemester as $row)
{
$qry="SELECT
distinct vorname, nachname, tbl_studiengang.studiengang_kz, UPPER(tbl_studiengang.typ || tbl_studiengang.kurzbz) as stg
FROM
public.tbl_prestudent
JOIN public.tbl_person USING(person_id)
JOIN public.tbl_studiengang USING(studiengang_kz)
JOIN public.tbl_student USING(prestudent_id)
JOIN bis.tbl_bisio USING(student_uid)
WHERE
(
(tbl_bisio.von>='$row->start' AND tbl_bisio.von<='$row->ende')
OR (tbl_bisio.bis<='$row->ende' AND tbl_bisio.bis>='$row->start')
)
AND get_rolle_prestudent (prestudent_id, '$row->studiensemester_kurzbz')<>'Incoming' ";
if($studiengang_kz!='')
$qry.=" AND tbl_student.studiengang_kz='".addslashes($studiengang_kz)."'";
$qry.=" ORDER BY stg";
if($result = $db->db_query($qry))
{
$anzahl = $db->db_num_rows($result);
echo '<h3>'.$row->studiensemester_kurzbz.' Anzahl: '.$anzahl.'</h3>';
if($anzahl>0)
{
echo '
<script type="text/javascript">
$(document).ready(function()
{
$("#'.$row->studiensemester_kurzbz.'").tablesorter(
{
sortList: [[2,0]],
widgets: ["zebra"]
});
}
);
</script>
<table id="'.$row->studiensemester_kurzbz.'" class="tablesorter" style="width:auto">
<thead>
<tr>
<th>Nachname</th>
<th>Vorname</th>
<th>Studiengang</th>
</tr>
</thead>
<tbody>';
while($row = $db->db_fetch_object($result))
{
echo '<tr>';
echo '<td>'.$row->nachname.'</td>';
echo '<td>'.$row->vorname.'</td>';
echo '<td>'.$row->stg.'</td>';
echo '</tr>';
}
echo '</tbody></table>';
}
}
}
echo '</body></html>';
<script type="text/javascript" src="../../vendor/jquery/sizzle/sizzle.js"></script>
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
</head>
<body>
<h2>Outgoing</h2>';
$studiengang_kz = isset($_REQUEST['studiengang_kz'])?$_REQUEST['studiengang_kz']:'';
echo '<form action="'.$_SERVER['PHP_SELF'].'" method="POST">';
$stg_obj = new studiengang();
$stg_obj->getAll('typ, kurzbz');
echo "\n",'Studiengang <SELECT name="studiengang_kz">
<OPTION value="">-- Alle --</OPTION>';
foreach($stg_obj->result as $row)
{
if($row->studiengang_kz==$studiengang_kz)
$selected='selected';
else
$selected='';
echo '<OPTION value="'.$row->studiengang_kz.'" '.$selected.'>'.$row->kuerzel.' ('.$row->kurzbzlang.')</OPTION>';
}
echo '</SELECT>';
echo '&nbsp;&nbsp;<input type="submit" name="show" value="OK"></form>';
$stsem = new studiensemester();
$stsem->getFinished();
foreach($stsem->studiensemester as $row)
{
$qry="SELECT
distinct vorname, nachname, tbl_studiengang.studiengang_kz, UPPER(tbl_studiengang.typ || tbl_studiengang.kurzbz) as stg
FROM
public.tbl_prestudent
JOIN public.tbl_person USING(person_id)
JOIN public.tbl_studiengang USING(studiengang_kz)
JOIN public.tbl_student USING(prestudent_id)
JOIN bis.tbl_bisio ON tbl_bisio.prestudent_id = tbl_prestudent.prestudent_id
WHERE
(
(tbl_bisio.von>='$row->start' AND tbl_bisio.von<='$row->ende')
OR (tbl_bisio.bis<='$row->ende' AND tbl_bisio.bis>='$row->start')
)
AND get_rolle_prestudent (tbl_prestudent.prestudent_id, '$row->studiensemester_kurzbz')<>'Incoming' ";
if($studiengang_kz!='')
$qry.=" AND tbl_student.studiengang_kz='".addslashes($studiengang_kz)."'";
$qry.=" ORDER BY stg";
if($result = $db->db_query($qry))
{
$anzahl = $db->db_num_rows($result);
echo '<h3>'.$row->studiensemester_kurzbz.' Anzahl: '.$anzahl.'</h3>';
if($anzahl>0)
{
echo '
<script type="text/javascript">
$(document).ready(function()
{
$("#'.$row->studiensemester_kurzbz.'").tablesorter(
{
sortList: [[2,0]],
widgets: ["zebra"]
});
}
);
</script>
<table id="'.$row->studiensemester_kurzbz.'" class="tablesorter" style="width:auto">
<thead>
<tr>
<th>Nachname</th>
<th>Vorname</th>
<th>Studiengang</th>
</tr>
</thead>
<tbody>';
while($row = $db->db_fetch_object($result))
{
echo '<tr>';
echo '<td>'.$row->nachname.'</td>';
echo '<td>'.$row->vorname.'</td>';
echo '<td>'.$row->stg.'</td>';
echo '</tr>';
}
echo '</tbody></table>';
}
}
}
echo '</body></html>';
?>