From 6c3b5403ae5905e3e77b5104930ec1a6d4ef5b14 Mon Sep 17 00:00:00 2001
From: Robert Hofer <robert.hofer@technikum-wien.at>
Date: Fri, 13 Mar 2015 14:44:20 +0100
Subject: [PATCH] column tbl_prestudent.anmerkung

is called "anmerkung_status" in php object
---
 .gitignore                   | 1 +
 include/prestudent.class.php | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index bdc8b3565..8de7f9320 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 .htaccess
 /nbproject/
+/.idea/
diff --git a/include/prestudent.class.php b/include/prestudent.class.php
index 82f7de48d..8ab5dcba5 100644
--- a/include/prestudent.class.php
+++ b/include/prestudent.class.php
@@ -779,7 +779,7 @@ class prestudent extends person
 			       ' bestaetigtam='.$this->db_add_param($this->bestaetigtam).",".
 			       ' bestaetigtvon='.$this->db_add_param($this->bestaetigtvon).",".
 				   ' studienplan_id='.$this->db_add_param($this->studienplan_id, FHC_INTEGER).",".
-				   ' anmerkung_status='.$this->db_add_param($this->anmerkung_status).",".
+				   ' anmerkung='.$this->db_add_param($this->anmerkung_status).",".
 			       ' orgform_kurzbz='.$this->db_add_param($this->orgform_kurzbz).
 			       " WHERE 
 						prestudent_id=".$this->db_add_param($this->prestudent_id, FHC_INTEGER, false)." 
@@ -835,7 +835,7 @@ class prestudent extends person
 			$log->sql = $qry;
 			$log->sqlundo = 'INSERT INTO public.tbl_prestudentstatus(prestudent_id, status_kurzbz, studiensemester_kurzbz,'
 							. ' ausbildungssemester, datum, insertamum, insertvon, updateamum, updatevon, ext_id, orgform_kurzbz,'
-							. ' bestaetigtam, bestaetigtvon, anmerkung_status, studienplan_id) VALUES('.
+							. ' bestaetigtam, bestaetigtvon, anmerkung, studienplan_id) VALUES('.
 							$this->db_add_param($this->prestudent_id).','.
 							$this->db_add_param($this->status_kurzbz).','.
 							$this->db_add_param($this->studiensemester_kurzbz).','.