From 28ca2f05078f0612f3dd5c81703908d20d5d0664 Mon Sep 17 00:00:00 2001
From: Stefan Puraner <puraner@technikum-wien.at>
Date: Tue, 11 Nov 2014 08:39:49 +0000
Subject: [PATCH] =?UTF-8?q?Status=20Vorr=C3=BCckung=20eines=20einzelnen=20?=
 =?UTF-8?q?Studenten=20nur=20noch=20in=20bestehenden=20Lehrverband=20m?=
 =?UTF-8?q?=C3=B6glich?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 content/student/studentDBDML.php | 58 +++++++++++++++-----------------
 1 file changed, 28 insertions(+), 30 deletions(-)

diff --git a/content/student/studentDBDML.php b/content/student/studentDBDML.php
index 27beb7cab..fb912619e 100644
--- a/content/student/studentDBDML.php
+++ b/content/student/studentDBDML.php
@@ -1035,44 +1035,42 @@ if(!$error)
 					    $errormsg = "Rolle existiert bereits.";
 					    $return = false;
 					}
+					
+					$student = new student();
+					$temp_uid = $student->getUid($rolle->prestudent_id);
 
 					if(!$error)
 					{
-						$rolle->ausbildungssemester = $semester;
-						$rolle->studiensemester_kurzbz = $stdsem;
-						$rolle->datum = date("Y-m-d");
-						$rolle->orgform_kurzbz = $_POST['orgform_kurzbz'];
-						$rolle->studienplan_id = $_POST['studienplan_id'];
-						
-						if($rolle->save_rolle())
-						{
-							$return = true;
-						}
-						else
-						{
-							$return = false;
-							$errormsg = $rolle->errormsg;
-						}
-					}
-					$student = new student();
-					$temp_uid = $student->getUid($rolle->prestudent_id);
-					if(!$student->studentlehrverband_exists($temp_uid, $stdsem))
-					{
-					    $lehrverband = new lehrverband();
 					    $student->load_studentlehrverband($temp_uid, $_POST["studiensemester_kurzbz"]);
-					    
-					    if(!$lehrverband->exists($student->studiengang_kz, $student->semester, $student->verband, $student->gruppe))
+					    $lehrverband = new lehrverband();
+					    if(!$lehrverband->exists($student->studiengang_kz, $semester, $student->verband, $student->gruppe))
 					    {
-						$lehrverband->studiengang_kz = $student->studiengang_kz;
-						$lehrverband->semester = $student->semester;
-						$lehrverband->verband = $student->verband;
-						$lehrverband->gruppe = $student->gruppe;
-						$lehrverband->save(true);
+						$student->studiensemester_kurzbz = $stdsem;
+						$return = false;
+						$errormsg = $student->errormsg;
+					    }
+					    else
+					    {
+						$student->studiensemester_kurzbz = $stdsem;
+						$student->semester = $semester;
 					    }
 					    
-					    $student->studiensemester_kurzbz = $stdsem;
-					    $student->semester = $semester;
 					    $student->save_studentlehrverband(true);
+					    $rolle->ausbildungssemester = $semester;
+					    $rolle->studiensemester_kurzbz = $stdsem;
+					    $rolle->datum = date("Y-m-d");
+					    $rolle->orgform_kurzbz = $_POST['orgform_kurzbz'];
+					    $rolle->studienplan_id = $_POST['studienplan_id'];
+
+					    if($rolle->save_rolle())
+					    {
+						    $return = true;
+					    }
+					    else
+					    {
+						    $return = false;
+						    $errormsg = $rolle->errormsg;
+					    }
 					}
 				}
 			}