From df9dfa184342ab22fbe8ebca5e89eadc59884a5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Wed, 5 Jan 2022 15:15:56 +0100
Subject: [PATCH] =?UTF-8?q?Nationen=20DropDown=20Sperre=20auf=20Rule=20ge?=
 =?UTF-8?q?=C3=A4ndert?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 content/student/studentdetailoverlay.xul.php | 113 +++++++++++--------
 rdf/nation.rdf.php                           |   1 -
 2 files changed, 67 insertions(+), 47 deletions(-)

diff --git a/content/student/studentdetailoverlay.xul.php b/content/student/studentdetailoverlay.xul.php
index d038364fc..2ea56203b 100644
--- a/content/student/studentdetailoverlay.xul.php
+++ b/content/student/studentdetailoverlay.xul.php
@@ -104,20 +104,26 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 							<label value="Geburtsnation" control="student-detail-menulist-geburtsnation"/>
 							<menulist id="student-detail-menulist-geburtsnation" disabled="true"
 									datasources="<?php echo APP_ROOT ?>rdf/nation.rdf.php?optional=true" flex="1"
+									 xmlns:NATION="http://www.technikum-wien.at/nation/rdf#"
 									ref="http://www.technikum-wien.at/nation/liste" >
 								<template>
-									<menupopup>
-										<?php
-											$styleNationSperre = 'rdf:http://www.technikum-wien.at/nation/rdf#styleNationSperre';
-											$nationSperre= 'rdf:http://www.technikum-wien.at/nation/rdf#sperre';
-										?>
-										<menuitem value="rdf:http://www.technikum-wien.at/nation/rdf#nation_code"
-												label="rdf:http://www.technikum-wien.at/nation/rdf#kurztext"
-												uri="rdf:*"
-												style="<?php echo $styleNationSperre?>"
-												disabled="<?php echo $nationSperre?>"
-												/>
+									<rule NATION:sperre='false'>
+										<menupopup>
+											<menuitem value="rdf:http://www.technikum-wien.at/nation/rdf#nation_code"
+													label="rdf:http://www.technikum-wien.at/nation/rdf#kurztext"
+													uri="rdf:*"
+													/>
 										</menupopup>
+									</rule>
+									<rule>
+										<menupopup>
+											<menuitem value="rdf:http://www.technikum-wien.at/nation/rdf#nation_code"
+													label="rdf:http://www.technikum-wien.at/nation/rdf#kurztext"
+													uri="rdf:*" style="text-decoration:line-through;"
+													/>
+										</menupopup>
+									</rule>
+
 								</template>
 							</menulist>
 
@@ -134,20 +140,25 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 							<label value="Staatsbuergerschaft" control="student-detail-menulist-staatsbuergerschaft"/>
 							<menulist id="student-detail-menulist-staatsbuergerschaft" disabled="true"
 									datasources="<?php echo APP_ROOT ?>rdf/nation.rdf.php?optional=true" flex="1"
+									xmlns:NATION="http://www.technikum-wien.at/nation/rdf#"
 									ref="http://www.technikum-wien.at/nation/liste" >
 								<template>
-									<menupopup>
-										<?php
-											$styleNationSperre = 'rdf:http://www.technikum-wien.at/nation/rdf#styleNationSperre';
-											$nationSperre= 'rdf:http://www.technikum-wien.at/nation/rdf#sperre';
-										?>
-										<menuitem value="rdf:http://www.technikum-wien.at/nation/rdf#nation_code"
-												label="rdf:http://www.technikum-wien.at/nation/rdf#kurztext"
-												uri="rdf:*"
-												style="<?php echo $styleNationSperre?>"
-												disabled="<?php echo $nationSperre?>"
-												 />
+									<rule NATION:sperre='false'>
+										<menupopup>
+											<menuitem value="rdf:http://www.technikum-wien.at/nation/rdf#nation_code"
+													label="rdf:http://www.technikum-wien.at/nation/rdf#kurztext"
+													uri="rdf:*"
+													 />
 										</menupopup>
+									</rule>
+									<rule>
+										<menupopup>
+											<menuitem value="rdf:http://www.technikum-wien.at/nation/rdf#nation_code"
+													label="rdf:http://www.technikum-wien.at/nation/rdf#kurztext"
+													uri="rdf:*" style="text-decoration:line-through;"
+													 />
+										</menupopup>
+									</rule>
 								</template>
 							</menulist>
 
