X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttPredefinedExpenseHelper.class.php;h=16dff2840c38ebd34cad46719f10a0aa146e25ad;hb=f58ab716cb0cc4b8be8e48723b345bfab29697a6;hp=4c33c42731f77fe23922a3c32f277126f7a3cbc3;hpb=2df0ec3f98d0fa23102dc8362c4272ddebecf157;p=timetracker.git

diff --git a/WEB-INF/lib/ttPredefinedExpenseHelper.class.php b/WEB-INF/lib/ttPredefinedExpenseHelper.class.php
index 4c33c427..16dff284 100644
--- a/WEB-INF/lib/ttPredefinedExpenseHelper.class.php
+++ b/WEB-INF/lib/ttPredefinedExpenseHelper.class.php
@@ -34,16 +34,20 @@ class ttPredefinedExpenseHelper {
   static function get($id)
   {
     global $user;
+    $replaceDecimalMark = ('.' != $user->decimal_mark);
 
     $mdb2 = getConnection();
 
     $sql = "select id, name, cost from tt_predefined_expenses
-      where id = $id and team_id = $user->team_id";
+      where id = $id and group_id = ".$user->getGroup();
     $res = $mdb2->query($sql);
     if (!is_a($res, 'PEAR_Error')) {
       $val = $res->fetchRow();
-	  if ($val && $val['id'])
+      if ($val && $val['id']) {
+        if ($replaceDecimalMark)
+          $val['cost'] = str_replace('.', $user->decimal_mark, $val['cost']);
         return $val;
+      }
     }
     return false;
   }
@@ -54,7 +58,7 @@ class ttPredefinedExpenseHelper {
 
     $mdb2 = getConnection();
 
-    $sql = "delete from tt_predefined_expenses where id = $id and team_id = $user->team_id";
+    $sql = "delete from tt_predefined_expenses where id = $id and group_id = ".$user->getGroup();
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
@@ -65,14 +69,19 @@ class ttPredefinedExpenseHelper {
   // insert function inserts a new predefined expense into database.
   static function insert($fields)
   {
+    global $user;
+
     $mdb2 = getConnection();
 
-    $team_id = (int) $fields['team_id'];
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
     $name = $fields['name'];
     $cost = $fields['cost'];
+    if ('.' != $user->decimal_mark)
+      $cost = str_replace($user->decimal_mark, '.', $cost);
 
-    $sql = "insert into tt_predefined_expenses (team_id, name, cost)
-      values ($team_id, ".$mdb2->quote($name).", ".$mdb2->quote($cost).")";
+    $sql = "insert into tt_predefined_expenses (group_id, org_id, name, cost)".
+      " values ($group_id, $org_id, ".$mdb2->quote($name).", ".$mdb2->quote($cost).")";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
       return false;
@@ -83,15 +92,20 @@ class ttPredefinedExpenseHelper {
   // update function - updates a predefined expense in database.
   static function update($fields)
   {
+    global $user;
+
     $mdb2 = getConnection();
 
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
     $predefined_expense_id = (int) $fields['id'];
-    $team_id = (int) $fields['team_id'];
     $name = $fields['name'];
     $cost = $fields['cost'];
+    if ('.' != $user->decimal_mark)
+      $cost = str_replace($user->decimal_mark, '.', $cost);
 
     $sql = "update tt_predefined_expenses set name = ".$mdb2->quote($name).", cost = ".$mdb2->quote($cost).
-      " where id = $predefined_expense_id and team_id = $team_id";
+      " where id = $predefined_expense_id and group_id = $group_id and org_id = $org_id";
     $affected = $mdb2->exec($sql);
     return (!is_a($affected, 'PEAR_Error'));
   }