X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttGroupHelper.class.php;h=83f607a19f45aac4d294a2ec39ef1777af478074;hb=75a1eedb8977b8f2db459128bab9aaf367e3b58b;hp=251fb9e7178bd72fe1bfa9c96296cff6694516de;hpb=acd436b6c7d3bc585bb3841d4d69dbe15cd8d140;p=timetracker.git

diff --git a/WEB-INF/lib/ttGroupHelper.class.php b/WEB-INF/lib/ttGroupHelper.class.php
index 251fb9e7..83f607a1 100644
--- a/WEB-INF/lib/ttGroupHelper.class.php
+++ b/WEB-INF/lib/ttGroupHelper.class.php
@@ -88,18 +88,20 @@ class ttGroupHelper {
     $mdb2 = getConnection();
     $parent_id = $user->getGroup();
     $org_id = $user->org_id;
+    $group_key = ttRandomString();
     $name = $fields['name'];
     $description = $fields['description'];
 
     // We need to inherit attributes from the parent group.
     $attrs = ttGroupHelper::getGroupAttrs($parent_id);
 
-    $columns = '(parent_id, org_id, name, description, currency, decimal_mark, lang, date_format, time_format'.
-      ', week_start, tracking_mode, project_required, task_required, record_type, bcc_email'.
-      ', allow_ip, password_complexity, plugins, lock_spec'.
-      ', workday_minutes, config, created, created_ip, created_by)';
+    $columns = '(parent_id, org_id, group_key, name, description, currency, decimal_mark, lang, date_format,'.
+      ' time_format, week_start, tracking_mode, project_required, task_required, record_type, bcc_email,'.
+      ' allow_ip, password_complexity, plugins, lock_spec,'.
+      ' workday_minutes, config, created, created_ip, created_by)';
 
     $values = " values ($parent_id, $org_id";
+    $values .= ', '.$mdb2->quote($group_key);
     $values .= ', '.$mdb2->quote($name);
     $values .= ', '.$mdb2->quote($description);
     $values .= ', '.$mdb2->quote($attrs['currency']);
@@ -342,6 +344,32 @@ class ttGroupHelper {
     return $result;
   }
 
+  // getActiveProjectsWithFiles - returns an array of active projects for a group
+  // with information whether they have attached files (has_files property).
+  // A separate fiunction from getActiveProjects because sql here is more complex.
+  static function getActiveProjectsWithFiles()
+  {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $sql = "select p.id, p.name, if(Sub1.entity_id is null, 0, 1) as has_files from tt_projects p".
+      " left join (select distinct entity_id from tt_files".
+      " where entity_type = 'project' and group_id = $group_id and org_id = $org_id and status = 1) Sub1".
+      " on (p.id = Sub1.entity_id)".
+      " where p.group_id = $group_id and p.org_id = $org_id and p.status = 1 order by upper(p.name)";
+    $res = $mdb2->query($sql);
+    $result = array();
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        $result[] = $val;
+      }
+    }
+    return $result;
+  }
+
   // getInactiveProjects - returns an array of inactive projects for a group.
   static function getInactiveProjects()
   {
@@ -363,6 +391,32 @@ class ttGroupHelper {
     return $result;
   }
 
+  // getInactiveProjectsWithFiles - returns an array of inactive projects for a group
+  // with information whether they have attached files (has_files property).
+  // A separate fiunction from getInactiveProjects because sql here is more complex.
+  static function getInactiveProjectsWithFiles()
+  {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $sql = "select p.id, p.name, if(Sub1.entity_id is null, 0, 1) as has_files from tt_projects p".
+      " left join (select distinct entity_id from tt_files".
+      " where entity_type = 'project' and group_id = $group_id and org_id = $org_id and status = 1) Sub1".
+      " on (p.id = Sub1.entity_id)".
+      " where p.group_id = $group_id and p.org_id = $org_id and p.status = 0 order by upper(p.name)";
+    $res = $mdb2->query($sql);
+    $result = array();
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        $result[] = $val;
+      }
+    }
+    return $result;
+  }
+
   // getPredefinedExpenses - obtains predefined expenses for a group.
   static function getPredefinedExpenses() {
     global $user;
@@ -527,7 +581,7 @@ class ttGroupHelper {
     $group_id = $user->getGroup();
     $org_id = $user->org_id;
 
-    $sql = "select id, name, description from tt_templates".
+    $sql = "select id, name, description, content from tt_templates".
       " where group_id = $group_id and org_id = $org_id and status = 1 order by upper(name)";
     $res = $mdb2->query($sql);
     $result = array();