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

PreIncoming

Browse Source 
- ECTS am Learnungagreement und in LV-Liste anzeigen
- Thesis und Research Area bei LVs auswählbar
- Anmeldung zu Deutschkursen
This commit is contained in:
Andreas Österreicher
2011-11-03 14:09:53 +00:00
parent 7406060d50
commit ac132ab06d
10 changed files with 347 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
system/FH-Complete.txp
+41 -41
View File
@@ -40685,8 +40685,8 @@
<FontStyle>0</FontStyle>
<FormatLocked>0</FormatLocked>
<FontHeight>-28</FontHeight>
<Top>564</Top>
<Left>77</Left>
<Top>551</Top>
<Left>42</Left>
<z>0</z>
<Width>1013</Width>
<Height>590</Height>
@@ -40764,8 +40764,8 @@
<FontStyle>0</FontStyle>
<FormatLocked>0</FormatLocked>
<FontHeight>-28</FontHeight>
<Top>2127</Top>
<Left>1227</Left>
<Top>2131</Top>
<Left>1194</Left>
<z>0</z>
<Width>1053</Width>
<Height>356</Height>
@@ -41947,8 +41947,8 @@
<WorkSpaceShape2>
<Id>{B39C63FA-F416-40B5-A65C-C3CFA65D7A85}</Id>
</WorkSpaceShape2>
<NamePositionX>1250</NamePositionX>
<NamePositionY>954</NamePositionY>
<NamePositionX>1232</NamePositionX>
<NamePositionY>948</NamePositionY>
<Points>
<Point>
<x>1522</x>
@@ -41959,12 +41959,12 @@
<y>897</y>
</Point>
<Point>
<x>1121</x>
<y>859</y>
<x>1086</x>
<y>846</y>
</Point>
<Point>
<x>1090</x>
<y>859</y>
<x>1055</x>
<y>846</y>
</Point>
</Points>
</WorkSpaceLinePERRelationPG83>
@@ -41990,16 +41990,16 @@
<WorkSpaceShape2>
<Id>{AC7E9335-6EDA-449D-AAED-066D0C76A911}</Id>
</WorkSpaceShape2>
<NamePositionX>1047</NamePositionX>
<NamePositionY>2023</NamePositionY>
<NamePositionX>1030</NamePositionX>
<NamePositionY>2025</NamePositionY>
<Points>
<Point>
<x>1754</x>
<y>2127</y>
<x>1720</x>
<y>2131</y>
</Point>
<Point>
<x>1754</x>
<y>2096</y>
<x>1720</x>
<y>2100</y>
</Point>
<Point>
<x>1668</x>
@@ -42205,16 +42205,16 @@
<WorkSpaceShape2>
<Id>{20F41636-8E77-4350-B677-A3F3B4033D9D}</Id>
</WorkSpaceShape2>
<NamePositionX>2108</NamePositionX>
<NamePositionY>317</NamePositionY>
<NamePositionX>2091</NamePositionX>
<NamePositionY>320</NamePositionY>
<Points>
<Point>
<x>2280</x>
<y>2246</y>
<x>2247</x>
<y>2250</y>
</Point>
<Point>
<x>2311</x>
<y>2246</y>
<x>2278</x>
<y>2250</y>
</Point>
<Point>
<x>2453</x>
@@ -42893,16 +42893,16 @@
<WorkSpaceShape2>
<Id>{6419EE86-CB44-41FA-9E2B-1C2555508A93}</Id>
</WorkSpaceShape2>
<NamePositionX>1027</NamePositionX>
<NamePositionY>2295</NamePositionY>
<NamePositionX>1011</NamePositionX>
<NamePositionY>2297</NamePositionY>
<Points>
<Point>
<x>1227</x>
<y>2246</y>
<x>1194</x>
<y>2250</y>
</Point>
<Point>
<x>1196</x>
<y>2246</y>
<x>1163</x>
<y>2250</y>
</Point>
<Point>
<x>1058</x>
@@ -42979,16 +42979,16 @@
<WorkSpaceShape2>
<Id>{5FEF0B42-3911-4B97-A654-2AD1A67125FC}</Id>
</WorkSpaceShape2>
<NamePositionX>1058</NamePositionX>
<NamePositionY>2629</NamePositionY>
<NamePositionX>1041</NamePositionX>
<NamePositionY>2632</NamePositionY>
<Points>
<Point>
<x>1227</x>
<y>2364</y>
<x>1194</x>
<y>2368</y>
</Point>
<Point>
<x>1196</x>
<y>2364</y>
<x>1163</x>
<y>2368</y>
</Point>
<Point>
<x>1120</x>
@@ -43151,16 +43151,16 @@
<WorkSpaceShape2>
<Id>{D8AD2B3F-B9E4-412E-992F-3B4D116FDEE1}</Id>
</WorkSpaceShape2>
<NamePositionX>2590</NamePositionX>
<NamePositionY>2098</NamePositionY>
<NamePositionX>2574</NamePositionX>
<NamePositionY>2100</NamePositionY>
<Points>
<Point>
<x>2280</x>
<y>2364</y>
<x>2247</x>
<y>2368</y>
</Point>
<Point>
<x>2311</x>
<y>2364</y>
<x>2278</x>
<y>2368</y>
</Point>
<Point>
<x>3069</x>
@@ -46321,7 +46321,7 @@
<Company>Technikum Wien</Company>
<Version>2.0</Version>
<CreatedDate>2009-04-17T11:15:21.000+02:00</CreatedDate>
<ModifiedDate>2011-10-17T16:45:22.409+02:00</ModifiedDate>
<ModifiedDate>2011-10-25T17:15:48.845+02:00</ModifiedDate>
<Project>FH-Complete 2.0</Project>
<Description>&lt;?xml-stylesheet type="text/xsl" href="FHCompleteTDM3PG83.xsl"?&gt;
</Description>
system/checksystem.php
+20 -1
View File
@@ -2901,6 +2901,25 @@ if(!$result = @$db->db_query("SELECT 1 FROM public.tbl_ampel"))
else
echo 'public.tbl_ampel: Tabellen fuer Ampelsystem hinzugefuegt!<br>';
}
//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 '<strong>public.tbl_preincoming: '.$db->db_last_error().'</strong><br>';
else
echo 'public.tbl_preincoming: Spalten hinzugefuegt!<br>';
}
echo '<br>';
$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"),
system/xsl/learningAgreement_0_v1.xsl
+15 -3
View File
@@ -45,9 +45,10 @@
</fo:block-container>
<fo:block-container position="absolute" top="85mm" left="15mm">
<fo:table table-layout="fixed" border-collapse="collapse" border-width="0.2pt" border-style="solid">
<fo:table-column column-width="95mm"/>
<fo:table-column column-width="65mm"/>
<fo:table-column column-width="85mm"/>
<fo:table-column column-width="60mm"/>
<fo:table-column column-width="20mm"/>
<fo:table-column column-width="15mm"/>
<fo:table-body>
<fo:table-row line-height="14pt">
<fo:table-cell border-width="0.2mm" border-style="solid" display-align="center">
@@ -65,6 +66,11 @@
Semester
</fo:block>
</fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid" display-align="center">
<fo:block font-size="10pt" font-weight="bold" content-width="15mm" text-align="center">
ECTS
</fo:block>
</fo:table-cell>
</fo:table-row>
<xsl:apply-templates select="lehrveranstaltung"/>
</fo:table-body>
@@ -103,7 +109,7 @@
</fo:block-container>
<fo:block-container position="absolute" top="250mm" left="159mm">
<fo:block line-height="10pt" font-family="arial" font-size="9pt">
<xsl:text>Institutinal Stamp</xsl:text>
<xsl:text>Institutional Stamp</xsl:text>
</fo:block>
</fo:block-container>
</fo:flow>
@@ -130,6 +136,12 @@
<xsl:value-of select="semester"/>
</fo:block>
</fo:table-cell>
<fo:table-cell border-width="0.2mm" border-style="solid" display-align="center">
<fo:block font-size="10pt" content-width="15mm" text-align="center">
<xsl:text> </xsl:text>
<xsl:value-of select="ects"/>
</fo:block>
</fo:table-cell>
</fo:table-row>
</xsl:template>
</xsl:stylesheet >