Refactored mobile expenses.php for subgroups.

[timetracker.git] / mobile / time_edit.php

diff --git a/mobile/time_edit.php b/mobile/time_edit.php
index 3094df64beab78ab111239ce4bf1ed73bdd749ed..60a14e2c65f572db4b65d1ce078712ca1462812f 100644 (file)
--- a/mobile/time_edit.php
+++ b/mobile/time_edit.php
@@ -30,6 +30,7 @@ require_once('../initialize.php');
 import('form.Form');
 import('ttUserHelper');
 import('ttTeamHelper');
 import('form.Form');
 import('ttUserHelper');
 import('ttTeamHelper');

+import('ttGroupHelper');

 import('ttClientHelper');
 import('ttTimeHelper');
 import('DateAndTime');
 import('ttClientHelper');
 import('ttTimeHelper');
 import('DateAndTime');


@@ -52,12 +53,12 @@ if (!$time_rec || $time_rec['invoice_id']) {
 // Use custom fields plugin if it is enabled.
 if ($user->isPluginEnabled('cf')) {
   require_once('../plugins/CustomFields.class.php');
 // Use custom fields plugin if it is enabled.
 if ($user->isPluginEnabled('cf')) {
   require_once('../plugins/CustomFields.class.php');

-  $custom_fields = new CustomFields($user->group_id);
+  $custom_fields = new CustomFields();

   $smarty->assign('custom_fields', $custom_fields);
 }
 
 $item_date = new DateAndTime(DB_DATEFORMAT, $time_rec['date']);
   $smarty->assign('custom_fields', $custom_fields);
 }
 
 $item_date = new DateAndTime(DB_DATEFORMAT, $time_rec['date']);

-$confirm_save = $user->getConfirmSave();
+$confirm_save = $user->getConfigOption('confirm_save');

 
 // Initialize variables.
 $cl_start = $cl_finish = $cl_duration = $cl_date = $cl_note = $cl_project = $cl_task = $cl_billable = null;
 
 // Initialize variables.
 $cl_start = $cl_finish = $cl_duration = $cl_date = $cl_note = $cl_project = $cl_task = $cl_billable = null;


@@ -109,7 +110,7 @@ $form = new Form('timeRecordForm');
 
 // Dropdown for clients in MODE_TIME. Use all active clients.
 if (MODE_TIME == $user->tracking_mode && $user->isPluginEnabled('cl')) {
 
 // Dropdown for clients in MODE_TIME. Use all active clients.
 if (MODE_TIME == $user->tracking_mode && $user->isPluginEnabled('cl')) {

-    $active_clients = ttTeamHelper::getActiveClients($user->group_id, true);
+    $active_clients = ttGroupHelper::getActiveClients(true);

     $form->addInput(array('type'=>'combobox',
       'onchange'=>'fillProjectDropdown(this.value);',
       'name'=>'client',
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'fillProjectDropdown(this.value);',
       'name'=>'client',


@@ -135,7 +136,7 @@ if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->t
 
   // Dropdown for clients if the clients plugin is enabled.
   if ($user->isPluginEnabled('cl')) {
 
   // Dropdown for clients if the clients plugin is enabled.
   if ($user->isPluginEnabled('cl')) {

-    $active_clients = ttTeamHelper::getActiveClients($user->group_id, true);
+    $active_clients = ttGroupHelper::getActiveClients(true);

     // We need an array of assigned project ids to do some trimming.
     foreach($project_list as $project)
       $projects_assigned_to_user[] = $project['id'];
     // We need an array of assigned project ids to do some trimming.
     foreach($project_list as $project)
       $projects_assigned_to_user[] = $project['id'];