Refactoring: some renaming.

diff --git a/WEB-INF/lib/ttTeamHelper.class.php b/WEB-INF/lib/ttTeamHelper.class.php
index 0a92ef54114ea6e3665d27431e5cbc4885b0f63d..f3763c2061030c14099e18ee2cbddd80196fe9f7 100644 (file)
--- a/WEB-INF/lib/ttTeamHelper.class.php
+++ b/WEB-INF/lib/ttTeamHelper.class.php
@@ -718,7 +718,7 @@ class ttTeamHelper {
     $record_type_part = '';
     $plugins_part = '';
     $lock_spec_part = '';
     $record_type_part = '';
     $plugins_part = '';
     $lock_spec_part = '';

-    $work_hours_part = '';
+    $workday_hours_part = '';

 
     if (isset($fields['address'])) $addr_part = ', address = '.$mdb2->quote($fields['address']);
     if (isset($fields['currency'])) $currency_part = ', currency = '.$mdb2->quote($fields['currency']);
 
     if (isset($fields['address'])) $addr_part = ', address = '.$mdb2->quote($fields['address']);
     if (isset($fields['currency'])) $currency_part = ', currency = '.$mdb2->quote($fields['currency']);


@@ -731,11 +731,11 @@ class ttTeamHelper {
     if (isset($fields['record_type'])) $record_type_part = ', record_type = '.intval($fields['record_type']);
     if (isset($fields['plugins'])) $plugins_part = ', plugins = '.$mdb2->quote($fields['plugins']);
     if (isset($fields['lock_spec'])) $lock_spec_part = ', lock_spec = '.$mdb2->quote($fields['lock_spec']);
     if (isset($fields['record_type'])) $record_type_part = ', record_type = '.intval($fields['record_type']);
     if (isset($fields['plugins'])) $plugins_part = ', plugins = '.$mdb2->quote($fields['plugins']);
     if (isset($fields['lock_spec'])) $lock_spec_part = ', lock_spec = '.$mdb2->quote($fields['lock_spec']);

-    if (isset($fields['working_hours'])) $work_hours_part = ', workday_hours = '.$mdb2->quote($fields['working_hours']);
+    if (isset($fields['workday_hours'])) $workday_hours_part = ', workday_hours = '.$mdb2->quote($fields['workday_hours']);

 
     $sql = "update tt_teams set $name_part $addr_part $currency_part $lang_part $decimal_mark_part
       $date_format_part $time_format_part $week_start_part $tracking_mode_part $record_type_part
 
     $sql = "update tt_teams set $name_part $addr_part $currency_part $lang_part $decimal_mark_part
       $date_format_part $time_format_part $week_start_part $tracking_mode_part $record_type_part

-      $plugins_part $lock_spec_part $work_hours_part where id = $team_id";
+      $plugins_part $lock_spec_part $workday_hours_part where id = $team_id";

     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error')) return false;
 

diff --git a/cf_monthly_quota.php b/cf_monthly_quota.php
index 9f0f7df9ee4af432617e26c0cf6dc83d3c27adfa..6b94cfdad97ab4952916a2d49a4b86fb9e6d3ef0 100644 (file)
--- a/cf_monthly_quota.php
+++ b/cf_monthly_quota.php
@@ -56,7 +56,7 @@ if ($request->isPost()){
     $hours = $request->getParameter("dailyWorkingHours");
     $teamDetails = ttTeamHelper::getTeamDetails($quota->usersTeamId);
     $res = ttTeamHelper::update($quota->usersTeamId, array('name'=>$teamDetails['team_name'], 
     $hours = $request->getParameter("dailyWorkingHours");
     $teamDetails = ttTeamHelper::getTeamDetails($quota->usersTeamId);
     $res = ttTeamHelper::update($quota->usersTeamId, array('name'=>$teamDetails['team_name'], 

-                                                           'working_hours'=>$hours));
+                                                           'workday_hours'=>$hours));

   }
   if ($res) {
     header('Location: profile_edit.php');
   }
   if ($res) {
     header('Location: profile_edit.php');