Merge branch 'master' of https://github.com/FH-Complete/FHC-Core

application/controllers/system/Users.php

@@ -36,6 +36,41 @@ class Users extends VileSci_Controller
 			$users = $returnUsers->retval;
 		}
 		
+		// Gruppen
+		$this->load->model('organisation/Gruppe_model', 'GruppeModel');
+		$this->GruppeModel->addOrder('beschreibung');
+		$gruppen = $this->GruppeModel->loadWhere(array('aktiv' => true, 'aufnahmegruppe' => true));
+		if (hasData($gruppen))
+		{
+			// Adding an empty element at the beginning
+			$emptyElement = new stdClass();
+			$emptyElement->gruppe_kurzbz = '-1';
+			$emptyElement->beschreibung = 'Select a group...';
+			array_unshift($gruppen->retval, $emptyElement);
+		}
+		else
+		{
+			show_error($gruppen->retval);
+		}
+		
+		// Stufe
+		$this->load->model('crm/Reihungstest_model', 'ReihungstestModel');
+		$this->ReihungstestModel->addSelect('DISTINCT ON(stufe) stufe, stufe AS beschreibung');
+		$this->ReihungstestModel->addOrder('stufe');
+		$stufen = $this->ReihungstestModel->loadWhere('stufe IS NOT NULL');
+		if (hasData($stufen))
+		{
+			// Adding an empty element at the beginning
+			$emptyElement = new stdClass();
+			$emptyElement->stufe = '-1';
+			$emptyElement->beschreibung = 'Select a stufe...';
+			array_unshift($stufen->retval, $emptyElement);
+		}
+		else
+		{
+			show_error($stufen->retval);
+		}
+		
 		if ($returnUsers == null || isSuccess($returnUsers))
 		{
 			$viewData = array(
@@ -44,7 +79,9 @@ class Users extends VileSci_Controller
 				'gruppe' => $gruppe,
 				'reihungstest' => $reihungstest,
 				'stufe' => $stufe,
-				'users' => $users
+				'users' => $users,
+				'gruppen' => $gruppen->retval,
+				'stufen' => $stufen->retval
 			);
 			
 			$this->load->view('system/users', $viewData);
@@ -67,11 +104,12 @@ class Users extends VileSci_Controller
         
         if (isSuccess($result))
         {
-			echo "Tutto ok!";
+			$href = str_replace("/system/Users/linkToStufe", "/system/Users", $_SERVER["REQUEST_URI"]);
+			echo "<div>Data correctly saved - <a href=\"" . $href . "\">Back</a></div>";
         }
         else
         {
-			echo "Kaputt!";
+			echo "<div>Error occurred while saving data, please contact the administrator.</div>";
         }
 	}
 	
@@ -87,11 +125,12 @@ class Users extends VileSci_Controller
         
         if (isSuccess($result))
         {
-			echo "Tutto ok!";
+			$href = str_replace("/system/Users/linkToAufnahmegruppe", "/system/Users", $_SERVER["REQUEST_URI"]);
+			echo "<div>Data correctly saved - <a href=\"" . $href . "\">Back</a></div>";
         }
         else
         {
-			echo "Kaputt!";
+			echo "<div>Error occurred while saving data, please contact the administrator.</div>";
         }
 	}
 	
@@ -112,7 +151,9 @@ class Users extends VileSci_Controller
 			sg.bezeichnung,
 			sg.orgform_kurzbz,
 			sgt.bezeichnung AS typ,
+			s.bezeichnung AS studienplan,
 			ps.rt_stufe,
+			aufnahmegruppe_kurzbz,
 			rtp.punkte'
 		);
 		

application/core/DB_Model.php

@@ -653,6 +653,7 @@ class DB_Model extends FHC_Model
 		{
 			if (($isEntitled = $this->isEntitled($this->dbTable, $permission, FHC_NORIGHT, FHC_MODEL_ERROR)) !== true)
 			{
+				// TODO: resetQuery
 				return $isEntitled;
 			}
 		}

