diff --git a/admin/fas/check_fas_diplomarbeit.php b/admin/fas/check_fas_diplomarbeit.php
index c371e02af..ddfefe317 100644
--- a/admin/fas/check_fas_diplomarbeit.php
+++ b/admin/fas/check_fas_diplomarbeit.php
@@ -34,24 +34,14 @@ $nachname[]="";
 <link href="../../skin/vilesci.css" rel="stylesheet" type="text/css">
 </head>
 <body>
-<style>
-TR.liste
-{
-	background-color: #D3DCE3;
-}
-TR.liste0
-{
-	background-color: #EEEEEE;
-}
-TR.liste1
-{
-	background-color: #DDDDDD;
-}
-</style>
 <?php
 
 if(isset($_POST['da']))
 {
+	if(isset($_POST['erst']) AND trim($_POST['erst'])!='')
+	{
+		$qry1= "UPDATE diplomarbeit SET vilesci_erstbegutachter='".$_POST['erst']."' WHERE diplomarbeit_pk='".$_POST['da']."';";
+	}
 	if(isset($_POST['top1']) AND trim($_POST['top1'])!='')
 	{
 		$qry1= "UPDATE diplomarbeit SET vilesci_zweitbegutachter='".$_POST['top1']."' WHERE diplomarbeit_pk='".$_POST['da']."';";
@@ -83,14 +73,20 @@ if(isset($_POST['da']))
 	}
 }
 
-ob_flush();
-flush();
+//ob_flush();
+//flush();
 
-$qryvilesci="SELECT titelpre, nachname, vorname, titelpost, person_id FROM public.tbl_person WHERE 
-	(person_id IN (SELECT person_id FROM public.tbl_benutzer, public.tbl_mitarbeiter WHERE public.tbl_benutzer.uid=public.tbl_mitarbeiter.mitarbeiter_uid) 
+/*$qryvilesci="SELECT titelpre, nachname, vorname, titelpost, person_id FROM public.tbl_person WHERE
+	(person_id IN (SELECT person_id FROM public.tbl_benutzer, public.tbl_mitarbeiter WHERE public.tbl_benutzer.uid=public.tbl_mitarbeiter.mitarbeiter_uid)
 	OR trim(updatevon)='Administrator')
-	AND trim(nachname)!='Account' AND trim(nachname)!='Lektor' AND trim(vorname)!='Lektor' 
-	ORDER BY nachname;";
+	AND trim(nachname)!='Account' AND trim(nachname)!='Lektor' AND trim(vorname)!='Lektor'
+	ORDER BY nachname;";*/
+$qryvilesci="SELECT titelpre, nachname, vorname, titelpost, person_id
+				FROM public.tbl_person WHERE trim(updatevon)='Administrator'";
+$qryvilesci.=" UNION SELECT titelpre, nachname, vorname, titelpost, person_id
+				FROM public.tbl_person JOIN tbl_benutzer USING (person_id) JOIN tbl_mitarbeiter ON (uid=mitarbeiter_uid)";
+if (isset($_GET['all']))
+	$qryvilesci.=" ORDER BY nachname;";
 if($resultvilesci = pg_query($conn, $qryvilesci))
 {
 	while($rowvilesci = pg_fetch_object($resultvilesci))
@@ -102,34 +98,84 @@ if($resultvilesci = pg_query($conn, $qryvilesci))
 	}
 }
 
+$qry="SELECT count(*) AS anz FROM diplomarbeit WHERE
+	((vilesci_erstbegutachter IS NULL AND trim(erstbegutachter)!='') OR
+	(vilesci_zweitbegutachter IS NULL AND trim(zweitbegutachter)!='') OR
+	(vilesci_betreuer IS NULL AND trim(betreuer)!='') OR
+	(vilesci_firmenbetreuer IS NULL AND trim(firmenbetreuer)!='') OR
+	(vilesci_pruefer IS NULL AND trim(pruefer)!='') OR
+	(vilesci_vorsitzender IS  NULL AND trim(vorsitzender)!='') OR
+	(vilesci_pruefer1 IS NULL AND trim(pruefer1)!=''));";
+if($result = pg_query($conn_fas, $qry))
+{
+	$row=pg_fetch_object($result);
+	echo '<BR>Verbleibend: '.$row->anz.' Diplomarbeiten<BR>';
+}
+
 echo "<table class='liste'><tr><th></th><th>FAS</th><th>Vilesci</th><th></th></tr>";
 
