From: Nik Okuntseff <support@anuko.com>
Date: Sat, 24 Nov 2018 17:26:05 +0000 (+0000)
Subject: Improved population of group dropdown to include the entire stack of groups.
X-Git-Tag: timetracker_1.19-1~555
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=1a1ae10cf832a697192fc5e1e84debe930ce3c9f;p=timetracker.git

Improved population of group dropdown to include the entire stack of groups.
---

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index e50d9a3e..859d0881 100644
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -366,47 +366,51 @@ class ttUser {
     return $user_list;
   }
 
-  // getGroups obtains an array consisting of:
-  // - A parent group (..) of a currently selected group, if available.
-  // - A currently selected group (.) represented by $behalf_group_id.
-  // - All subgroups (only immediate children) of a currently selected group.
-  function getGroups() {
+  // getGroupsForDropdown obtains an array of groups to populate "Group" dropdown.
+  // It consists of:
+  //   - User home group.
+  //   - The entire stack of groups all the way down to current on behalf group.
+  //   - All immediate children of the current on behalf group.
+  // This allows user to navigate easily to home group, anything in between, and 1 level below.
+  function getGroupsForDropdown() {
     $mdb2 = getConnection();
 
+    // Start with subgroups.
+    $groups = array();
+    $group_id = $this->getActiveGroup();
+    $sql = "select id, name from tt_groups where org_id = $this->org_id and parent_id = $group_id and status = 1";
+    $res = $mdb2->query($sql);
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        $groups[] = $val;
+      }
+    }
+
+    // Add current on behalf group to the beginning of array.
     $selected_group_id = ($this->behalf_group_id ? $this->behalf_group_id : $this->group_id);
     $selected_group_name = ($this->behalf_group_id ? $this->behalf_group_name : $this->group_name);
+    array_unshift($groups,  array('id'=>$selected_group_id,'name'=>$selected_group_name));
 
-    // Start with parent group.
-    if ($selected_group_id != $this->group_id) {
-      // We are in one of subgroups, and a parent exists.
-      // Get parent group info.
-      $sql = "select parent_id from tt_groups where org_id = $this->org_id and id = $selected_group_id and status = 1";
+    // Iterate all the way to the home group, starting with selected ("on behalf") group.
+    $current_group_id = $selected_group_id;
+    while ($current_group_id != $this->group_id) {
+      $sql = "select parent_id from tt_groups where org_id = $this->org_id and id = $current_group_id and status = 1";
       $res = $mdb2->query($sql);
-      if (!is_a($res, 'PEAR_Error')) {
-        $val = $res->fetchRow();
-        $parent_id = $val['parent_id'];
-        if ($parent_id) {
-          // Get parent group name.
-          $sql = "select name from tt_groups where org_id = $this->org_id and id = $parent_id and status = 1";
-          $res = $mdb2->query($sql);
-          if (!is_a($res, 'PEAR_Error')) {
-            $val = $res->fetchRow();
-            $groups[] = array('id'=>$parent_id,'name'=>$val['name']);
-          }
-        }
-      }
-    }
-
-    // Add current group.
-    $groups[] = array('id'=>$selected_group_id,'name'=>$selected_group_name);
+      if (is_a($res, 'PEAR_Error')) return false;
 
-    // Add subgroups.
-    $sql = "select id, name from tt_groups where org_id = $this->org_id and parent_id = $selected_group_id and status = 1";
-    //die($sql);
-    $res = $mdb2->query($sql);
-    if (!is_a($res, 'PEAR_Error')) {
-      while ($val = $res->fetchRow()) {
-        $groups[] = $val;
+      $val = $res->fetchRow();
+      $parent_id = $val['parent_id'];
+      if ($parent_id) {
+        // Get parent group name.
+        $sql = "select name from tt_groups where org_id = $this->org_id and id = $parent_id and status = 1";
+        $res = $mdb2->query($sql);
+        if (is_a($res, 'PEAR_Error')) return false;
+        $val = $res->fetchRow();
+        if (!$val) return false;
+        array_unshift($groups, array('id'=>$parent_id,'name'=>$val['name']));
+        $current_group_id = $parent_id;
+      } else {
+        return false;
       }
     }
     return $groups;
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index c4db5512..5c42acc7 100644
--- a/WEB-INF/templates/footer.tpl
+++ b/WEB-INF/templates/footer.tpl
@@ -12,7 +12,7 @@
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>
-          <td align="center">&nbsp;Anuko Time Tracker 1.18.28.4510 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.18.28.4511 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>
diff --git a/groups.php b/groups.php
index 172dd329..6c35bfb3 100644
--- a/groups.php
+++ b/groups.php
@@ -49,7 +49,7 @@ if ($request->isPost()) {
 }
 
 $form = new Form('subgroupsForm');
-$groups = $user->getGroups();
+$groups = $user->getGroupsForDropdown();
 if (count($groups) > 1) {
   $form->addInput(array('type'=>'combobox',
     'onchange'=>'this.form.submit();',
diff --git a/time.php b/time.php
index 9e6be9a8..c7d2979c 100644
--- a/time.php
+++ b/time.php
@@ -109,7 +109,7 @@ $form = new Form('timeRecordForm');
 
 if (isTrue(SUBGROUP_DEBUG)) {
 if ($user->can('manage_subgroups')) {
-  $groups = $user->getGroups();
+  $groups = $user->getGroupsForDropdown();
   if (count($groups) > 1) {
     $form->addInput(array('type'=>'combobox',
       'onchange'=>'this.form.submit();',