application/views/system/messageWrite.php

@@ -5,81 +5,124 @@
 			$href = str_replace("/system/Messages/write", "/system/Messages/send", $_SERVER["REQUEST_URI"]);
 		?>
 		<form id="sendForm" method="post" action="<?php echo $href; ?>">
-			
-			<div class="row">
-				<div class="span4">
-					To:
-					<?php
-						for($i = 0; $i < count($receivers); $i++)
-						{
-							$receiver = $receivers[$i];
-							// Every 10 recipients a new line
-							if ($i > 1 && $i % 10 == 0)
-							{
-								echo '<br>';
-							}
-							echo $receiver->Vorname . " " . $receiver->Nachname . "; ";
-						}
-					?>
-					<br>
-					Subject: <input id="subject" type="text" value="" name="subject" size="70"><br/>
-					<textarea id="bodyTextArea" name="body"></textarea>
-				<?php
-					if (isset($variables))
-					{
-				?>
-						Variables:<br>
-						<select id="variables" size="12" style="min-width:200px;">
+			<table>
+				<tr>
+					<td>
+						<strong>To:</strong>
+					</td>
+					<td>
 						<?php
-							foreach($variables as $key => $val)
+							for ($i = 0; $i < count($receivers); $i++)
+							{
+								$receiver = $receivers[$i];
+								// Every 10 recipients a new line
+								if ($i > 1 && $i % 10 == 0)
+								{
+									echo '<br>';
+								}
+								echo $receiver->Vorname . " " . $receiver->Nachname . "; ";
+							}
+						?>
+					</td>
+				</tr>
+				<tr>
+					<td height="3px"></td>
+				</tr>
+				<tr>
+					<td>
+						<strong>Subject:</strong>&nbsp;
+					</td>
+					<td>
+						<input id="subject" type="text" value="" name="subject" size="70">
+					</td>
+				</tr>
+			</table>
+			<table width="100%">
+				<tr>
+					<td width="80%">
+						<strong>Message:</strong><br>
+						<textarea id="bodyTextArea" name="body"></textarea>
+					</td>
+					<td width="3%">&nbsp;</td>
+					<td width="17%">
+						<?php
+							if (isset($variables))
 							{
 						?>
-								<option value="<?php echo $key; ?>"><?php echo $val; ?></option>
+							<div>
+								<strong>Variables:</strong><br>
+								<select id="variables" size="14" style="min-width:200px;">
+								<?php
+									foreach($variables as $key => $val)
+									{
+								?>
+										<option value="<?php echo $key; ?>"><?php echo $val; ?></option>
+								<?php
+									}
+								?>
+								</select>
+							</div>
 						<?php
 							}
 						?>
-						</select>
-				<?php
-					}
-				?>
-				
-				</div>
-			</div>
+					</td>
+				</tr>
+			</table>
 			
