diff --git a/cis/public/incoming/akteupload.php b/cis/public/incoming/akteupload.php index 6ca2ad138..b50a04605 100644 --- a/cis/public/incoming/akteupload.php +++ b/cis/public/incoming/akteupload.php @@ -145,11 +145,15 @@ if(isset($_GET['person_id'])) echo "
- + + - + - + +
".$p->t('incoming/dokument').": - ".$p->t('incoming/dokument').": + +
Typ: ".$p->t('incoming/dokumenttyp').": +
 
"; diff --git a/cis/public/incoming/incoming.php b/cis/public/incoming/incoming.php index 74210156d..8ba450d13 100644 --- a/cis/public/incoming/incoming.php +++ b/cis/public/incoming/incoming.php @@ -88,7 +88,7 @@ $firma->getFirmen('Partneruniversität'); ?> - Incomming-Verwaltung + Incoming-Verwaltung @@ -207,14 +207,61 @@ else if($method=="lehrveranstaltungen") echo $p->t('global/fehleraufgetreten'); } } + if(isset($_GET['mode']) && $_GET['mode'] == "thesis") + { + switch($_GET['thesis']) + { + case 'bachelor': + $preincoming->bachelorthesis=true; + $preincoming->masterthesis=true; + $preincoming->research_area=$_GET['research_area']; + if(!$preincoming->save(false)) + echo $preincoming->errormsg; + break; + case 'master': + $preincoming->bachelorthesis=false; + $preincoming->masterthesis=true; + $preincoming->research_area=$_GET['research_area']; + if(!$preincoming->save(false)) + echo $preincoming->errormsg; + break; + case '': + $preincoming->bachelorthesis=false; + $preincoming->masterthesis=false; + $preincoming->research_area=''; + if(!$preincoming->save(false)) + echo $preincoming->errormsg; + break; + } + } + if(isset($_GET['type'])) + { + if(isset($_GET['mode']) && $_GET['mode']=='add') + { + if($_GET['type']=='deutschkurs1') + $preincoming->deutschkurs1=true; + elseif($_GET['type']=='deutschkurs2') + $preincoming->deutschkurs2=true; + if(!$preincoming->save(false)) + echo $preincoming->errormsg; + } + elseif(isset($_GET['mode']) && $_GET['mode']=='delete') + { + if($_GET['type']=='deutschkurs1') + $preincoming->deutschkurs1=false; + if($_GET['type']=='deutschkurs2') + $preincoming->deutschkurs2=false; + if(!$preincoming->save(false)) + echo $preincoming->errormsg; + } + } // Übersicht der eigenen LVs if(isset($_GET['view'])) { if($_GET['view']=="own") { $lvs = $preincoming->getLehrveranstaltungen($preincoming->preincoming_id); - echo '


- + echo '


@@ -223,7 +270,41 @@ else if($method=="lehrveranstaltungen") -
 
+ '; + + if($preincoming->deutschkurs1 || $preincoming->deutschkurs2) + { + //Uebersicht Deutschkurse + echo ' + + + + + + + '; + + //Deutschkurs1 + if($preincoming->deutschkurs1) + { + echo ''; + echo ''; + echo ''; + echo ''; + } + //Deutschkurs2 + if($preincoming->deutschkurs2) + { + echo ''; + echo ''; + echo ''; + echo ''; + } + echo '
'.$p->t('incoming/deutschkurse').'
'.$p->t('global/löschen').''.$p->t('incoming/deutschkurs1').'
'.$p->t('global/löschen').''.$p->t('incoming/deutschkurs2').'


'; + } + + + echo ' @@ -269,9 +350,76 @@ else if($method=="lehrveranstaltungen")


'; + + //Uebersicht Deutschkurse + echo ' + + + + + + '; + + //Deutschkurs1 + echo ''; + if(!$preincoming->deutschkurs1) + echo ''; + else + echo ''; + echo ''; + echo ''; + //Deutschkurs2 + echo ''; + if(!$preincoming->deutschkurs2) + echo ''; + else + echo ''; + echo ''; + echo ''; + echo '
'.$p->t('incoming/deutschkurse').'
'.$p->t('global/anmelden').''.$p->t('global/angemeldet').''.$p->t('incoming/deutschkurs1').'
'.$p->t('global/anmelden').''.$p->t('global/angemeldet').''.$p->t('incoming/deutschkurs2').'