-$qry="SELECT * FROM diplomarbeit WHERE 
-	((vilesci_zweitbegutachter IS NULL AND trim(zweitbegutachter)!='') OR
+
+$qry="SELECT *, trim(substring(trim(erstbegutachter) from ' [A-ü]*$')) as erst, trim(substring(trim(zweitbegutachter) from ' [A-ü]*$')) as zweit, trim(substring(trim(betreuer) from ' [A-ü]*$')) as dritt,
+		trim(substring(trim(firmenbetreuer) from ' [A-ü]*$')) as viert, trim(substring(trim(pruefer) from ' [A-ü]*$')) as fuenft,
+		trim(substring(trim(vorsitzender) from ' [A-ü]*$')) as sechst, trim(substring(trim(pruefer1) from ' [A-ü]*$')) as siebent
+	FROM diplomarbeit WHERE
+	((vilesci_erstbegutachter IS NULL AND trim(erstbegutachter)!='') OR
+	(vilesci_zweitbegutachter IS NULL AND trim(zweitbegutachter)!='') OR
 	(vilesci_betreuer IS NULL AND trim(betreuer)!='') OR
 	(vilesci_firmenbetreuer IS NULL AND trim(firmenbetreuer)!='') OR
 	(vilesci_pruefer IS NULL AND trim(pruefer)!='') OR
 	(vilesci_vorsitzender IS  NULL AND trim(vorsitzender)!='') OR
 	(vilesci_pruefer1 IS NULL AND trim(pruefer1)!=''))
-	ORDER BY diplomarbeit_pk 
-	LIMIT 10;";
-
+	ORDER BY diplomarbeit_pk
+	LIMIT 5;";
+//ORDER BY diplomarbeit_pk
 if($result = pg_query($conn_fas, $qry))
 {
 	while($row = pg_fetch_object($result))
 	{
-		$qryselect="SELECT trim(substring(trim(zweitbegutachter) from ' [A-ü]*$')) as zweit, trim(substring(trim(betreuer) from ' [A-ü]*$')) as dritt,
+		/*$qryselect="SELECT trim(substring(trim(zweitbegutachter) from ' [A-ü]*$')) as zweit, trim(substring(trim(betreuer) from ' [A-ü]*$')) as dritt,
 		trim(substring(trim(firmenbetreuer) from ' [A-ü]*$')) as viert, trim(substring(trim(pruefer) from ' [A-ü]*$')) as fuenft,
-		trim(substring(trim(vorsitzender) from ' [A-ü]*$')) as sechst, trim(substring(trim(pruefer1) from ' [A-ü]*$')) as siebent  
+		trim(substring(trim(vorsitzender) from ' [A-ü]*$')) as sechst, trim(substring(trim(pruefer1) from ' [A-ü]*$')) as siebent
 		FROM diplomarbeit WHERE diplomarbeit_pk='".$row->diplomarbeit_pk."';";
 		$resultselect = pg_query($conn_fas, $qryselect);
-		$rowselect = pg_fetch_object($resultselect);
-		
+		$rowselect = pg_fetch_object($resultselect);*/
+
 		$k++;
+		if($row->vilesci_erstbegutachter=='' AND $row->erstbegutachter!='')
+		{
+			echo "<tr class='liste".($k%2)."'>";
+			echo "<form  method='POST'>";
+			echo "<td><input type='submit' value='Speichern'></td>";
+			echo "<td>'".$row->erstbegutachter."'";
+			echo "<input type='hidden' name='da' value='".$row->diplomarbeit_pk."'>";
+			echo "</td>";
+			echo "<td><select name=\"erst\">";
+			echo"<option value=\"\"></option>";
+			for($j=0;$j<$i;$j++)
+			{
+				if($nachname[$j]==$row->erst)
+				{
+					echo"<option value=\"".$valuebox[$j]."\" selected=\"selected\">".$combobox[$j]."</option>";
+				}
+				else if(soundex($nachname[$j])==soundex($row->erst))
+				{
+					echo"<option value=\"".$valuebox[$j]."\">".$combobox[$j]."</option>";
+				}
+				else if($_GET['all']==true)
+				{
+					echo"<option value=\"".$valuebox[$j]."\">".$combobox[$j]."</option>";
+				}
+			}
+			echo"</select>";
+			echo "</td>";
+			echo "<td><input type='submit' value='Speichern'></td>";
+			echo "</form>";
+			echo "</tr>";
+		}
 		if($row->vilesci_zweitbegutachter=='' AND $row->zweitbegutachter!='')
 		{
 			echo "<tr class='liste".($k%2)."'>";
-			echo "<form action='$PHP_SELF'  method='POST'>";
+			echo "<form  method='POST'>";
 			echo "<td><input type='submit' value='Speichern'></td>";
 			echo "<td>'".$row->zweitbegutachter."'";
 			echo "<input type='hidden' name='da' value='".$row->diplomarbeit_pk."'>";
@@ -138,11 +184,15 @@ if($result = pg_query($conn_fas, $qry))
 			echo"<option value=\"\"></option>";
 			for($j=0;$j<$i;$j++)
 			{
-				if($nachname[$j]==$rowselect->zweit)
+				if($nachname[$j]==$row->zweit)
 				{
 					echo"<option value=\"".$valuebox[$j]."\" selected=\"selected\">".$combobox[$j]."</option>";
 				}
-				else 
+				else if(soundex($nachname[$j])==soundex($row->zweit))
+				{
+					echo"<option value=\"".$valuebox[$j]."\">".$combobox[$j]."</option>";
+				}
+				else if($_GET['all']==true)
 				{
 					echo"<option value=\"".$valuebox[$j]."\">".$combobox[$j]."</option>";
 				}
@@ -156,7 +206,7 @@ if($result = pg_query($conn_fas, $qry))
 		if(($row->vilesci_betreuer=='' OR $row->vilesci_betreuer==NULL) AND trim($row->betreuer)!='')
 		{
 			echo "<tr class='liste".($k%2)."'>";
-			echo "<form action='$PHP_SELF'  method='POST'>";
+			echo "<form  method='POST'>";
 			echo "<td><input type='submit' value='Speichern'></td>";
 			echo "<td>'".$row->betreuer."'";
 			echo "<input type='hidden' name='da' value='".$row->diplomarbeit_pk."'>";
@@ -165,15 +215,19 @@ if($result = pg_query($conn_fas, $qry))
 			echo"<option value=\"\"></option>";
 			for($j=0;$j<$i;$j++)
 			{
-				if($nachname[$j]==$rowselect->dritt)
+				if($nachname[$j]==$row->dritt)
 				{
 					echo"<option value=\"".$valuebox[$j]."\" selected=\"selected\">".$combobox[$j]."</option>";
 				}
-				else 
+				else  if(soundex($nachname[$j])==soundex($row->dritt))
 				{
 					echo"<option value=\"".$valuebox[$j]."\">".$combobox[$j]."</option>";
 				}
-			}	
+				else if($_GET['all']==true)
+				{
+					echo"<option value=\"".$valuebox[$j]."\">".$combobox[$j]."</option>";
+				}
+			}
 			echo"</select>";
 			echo "</td>";
 			echo "<td><input type='submit' value='Speichern'></td>";
@@ -183,7 +237,7 @@ if($result = pg_query($conn_fas, $qry))
 		if(($row->vilesci_firmenbetreuer=='' OR $row->vilesci_firmenbetreuer==NULL) AND trim($row->firmenbetreuer)!='')
 		{
 			echo "<tr class='liste".($k%2)."'>";
-			echo "<form action='$PHP_SELF'  method='POST'>";
+			echo "<form  method='POST'>";
 			echo "<td><input type='submit' value='Speichern'></td>";
 			echo "<td>'".$row->firmenbetreuer."'";
 			echo "<input type='hidden' name='da' value='".$row->diplomarbeit_pk."'>";
@@ -192,15 +246,19 @@ if($result = pg_query($conn_fas, $qry))
 			echo"<option value=\"\"></option>";
 			for($j=0;$j<$i;$j++)
 			{
-				if($nachname[$j]==$rowselect->viert)
+				if($nachname[$j]==$row->viert)
 				{
 					echo"<option value=\"".$valuebox[$j]."\" selected=\"selected\">".$combobox[$j]."</option>";
 				}
-				else 
+				else  if(soundex($nachname[$j])==soundex($row->viert))
 				{
 					echo"<option value=\"".$valuebox[$j]."\">".$combobox[$j]."</option>";
 				}
-			}	
+				else if($_GET['all']==true)
+				{
+					echo"<option value=\"".$valuebox[$j]."\">".$combobox[$j]."</option>";
+				}
+			}
 			echo"</select>";
 			echo "</td>";
 			echo "<td><input type='submit' value='Speichern'></td>";
@@ -210,7 +268,7 @@ if($result = pg_query($conn_fas, $qry))
 		if(($row->vilesci_pruefer=='' OR $row->vilesci_pruefer==NULL) AND trim($row->pruefer)!='')
 		{
 			echo "<tr class='liste".($k%2)."'>";
-			echo "<form action='$PHP_SELF'  method='POST'>";
+			echo "<form method='POST'>";
 			echo "<td><input type='submit' value='Speichern'></td>";
 			echo "<td>'".$row->pruefer."'";
 			echo "<input type='hidden' name='da' value='".$row->diplomarbeit_pk."'>";
@@ -219,15 +277,19 @@ if($result = pg_query($conn_fas, $qry))
 			echo"<option value=\"\"></option>";
 			for($j=0;$j<$i;$j++)
 			{
-				if($nachname[$j]==$rowselect->fuenft)
+				if($nachname[$j]==$row->fuenft)
 				{
 					echo"<option value=\"".$valuebox[$j]."\" selected=\"selected\">".$combobox[$j]."</option>";
 				}
-				else 
+				else  if(soundex($nachname[$j])==soundex($row->fuenft))
 				{
 					echo"<option value=\"".$valuebox[$j]."\">".$combobox[$j]."</option>";
 				}
-			}	
+				else if($_GET['all']==true)
+				{
+					echo"<option value=\"".$valuebox[$j]."\">".$combobox[$j]."</option>";
+				}
+			}
 			echo"</select>";
 			echo "</td>";
 			echo "<td><input type='submit' value='Speichern'></td>";
@@ -237,7 +299,7 @@ if($result = pg_query($conn_fas, $qry))
 		if(($row->vilesci_vorsitzender=='' OR $row->vilesci_vorsitzender==NULL) AND trim($row->vorsitzender)!='')
 		{
 			echo "<tr class='liste".($k%2)."'>";
-			echo "<form action='$PHP_SELF'  method='POST'>";
+			echo "<form method='POST'>";
 			echo "<td><input type='submit' value='Speichern'></td>";
 			echo "<td>'".$row->vorsitzender."'";
 			echo "<input type='hidden' name='da' value='".$row->diplomarbeit_pk."'>";
@@ -246,11 +308,15 @@ if($result = pg_query($conn_fas, $qry))
 			echo"<option value=\"\"></option>";
 			for($j=0;$j<$i;$j++)
 			{
-				if($nachname[$j]==$rowselect->sechst)
+				if($nachname[$j]==$row->sechst)
 				{
 					echo"<option value=\"".$valuebox[$j]."\" selected=\"selected\">".$combobox[$j]."</option>";
 				}
-				else 
+				else if(soundex($nachname[$j])==soundex($row->sechst))
+				{
+					echo"<option value=\"".$valuebox[$j]."\">".$combobox[$j]."</option>";
+				}
+				else if($_GET['all']==true)
 				{
 					echo"<option value=\"".$valuebox[$j]."\">".$combobox[$j]."</option>";
 				}
@@ -264,7 +330,7 @@ if($result = pg_query($conn_fas, $qry))
 		if(($row->vilesci_pruefer1=='' OR $row->vilesci_pruefer1==NULL) AND trim($row->pruefer1)!='')
 		{
 			echo "<tr class='liste".($k%2)."'>";
-			echo "<form action='$PHP_SELF'  method='POST'>";
+			echo "<form method='POST'>";
 			echo "<td><input type='submit' value='Speichern'></td>";
 			echo "<td>'".$row->pruefer1."'";
 			echo "<input type='hidden' name='da' value='".$row->diplomarbeit_pk."'>";
@@ -273,20 +339,24 @@ if($result = pg_query($conn_fas, $qry))
 			echo"<option value=\"\"></option>";
 			for($j=0;$j<$i;$j++)
 			{
-				if($nachname[$j]==$rowselect->siebent)
+				if($nachname[$j]==$row->siebent)
 				{
 					echo"<option value=\"".$valuebox[$j]."\" selected=\"selected\">".$combobox[$j]."</option>";
 				}
-				else 
+				else if(soundex($nachname[$j])==soundex($row->siebent))
 				{
 					echo"<option value=\"".$valuebox[$j]."\">".$combobox[$j]."</option>";
 				}
-			}	
+				else if($_GET['all']==true)
+				{
+					echo"<option value=\"".$valuebox[$j]."\">".$combobox[$j]."</option>";
+				}
+			}
 			echo"</select>";
 			echo "</td>";
 			echo "<td><input type='submit' value='Speichern'></td>";
 			echo "</form>";
-			echo "</tr>";			
+			echo "</tr>";
 		}
 	}
 }

	FAS	Vilesci
	'".$row->erstbegutachter."'"; + echo ""; + echo "	"; + echo "
	'".$row->zweitbegutachter."'"; echo ""; @@ -138,11 +184,15 @@ if($result = pg_query($conn_fas, $qry)) echo""; for($j=0;$j<$i;$j++) { - if($nachname[$j]==$rowselect->zweit) + if($nachname[$j]==$row->zweit) { echo""; } - else + else if(soundex($nachname[$j])==soundex($row->zweit)) + { + echo""; + } + else if($_GET['all']==true) { echo""; } @@ -156,7 +206,7 @@ if($result = pg_query($conn_fas, $qry)) if(($row->vilesci_betreuer=='' OR $row->vilesci_betreuer==NULL) AND trim($row->betreuer)!='') { echo "
	'".$row->betreuer."'"; echo ""; @@ -165,15 +215,19 @@ if($result = pg_query($conn_fas, $qry)) echo""; for($j=0;$j<$i;$j++) { - if($nachname[$j]==$rowselect->dritt) + if($nachname[$j]==$row->dritt) { echo""; } - else + else if(soundex($nachname[$j])==soundex($row->dritt)) { echo""; } - } + else if($_GET['all']==true) + { + echo""; + } + } echo""; echo "
	'".$row->firmenbetreuer."'"; echo ""; @@ -192,15 +246,19 @@ if($result = pg_query($conn_fas, $qry)) echo""; for($j=0;$j<$i;$j++) { - if($nachname[$j]==$rowselect->viert) + if($nachname[$j]==$row->viert) { echo""; } - else + else if(soundex($nachname[$j])==soundex($row->viert)) { echo""; } - } + else if($_GET['all']==true) + { + echo""; + } + } echo""; echo "
	'".$row->pruefer."'"; echo ""; @@ -219,15 +277,19 @@ if($result = pg_query($conn_fas, $qry)) echo""; for($j=0;$j<$i;$j++) { - if($nachname[$j]==$rowselect->fuenft) + if($nachname[$j]==$row->fuenft) { echo""; } - else + else if(soundex($nachname[$j])==soundex($row->fuenft)) { echo""; } - } + else if($_GET['all']==true) + { + echo""; + } + } echo""; echo "
	'".$row->vorsitzender."'"; echo ""; @@ -246,11 +308,15 @@ if($result = pg_query($conn_fas, $qry)) echo""; for($j=0;$j<$i;$j++) { - if($nachname[$j]==$rowselect->sechst) + if($nachname[$j]==$row->sechst) { echo""; } - else + else if(soundex($nachname[$j])==soundex($row->sechst)) + { + echo""; + } + else if($_GET['all']==true) { echo""; } @@ -264,7 +330,7 @@ if($result = pg_query($conn_fas, $qry)) if(($row->vilesci_pruefer1=='' OR $row->vilesci_pruefer1==NULL) AND trim($row->pruefer1)!='') { echo "
	'".$row->pruefer1."'"; echo ""; @@ -273,20 +339,24 @@ if($result = pg_query($conn_fas, $qry)) echo""; for($j=0;$j<$i;$j++) { - if($nachname[$j]==$rowselect->siebent) + if($nachname[$j]==$row->siebent) { echo""; } - else + else if(soundex($nachname[$j])==soundex($row->siebent)) { echo""; } - } + else if($_GET['all']==true) + { + echo""; + } + } echo""; echo "