-			<div class="row">
-				<div class="span4">
-					<button id="sendButton" type="button">Send</button>
-					&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-					<?php echo $this->templatelib->widget("Vorlage_widget", array("title" => "Vorlage")); ?>
-				</div>
-			</div>
+			<table>
+				<tr>
+					<td>
+						<?php echo $this->templatelib->widget("Vorlage_widget", array("title" => "Vorlage")); ?>
+					</td>
+					<td>
+						&nbsp;
+					</td>
+					<td>
+						<button id="sendButton" type="button">Send</button>
+					</td>
+				</tr>
+			</table>
+			
+			<br>
 			
 			<?php
 				if (isset($receivers) && count($receivers) > 0)
 				{
 			?>
-				<div class="row">
-					<div class="span4">
-						Recipients:<br>
-						<select id="recipients">
-							<option value="-1">Select...</option>
-						<?php
-							foreach($receivers as $receiver)
-							{
-						?>
-							<option value="<?php echo $receiver->prestudent_id; ?>"><?php echo $receiver->Nachname . " " . $receiver->Vorname; ?></option>
-						<?php
-							}
-						?>	
-						</select>
-						<a href="#" id="refresh">Refresh</a>
-					</div>
+				<div>
+					Preview:
 				</div>
-				
-				<div class="row">
-					<div class="span4">
-						<textarea id="tinymcePreview"></textarea>
-					</div>
+				<div style="border: 1px; border-style: solid;">
+					<table width="100%" style="margin: 3px;">
+						<tr>
+							<td>
+								<strong>Recipient:</strong>
+								<select id="recipients">
+									<option value="-1">Select...</option>
+								<?php
+									foreach($receivers as $receiver)
+									{
+								?>
+									<option value="<?php echo $receiver->prestudent_id; ?>"><?php echo $receiver->Nachname . " " . $receiver->Vorname; ?></option>
+								<?php
+									}
+								?>	
+								</select>
+								&nbsp;
+								<strong><a href="#" id="refresh">Refresh</a></strong>
+							</td>
+						</tr>
+						<tr>
+							<td>
+								&nbsp;
+							</td>
+						</tr>
+						<tr>
+							<td width="100%">
+								<textarea id="tinymcePreview"></textarea>
+							</td>
+						</tr>
+					</table>
 				</div>
 			<?php
 				}
