Erstversion Ampelsystem

This commit is contained in:
Andreas Österreicher
2011-11-29 08:50:02 +00:00
parent 12e6092178
commit a0bd89cbc8
13 changed files with 584 additions and 193 deletions
+205 -154
View File
@@ -25456,8 +25456,8 @@
<FontStyle>0</FontStyle>
<FormatLocked>0</FormatLocked>
<FontHeight>-28</FontHeight>
<Top>1773</Top>
<Left>8676</Left>
<Top>1615</Top>
<Left>8697</Left>
<z>0</z>
<Width>886</Width>
<Height>551</Height>
@@ -25612,8 +25612,8 @@
<FontStyle>0</FontStyle>
<FormatLocked>0</FormatLocked>
<FontHeight>-28</FontHeight>
<Top>2419</Top>
<Left>8830</Left>
<Top>2230</Top>
<Left>8790</Left>
<z>0</z>
<Width>764</Width>
<Height>200</Height>
@@ -26056,8 +26056,8 @@
<FontStyle>0</FontStyle>
<FormatLocked>0</FormatLocked>
<FontHeight>-28</FontHeight>
<Top>767</Top>
<Left>8552</Left>
<Top>717</Top>
<Left>8585</Left>
<z>0</z>
<Width>794</Width>
<Height>278</Height>
@@ -26747,8 +26747,8 @@
<FontStyle>0</FontStyle>
<FormatLocked>0</FormatLocked>
<FontHeight>-28</FontHeight>
<Top>1207</Top>
<Left>8758</Left>
<Top>1050</Top>
<Left>8751</Left>
<z>0</z>
<Width>899</Width>
<Height>473</Height>
@@ -27337,8 +27337,8 @@
<FontStyle>0</FontStyle>
<FormatLocked>0</FormatLocked>
<FontHeight>-28</FontHeight>
<Top>2797</Top>
<Left>8637</Left>
<Top>2579</Top>
<Left>8666</Left>
<z>0</z>
<Width>1092</Width>
<Height>1487</Height>
@@ -27416,8 +27416,8 @@
<FontStyle>0</FontStyle>
<FormatLocked>0</FormatLocked>
<FontHeight>-28</FontHeight>
<Top>2315</Top>
<Left>9924</Left>
<Top>2371</Top>
<Left>10020</Left>
<z>0</z>
<Width>801</Width>
<Height>473</Height>
@@ -27929,16 +27929,16 @@
<WorkSpaceShape2>
<Id>{4B8FF0F0-CE9E-4D02-B29F-73FEB38DB1AC}</Id>
</WorkSpaceShape2>
<NamePositionX>9723</NamePositionX>
<NamePositionY>2812</NamePositionY>
<NamePositionX>9703</NamePositionX>
<NamePositionY>2718</NamePositionY>
<Points>
<Point>
<x>9594</x>
<y>2519</y>
<x>9554</x>
<y>2330</y>
</Point>
<Point>
<x>9625</x>
<y>2519</y>
<x>9585</x>
<y>2330</y>
</Point>
<Point>
<x>9934</x>
@@ -28243,15 +28243,15 @@
<Id>{4C98A428-14DD-4587-B44B-5A31CAA42B19}</Id>
</WorkSpaceShape2>
<NamePositionX>4281</NamePositionX>
<NamePositionY>2195</NamePositionY>
<NamePositionY>2241</NamePositionY>
<Points>
<Point>
<x>7672</x>
<y>2907</y>
<y>2999</y>
</Point>
<Point>
<x>7641</x>
<y>2907</y>
<y>2999</y>
</Point>
<Point>
<x>2302</x>
@@ -28501,23 +28501,23 @@
<Id>{C2303976-8004-4530-A9DC-543D000F94C9}</Id>
</WorkSpaceShape2>
<NamePositionX>7449</NamePositionX>
<NamePositionY>2917</NamePositionY>
<NamePositionY>2732</NamePositionY>
<Points>
<Point>
<x>7672</x>
<y>2999</y>
<y>2907</y>
</Point>
<Point>
<x>7641</x>
<y>2999</y>
<y>2907</y>
</Point>
<Point>
<x>7417</x>
<y>2944</y>
<y>2667</y>
</Point>
<Point>
<x>7386</x>
<y>2944</y>
<y>2667</y>
</Point>
</Points>
</WorkSpaceLinePERRelationPG83>
@@ -28587,15 +28587,15 @@
<Id>{003CB043-E645-44CB-A1E7-B2DAB7CD0513}</Id>
</WorkSpaceShape2>
<NamePositionX>8338</NamePositionX>
<NamePositionY>2001</NamePositionY>
<NamePositionY>1932</NamePositionY>
<Points>
<Point>
<x>7386</x>
<y>2621</y>
<y>2483</y>
</Point>
<Point>
<x>7417</x>
<y>2621</y>
<y>2483</y>
</Point>
<Point>
<x>9765</x>
@@ -28715,24 +28715,24 @@
<WorkSpaceShape2>
<Id>{CA4F7EAC-55C4-480E-B7C9-180DB66AC5B0}</Id>
</WorkSpaceShape2>
<NamePositionX>8086</NamePositionX>
<NamePositionY>1753</NamePositionY>
<NamePositionX>7827</NamePositionX>
<NamePositionY>1519</NamePositionY>
<Points>
<Point>
<x>7386</x>
<y>2460</y>
<x>6906</x>
<y>2298</y>
</Point>
<Point>
<x>7417</x>
<y>2460</y>
<x>6906</x>
<y>2267</y>
</Point>
<Point>
<x>8727</x>
<y>1562</y>
<x>8720</x>
<y>1286</y>
</Point>
<Point>
<x>8758</x>
<y>1562</y>
<x>8751</x>
<y>1286</y>
</Point>
</Points>
</WorkSpaceLinePERRelationPG83>
@@ -28758,16 +28758,16 @@
<WorkSpaceShape2>
<Id>{0C663600-4D6D-4A2E-800A-153F59399066}</Id>
</WorkSpaceShape2>
<NamePositionX>8585</NamePositionX>
<NamePositionY>1387</NamePositionY>
<NamePositionX>8582</NamePositionX>
<NamePositionY>1367</NamePositionY>
<Points>
<Point>
<x>8758</x>
<y>1444</y>
<x>8751</x>
<y>1405</y>
</Point>
<Point>
<x>8727</x>
<y>1444</y>
<x>8720</x>
<y>1405</y>
</Point>
<Point>
<x>8507</x>
@@ -28887,15 +28887,15 @@
<WorkSpaceShape2>
<Id>{FFCA6168-3717-4994-BC3B-042505DD8EED}</Id>
</WorkSpaceShape2>
<NamePositionX>8029</NamePositionX>
<NamePositionX>8069</NamePositionX>
<NamePositionY>2037</NamePositionY>
<Points>
<Point>
<x>7066</x>
<x>7146</x>
<y>2298</y>
</Point>
<Point>
<x>7066</x>
<x>7146</x>
<y>2267</y>
</Point>
<Point>
@@ -28930,15 +28930,15 @@
<WorkSpaceShape2>
<Id>{C9AFAFC7-19FB-4784-A406-4B4CDEABCD21}</Id>
</WorkSpaceShape2>
<NamePositionX>7695</NamePositionX>
<NamePositionX>7654</NamePositionX>
<NamePositionY>1299</NamePositionY>
<Points>
<Point>
<x>6747</x>
<x>6667</x>
<y>2298</y>
</Point>
<Point>
<x>6747</x>
<x>6667</x>
<y>2267</y>
</Point>
<Point>
@@ -29145,8 +29145,8 @@
<WorkSpaceShape2>
<Id>{6AEE904A-17EB-47A0-B5FD-DEAC6C762AEA}</Id>
</WorkSpaceShape2>
<NamePositionX>8456</NamePositionX>
<NamePositionY>1012</NamePositionY>
<NamePositionX>8473</NamePositionX>
<NamePositionY>986</NamePositionY>
<Points>
<Point>
<x>8476</x>
@@ -29157,12 +29157,12 @@
<y>1239</y>
</Point>
<Point>
<x>8521</x>
<y>906</y>
<x>8554</x>
<y>856</y>
</Point>
<Point>
<x>8552</x>
<y>906</y>
<x>8585</x>
<y>856</y>
</Point>
</Points>
</WorkSpaceLinePERRelationPG83>
@@ -29845,16 +29845,16 @@
<WorkSpaceShape2>
<Id>{3C978BA4-E261-44AB-A8AC-850BFC5A3C3B}</Id>
</WorkSpaceShape2>
<NamePositionX>9397</NamePositionX>
<NamePositionY>625</NamePositionY>
<NamePositionX>9394</NamePositionX>
<NamePositionY>546</NamePositionY>
<Points>
<Point>
<x>9357</x>
<y>1207</y>
<x>9350</x>
<y>1050</y>
</Point>
<Point>
<x>9357</x>
<y>1176</y>
<x>9350</x>
<y>1019</y>
</Point>
<Point>
<x>9513</x>
@@ -29888,24 +29888,24 @@
<WorkSpaceShape2>
<Id>{CF52EB80-BE30-40A3-980C-8F262A0A0484}</Id>
</WorkSpaceShape2>
<NamePositionX>9119</NamePositionX>
<NamePositionY>1666</NamePositionY>
<NamePositionX>9125</NamePositionX>
<NamePositionY>1508</NamePositionY>
<Points>
<Point>
<x>9208</x>
<y>1680</y>
<x>9200</x>
<y>1523</y>
</Point>
<Point>
<x>9208</x>
<y>1711</y>
<x>9200</x>
<y>1554</y>
</Point>
<Point>
<x>9119</x>
<y>1742</y>
<x>9140</x>
<y>1584</y>
</Point>
<Point>
<x>9119</x>
<y>1773</y>
<x>9140</x>
<y>1615</y>
</Point>
</Points>
</WorkSpaceLinePERRelationPG83>
@@ -29931,16 +29931,16 @@
<WorkSpaceShape2>
<Id>{2E5D944C-5C5D-4F01-9057-73779D9CDCAA}</Id>
</WorkSpaceShape2>
<NamePositionX>7470</NamePositionX>
<NamePositionY>752</NamePositionY>
<NamePositionX>7466</NamePositionX>
<NamePositionY>673</NamePositionY>
<Points>
<Point>
<x>8758</x>
<y>1325</y>
<x>8751</x>
<y>1168</y>
</Point>
<Point>
<x>8727</x>
<y>1325</y>
<x>8720</x>
<y>1168</y>
</Point>
<Point>
<x>3876</x>
@@ -30146,16 +30146,16 @@
<WorkSpaceShape2>
<Id>{C9AFAFC7-19FB-4784-A406-4B4CDEABCD21}</Id>
</WorkSpaceShape2>
<NamePositionX>9105</NamePositionX>
<NamePositionY>874</NamePositionY>
<NamePositionX>9102</NamePositionX>
<NamePositionY>795</NamePositionY>
<Points>
<Point>
<x>9058</x>
<y>1207</y>
<x>9051</x>
<y>1050</y>
</Point>
<Point>
<x>9058</x>
<y>1176</y>
<x>9051</x>
<y>1019</y>
</Point>
<Point>
<x>9006</x>
@@ -30748,8 +30748,8 @@
<WorkSpaceShape2>
<Id>{CF52EB80-BE30-40A3-980C-8F262A0A0484}</Id>
</WorkSpaceShape2>
<NamePositionX>9764</NamePositionX>
<NamePositionY>1794</NamePositionY>
<NamePositionX>9775</NamePositionX>
<NamePositionY>1715</NamePositionY>
<Points>
<Point>
<x>10135</x>
@@ -30760,12 +30760,12 @@
<y>1660</y>
</Point>
<Point>
<x>9593</x>
<y>2048</y>
<x>9614</x>
<y>1890</y>
</Point>
<Point>
<x>9562</x>
<y>2048</y>
<x>9583</x>
<y>1890</y>
</Point>
</Points>
</WorkSpaceLinePERRelationPG83>
@@ -30834,24 +30834,24 @@
<WorkSpaceShape2>
<Id>{DBBBEEE5-BBA2-48F5-9350-350BBFF93EC5}</Id>
</WorkSpaceShape2>
<NamePositionX>7911</NamePositionX>
<NamePositionY>2854</NamePositionY>
<NamePositionX>7926</NamePositionX>
<NamePositionY>2780</NamePositionY>
<Points>
<Point>
<x>7386</x>
<y>2782</y>
<y>2852</y>
</Point>
<Point>
<x>7417</x>
<y>2782</y>
<y>2852</y>
</Point>
<Point>
<x>8606</x>
<y>3045</y>
<x>8635</x>
<y>2827</y>
</Point>
<Point>
<x>8637</x>
<y>3045</y>
<x>8666</x>
<y>2827</y>
</Point>
</Points>
</WorkSpaceLinePERRelationPG83>
@@ -30877,16 +30877,16 @@
<WorkSpaceShape2>
<Id>{1F6B4A81-9A0B-48B3-84B2-91248263F8C0}</Id>
</WorkSpaceShape2>
<NamePositionX>9726</NamePositionX>
<NamePositionY>3710</NamePositionY>
<NamePositionX>9740</NamePositionX>
<NamePositionY>3601</NamePositionY>
<Points>
<Point>
<x>9729</x>
<y>3540</y>
<x>9758</x>
<y>3322</y>
</Point>
<Point>
<x>9760</x>
<y>3540</y>
<x>9789</x>
<y>3322</y>
</Point>
<Point>
<x>9891</x>
@@ -30920,8 +30920,8 @@
<WorkSpaceShape2>
<Id>{DBBBEEE5-BBA2-48F5-9350-350BBFF93EC5}</Id>
</WorkSpaceShape2>
<NamePositionX>5304</NamePositionX>
<NamePositionY>3536</NamePositionY>
<NamePositionX>5319</NamePositionX>
<NamePositionY>3303</NamePositionY>
<Points>
<Point>
<x>2172</x>
@@ -30932,12 +30932,12 @@
<y>3157</y>
</Point>
<Point>
<x>8606</x>
<y>4036</y>
<x>8635</x>
<y>3570</y>
</Point>
<Point>
<x>8637</x>
<y>4036</y>
<x>8666</x>
<y>3570</y>
</Point>
</Points>
</WorkSpaceLinePERRelationPG83>
@@ -30963,24 +30963,24 @@
<WorkSpaceShape2>
<Id>{DBBBEEE5-BBA2-48F5-9350-350BBFF93EC5}</Id>
</WorkSpaceShape2>
<NamePositionX>7911</NamePositionX>
<NamePositionY>3140</NamePositionY>
<NamePositionX>7926</NamePositionX>
<NamePositionY>2995</NamePositionY>
<Points>
<Point>
<x>7386</x>
<y>3106</y>
<y>3036</y>
</Point>
<Point>
<x>7417</x>
<y>3106</y>
<y>3036</y>
</Point>
<Point>
<x>8606</x>
<y>3293</y>
<x>8635</x>
<y>3075</y>
</Point>
<Point>
<x>8637</x>
<y>3293</y>
<x>8666</x>
<y>3075</y>
</Point>
</Points>
</WorkSpaceLinePERRelationPG83>
@@ -31006,24 +31006,24 @@
<WorkSpaceShape2>
<Id>{DBBBEEE5-BBA2-48F5-9350-350BBFF93EC5}</Id>
</WorkSpaceShape2>
<NamePositionX>7911</NamePositionX>
<NamePositionY>3343</NamePositionY>
<NamePositionX>7926</NamePositionX>
<NamePositionY>3211</NamePositionY>
<Points>
<Point>
<x>7386</x>
<y>3267</y>
<y>3221</y>
</Point>
<Point>
<x>7417</x>
<y>3267</y>
<y>3221</y>
</Point>
<Point>
<x>8606</x>
<y>3540</y>
<x>8635</x>
<y>3322</y>
</Point>
<Point>
<x>8637</x>
<y>3540</y>
<x>8666</x>
<y>3322</y>
</Point>
</Points>
</WorkSpaceLinePERRelationPG83>
@@ -31049,24 +31049,24 @@
<WorkSpaceShape2>
<Id>{DBBBEEE5-BBA2-48F5-9350-350BBFF93EC5}</Id>
</WorkSpaceShape2>
<NamePositionX>7911</NamePositionX>
<NamePositionY>3548</NamePositionY>
<NamePositionX>7926</NamePositionX>
<NamePositionY>3551</NamePositionY>
<Points>
<Point>
<x>7386</x>
<y>3428</y>
<y>3405</y>
</Point>
<Point>
<x>7417</x>
<y>3428</y>
<y>3405</y>
</Point>
<Point>
<x>8606</x>
<y>3788</y>
<x>8635</x>
<y>3818</y>
</Point>
<Point>
<x>8637</x>
<y>3788</y>
<x>8666</x>
<y>3818</y>
</Point>
</Points>
</WorkSpaceLinePERRelationPG83>
@@ -31092,16 +31092,16 @@
<WorkSpaceShape2>
<Id>{0CD0899C-7A52-4F35-AC37-1239971710E8}</Id>
</WorkSpaceShape2>
<NamePositionX>10272</NamePositionX>
<NamePositionY>2156</NamePositionY>
<NamePositionX>10320</NamePositionX>
<NamePositionY>2184</NamePositionY>
<Points>
<Point>
<x>10324</x>
<y>2315</y>
<x>10420</x>
<y>2371</y>
</Point>
<Point>
<x>10324</x>
<y>2284</y>
<x>10420</x>
<y>2340</y>
</Point>
<Point>
<x>10421</x>
@@ -31135,16 +31135,16 @@
<WorkSpaceShape2>
<Id>{0CD0899C-7A52-4F35-AC37-1239971710E8}</Id>
</WorkSpaceShape2>
<NamePositionX>9680</NamePositionX>
<NamePositionY>1661</NamePositionY>
<NamePositionX>9677</NamePositionX>
<NamePositionY>1582</NamePositionY>
<Points>
<Point>
<x>9657</x>
<y>1444</y>
<x>9650</x>
<y>1286</y>
</Point>
<Point>
<x>9688</x>
<y>1444</y>
<x>9681</x>
<y>1286</y>
</Point>
<Point>
<x>9873</x>
@@ -45938,7 +45938,7 @@
<Company>Technikum Wien</Company>
<Version>2.0</Version>
<CreatedDate>2009-04-17T10:15:21.000+01:00</CreatedDate>
<ModifiedDate>2011-11-18T10:58:06.124+01:00</ModifiedDate>
<ModifiedDate>2011-11-25T10:08:59.478+01:00</ModifiedDate>
<Project>FH-Complete 2.0</Project>
<Description>&lt;?xml-stylesheet type="text/xsl" href="FHCompleteTDM3PG83.xsl"?&gt;
</Description>
@@ -141320,10 +141320,10 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a
<FKForeignKeys/>
<DictType/>
<Domain/>
<DataType>
<Id>{8D91E2A4-12F5-40E3-BAC2-BFCF7BE1C8B7}</Id>
</DataType>
<UserDataType/>
<DataType/>
<UserDataType>
<Id>{08329601-EAC4-4BE4-9203-95AB41C47F91}</Id>
</UserDataType>
<IndexItems/>
<Default/>
<CheckConstraints/>
@@ -142625,7 +142625,7 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a
</PERUserDataTypePG83>
<PERUserDataTypePG83 ObjectType="2008" CSAOName="PERUserDataTypePG83">
<Id>{F0B7457E-0314-41A3-9B8C-C2FA39AA0ADD}</Id>
<Name>character varying[ ]</Name>
<Name>Character varying[ ]</Name>
<Ordinal>0</Ordinal>
<HistoryID>{96978687-DD4B-43E2-8AA1-090A2AC4E406}</HistoryID>
<GlobalOrder>0</GlobalOrder>
@@ -142645,7 +142645,7 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a
<Param2Min></Param2Min>
<Param2Max></Param2Max>
<Param2Default></Param2Default>
<Caption>character varying[ ]</Caption>
<Caption>Character varying[ ]</Caption>
<DontCheckParams>0</DontCheckParams>
<Attributes>
<Id>{50C8C070-F10E-4B6D-B2ED-702F87F61F8A}</Id>
@@ -142675,6 +142675,57 @@ Wenn FALSE haengt die Anzahl der Fragen pro Level von der Gesamtzahl pro Level a
<FunctionTypModIn/>
<EnumTypeList></EnumTypeList>
</PERUserDataTypePG83>
<PERUserDataTypePG83 ObjectType="2008" CSAOName="PERUserDataTypePG83">
<Id>{08329601-EAC4-4BE4-9203-95AB41C47F91}</Id>
<Name>Text[]</Name>
<Ordinal>0</Ordinal>
<HistoryID>{99C48025-280E-405A-9F81-B74A54BB1D31}</HistoryID>
<GlobalOrder>0</GlobalOrder>
<RNOffset>0</RNOffset>
<RNLength>0</RNLength>
<IgnoreNC>0</IgnoreNC>
<GenerateCode>1</GenerateCode>
<BeforeScript></BeforeScript>
<AfterScript></AfterScript>
<Notes></Notes>
<Comments></Comments>
<Param1Name></Param1Name>
<Param1Min></Param1Min>
<Param1Max></Param1Max>
<Param1Default></Param1Default>
<Param2Name></Param2Name>
<Param2Min></Param2Min>
<Param2Max></Param2Max>
<Param2Default></Param2Default>
<Caption>Text[]</Caption>
<DontCheckParams>0</DontCheckParams>
<Attributes>
<Id>{80B9D986-981E-42E8-A04C-9D47377C9A34}</Id>
</Attributes>
<Domains/>
<DictTypes/>
<ToDoItems/>
<Delimiter></Delimiter>
<Element></Element>
<Default></Default>
<Storage>plain</Storage>
<Alignment>int4</Alignment>
<PassedByValue>0</PassedByValue>
<InternalLength></InternalLength>
<CompositeTypeList></CompositeTypeList>
<Schema/>
<FunctionAnalyze/>
<FunctionSend/>
<FunctionReceive/>
<FunctionOutput/>
<FunctionInput/>
<TType>CT</TType>
<GenerateSQLOnly>0</GenerateSQLOnly>
<SQL></SQL>
<FunctionTypModOut/>
<FunctionTypModIn/>
<EnumTypeList></EnumTypeList>
</PERUserDataTypePG83>
</UserDataTypes>
<Relations>
<PERRelationPG83 ObjectType="2004" CSAOName="PERRelationPG83">
+25 -1
View File
@@ -2997,6 +2997,30 @@ if(!@$db->db_query("SELECT 1 FROM system.tbl_webservicelog LIMIT 1"))
echo 'Tabelle system.tbl_webservicelog und system.tbl_webservicetyp hinzugefuegt!<br>';
}
// Beschreibung der Ampel auf Array aendern damit mehrere Sprachen verwendet werden koennen
if($result = $db->db_query("SELECT * FROM information_schema.columns WHERE table_name='tbl_ampel' AND table_schema='public' AND column_name='beschreibung' AND data_type='text'"))
{
//Wenn die Spalte vom Datentyp Text ist wird diese auf Array geaendert
if($db->db_num_rows($result)>0)
{
/*
* - Neue Spalte hinzufuegen
* - Inhalt auf index 1 kopieren
* - Alte Spalte entfernen
* - Neue Spalte umbennen
*/
$qry = "ALTER TABLE public.tbl_ampel ADD COLUMN beschreibung_neu text[];
UPDATE public.tbl_ampel SET beschreibung_neu[1]=beschreibung;
ALTER TABLE public.tbl_ampel DROP COLUMN beschreibung;
ALTER TABLE public.tbl_ampel RENAME COLUMN beschreibung_neu TO beschreibung;";
if(!$db->db_query($qry))
echo '<strong>public.tbl_ampel: '.$db->db_last_error().'</strong><br>';
else
echo 'Tabelle public.tbl_ampel Bezeichnung auf Array geaendert!<br>';
}
}
echo '<br>';
@@ -3243,4 +3267,4 @@ if (!$result=@$db->db_query($sql_query))
echo 'Attribut '.$fulltablename.'.<strong>'.$fieldnameDB.'</strong> existiert in der DB, aber nicht in diesem Skript!<BR>';
}
}
?>
?>