'; + + echo ' + + + + + + + + + + +
'.$p->t('incoming/thesis').'
+
+ + + + + + + + + +
+ bachelorthesis && !$preincoming->masterthesis)?'checked="checked"':'').'>'.$p->t('incoming/nothesis').'
+ masterthesis)?'checked="checked"':'').'>'.$p->t('incoming/bachelorthesis').'
+ bachelorthesis)?'checked="checked"':'').'>'.$p->t('incoming/masterthesis').' + 		+ '.$p->t('incoming/researcharea').' + + + + +
+
+
+

+ '; + + //Uebersicht LVs $qry = "SELECT - tbl_lehrveranstaltung.lehrveranstaltung_id, tbl_lehrveranstaltung.studiengang_kz, + tbl_lehrveranstaltung.lehrveranstaltung_id, tbl_lehrveranstaltung.studiengang_kz, tbl_lehrveranstaltung.ects, tbl_lehrveranstaltung.bezeichnung, tbl_lehrveranstaltung.semester, tbl_lehrveranstaltung.bezeichnung_english, tbl_lehrveranstaltung.incoming, ( @@ -317,8 +465,7 @@ else if($method=="lehrveranstaltungen") AND tbl_studiengang.aktiv order by studiengang_kz "; - echo '
- + echo '
@@ -326,6 +473,7 @@ else if($method=="lehrveranstaltungen") + @@ -351,6 +499,7 @@ else if($method=="lehrveranstaltungen") echo ''; echo ''; echo ''; + echo ''; echo ' - + @@ -1326,7 +1475,7 @@ echo' function FensterOeffnen(adresse) { - MeinFenster = window.open(adresse, "Info", "width=500,height=500,left=100,top=200"); + MeinFenster = window.open(adresse, "Info", "width=600,height=200"); MeinFenster.focus(); } @@ -1365,40 +1514,38 @@ else if($method == 'files') echo($p->t('global/fehleraufgetreten')); } } -echo '


-
'.$p->t('global/semester').' '.$p->t('global/lehrveranstaltung').' '.$p->t('global/lehrveranstaltung').' '.$p->t('global/englisch').''.$p->t('incoming/ects').' Info '.$p->t('incoming/freieplätze').'
',$row->semester,'',$row->bezeichnung,'',$row->bezeichnung_english,'',$row->ects,' Deutsch  Englisch @@ -1298,7 +1447,7 @@ echo' '.$p->t('incoming/abgelegtin').'
person_id.'&dokumenttyp=Lebenslf");>person_id.'&dokumenttyp=Lebenslf");>
'.$p->t('incoming/abgelegtin').'
- - - - - - - -
Upload File
 
'; +
+ ',$p->t('incoming/fileupload'),' +