@@ -192,6 +235,7 @@
 				data: {"vorlage_kurzbz": vorlage_kurzbz},
 				success: function(data, textStatus, jqXHR) {
 					tinyMCE.get("bodyTextArea").setContent(data.retval[0].text);
+					$("#subject").val(data.retval[0].subject);
 				},
 				error: function(jqXHR, textStatus, errorThrown) {
 					alert(textStatus + " - " + errorThrown);

application/views/system/users.php

@@ -1,4 +1,4 @@
-<?php $this->load->view("templates/header", array("title" => "MessageReply", "jquery" => true, "tinymce" => true)); ?>
+<?php $this->load->view("templates/header", array("title" => "Users manager", "jquery" => true, "tablesort" => true, "jquery_checkboxes" => true, "jquery_custom" => true)); ?>
 
 	<body>
 		<div>
@@ -17,15 +17,70 @@
 				?>
 			</form>
 		</div>
-
+		
+		<br>
+		
 		<form id="linkUsersForm" action="" method="post">
-			<div>
-				Stufe: <input type="text" name="stufe" value=""> <button type="button" id="linkToStufe">To step</button>
-			</div>
-			<div>
-				Gruppe: <input type="text" name="aufnahmegruppe" value=""> <button type="button" id="linkToGruppe">To group</button>
-			</div>
-
+			<?php
+				if ($users != null)
+				{
+			?>
+				<table>
+					<tr>
+						<td colspan="2">
+							<strong>Assign to:</strong>
+						</td>
+					</tr>
+					<tr>
+						<td height="3px" colspan="2"></td>
+					</tr>
+					<tr>
+						<td>
+							<select name="stufe">
+								<?php foreach($stufen as $v): ?>
+									<?php
+										$selected = '';
+										if ($v->stufe == $selectedStufe)
+										{
+											$selected = 'selected';
+										}
+									?>
+									<option value="<?php echo $v->stufe; ?>" <?php echo $selected; ?>>
+										<?php echo $v->beschreibung; ?>
+									</option>
+								<?php endforeach; ?>
+							</select>
+						</td>
+						<td>&nbsp;</td>
+						<td>
+							<input type="button" id="linkToStufe" value="Assign this stufe">
+						</td>
+					</tr>
+					<tr>
+						<td>
+							<select name="aufnahmegruppe">
+								<?php foreach($gruppen as $v): ?>
+									<?php
+										$selected = '';
+										if ($v->gruppe_kurzbz == $selectedGruppe)
+										{
+											$selected = 'selected';
+										}
+									?>
+									<option value="<?php echo $v->gruppe_kurzbz; ?>" <?php echo $selected; ?>>
+										<?php echo $v->beschreibung; ?>
+									</option>
+								<?php endforeach; ?>
+							</select>
+						<td>&nbsp;</td>
+						<td>
+							<input type="button" id="linkToGruppe" value="Assign to this group">
+						</td>
+					</tr>
+				</table>
+			<?php
+				}
+			?>
 			<br>
 			<br>
 
@@ -33,20 +88,100 @@
 				<?php
 					if ($users != null)
 					{
+				?>
+						<table id="t0" class="tablesorter">
+							<thead>
+								<tr>
+									<th>&nbsp;</th>
+									<th class="clm_prestudent_id header">Prestudent ID</th>
+									<th class="clm_person_id header">Person ID</th>
+									<th class="header headerSortDown">Vorname</th>
+									<th>Nachname</th>
+									<th>Geschlecht</th>
+									<th>Studiengang</th>
+									<th>OrgForm</th>
+									<th>Studienplan</th>
+									<th>Geburtsdatum</th>
+									<th>Email</th>
+									<th>Stufe</th>
+									<th>Gruppe</th>
+									<th>Punkte</th>
+								</tr>
+							</thead>
+							<tbody>
+				<?php
 						for ($i = 0; $i < count($users); $i++)
 						{
 							$user = $users[$i];
-
-							echo '<input type="checkbox" name="prestudent_id[]" value="' . $user->prestudent_id . '"> - ';
-							echo $user->prestudent_id . ' - ';
-							echo $user->vorname . ' - ';
+							
+							echo "<tr>";
+							
+							echo "<td>";
+							echo '<input type="checkbox" name="prestudent_id[]" value="' . $user->prestudent_id . '">';
+							echo "</td>";
+							
+							echo "<td>";
+							echo $user->prestudent_id;
+							echo "</td>";
+							
+							echo "<td>";
+							echo $user->person_id;
+							echo "</td>";
+							
+							echo "<td>";
+							echo $user->vorname;
+							echo "</td>";
+							
+							echo "<td>";
 							echo $user->nachname;
-							echo '<br>';
+							echo "</td>";
+							
+							echo "<td>";
+							echo $user->geschlecht;
+							echo "</td>";
+							
+							echo "<td>";
+							echo $user->kurzbzlang;
+							echo "</td>";
+							
+							echo "<td>";
+							echo $user->orgform_kurzbz;
+							echo "</td>";
+							
+							echo "<td>";
+							echo $user->studienplan;
+							echo "</td>";
+							
+							echo "<td>";
+							echo $user->gebdatum;
+							echo "</td>";
+							
+							echo "<td>";
+							echo $user->email;
+							echo "</td>";
+							
+							echo "<td>";
+							echo $user->rt_stufe;
+							echo "</td>";
+							
+							echo "<td>";
+							echo $user->aufnahmegruppe_kurzbz;
+							echo "</td>";
+							
+							echo "<td>";
+							echo $user->punkte;
+							echo "</td>";
+							
+							echo "</tr>";
 						}
+				?>
+							</tbody>
+						</table>
+				<?php
 					}
 					else
 					{
-						echo 'No data found!!!';
+						echo 'No users found.';
 					}
 				?>
 			</div>
@@ -81,6 +216,43 @@
 					}
 				});
 			}
+			
+			$(".tablesorter").each(function(i, v) {
+				$("#"+v.id).tablesorter(
+				{
+					widgets: ["zebra"],
+					sortList: [[3,0],[4,0]],
+					headers: {0: { sorter: false}}
+				});
+
+				$("#toggle_"+v.id).on('click', function(e) {
+					$("#"+v.id).checkboxes('toggle');
+					e.preventDefault();
+					if ($("input.chkbox:checked").size() > 0)
+						$("#mailSendButton").html('Mail an markierte Personen senden');
+					else
+						$("#mailSendButton").html('Mail an alle senden');
+				});
+
+				$("#uncheck_"+v.id).on('click', function(e) {
+					$("#"+v.id).checkboxes('uncheck');
+					e.preventDefault();
+					if ($("input.chkbox:checked").size() > 0)
+						$("#mailSendButton").html('Mail an markierte Personen senden');
+					else
+						$("#mailSendButton").html('Mail an alle senden');
+				});
+
+				$("#"+v.id).checkboxes('range', true);
+			});
+
+			$('.chkbox').change(function()
+			{
+				if ($("input.chkbox:checked").size() > 0)
+					$("#mailSendButton").html('Mail an markierte Personen senden');
+				else
+					$("#mailSendButton").html('Mail an alle senden');
+			});
 		});
 
 		function studiengangSelected(value)

