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

nation attribute for ZGV

Browse Source
This commit is contained in:
Robert Hofer
2015-03-24 18:07:43 +01:00
parent 5b58fce5de
commit 95d8967855
7 changed files with 709 additions and 632 deletions
Download Patch File Download Diff File Expand all files Collapse all files
content/student/studentdetailoverlay.xul.php
+638 -608
View File
File diff suppressed because it is too large Load Diff
content/student/studentoverlay.js.php
+10
View File
@@ -1023,9 +1023,11 @@ function StudentAuswahl()
ausbildungcode = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#ausbildungcode" ));
zgv_code = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zgv_code" ));
zgvort = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zgvort" ));
zgvnation = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zgvnation" ));
zgvdatum = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zgvdatum" ));
zgvmaster_code = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zgvmas_code" ));
zgvmasterort = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zgvmaort" ));
zgvmasternation = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zgvmanation" ));
zgvmasterdatum = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#zgvmadatum" ));
ausstellungsstaat = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#ausstellungsstaat" ));
aufnahmeschluessel = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#aufnahmeschluessel" ));
@@ -1047,9 +1049,11 @@ function StudentAuswahl()
document.getElementById('student-prestudent-menulist-ausbildung').value=ausbildungcode;
document.getElementById('student-prestudent-menulist-zgvcode').value=zgv_code;
document.getElementById('student-prestudent-textbox-zgvort').value=zgvort;
document.getElementById('student-prestudent-menulist-zgvnation').value=zgvnation;
document.getElementById('student-prestudent-textbox-zgvdatum').value=zgvdatum;
document.getElementById('student-prestudent-menulist-zgvmastercode').value=zgvmaster_code;
document.getElementById('student-prestudent-textbox-zgvmasterort').value=zgvmasterort;
document.getElementById('student-prestudent-menulist-zgvmasternation').value=zgvmasternation;
document.getElementById('student-prestudent-textbox-zgvmasterdatum').value=zgvmasterdatum;
document.getElementById('student-prestudent-menulist-ausstellungsstaat').value=ausstellungsstaat;
document.getElementById('student-prestudent-menulist-aufnahmeschluessel').value=aufnahmeschluessel;
@@ -1547,9 +1551,11 @@ function StudentPrestudentDisableFields(val)
document.getElementById('student-prestudent-menulist-ausbildung').disabled=val;
document.getElementById('student-prestudent-menulist-zgvcode').disabled=val;
document.getElementById('student-prestudent-textbox-zgvort').disabled=val;
document.getElementById('student-prestudent-menulist-zgvnation').disabled=val;
document.getElementById('student-prestudent-textbox-zgvdatum').disabled=val;
document.getElementById('student-prestudent-menulist-zgvmastercode').disabled=val;
document.getElementById('student-prestudent-textbox-zgvmasterort').disabled=val;
document.getElementById('student-prestudent-menulist-zgvmasternation').disabled=val;
document.getElementById('student-prestudent-textbox-zgvmasterdatum').disabled=val;
document.getElementById('student-prestudent-menulist-ausstellungsstaat').disabled=val;
document.getElementById('student-prestudent-menulist-aufnahmeschluessel').disabled=val;
@@ -1599,9 +1605,11 @@ function StudentPrestudentSave()
ausbildungcode = document.getElementById('student-prestudent-menulist-ausbildung').value;
zgv_code = document.getElementById('student-prestudent-menulist-zgvcode').value;
zgvort = document.getElementById('student-prestudent-textbox-zgvort').value;
zgvnation = document.getElementById('student-prestudent-menulist-zgvnation').value;
zgvdatum = document.getElementById('student-prestudent-textbox-zgvdatum').value;
zgvmaster_code = document.getElementById('student-prestudent-menulist-zgvmastercode').value;
zgvmasterort = document.getElementById('student-prestudent-textbox-zgvmasterort').value;
zgvmasternation = document.getElementById('student-prestudent-menulist-zgvmasternation').value;
zgvmasterdatum = document.getElementById('student-prestudent-textbox-zgvmasterdatum').value;
ausstellungsstaat = document.getElementById('student-prestudent-menulist-ausstellungsstaat').value;
aufnahmeschluessel = document.getElementById('student-prestudent-menulist-aufnahmeschluessel').value;
@@ -1654,9 +1662,11 @@ function StudentPrestudentSave()
req.add('ausbildungcode', ausbildungcode);
req.add('zgv_code', zgv_code);
req.add('zgvort', zgvort);
req.add('zgvnation', zgvnation);
req.add('zgvdatum', ConvertDateToISO(zgvdatum));
req.add('zgvmas_code', zgvmaster_code);
req.add('zgvmaort', zgvmasterort);
req.add('zgvmanation', zgvmasternation);
req.add('zgvmadatum', ConvertDateToISO(zgvmasterdatum));
req.add('ausstellungsstaat', ausstellungsstaat);
req.add('aufnahmeschluessel', aufnahmeschluessel);
include/prestudent.class.php
+39 -19
View File
@@ -32,9 +32,11 @@ class prestudent extends person
public $zgv_code;
public $zgvort;
public $zgvdatum;
public $zgvnation;
public $zgvmas_code;
public $zgvmaort;
public $zgvmadatum;
public $zgvmanation;
public $ausstellungsstaat;
public $aufnahmeschluessel;
public $facheinschlberuf;
@@ -44,17 +46,18 @@ class prestudent extends person
public $punkte; //rt_gesamtpunkte
public $rt_punkte1;
public $rt_punkte2;
public $rt_punkte3=0;
public $bismelden=true;
public $rt_punkte3 = 0;
public $bismelden = true;
public $anmerkung;
public $anmerkung_status;
public $mentor;
public $ext_id_prestudent;
public $dual=false;
public $dual = false;
public $zgvdoktor_code;
public $zgvdoktorort;
public $zgvdoktordatum;
public $zgvdoktornation;
public $status_kurzbz;
public $studiensemester_kurzbz;
public $ausbildungssemester;
@@ -68,13 +71,13 @@ class prestudent extends person
public $studienplan_bezeichnung;
public $bestaetigtam;
public $bestaetigtvon;
public $studiensemester_old='';
public $ausbildungssemester_old='';
// ErgebnisArray
public $result=array();
public $num_rows=0;
public $studiensemester_old = '';
public $ausbildungssemester_old = '';
// ErgebnisArray
public $result = array();
public $num_rows = 0;
/**
* Konstruktor - Uebergibt die Connection und laedt optional einen Prestudent
@@ -116,10 +119,12 @@ class prestudent extends person
$this->zgv_code = $row->zgv_code;
$this->zgvort = $row->zgvort;
$this->zgvdatum = $row->zgvdatum;
$this->zgvnation = $row->zgvnation;
$this->zgvmas_code = $row->zgvmas_code;
$this->zgvmaort = $row->zgvmaort;
$this->zgvmadatum = $row->zgvmadatum;
$this->aufnahmeschluessel = $row->aufnahmeschluessel;
$this->zgvmadatum = $row->zgvmadatum;
$this->zgvmanation = $row->zgvmanation;
$this->aufnahmeschluessel = $row->aufnahmeschluessel;
$this->facheinschlberuf = $this->db_parse_bool($row->facheinschlberuf);
$this->anmeldungreihungstest = $row->anmeldungreihungstest;
$this->reihungstestangetreten = $this->db_parse_bool($row->reihungstestangetreten);
@@ -136,10 +141,11 @@ class prestudent extends person
$this->dual = $this->db_parse_bool($row->dual);
$this->ausstellungsstaat = $row->ausstellungsstaat;
$this->zgvdoktor_code = $row->zgvdoktor_code;
$this->zgvdoktorort = $row->zgvdoktorort;
$this->zgvdoktordatum = $row->zgvdoktordatum;
if(!person::load($row->person_id))
$this->zgvdoktorort = $row->zgvdoktorort;
$this->zgvdoktordatum = $row->zgvdoktordatum;
$this->zgvdoktornation = $row->zgvdoktornation;
if(!person::load($row->person_id))
return false;
else
return true;
@@ -207,8 +213,8 @@ class prestudent extends person
if($this->new) //Wenn new true ist dann ein INSERT absetzen ansonsten ein UPDATE
{
$qry = 'BEGIN;INSERT INTO public.tbl_prestudent (aufmerksamdurch_kurzbz, person_id,
studiengang_kz, berufstaetigkeit_code, ausbildungcode, zgv_code, zgvort, zgvdatum,
zgvmas_code, zgvmaort, zgvmadatum, aufnahmeschluessel, facheinschlberuf,
studiengang_kz, berufstaetigkeit_code, ausbildungcode, zgv_code, zgvort, zgvdatum, zgvnation,
zgvmas_code, zgvmaort, zgvmadatum, zgvmanation, aufnahmeschluessel, facheinschlberuf,
reihungstest_id, anmeldungreihungstest, reihungstestangetreten, rt_gesamtpunkte,
rt_punkte1, rt_punkte2, rt_punkte3, bismelden, insertamum, insertvon,
updateamum, updatevon, ext_id, anmerkung, dual, ausstellungsstaat, mentor) VALUES('.
@@ -220,9 +226,11 @@ class prestudent extends person
$this->db_add_param($this->zgv_code).",".
$this->db_add_param($this->zgvort).",".
$this->db_add_param($this->zgvdatum).",".
$this->db_add_param($this->zgvnation).",".
$this->db_add_param($this->zgvmas_code).",".
$this->db_add_param($this->zgvmaort).",".
$this->db_add_param($this->zgvmadatum).",".
$this->db_add_param($this->zgvmanation).",".
$this->db_add_param($this->aufnahmeschluessel).",".
$this->db_add_param($this->facheinschlberuf, FHC_BOOLEAN).",".
$this->db_add_param($this->reihungstest_id).",".
@@ -254,9 +262,11 @@ class prestudent extends person
' zgv_code='.$this->db_add_param($this->zgv_code).",".
' zgvort='.$this->db_add_param($this->zgvort).",".
' zgvdatum='.$this->db_add_param($this->zgvdatum).",".
' zgvnation='.$this->db_add_param($this->zgvnation).",".
' zgvmas_code='.$this->db_add_param($this->zgvmas_code).",".
' zgvmaort='.$this->db_add_param($this->zgvmaort).",".
' zgvmadatum='.$this->db_add_param($this->zgvmadatum).",".
' zgvmanation='.$this->db_add_param($this->zgvmanation).",".
' aufnahmeschluessel='.$this->db_add_param($this->aufnahmeschluessel).",".
' facheinschlberuf='.$this->db_add_param($this->facheinschlberuf, FHC_BOOLEAN).",".
' reihungstest_id='.$this->db_add_param($this->reihungstest_id).",".
@@ -372,9 +382,11 @@ class prestudent extends person
$ps->zgv_code = $row->zgv_code;
$ps->zgvort = $row->zgvort;
$ps->zgvdatum = $row->zgvdatum;
$ps->zgvnation = $row->zgvnation;
$ps->zgvmas_code = $row->zgvmas_code;
$ps->zgvmaort = $row->zgvmaort;
$ps->zgvmadatum = $row->zgvmadatum;
$ps->zgvmanation = $row->zgvmanation;
$ps->aufnahmeschluessel = $row->aufnahmeschluessel;
$ps->facheinschlberuf = $this->db_parse_bool($row->facheinschlberuf);
$ps->anmeldungreihungstest = $row->anmeldungreihungstest;
@@ -631,9 +643,11 @@ class prestudent extends person
$ps->zgv_code = $row->zgv_code;
$ps->zgvort = $row->zgvort;
$ps->zgvdatum = $row->zgvdatum;
$ps->zgvnation = $row->zgvnation;
$ps->zgvmas_code = $row->zgvmas_code;
$ps->zgvmaort = $row->zgvmaort;
$ps->zgvmadatum = $row->zgvmadatum;
$ps->zgvmanation = $row->zgvmanation;
$ps->ausstellungsstaat = $row->ausstellungsstaat;
$ps->aufnahmeschluessel = $row->aufnahmeschluessel;
$ps->facheinschlberuf = $this->db_parse_bool($row->facheinschlberuf);
@@ -1046,9 +1060,11 @@ class prestudent extends person
$obj->zgv_code = $row->zgv_code;
$obj->zgvort = $row->zgvort;
$obj->zgvdatum = $row->zgvdatum;
$obj->zgvnation = $row->zgvnation;
$obj->zgvmas_code = $row->zgvmas_code;
$obj->zgvmaort = $row->zgvmaort;
$obj->zgvmadatum = $row->zgvmadatum;
$obj->zgvmanation = $row->zgvmanation;
$obj->aufnahmeschluessel = $row->aufnahmeschluessel;
$obj->facheinschlberuf = $this->db_parse_bool($row->facheinschlberuf);
$obj->anmeldungreihungstest = $row->anmeldungreihungstest;
@@ -1095,17 +1111,21 @@ class prestudent extends person
'art',
'ort',
'datum',
'nation',
);
$db_attribute = array(
'zgv_code',
'zgvort',
'zgvdatum',
'zgvnation',
'zgvmas_code',
'zgvmaort',
'zgvmadatum',
'zgvmanation',
'zgvdoktor_code',
'zgvdoktorort',
'zgvdoktordatum',
'zgvdoktornation',
);
foreach($this->result as $prestudent) {
locale/de-AT/bewerbung.php
+1 -1
View File
@@ -12,7 +12,7 @@ $this->phrasen['bewerbung/mailtextHtml']='Bitte sehen Sie sich die Nachricht in
$this->phrasen['bewerbung/mailtext']='Sehr geehrteR Herr/Frau %1$s %2$s.<br><br>
Vielen Dank für Ihr Interesse an einem Studiengang der '.CAMPUS_NAME.'. <br>
Um sich für einen Studiengang zu bewerben verwenden Sie bitte folgenden Link und Zugangscode: <br><br>
<a href="'.APP_ROOT.'cis/public/registration.php">Link zur Bewerbung</a><br>
<a href="'.APP_ROOT.'addons/bewerbung/cis/registration.php">Link zur Bewerbung</a><br>
Zugangscode: %3$s <br><br>
Mit freundlichen Grüßen, <br>
'.CAMPUS_NAME;
rdf/prestudent.rdf.php
+6 -4
View File
@@ -66,12 +66,14 @@ if(isset($_GET['prestudent_id']) && is_numeric($_GET['prestudent_id']))
<PRESTD:zgv_code><![CDATA[<?php echo $prestd->zgv_code; ?>]]></PRESTD:zgv_code>
<PRESTD:zgvort><![CDATA[<?php echo $prestd->zgvort; ?>]]></PRESTD:zgvort>
<PRESTD:zgvdatum_iso><![CDATA[<?php echo $prestd->zgvdatum; ?>]]></PRESTD:zgvdatum_iso>
<PRESTD:zgvdatum><![CDATA[<?php echo $datum->convertISODate($prestd->zgvdatum); ?>]]></PRESTD:zgvdatum>
<PRESTD:zgvmas_code><![CDATA[<?php echo $prestd->zgvmas_code; ?>]]></PRESTD:zgvmas_code>
<PRESTD:zgvdatum><![CDATA[<?php echo $datum->convertISODate($prestd->zgvdatum); ?>]]></PRESTD:zgvdatum>
<PRESTD:zgvnation><![CDATA[<?php echo $prestd->zgvnation; ?>]]></PRESTD:zgvnation>
<PRESTD:zgvmas_code><![CDATA[<?php echo $prestd->zgvmas_code; ?>]]></PRESTD:zgvmas_code>
<PRESTD:zgvmaort><![CDATA[<?php echo $prestd->zgvmaort; ?>]]></PRESTD:zgvmaort>
<PRESTD:zgvmadatum_iso><![CDATA[<?php echo $prestd->zgvmadatum; ?>]]></PRESTD:zgvmadatum_iso>
<PRESTD:zgvmadatum><![CDATA[<?php echo $datum->convertISODate($prestd->zgvmadatum); ?>]]></PRESTD:zgvmadatum>
<PRESTD:aufnahmeschluessel><![CDATA[<?php echo $prestd->aufnahmeschluessel; ?>]]></PRESTD:aufnahmeschluessel>
<PRESTD:zgvmadatum><![CDATA[<?php echo $datum->convertISODate($prestd->zgvmadatum); ?>]]></PRESTD:zgvmadatum>
<PRESTD:zgvmanation><![CDATA[<?php echo $prestd->zgvmanation; ?>]]></PRESTD:zgvmanation>
<PRESTD:aufnahmeschluessel><![CDATA[<?php echo $prestd->aufnahmeschluessel; ?>]]></PRESTD:aufnahmeschluessel>
<PRESTD:facheinschlberuf><![CDATA[<?php echo ($prestd->facheinschlberuf?'true':'false'); ?>]]></PRESTD:facheinschlberuf>
<PRESTD:reihungstest_id><![CDATA[<?php echo $prestd->reihungstest_id; ?>]]></PRESTD:reihungstest_id>
<PRESTD:anmeldungreihungstest_iso><![CDATA[<?php echo $prestd->anmeldungreihungstest; ?>]]></PRESTD:anmeldungreihungstest_iso>
rdf/student.rdf.php
+2
View File
@@ -294,10 +294,12 @@ function draw_prestudent($row)
<STUDENT:zgvort><![CDATA['.$row->zgvort.']]></STUDENT:zgvort>
<STUDENT:zgvdatum><![CDATA['.$datum_obj->convertISODate($row->zgvdatum).']]></STUDENT:zgvdatum>
<STUDENT:zgvdatum_iso><![CDATA['.$row->zgvdatum.']]></STUDENT:zgvdatum_iso>
<STUDENT:zgvnation><![CDATA['.$row->zgvnation.']]></STUDENT:zgvnation>
<STUDENT:zgvmas_code><![CDATA['.$row->zgvmas_code.']]></STUDENT:zgvmas_code>
<STUDENT:zgvmaort><![CDATA['.$row->zgvmaort.']]></STUDENT:zgvmaort>
<STUDENT:zgvmadatum><![CDATA['.$datum_obj->convertISODate($row->zgvmadatum).']]></STUDENT:zgvmadatum>
<STUDENT:zgvmadatum_iso><![CDATA['.$row->zgvmadatum.']]></STUDENT:zgvmadatum_iso>
<STUDENT:zgvmanation><![CDATA['.$row->zgvmanation.']]></STUDENT:zgvmanation>
<STUDENT:ausstellungsstaat><![CDATA['.$row->ausstellungsstaat.']]></STUDENT:ausstellungsstaat>
<STUDENT:aufnahmeschluessel><![CDATA['.$row->aufnahmeschluessel.']]></STUDENT:aufnahmeschluessel>
<STUDENT:facheinschlberuf><![CDATA['.($row->facheinschlberuf?'true':'false').']]></STUDENT:facheinschlberuf>
system/checksystem.php
+13
View File
@@ -2620,6 +2620,19 @@ if(!$result = @$db->db_query("SELECT pflicht FROM public.tbl_dokumentstudiengang
echo 'public.tbl_dokumentstudiengang: Spalte "pflicht" hinzugefuegt!<br>';
}
// Spalten zgvnation, zgvmanation, zgvdoktornation in public.tbl_prestudent
if(!$result = @$db->db_query("SELECT pflicht FROM public.tbl_prestudent LIMIT 1"))
{
$qry = "ALTER TABLE public.tbl_prestudent ADD COLUMN zgvnation character varying(3);
ALTER TABLE public.tbl_prestudent ADD COLUMN zgvmanation character varying(3) ;
ALTER TABLE public.tbl_prestudent ADD COLUMN zgvdoktornation character varying(3);";
if(!$db->db_query($qry))
echo '<strong>public.tbl_prestudent '.$db->db_last_error().'</strong><br>';
else
echo 'public.tbl_prestudent: Spalten "zgvnation", "zgvmanation", "zgvdoktornation" hinzugefuegt!<br>';
}
// Anrechnungen
if(!$result = @$db->db_query("SELECT 1 FROM lehre.tbl_anrechnung LIMIT 1;"))
{