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

- Free Busy - Vorschlag URL für Typen

Browse Source 
- View für Testtool Auswertung
This commit is contained in:
Andreas Österreicher
2012-03-29 08:10:09 +00:00
parent 58654e995e
commit e373bf8da9
2 changed files with 319 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
system/FH-Complete.txp
+265 -30
View File
@@ -8874,6 +8874,34 @@
<DisplayGraphicalKeys>0</DisplayGraphicalKeys>
<Gradient>1</Gradient>
</WorkSpaceShapePEREntityPG83>
<WorkSpaceShapePERViewPG83 ObjectType="2503" CSAOName="WorkSpaceShapePERViewPG83">
<Id>{7421E7B2-C482-4560-B61C-97D5C777657D}</Id>
<Name>vw_auswertung_ablauf</Name>
<Ordinal>0</Ordinal>
<HistoryID>{E42346CC-C286-432A-82D4-3A2F6B38C169}</HistoryID>
<GlobalOrder>0</GlobalOrder>
<ParentBaseID>{E452884F-8BEB-4A49-84E0-56B882861833}</ParentBaseID>
<PenWidth>1</PenWidth>
<PenColor>0</PenColor>
<BrushColor>15780518</BrushColor>
<FontCharset>238</FontCharset>
<FontColor>0</FontColor>
<FontName>Arial</FontName>
<FontStyle>0</FontStyle>
<FormatLocked>0</FormatLocked>
<FontHeight>-28</FontHeight>
<Top>599</Top>
<Left>836</Left>
<z>0</z>
<Width>399</Width>
<Height>150</Height>
<dz>0</dz>
<RecalculateSizes>1</RecalculateSizes>
<UseWorkSpaceRecalculateSizes>1</UseWorkSpaceRecalculateSizes>
<Shadow>1</Shadow>
<FullBackground>0</FullBackground>
<LineList/>
</WorkSpaceShapePERViewPG83>
</ShapeList>
<LineList>
<WorkSpaceLinePERRelationPG83 ObjectType="2504" CSAOName="WorkSpaceLinePERRelationPG83">
@@ -36961,7 +36989,7 @@
<Top>1589</Top>
<Left>4179</Left>
<z>0</z>
<Width>867</Width>
<Width>888</Width>
<Height>200</Height>
<dz>0</dz>
<RecalculateSizes>1</RecalculateSizes>
@@ -38446,15 +38474,15 @@
<WorkSpaceShape2>
<Id>{218B3815-BF6A-490B-B8CF-BB9BC3CBB4BC}</Id>
</WorkSpaceShape2>
<NamePositionX>4515</NamePositionX>
<NamePositionX>4521</NamePositionX>
<NamePositionY>1448</NamePositionY>
<Points>
<Point>
<x>4612</x>
<x>4623</x>
<y>1589</y>
</Point>
<Point>
<x>4612</x>
<x>4623</x>
<y>1558</y>
</Point>
<Point>
@@ -42078,7 +42106,7 @@
<Left>3848</Left>
<z>0</z>
<Width>794</Width>
<Height>356</Height>
<Height>395</Height>
<dz>0</dz>
<RecalculateSizes>1</RecalculateSizes>
<UseWorkSpaceRecalculateSizes>1</UseWorkSpaceRecalculateSizes>
@@ -43343,16 +43371,16 @@
<WorkSpaceShape2>
<Id>{2FC2ED24-E0E3-4F64-8362-24385DBDDE02}</Id>
</WorkSpaceShape2>
<NamePositionX>4035</NamePositionX>
<NamePositionY>358</NamePositionY>
<NamePositionX>4034</NamePositionX>
<NamePositionY>377</NamePositionY>
<Points>
<Point>
<x>4245</x>
<y>365</y>
<y>404</y>
</Point>
<Point>
<x>4245</x>
<y>396</y>
<y>435</y>
</Point>
<Point>
<x>4226</x>
@@ -44600,7 +44628,7 @@
<Left>54</Left>
<z>0</z>
<Width>794</Width>
<Height>356</Height>
<Height>395</Height>
<dz>0</dz>
<RecalculateSizes>1</RecalculateSizes>
<UseWorkSpaceRecalculateSizes>1</UseWorkSpaceRecalculateSizes>
@@ -44769,7 +44797,7 @@
<Left>1162</Left>
<z>0</z>
<Width>801</Width>
<Height>551</Height>
<Height>590</Height>
<dz>0</dz>
<RecalculateSizes>1</RecalculateSizes>
<UseWorkSpaceRecalculateSizes>1</UseWorkSpaceRecalculateSizes>
@@ -45165,23 +45193,23 @@
<Id>{0E058C3F-E002-4DE4-A099-651D67DDCBEC}</Id>
</WorkSpaceShape2>
<NamePositionX>773</NamePositionX>
<NamePositionY>1049</NamePositionY>
<NamePositionY>1065</NamePositionY>
<Points>
<Point>
<x>848</x>
<y>957</y>
<y>976</y>
</Point>
<Point>
<x>879</x>
<y>957</y>
<y>976</y>
</Point>
<Point>
<x>1131</x>
<y>1001</y>
<y>1014</y>
</Point>
<Point>
<x>1162</x>
<y>1001</y>
<y>1014</y>
</Point>
</Points>
</WorkSpaceLinePERRelationPG83>
@@ -45208,15 +45236,15 @@
<Id>{6704B70E-0AB9-410E-AEDB-795DE7375F92}</Id>
</WorkSpaceShape2>
<NamePositionX>958</NamePositionX>
<NamePositionY>1440</NamePositionY>
<NamePositionY>1453</NamePositionY>
<Points>
<Point>
<x>1162</x>
<y>1184</y>
<y>1210</y>
</Point>
<Point>
<x>1131</x>
<y>1184</y>
<y>1210</y>
</Point>
<Point>
<x>907</x>
@@ -45294,15 +45322,15 @@
<Id>{69408933-7B12-47CF-A4BF-073FDC6F95DA}</Id>
</WorkSpaceShape2>
<NamePositionX>889</NamePositionX>
<NamePositionY>678</NamePositionY>
<NamePositionY>684</NamePositionY>
<Points>
<Point>
<x>848</x>
<y>868</y>
<y>878</y>
</Point>
<Point>
<x>879</x>
<y>868</y>
<y>878</y>
</Point>
<Point>
<x>1099</x>
@@ -45607,15 +45635,15 @@
<Id>{05D38B22-230A-490A-AE08-48BD19868B8F}</Id>
</WorkSpaceShape2>
<NamePositionX>940</NamePositionX>
<NamePositionY>1504</NamePositionY>
<NamePositionY>1519</NamePositionY>
<Points>
<Point>
<x>848</x>
<y>1046</y>
<y>1075</y>
</Point>
<Point>
<x>879</x>
<y>1046</y>
<y>1075</y>
</Point>
<Point>
<x>1201</x>
@@ -45650,15 +45678,15 @@
<Id>{05D38B22-230A-490A-AE08-48BD19868B8F}</Id>
</WorkSpaceShape2>
<NamePositionX>1515</NamePositionX>
<NamePositionY>1619</NamePositionY>
<NamePositionY>1638</NamePositionY>
<Points>
<Point>
<x>1562</x>
<y>1368</y>
<y>1407</y>
</Point>
<Point>
<x>1562</x>
<y>1399</y>
<y>1438</y>
</Point>
<Point>
<x>1668</x>
@@ -46507,6 +46535,34 @@
<DisplayGraphicalKeys>1</DisplayGraphicalKeys>
<Gradient>1</Gradient>
</WorkSpaceShapePEREntityPG83>
<WorkSpaceShapePERViewPG83 ObjectType="2503" CSAOName="WorkSpaceShapePERViewPG83">
<Id>{04DBC9B1-1890-44C3-B72B-E29FFC610389}</Id>
<Name>vw_auswertung_ablauf</Name>
<Ordinal>0</Ordinal>
<HistoryID>{FE6F0171-732C-4679-B991-528510D1875C}</HistoryID>
<GlobalOrder>0</GlobalOrder>
<ParentBaseID>{E452884F-8BEB-4A49-84E0-56B882861833}</ParentBaseID>
<PenWidth>1</PenWidth>
<PenColor>0</PenColor>
<BrushColor>15780518</BrushColor>
<FontCharset>238</FontCharset>
<FontColor>0</FontColor>
<FontName>Arial</FontName>
<FontStyle>0</FontStyle>
<FormatLocked>0</FormatLocked>
<FontHeight>-28</FontHeight>
<Top>599</Top>
<Left>836</Left>
<z>0</z>
<Width>0</Width>
<Height>0</Height>
<dz>0</dz>
<RecalculateSizes>1</RecalculateSizes>
<UseWorkSpaceRecalculateSizes>1</UseWorkSpaceRecalculateSizes>
<Shadow>1</Shadow>
<FullBackground>0</FullBackground>
<LineList/>
</WorkSpaceShapePERViewPG83>
</ShapeList>
<LineList>
<WorkSpaceLinePERRelationPG83 ObjectType="2504" CSAOName="WorkSpaceLinePERRelationPG83">
@@ -47252,8 +47308,8 @@
<Author>Systementwicklung</Author>
<Company>Technikum Wien</Company>
<Version>2.0</Version>
<CreatedDate>2009-04-17T10:15:21.000+01:00</CreatedDate>
<ModifiedDate>2012-03-13T16:09:48.417+01:00</ModifiedDate>
<CreatedDate>2009-04-17T11:15:21.000+02:00</CreatedDate>
<ModifiedDate>2012-03-28T16:43:29.462+02:00</ModifiedDate>
<Project>FH-Complete 2.0</Project>
<Description>&lt;?xml-stylesheet type="text/xsl" href="FHCompleteTDM3PG83.xsl"?&gt;
</Description>
@@ -65929,6 +65985,47 @@ Studiengang&gt;0 und Semester&gt;0 -&gt; News fuer bestimmtes Semester im Studie
<ArrDims></ArrDims>
<IsArray>0</IsArray>
</PERAttributePG83>
<PERAttributePG83 ObjectType="2003" CSAOName="PERAttributePG83">
<Id>{AB215827-9737-4DCE-9184-CF394635AC9A}</Id>
<Name>farbe</Name>
<Ordinal>0</Ordinal>
<HistoryID>{EDF70E73-E0FE-447F-8DDB-16AD4781F837}</HistoryID>
<GlobalOrder>0</GlobalOrder>
<RNOffset>0</RNOffset>
<RNLength>0</RNLength>
<IgnoreNC>0</IgnoreNC>
<GenerateCode>1</GenerateCode>
<BeforeScript></BeforeScript>
<AfterScript></AfterScript>
<Notes></Notes>
<Comments></Comments>
<DataTypeParam1>7</DataTypeParam1>
<DataTypeParam2></DataTypeParam2>
<KeepForeignKey>0</KeepForeignKey>
<DefaultValue>'#FF0000'</DefaultValue>
<NotNull>1</NotNull>
<Migrated>0</Migrated>
<Caption>farbe</Caption>
<Unique>0</Unique>
<OriginalName></OriginalName>
<CheckConstraint></CheckConstraint>
<CheckConstraintName></CheckConstraintName>
<KeyConstraintItems/>
<PKForeignKeys/>
<FKForeignKeys/>
<DictType/>
<Domain/>
<DataType>
<Id>{ECB8F02F-B683-4252-8508-ED9D064C9AF3}</Id>
</DataType>
<UserDataType/>
<IndexItems/>
<Default/>
<CheckConstraints/>
<KeyConstraint/>
<ArrDims></ArrDims>
<IsArray>0</IsArray>
</PERAttributePG83>
</Attributes>
<Keys>
<PERKeyConstraintPG83 ObjectType="2010" CSAOName="PERKeyConstraintPG83">
@@ -139283,6 +139380,47 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a
<ArrDims></ArrDims>
<IsArray>0</IsArray>
</PERAttributePG83>
<PERAttributePG83 ObjectType="2003" CSAOName="PERAttributePG83">
<Id>{B3DFFA04-3802-4998-9D42-AB92AEAFB58D}</Id>
<Name>farbe</Name>
<Ordinal>0</Ordinal>
<HistoryID>{5642D283-4D5C-4E9E-A17F-0BDBB00D0EDA}</HistoryID>
<GlobalOrder>0</GlobalOrder>
<RNOffset>0</RNOffset>
<RNLength>0</RNLength>
<IgnoreNC>0</IgnoreNC>
<GenerateCode>1</GenerateCode>
<BeforeScript></BeforeScript>
<AfterScript></AfterScript>
<Notes></Notes>
<Comments></Comments>
<DataTypeParam1>7</DataTypeParam1>
<DataTypeParam2></DataTypeParam2>
<KeepForeignKey>0</KeepForeignKey>
<DefaultValue>'#0000FF'</DefaultValue>
<NotNull>1</NotNull>
<Migrated>0</Migrated>
<Caption>farbe</Caption>
<Unique>0</Unique>
<OriginalName></OriginalName>
<CheckConstraint></CheckConstraint>
<CheckConstraintName></CheckConstraintName>
<KeyConstraintItems/>
<PKForeignKeys/>
<FKForeignKeys/>
<DictType/>
<Domain/>
<DataType>
<Id>{ECB8F02F-B683-4252-8508-ED9D064C9AF3}</Id>
</DataType>
<UserDataType/>
<IndexItems/>
<Default/>
<CheckConstraints/>
<KeyConstraint/>
<ArrDims></ArrDims>
<IsArray>0</IsArray>
</PERAttributePG83>
</Attributes>
<Keys>
<PERKeyConstraintPG83 ObjectType="2010" CSAOName="PERKeyConstraintPG83">
@@ -145379,6 +145517,47 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a
<ArrDims></ArrDims>
<IsArray>0</IsArray>
</PERAttributePG83>
<PERAttributePG83 ObjectType="2003" CSAOName="PERAttributePG83">
<Id>{505C7D20-3153-434A-B5B5-4A3DC7205632}</Id>
<Name>url_vorlage</Name>
<Ordinal>0</Ordinal>
<HistoryID>{7A3CAE9F-C67C-46D1-BEC7-190D49D0DE13}</HistoryID>
<GlobalOrder>0</GlobalOrder>
<RNOffset>0</RNOffset>
<RNLength>0</RNLength>
<IgnoreNC>0</IgnoreNC>
<GenerateCode>1</GenerateCode>
<BeforeScript></BeforeScript>
<AfterScript></AfterScript>
<Notes></Notes>
<Comments></Comments>
<DataTypeParam1>1024</DataTypeParam1>
<DataTypeParam2></DataTypeParam2>
<KeepForeignKey>0</KeepForeignKey>
<DefaultValue></DefaultValue>
<NotNull>0</NotNull>
<Migrated>0</Migrated>
<Caption>url_vorlage</Caption>
<Unique>0</Unique>
<OriginalName></OriginalName>
<CheckConstraint></CheckConstraint>
<CheckConstraintName></CheckConstraintName>
<KeyConstraintItems/>
<PKForeignKeys/>
<FKForeignKeys/>
<DictType/>
<Domain/>
<DataType>
<Id>{ECB8F02F-B683-4252-8508-ED9D064C9AF3}</Id>
</DataType>
<UserDataType/>
<IndexItems/>
<Default/>
<CheckConstraints/>
<KeyConstraint/>
<ArrDims></ArrDims>
<IsArray>0</IsArray>
</PERAttributePG83>
</Attributes>
<Keys>
<PERKeyConstraintPG83 ObjectType="2010" CSAOName="PERKeyConstraintPG83">
@@ -201906,6 +202085,61 @@ SELECT tbl_pruefling.prestudent_id, tbl_pruefling.pruefling_id, tbl_pruefling.st
<Aliases></Aliases>
<RewriteRules/>
</PERViewPG83>
<PERViewPG83 ObjectType="2005" CSAOName="PERViewPG83">
<Id>{E452884F-8BEB-4A49-84E0-56B882861833}</Id>
<Name>vw_auswertung_ablauf</Name>
<Ordinal>0</Ordinal>
<HistoryID>{1CD2D3F5-13AF-409E-9087-BED6B50E7D2D}</HistoryID>
<GlobalOrder>0</GlobalOrder>
<RNOffset>0</RNOffset>
<RNLength>0</RNLength>
<IgnoreNC>0</IgnoreNC>
<GenerateCode>1</GenerateCode>
<BeforeScript></BeforeScript>
<AfterScript></AfterScript>
<Notes></Notes>
<Comments></Comments>
<SQL>
<![CDATA[SELECT
tbl_gebiet.gebiet_id, tbl_gebiet.bezeichnung AS gebiet, tbl_ablauf.reihung,
tbl_gebiet.maxpunkte, tbl_pruefling.pruefling_id, tbl_pruefling.prestudent_id,
tbl_person.vorname, tbl_person.nachname, tbl_person.gebdatum, tbl_person.geschlecht,
tbl_pruefling.semester,
upper(tbl_studiengang.typ::character varying(1)::text || tbl_studiengang.kurzbz::text) AS stg_kurzbz,
tbl_studiengang.bezeichnung AS stg_bez, tbl_pruefling.registriert,
tbl_pruefling.idnachweis,
( SELECT sum(tbl_vorschlag.punkte) AS sum
FROM
testtool.tbl_vorschlag
JOIN testtool.tbl_antwort USING (vorschlag_id)
JOIN testtool.tbl_frage USING (frage_id)
WHERE
tbl_antwort.pruefling_id = tbl_pruefling.pruefling_id
AND tbl_frage.gebiet_id = tbl_gebiet.gebiet_id
) AS punkte,
tbl_prestudent.reihungstest_id, tbl_ablauf.gewicht
FROM testtool.tbl_pruefling
JOIN testtool.tbl_ablauf ON tbl_ablauf.studiengang_kz = tbl_pruefling.studiengang_kz
JOIN testtool.tbl_gebiet USING (gebiet_id)
JOIN public.tbl_prestudent USING (prestudent_id)
JOIN public.tbl_person USING (person_id)
JOIN public.tbl_studiengang ON tbl_prestudent.studiengang_kz = tbl_studiengang.studiengang_kz
WHERE NOT (tbl_ablauf.gebiet_id IN ( SELECT tbl_kategorie.gebiet_id
FROM testtool.tbl_kategorie));]]>
</SQL>
<Caption>vw_auswertung_ablauf</Caption>
<GenerateSQLOnly>0</GenerateSQLOnly>
<ToDoItems/>
<Triggers/>
<Schema>
<Id>{951DEB7C-0566-4FDB-9767-BBA35A843199}</Id>
</Schema>
<DbOwner/>
<Category/>
<NoteLines/>
<Aliases></Aliases>
<RewriteRules/>
</PERViewPG83>
</Views>
<Schemas>
<PERSchemaPG83 ObjectType="2024" CSAOName="PERSchemaPG83">
@@ -202234,6 +202468,7 @@ SELECT tbl_pruefling.prestudent_id, tbl_pruefling.pruefling_id, tbl_pruefling.st
<Id>{9A2C83BA-9711-4264-9307-C64CF6D2AEE0}</Id>
<Id>{B72D6C57-76B6-45B6-84A6-F51C8D522E61}</Id>
<Id>{D5D18086-CF2A-4207-88FE-1E5B418C14C2}</Id>
<Id>{E452884F-8BEB-4A49-84E0-56B882861833}</Id>
</Objects>
<UserDataTypes/>
<DictTypes/>
system/checksystem.php
+54 -1
View File
@@ -3341,6 +3341,59 @@ if(!@$db->db_query("SELECT farbe FROM fue.tbl_projektphase LIMIT 1"))
echo 'Tabelle fue.tbl_projektphase Spalte farbe hinzugefuegt!<br>';
}
// Testtool View
if(!@$db->db_query("SELECT 1 FROM testtool.vw_auswertung_ablauf LIMIT 1"))
{
$qry = "CREATE VIEW testtool.vw_auswertung_ablauf AS
SELECT
tbl_gebiet.gebiet_id, tbl_gebiet.bezeichnung AS gebiet, tbl_ablauf.reihung,
tbl_gebiet.maxpunkte, tbl_pruefling.pruefling_id, tbl_pruefling.prestudent_id,
tbl_person.vorname, tbl_person.nachname, tbl_person.gebdatum, tbl_person.geschlecht,
tbl_pruefling.semester,
upper(tbl_studiengang.typ::character varying(1)::text || tbl_studiengang.kurzbz::text) AS stg_kurzbz,
tbl_studiengang.bezeichnung AS stg_bez, tbl_pruefling.registriert,
tbl_pruefling.idnachweis,
( SELECT sum(tbl_vorschlag.punkte) AS sum
FROM
testtool.tbl_vorschlag
JOIN testtool.tbl_antwort USING (vorschlag_id)
JOIN testtool.tbl_frage USING (frage_id)
WHERE
tbl_antwort.pruefling_id = tbl_pruefling.pruefling_id
AND tbl_frage.gebiet_id = tbl_gebiet.gebiet_id
) AS punkte,
tbl_prestudent.reihungstest_id, tbl_ablauf.gewicht
FROM testtool.tbl_pruefling
JOIN testtool.tbl_ablauf ON tbl_ablauf.studiengang_kz = tbl_pruefling.studiengang_kz
JOIN testtool.tbl_gebiet USING (gebiet_id)
JOIN public.tbl_prestudent USING (prestudent_id)
JOIN public.tbl_person USING (person_id)
JOIN public.tbl_studiengang ON tbl_prestudent.studiengang_kz = tbl_studiengang.studiengang_kz
WHERE NOT (tbl_ablauf.gebiet_id IN ( SELECT tbl_kategorie.gebiet_id
FROM testtool.tbl_kategorie));
GRANT SELECT ON testtool.vw_auswertung_ablauf TO web;
GRANT SELECT ON testtool.vw_auswertung_ablauf TO admin;
";
if(!$db->db_query($qry))
echo '<strong>testtool.vw_auswertung_ablauf: '.$db->db_last_error().'</strong><br>';
else
echo 'VIEW testtool.vw_auswertung_ablauf!<br>';
}
// URL Vorlage fuer FreeBusy Typen
if(!@$db->db_query("SELECT url_vorlage FROM campus.tbl_freebusytyp LIMIT 1"))
{
$qry = "
ALTER TABLE campus.tbl_freebusytyp ADD COLUMN url_vorlage varchar(1024);
";
if(!$db->db_query($qry))
echo '<strong>campus.tbl_freebusytyp: '.$db->db_last_error().'</strong><br>';
else
echo 'Tabelle campus.tbl_freebusytyp Spalte url_vorlage hinzugefuegt!<br>';
}
echo '<br>';
@@ -3381,7 +3434,7 @@ $tabellen=array(
"campus.tbl_erreichbarkeit" => array("erreichbarkeit_kurzbz","beschreibung","farbe"),
"campus.tbl_feedback" => array("feedback_id","betreff","text","datum","uid","lehrveranstaltung_id","updateamum","updatevon","insertamum","insertvon"),
"campus.tbl_freebusy" => array("freebusy_id","uid","freebusytyp_kurzbz","url","aktiv","bezeichnung","insertamum","insertvon","updateamum","updatevon"),
"campus.tbl_freebusytyp" => array("freebusytyp_kurzbz","bezeichnung","beschreibung"),
"campus.tbl_freebusytyp" => array("freebusytyp_kurzbz","bezeichnung","beschreibung","url_vorlage"),
"campus.tbl_infoscreen" => array("infoscreen_id","bezeichnung","beschreibung","ipadresse"),
"campus.tbl_infoscreen_content" => array("infoscreen_content_id","infoscreen_id","content_id","gueltigvon","gueltigbis","insertamum","insertvon","updateamum","updatevon","refreshzeit"),
"campus.tbl_legesamtnote" => array("student_uid","lehreinheit_id","note","benotungsdatum","updateamum","updatevon","insertamum","insertvon"),