application/views/templates/header.php

@@ -1,8 +1,10 @@
 <?php
-if (! defined('BASEPATH'))
-	exit('No direct script access allowed');
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
 isset($title) ? $title = 'VileSci - '.$title : $title = 'VileSci';
 !isset($jquery) ? $jquery = false : $jquery = $jquery;
+!isset($jquery_checkboxes) ? $jquery_checkboxes = false : $jquery_checkboxes = $jquery_checkboxes;
+!isset($jquery_custom) ? $jquery_custom = false : $jquery_custom = $jquery_custom;
 !isset($tablesort) ? $tablesort = false : $tablesort = $tablesort;
 !isset($sortList) ? $sortList = '0,0' : $sortList = $sortList;
 !isset($widgets) ? $widgets = 'zebra' : $widgets = $widgets;
@@ -12,7 +14,7 @@ isset($title) ? $title = 'VileSci - '.$title : $title = 'VileSci';
 !isset($jsonforms) ? $jsonforms = false : $jsonforms = $jsonforms;
 !isset($textile) ? $textile = false : $textile = $textile;
 
-if ($tablesort)
+if ($tablesort || $jquery_checkboxes || $jquery_custom)
 	$jquery = true;
 ?>
 <!DOCTYPE HTML>
@@ -25,9 +27,19 @@ if ($tablesort)
 <?php if($tablesort) : ?>
 	<link rel="stylesheet"    type="text/css"     href="<?php echo base_url('skin/tablesort.css'); ?>" />
 <?php endif ?>
+
 <?php if($jquery) : ?>
 	<script type="text/javascript" src="<?php echo base_url('include/js/jquery1.9.min.js'); ?>"></script>
 <?php endif ?>
+
+<?php if($jquery_checkboxes) : ?>
+	<script type="text/javascript" src="<?php echo base_url('include/js/jquery.checkboxes-1.0.7.min.js'); ?>"></script>
+<?php endif ?>
+
+<?php if($jquery_custom) : ?>
+	<link rel="stylesheet"    type="text/css"     href="<?php echo base_url('skin/jquery-ui-1.9.2.custom.min.css'); ?>" />
+<?php endif ?>
+
 <?php if($tablesort && !empty($tableid)) : ?>
 	<script language="Javascript" type="text/javascript">
 		$(document).ready(function()

application/views/widgets/usersfilters.php

@@ -10,94 +10,98 @@
 <?php
 	}
 ?>
-<div>
-	<div>
-		<select id="studiengang" name="studiengang">
-			<?php foreach($studiengaenge as $v): ?>
-				<?php
-					$selected = '';
-					if ($v->studiengang_kz == $selectedStudiengang)
-					{
-						$selected = 'selected';
-					}
-				?>
-				<option value="<?php echo $v->studiengang_kz; ?>" <?php echo $selected; ?> onClick="studiengangSelected(this.value)">
+<table>
+	<tr>
+		<td>
+			<select id="studiengang" name="studiengang">
+				<?php foreach($studiengaenge as $v): ?>
 					<?php
-						if ($v->studiengang_kz == '-1')
-						{	
-							echo $v->kurzbzlang;
-						}
-						else
+						$selected = '';
+						if ($v->studiengang_kz == $selectedStudiengang)
 						{
-							echo $v->kurzbzlang . ' (' . $v->bezeichnung . ')';
+							$selected = 'selected';
 						}
 					?>
