From 175d75c70dfae9b92fcc596fd2b40464898f06ba Mon Sep 17 00:00:00 2001
From: KarpAlex <karpen_ko@hotmail.com>
Date: Mon, 4 Oct 2021 12:57:18 +0200
Subject: [PATCH] FAS studentdetailoverlay.xul.php bisstandort and
 foerderrelevant fields: - added label tags (for hiding also the labels) -
 changed column width for better look

---
 content/student/studentdetailoverlay.xul.php | 49 ++++++++++----------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/content/student/studentdetailoverlay.xul.php b/content/student/studentdetailoverlay.xul.php
index e07fac0fd..813805886 100644
--- a/content/student/studentdetailoverlay.xul.php
+++ b/content/student/studentdetailoverlay.xul.php
@@ -460,7 +460,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 										</menupopup>
 								</template>
 							</menulist>
-                            <label value="Bisstandort" control="student-prestudent-menulist-bisstandort"/>
+                            <label value="Bisstandort" control="student-prestudent-menulist-bisstandort" id="student-prestudent-label-bisstandort"/>
                             <menulist id="student-prestudent-menulist-bisstandort" disabled="true"
                                       datasources="<?php echo APP_ROOT ?>rdf/bisstandort.rdf.php?optional=true" flex="1"
                                       ref="http://www.technikum-wien.at/bisstandort/alle" >
@@ -481,25 +481,14 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 					<columns>
 						<column flex="1"/>
 						<column flex="12"/>
-						<column flex="1"/>
-						<column flex="1"/>
-						<column flex="1"/>
-						<column flex="1"/>
-						<column flex="1"/>
-						<column flex="1"/>
+						<column flex="2"/>
+						<column flex="2"/>
+						<column flex="3"/>
 					</columns>
 					<rows>
 						<row>
                             <label value="Anmerkung" control="student-prestudent-textbox-anmerkung"/>
                             <textbox id="student-prestudent-textbox-anmerkung" disabled="true"/>
-                            <label value="Förderrelevant" control="student-prestudent-menulist-foerderrelevant"/>
-                            <menulist id="student-prestudent-menulist-foerderrelevant" disabled="true">
-                                <menupopup>
-                                    <menuitem value="" label="Wie Studiengang"/>
-                                    <menuitem value="true" label="Ja"/>
-                                    <menuitem value="false" label="Nein"/>
-                                </menupopup>
-                            </menulist>
                             <hbox>
                                 <label value="Bismelden" control="student-prestudent-checkbox-bismelden"/>
                                 <checkbox id="student-prestudent-checkbox-bismelden" checked="true" disabled="true"/>
@@ -508,15 +497,27 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 								<label value="Dual" control="student-prestudent-checkbox-dual"/>
 								<checkbox id="student-prestudent-checkbox-dual" checked="false" disabled="true"/>
 							</hbox>
-                            <label value="Priorität" control="student-prestudent-textbox-priorisierung"/>
-							<?php
-							$readonly = 'readonly="true"';
-							$rechte = new benutzerberechtigung();
-							$rechte->getBerechtigungen($user);
-							if($rechte->isBerechtigt('basis/prestudent'))
-								$readonly = '';
-							?>
-                            <textbox id="student-prestudent-textbox-priorisierung" disabled="true" <?php echo $readonly ?>/>
+                            <hbox>
+                                <label value="Förderrelevant"  id="student-prestudent-label-foerderrelevant" control="student-prestudent-menulist-foerderrelevant"/>
+                                <menulist id="student-prestudent-menulist-foerderrelevant" disabled="true">
+                                    <menupopup>
+                                        <menuitem value="" label="Wie Studiengang"/>
+                                        <menuitem value="true" label="Ja"/>
+                                        <menuitem value="false" label="Nein"/>
+                                    </menupopup>
+                                </menulist>
+                            </hbox>
+                            <hbox>
+                                <label value="Priorität" control="student-prestudent-textbox-priorisierung"/>
+                                <?php
+                                $readonly = 'readonly="true"';
+                                $rechte = new benutzerberechtigung();
+                                $rechte->getBerechtigungen($user);
+                                if($rechte->isBerechtigt('basis/prestudent'))
+                                    $readonly = '';
+                                ?>
+                                <textbox id="student-prestudent-textbox-priorisierung" disabled="true" <?php echo $readonly ?>/>
+                            </hbox>
 						</row>
 						<row id="student-prestudent-row-mentor">
 						<label value="MentorIn" control="student-prestudent-textbox-mentor"/>