'; $akte->getAkten($person->person_id); - echo ' - - - - - '; - foreach ($akte->result as $ak) - { - echo ' - - - - '; + + if(count($akte->result)>0) + { + echo '
'.$p->t('incoming/name').''.$p->t('global/bezeichnung').'
'.$ak->titel.''.$ak->bezeichnung.'
+ + + + + '; + foreach ($akte->result as $ak) + { + echo ' + + + + '; + } + echo '
'.$p->t('incoming/name').''.$p->t('global/bezeichnung').'
'.$ak->titel.''.$ak->bezeichnung.'
'; } - echo ''; } // Ausgabe Menü @@ -1423,7 +1570,7 @@ else 5. '.$p->t('incoming/learningagreementerstellen').' - 6. '.$p->t("incoming/uploadLearningAgreement").' + 6. '.$p->t("incoming/uploadLearningAgreement").' 7. '.$p->t("incoming/uploadvondateien").' @@ -1438,7 +1585,7 @@ else echo ''; diff --git a/include/preincoming.class.php b/include/preincoming.class.php index bd35d24fe..eae4267df 100644 --- a/include/preincoming.class.php +++ b/include/preincoming.class.php @@ -64,7 +64,9 @@ class preincoming extends basis_db public $person_id_emergency; public $person_id_coordinator_dep; public $person_id_coordinator_int; - + public $research_area; + public $deutschkurs1; + public $deutschkurs2; /** * Konstruktor @@ -137,6 +139,9 @@ class preincoming extends basis_db $this->person_id_emergency = $row->person_id_emergency; $this->person_id_coordinator_dep = $row->person_id_coordinator_dep; $this->person_id_coordinator_int = $row->person_id_coordinator_int; + $this->deutschkurs1 = ($row->deutschkurs1=='t'?true:false); + $this->deutschkurs2 = ($row->deutschkurs2=='t'?true:false); + $this->research_area = $row->research_area; } else { @@ -196,7 +201,10 @@ class preincoming extends basis_db $obj->person_id_emergency = $row->person_id_emergency; $obj->person_id_coordinator_dep = $row->person_id_coordinator_dep; $obj->person_id_coordinator_int = $row->person_id_coordinator_int; - + $obj->deutschkurs1 = ($row->deutschkurs1=='t'?true:false); + $obj->deutschkurs2 = ($row->deutschkurs2=='t'?true:false); + $obj->research_area = $row->research_area; + $this->result[] = $obj; } return true; @@ -251,7 +259,8 @@ class preincoming extends basis_db firma_id, anmerkung, universitaet, aktiv, bachelorthesis, masterthesis, von, bis, code, uebernommen, insertamum, insertvon, updateamum, updatevon, zgv, zgv_ort, zgv_datum, zgv_name, zgvmaster, zgvmaster_name, zgvmaster_datum, zgvmaster_ort, program_name, - bachelor, master, jahre, person_id_emergency, person_id_coordinator_dep, person_id_coordinator_int) + bachelor, master, jahre, person_id_emergency, person_id_coordinator_dep, person_id_coordinator_int, + deutschkurs1, deutschkurs2, research_area) VALUES('. $this->addslashes($this->person_id).', '. $this->addslashes($this->mobilitaetsprogramm_code).', '. @@ -282,7 +291,10 @@ class preincoming extends basis_db $this->addslashes($this->jahre).', '. $this->addslashes($this->person_id_emergency).', '. $this->addslashes($this->person_id_coordinator_dep).', '. - $this->addslashes($this->person_id_coordinator_int).');'; + $this->addslashes($this->person_id_coordinator_int).', '. + ($this->deutschkurs1?'true':'false').', '. + ($this->deutschkurs2?'true':'false').', '. + $this->addslashes($this->research_area).' );'; } else { @@ -323,7 +335,10 @@ class preincoming extends basis_db ' jahre='.$this->addslashes($this->jahre).', '. ' person_id_emergency='.$this->addslashes($this->person_id_emergency).', '. ' person_id_coordinator_dep='.$this->addslashes($this->person_id_coordinator_dep).', '. - ' person_id_coordinator_int='.$this->addslashes($this->person_id_coordinator_int). + ' person_id_coordinator_int='.$this->addslashes($this->person_id_coordinator_int).', '. + ' deutschkurs1='.($this->deutschkurs1?'true':'false').', '. + ' deutschkurs2='.($this->deutschkurs2?'true':'false').', '. + ' research_area='.$this->addslashes($this->research_area).' '. ' WHERE preincoming_id='.$this->preincoming_id.';'; } @@ -576,21 +591,25 @@ class preincoming extends basis_db $obj->insertamum = $row->insertamum; $obj->insertvon = $row->insertvon; - $this->zgv = $row->zgv; - $this->zgv_ort = $row->zgv_ort; - $this->zgv_datum = $row->zgv_datum; - $this->zgv_name = $row->zgv_name; - $this->zgvmaster = $row->zgvmaster; - $this->zgvmaster_name = $row->zgvmaster_name; - $this->zgvmaster_datum = $row->zgvmaster_datum; - $this->zgvmaster_ort = $row->zgvmaster_ort; - $this->program_name = $row->program_name; - $this->bachelor = ($row->bachelor=='t'?true:false); - $this->master = ($row->master=='t'?true:false); - $this->jahre = $row->jahre; - $this->person_id_emergency = $row->person_id_emergency; - $this->person_id_coordinator_dep = $row->person_id_coordinator_dep; - $this->person_id_coordinator_int = $row->person_id_coordinator_int; + $obj->zgv = $row->zgv; + $obj->zgv_ort = $row->zgv_ort; + $obj->zgv_datum = $row->zgv_datum; + $obj->zgv_name = $row->zgv_name; + $obj->zgvmaster = $row->zgvmaster; + $obj->zgvmaster_name = $row->zgvmaster_name; + $obj->zgvmaster_datum = $row->zgvmaster_datum; + $obj->zgvmaster_ort = $row->zgvmaster_ort; + $obj->program_name = $row->program_name; + $obj->bachelor = ($row->bachelor=='t'?true:false); + $obj->master = ($row->master=='t'?true:false); + $obj->jahre = $row->jahre; + $obj->person_id_emergency = $row->person_id_emergency; + $obj->person_id_coordinator_dep = $row->person_id_coordinator_dep; + $obj->person_id_coordinator_int = $row->person_id_coordinator_int; + + $obj->deutschkurs1 = ($row->deutschkurs1=='t'?true:false); + $obj->deutschkurs2 = ($row->deutschkurs2=='t'?true:false); + $obj->research_area = $row->research_area; $obj->vorname = $row->vorname; $obj->nachname = $row->nachname; diff --git a/locale/de-AT/incoming.php b/locale/de-AT/incoming.php index a8dd580c3..7034835ac 100755 --- a/locale/de-AT/incoming.php +++ b/locale/de-AT/incoming.php @@ -46,4 +46,15 @@ $this->phrasen['incoming/nation']='Nation'; $this->phrasen['incoming/hauptmenue']='Hauptmenü'; $this->phrasen['incoming/welcomeToUAS']='Willkommen bei der Online Registrierung für Incomingstudierende an der Fachhochschule Technikum Wien!'; $this->phrasen['incoming/registration']='Registration'; -?> \ No newline at end of file +$this->phrasen['incoming/ects']='ECTS'; +$this->phrasen['incoming/dokumenttyp']='Typ'; +$this->phrasen['incoming/fileupload']='Neue Datei hochladen'; +$this->phrasen['incoming/deutschkurse']='Deutschkurse'; +$this->phrasen['incoming/deutschkurs1']='Deutsch für Anfänger'; +$this->phrasen['incoming/deutschkurs2']='Deutsch Intensivkurs'; +$this->phrasen['incoming/thesis']='Projektarbeiten'; +$this->phrasen['incoming/nothesis']='keine Projektarbeit'; +$this->phrasen['incoming/masterthesis']='Master Thesis'; +$this->phrasen['incoming/bachelorthesis']='Bachelor Thesis'; +$this->phrasen['incoming/researcharea']='Gebiet'; +?> diff --git a/locale/en-US/incoming.php b/locale/en-US/incoming.php index 359b46f2e..d10d0fca5 100755 --- a/locale/en-US/incoming.php +++ b/locale/en-US/incoming.php @@ -46,4 +46,15 @@ $this->phrasen['incoming/nation']='Country'; $this->phrasen['incoming/hauptmenue']='Main Menu'; $this->phrasen['incoming/welcomeToUAS']='Welcome at the Online Registration Platform for Incoming Students at UAS Technikum Wien!'; $this->phrasen['incoming/registration']='Registration'; -?> \ No newline at end of file +$this->phrasen['incoming/ects']='ECTS'; +$this->phrasen['incoming/dokumenttyp']='Type'; +$this->phrasen['incoming/fileupload']='Upload new File'; +$this->phrasen['incoming/deutschkurse']='German Courses'; +$this->phrasen['incoming/deutschkurs1']='German for Beginners'; +$this->phrasen['incoming/deutschkurs2']='Advanced German'; +$this->phrasen['incoming/thesis']='[BA] [MA] Program (at UAS)'; +$this->phrasen['incoming/nothesis']='no Thesis'; +$this->phrasen['incoming/masterthesis']='Master Thesis'; +$this->phrasen['incoming/bachelorthesis']='Bachelor Thesis'; +$this->phrasen['incoming/researcharea']='Research Area'; +?> diff --git a/rdf/learningagreement.rdf.php b/rdf/learningagreement.rdf.php index 785cbab68..011ca3f9b 100644 --- a/rdf/learningagreement.rdf.php +++ b/rdf/learningagreement.rdf.php @@ -81,6 +81,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml") echo " \n"; echo " bezeichnung]]>\n"; echo " semester]]>\n"; + echo " ects]]>\n"; echo " english]]>\n"; echo " \n"; } diff --git a/system/FH-Complete.txp b/system/FH-Complete.txp index af117f30b..096bd7e6d 100644 --- a/system/FH-Complete.txp +++ b/system/FH-Complete.txp @@ -40685,8 +40685,8 @@ 0 0 -28 - 564 - 77 + 551 + 42 0 1013 590 @@ -40764,8 +40764,8 @@ 0 0 -28 - 2127 - 1227 + 2131 + 1194 0 1053 356 @@ -41947,8 +41947,8 @@ {B39C63FA-F416-40B5-A65C-C3CFA65D7A85} - 1250 - 954 + 1232 + 948 1522 @@ -41959,12 +41959,12 @@ 897 - 1121 - 859 + 1086 + 846 - 1090 - 859 + 1055 + 846 @@ -41990,16 +41990,16 @@ {AC7E9335-6EDA-449D-AAED-066D0C76A911} - 1047 - 2023 + 1030 + 2025 - 1754 - 2127 + 1720 + 2131 - 1754 - 2096 + 1720 + 2100 1668 @@ -42205,16 +42205,16 @@ {20F41636-8E77-4350-B677-A3F3B4033D9D} - 2108 - 317 + 2091 + 320 - 2280 - 2246 + 2247 + 2250 - 2311 - 2246 + 2278 + 2250 2453 @@ -42893,16 +42893,16 @@ {6419EE86-CB44-41FA-9E2B-1C2555508A93} - 1027 - 2295 + 1011 + 2297 - 1227 - 2246 + 1194 + 2250 - 1196 - 2246 + 1163 + 2250 1058 @@ -42979,16 +42979,16 @@ {5FEF0B42-3911-4B97-A654-2AD1A67125FC} - 1058 - 2629 + 1041 + 2632 - 1227 - 2364 + 1194 + 2368 - 1196 - 2364 + 1163 + 2368 1120 @@ -43151,16 +43151,16 @@ {D8AD2B3F-B9E4-412E-992F-3B4D116FDEE1} - 2590 - 2098 + 2574 + 2100 - 2280 - 2364 + 2247 + 2368 - 2311 - 2364 + 2278 + 2368 3069 @@ -46321,7 +46321,7 @@ Technikum Wien 2.0 2009-04-17T11:15:21.000+02:00 - 2011-10-17T16:45:22.409+02:00 + 2011-10-25T17:15:48.845+02:00 FH-Complete 2.0 <?xml-stylesheet type="text/xsl" href="FHCompleteTDM3PG83.xsl"?> diff --git a/system/checksystem.php b/system/checksystem.php index fbd567190..9101bf54b 100644 --- a/system/checksystem.php +++ b/system/checksystem.php @@ -2901,6 +2901,25 @@ if(!$result = @$db->db_query("SELECT 1 FROM public.tbl_ampel")) else echo 'public.tbl_ampel: Tabellen fuer Ampelsystem hinzugefuegt!
'; } + +//public.tbl_preincoming +if(!$result = @$db->db_query("SELECT research_area FROM public.tbl_preincoming LIMIT 1")) +{ + $qry = "ALTER TABLE public.tbl_preincoming ADD COLUMN deutschkurs1 boolean; + ALTER TABLE public.tbl_preincoming ADD COLUMN deutschkurs2 boolean; + ALTER TABLE public.tbl_preincoming ADD COLUMN research_area text; + + GRANT USAGE ON SCHEMA fue TO wawi; + GRANT SELECT ON fue.tbl_ressource TO wawi; + GRANT SELECT ON fue.tbl_projekt_ressurce TO wawi; + "; + + if(!$db->db_query($qry)) + echo 'public.tbl_preincoming: '.$db->db_last_error().'
'; + else + echo 'public.tbl_preincoming: Spalten hinzugefuegt!
'; +} + echo '
'; $tabellen=array( @@ -3035,7 +3054,7 @@ $tabellen=array( "public.tbl_organisationseinheittyp" => array("organisationseinheittyp_kurzbz", "bezeichnung", "beschreibung"), "public.tbl_person" => array("person_id","staatsbuergerschaft","geburtsnation","sprache","anrede","titelpost","titelpre","nachname","vorname","vornamen","gebdatum","gebort","gebzeit","foto","anmerkung","homepage","svnr","ersatzkennzeichen","familienstand","geschlecht","anzahlkinder","aktiv","insertamum","insertvon","updateamum","updatevon","ext_id","bundesland_code","kompetenzen","kurzbeschreibung","zugangscode"), "public.tbl_personfunktionstandort" => array("personfunktionstandort_id","funktion_kurzbz","person_id","standort_id","position","anrede"), - "public.tbl_preincoming" => array("preincoming_id","person_id","mobilitaetsprogramm_code","zweck_code","firma_id","universitaet","aktiv","bachelorthesis","masterthesis","von","bis","uebernommen","insertamum","insertvon","updateamum","updatevon","anmerkung","zgv","zgv_ort","zgv_datum","zgv_name","zgvmaster","zgvmaster_datum","zgvmaster_ort","zgvmaster_name","program_name","bachelor","master","jahre","person_id_emergency","person_id_coordinator_dep","person_id_coordinator_int","code"), + "public.tbl_preincoming" => array("preincoming_id","person_id","mobilitaetsprogramm_code","zweck_code","firma_id","universitaet","aktiv","bachelorthesis","masterthesis","von","bis","uebernommen","insertamum","insertvon","updateamum","updatevon","anmerkung","zgv","zgv_ort","zgv_datum","zgv_name","zgvmaster","zgvmaster_datum","zgvmaster_ort","zgvmaster_name","program_name","bachelor","master","jahre","person_id_emergency","person_id_coordinator_dep","person_id_coordinator_int","code","deutschkurs1","deutschkurs2","research_area"), "public.tbl_preincoming_lehrveranstaltung" => array("preincoming_id","lehrveranstaltung_id","insertamum","insertvon"), "public.tbl_preinteressent" => array("preinteressent_id","person_id","studiensemester_kurzbz","firma_id","erfassungsdatum","einverstaendnis","absagedatum","anmerkung","maturajahr","infozusendung","aufmerksamdurch_kurzbz","kontaktmedium_kurzbz","insertamum","insertvon","updateamum","updatevon"), "public.tbl_preinteressentstudiengang" => array("studiengang_kz","preinteressent_id","freigabedatum","uebernahmedatum","prioritaet","insertamum","insertvon","updateamum","updatevon"), diff --git a/system/xsl/learningAgreement_0_v1.xsl b/system/xsl/learningAgreement_0_v1.xsl index c025641db..02edad34f 100644 --- a/system/xsl/learningAgreement_0_v1.xsl +++ b/system/xsl/learningAgreement_0_v1.xsl @@ -45,9 +45,10 @@ - - + + + @@ -65,6 +66,11 @@ Semester + + + ECTS + + @@ -103,7 +109,7 @@ - Institutinal Stamp + Institutional Stamp @@ -130,6 +136,12 @@ + + + + + + \ No newline at end of file diff --git a/vilesci/personen/incoming_detail.php b/vilesci/personen/incoming_detail.php index 640d34db1..89e99c86e 100644 --- a/vilesci/personen/incoming_detail.php +++ b/vilesci/personen/incoming_detail.php @@ -1058,10 +1058,23 @@ function print_lehrveranstaltungen() echo ''.$row->semester.'. Semester'; echo ''; } + echo ''; + echo ' + + + + + + + '; if($inc->bachelorthesis) - echo ''; + echo ''; if($inc->masterthesis) - echo ''; + echo ''; + if($inc->deutschkurs1) + echo ''; + if($inc->deutschkurs2) + echo ''; echo '
Zusatzfächer
Bachelor Thesis
Bachelor Thesis: '.$inc->research_area.'
Master Thesis
Master Thesis: '.$inc->research_area.'
Deutsch für Anfänger
Deutsch Intensivkurs
'; echo ''; }