-				</option>
-			<?php endforeach; ?>
-		</select>
-		AND
-		<select id="studiensemester" name="studiensemester">
-			<?php foreach($studiensemester as $v): ?>
-				<?php
-					$selected = '';
-					if ($v->studiensemester_kurzbz == $selectedStudiensemester)
-					{
-						$selected = 'selected';
-					}
-				?>
-				<option value="<?php echo $v->studiensemester_kurzbz; ?>" <?php echo $selected; ?> onClick="studiensemesterSelected(this.value)">
-					<?php echo $v->beschreibung; ?>
-				</option>
-			<?php endforeach; ?>
-		</select>
-		->
-		<select id="reihungstest" name="reihungstest">
-			<?php foreach($reihungstest as $v): ?>
-				<?php
-					$selected = '';
-					if ($v->reihungstest_id == $selectedReihungstest)
-					{
-						$selected = 'selected';
-					}
-				?>
-				<option value="<?php echo $v->reihungstest_id; ?>" <?php echo $selected; ?> onClick="reihungstestSelected(this.value)">
-					<?php echo $v->beschreibung; ?>
-				</option>
-			<?php endforeach; ?>
-		</select>
-	</div>
-	<div>
-		AND
-	</div>
-	<div>
-		<select id="gruppe" name="gruppe">
-			<?php foreach($gruppen as $v): ?>
-				<?php
-					$selected = '';
-					if ($v->gruppe_kurzbz == $selectedGruppe)
-					{
-						$selected = 'selected';
-					}
-				?>
-				<option value="<?php echo $v->gruppe_kurzbz; ?>" <?php echo $selected; ?> onClick="gruppeSelected(this.value)">
-					<?php echo $v->beschreibung; ?>
-				</option>
-			<?php endforeach; ?>
-		</select>
-		AND
-		<select id="stufe" name="stufe">
-			<?php foreach($stufen as $v): ?>
-				<?php
-					$selected = '';
-					if ($v->stufe == $selectedStufe)
-					{
-						$selected = 'selected';
-					}
-				?>
-				<option value="<?php echo $v->stufe; ?>" <?php echo $selected; ?> onClick="stufeSelected(this.value)">
-					<?php echo $v->beschreibung; ?>
-				</option>
-			<?php endforeach; ?>
-		</select>
-	</div>
-</div>
+					<option value="<?php echo $v->studiengang_kz; ?>" <?php echo $selected; ?> onClick="studiengangSelected(this.value)">
+						<?php
+							if ($v->studiengang_kz == '-1')
+							{	
+								echo $v->kurzbzlang;
+							}
+							else
+							{
+								echo $v->kurzbzlang . ' (' . $v->bezeichnung . ')';
+							}
+						?>
+					</option>
+				<?php endforeach; ?>
+			</select>
+		</td>
+		<td>
+			<select id="studiensemester" name="studiensemester">
+				<?php foreach($studiensemester as $v): ?>
+					<?php
+						$selected = '';
+						if ($v->studiensemester_kurzbz == $selectedStudiensemester)
+						{
+							$selected = 'selected';
+						}
+					?>
+					<option value="<?php echo $v->studiensemester_kurzbz; ?>" <?php echo $selected; ?> onClick="studiensemesterSelected(this.value)">
+						<?php echo $v->beschreibung; ?>
+					</option>
+				<?php endforeach; ?>
+			</select>
+		</td>
+		<td>
+			<select id="reihungstest" name="reihungstest">
+				<?php foreach($reihungstest as $v): ?>
+					<?php
+						$selected = '';
+						if ($v->reihungstest_id == $selectedReihungstest)
+						{
+							$selected = 'selected';
+						}
+					?>
+					<option value="<?php echo $v->reihungstest_id; ?>" <?php echo $selected; ?> onClick="reihungstestSelected(this.value)">
+						<?php echo $v->beschreibung; ?>
+					</option>
+				<?php endforeach; ?>
+			</select>
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<select id="gruppe" name="gruppe">
+				<?php foreach($gruppen as $v): ?>
+					<?php
+						$selected = '';
+						if ($v->gruppe_kurzbz == $selectedGruppe)
+						{
+							$selected = 'selected';
+						}
+					?>
+					<option value="<?php echo $v->gruppe_kurzbz; ?>" <?php echo $selected; ?> onClick="gruppeSelected(this.value)">
+						<?php echo $v->beschreibung; ?>
+					</option>
+				<?php endforeach; ?>
+			</select>
+		</td>
+		<td colspan="2">
+			<select id="stufe" name="stufe">
+				<?php foreach($stufen as $v): ?>
+					<?php
+						$selected = '';
+						if ($v->stufe == $selectedStufe)
+						{
+							$selected = 'selected';
+						}
+					?>
+					<option value="<?php echo $v->stufe; ?>" <?php echo $selected; ?> onClick="stufeSelected(this.value)">
+						<?php echo $v->beschreibung; ?>
+					</option>
+				<?php endforeach; ?>
+			</select>
+		</td>
+	</tr>
+</table>