@@ -342,20 +353,25 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 								<menulist id="student-prestudent-menulist-zgvnation" disabled="true"
 										datasources="<?php echo APP_ROOT ?>rdf/nation.rdf.php?optional=true" flex="1"
 										ref="http://www.technikum-wien.at/nation/liste"
+										xmlns:NATION="http://www.technikum-wien.at/nation/rdf#"
 										style="min-width: 100px">
 									<template>
-										<menupopup>
-											<?php
-												$styleNationSperre = 'rdf:http://www.technikum-wien.at/nation/rdf#styleNationSperre';
-												$nationSperre= 'rdf:http://www.technikum-wien.at/nation/rdf#sperre';
-											?>
-											<menuitem value="rdf:http://www.technikum-wien.at/nation/rdf#nation_code"
-													label="rdf:http://www.technikum-wien.at/nation/rdf#kurztext"
-													uri="rdf:*"
-													style="<?php echo $styleNationSperre?>"
-													disabled="<?php echo $nationSperre?>"
-													/>
-										</menupopup>
+										<rule NATION:sperre='false'>
+											<menupopup>
+												<menuitem value="rdf:http://www.technikum-wien.at/nation/rdf#nation_code"
+														label="rdf:http://www.technikum-wien.at/nation/rdf#kurztext"
+														uri="rdf:*"
+														/>
+											</menupopup>
+										</rule>
+										<rule>
+											<menupopup>
+												<menuitem value="rdf:http://www.technikum-wien.at/nation/rdf#nation_code"
+														label="rdf:http://www.technikum-wien.at/nation/rdf#kurztext"
+														uri="rdf:*" style="text-decoration:line-through;"
+														/>
+											</menupopup>
+										</rule>
 									</template>
 								</menulist>
 							</hbox>
@@ -386,20 +402,25 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 								<menulist id="student-prestudent-menulist-zgvmasternation" disabled="true"
 										datasources="<?php echo APP_ROOT ?>rdf/nation.rdf.php?optional=true" flex="1"
 										ref="http://www.technikum-wien.at/nation/liste"
+										xmlns:NATION="http://www.technikum-wien.at/nation/rdf#"
 										style="min-width: 100px">
 									<template>
-										<menupopup>
-											<?php
-												$styleNationSperre = 'rdf:http://www.technikum-wien.at/nation/rdf#styleNationSperre';
-												$nationSperre= 'rdf:http://www.technikum-wien.at/nation/rdf#sperre';
-											?>
-											<menuitem value="rdf:http://www.technikum-wien.at/nation/rdf#nation_code"
-													label="rdf:http://www.technikum-wien.at/nation/rdf#kurztext"
-													uri="rdf:*"
-													style="<?php echo $styleNationSperre?>"
-													disabled="<?php echo $nationSperre?>"
-													/>
-										</menupopup>
+										<rule NATION:sperre='false'>
+											<menupopup>
+												<menuitem value="rdf:http://www.technikum-wien.at/nation/rdf#nation_code"
+														label="rdf:http://www.technikum-wien.at/nation/rdf#kurztext"
+														uri="rdf:*"
+														/>
+											</menupopup>
+										</rule>
+										<rule>
+											<menupopup>
+												<menuitem value="rdf:http://www.technikum-wien.at/nation/rdf#nation_code"
+														label="rdf:http://www.technikum-wien.at/nation/rdf#kurztext"
+														uri="rdf:*" style="text-decoration:line-through;"
+														/>
+											</menupopup>
+										</rule>
 									</template>
 								</menulist>
 							</hbox>
diff --git a/rdf/nation.rdf.php b/rdf/nation.rdf.php
index 978c79ca5..a5afcbbd8 100644
--- a/rdf/nation.rdf.php
+++ b/rdf/nation.rdf.php
@@ -83,7 +83,6 @@ foreach ($nation->nation as $row)
             <NATION:langtext><![CDATA[<?php echo $row->langtext ?>]]></NATION:langtext>
             <NATION:engltext><![CDATA[<?php echo $row->engltext ?>]]></NATION:engltext>
             <NATION:sperre><![CDATA[<?php echo ($row->sperre?'true':'false') ?>]]></NATION:sperre>
-            <NATION:styleNationSperre><![CDATA[<?php echo ($row->sperre?'text-decoration: line-through':'') ?>]]></NATION:styleNationSperre>
          </RDF:Description>
       </RDF:li>
 <?php