content/student/studentabschlusspruefungoverlay.xul.php

@@ -60,7 +60,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 				datasources="rdf:null" ref="http://www.technikum-wien.at/abschlusspruefung/liste"
 				flags="dont-build-content"
 				enableColumnDrag="true"
-				style="margin:0px;"
+				style="margin:0px;min-height:100px;"
 				persist="hidden, height"
 				context="student-abschlusspruefung-tree-popup"
 		>

include/tw/cis_menu_lv.inc.php

@@ -457,14 +457,28 @@ function checkZeilenUmbruch()
 	//Gesamtnote
 	if($is_lector && ((!defined('CIS_LEHRVERANSTALTUNG_GESAMTNOTE_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_GESAMTNOTE_ANZEIGEN) && $angemeldet))
 	{
-		$menu[]=array
-		(
-			'id'=>'core_menu_gesamtnote',
-			'position'=>'80',
-			'name'=>$p->t('lehre/gesamtnote'),
-			'icon'=>'../../../skin/images/button_endnote.png',
-			'link'=>'benotungstool/lvgesamtnoteverwalten.php?lvid='.urlencode($lvid).'&stsem='.urlencode($angezeigtes_stsem)
-		);
+		if($lv_obj->benotung)
+		{
+			$menu[]=array
+			(
+				'id'=>'core_menu_gesamtnote',
+				'position'=>'80',
+				'name'=>$p->t('lehre/gesamtnote'),
+				'icon'=>'../../../skin/images/button_endnote.png',
+				'link'=>'benotungstool/lvgesamtnoteverwalten.php?lvid='.urlencode($lvid).'&stsem='.urlencode($angezeigtes_stsem)
+			);
+		}
+		else
+		{
+			$menu[]=array
+			(
+				'id'=>'core_menu_gesamtnote',
+				'position'=>'80',
+				'name'=>$p->t('lehre/gesamtnote'),
+				'icon'=>'../../../skin/images/button_endnote.png',
+				'text'=>$p->t('lehre/noteneingabedeaktiviert')
+			);
+		}
 	}
 
 	// Studentenupload

locale/de-AT/lehre.php

@@ -44,4 +44,5 @@ $this->phrasen['lehre/nichtzugeteilt']='Sie sind nicht zu dieser Lehrveranstaltu
 
 $this->phrasen['lehre/studienordnung']='Studienordnung';
 $this->phrasen['lehre/studienplan']='Studienplan';
+$this->phrasen['lehre/noteneingabedeaktiviert']='Noteneingabe deaktiviert';
 ?>

locale/en-US/lehre.php

@@ -44,5 +44,5 @@ $this->phrasen['lehre/nichtzugeteilt']='Sie sind nicht zu dieser Lehrveranstaltu
 
 $this->phrasen['lehre/studienordnung']='Studienordnung';
 $this->phrasen['lehre/studienplan']='Studienplan';
-
+$this->phrasen['lehre/noteneingabedeaktiviert']='Grading disabled';
 ?>