Some more work in progress on subgroups.

diff --git a/WEB-INF/templates/group_add.tpl b/WEB-INF/templates/group_add.tpl
new file mode 100644 (file)
index 0000000..852f1b7
--- /dev/null
+++ b/WEB-INF/templates/group_add.tpl
@@ -0,0 +1,28 @@
+{$forms.groupForm.open}
+<table cellspacing="4" cellpadding="7" border="0">
+  <tr>
+    <td>
+      <table cellspacing="1" cellpadding="2" border="0">
+        <tr>
+          <td align="right">{$i18n.label.thing_name} (*):</td>
+          <td>{$forms.groupForm.group_name.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.description}:</td>
+          <td>{$forms.groupForm.description.control}</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>{$i18n.label.required_fields}</td>
+        </tr>
+        <tr>
+          <td colspan="2">&nbsp;</td>
+        </tr>
+        <tr>
+          <td colspan="2" height="50" align="center">{$forms.groupForm.btn_add.control}</td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+{$forms.groupForm.close}

diff --git a/WEB-INF/templates/groups.tpl b/WEB-INF/templates/groups.tpl
index d9748bc..5810551 100644 (file)
--- a/WEB-INF/templates/groups.tpl
+++ b/WEB-INF/templates/groups.tpl
@@ -4,7 +4,8 @@
 
 <table cellspacing="1" cellpadding="3" border="0" width="720">
   <tr>
-    <td width="70%" class="tableHeader">{$i18n.label.thing_name}</td>
+    <td width="35%" class="tableHeader">{$i18n.label.thing_name}</td>
+    <td width="35%" class="tableHeader">{$i18n.label.description}</td>
     <td class="tableHeader">{$i18n.label.edit}</td>
     <td class="tableHeader">{$i18n.label.delete}</td>
   </tr>
@@ -12,6 +13,7 @@
   {foreach $groups as $group}
   <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
     <td>{$group.name|escape}</td>
+    <td>{$group.description|escape}</td>
     <td><a href="group_edit.php?id={$group.id}">{$i18n.label.edit}</a></td>
     <td><a href="group_delete.php?id={$group.id}">{$i18n.label.delete}</a></td>
   </tr>

diff --git a/dbinstall.php b/dbinstall.php
index f87b2a4..653d13a 100644 (file)
--- a/dbinstall.php
+++ b/dbinstall.php
@@ -957,7 +957,7 @@ if ($_POST) {
     print "Updated $tt_expense_items_updated tt_expense_items records...<br>\n";
   }
 
-  if ($_POST["convert11797to11824"]) {
+  if ($_POST["convert11797to11826"]) {
     setChange("ALTER TABLE `tt_fav_reports` CHANGE `group_by` `group_by1` varchar(20) default NULL");
     setChange("ALTER TABLE `tt_fav_reports` ADD `group_by2` varchar(20) default NULL AFTER `group_by1`");
     setChange("ALTER TABLE `tt_fav_reports` ADD `group_by3` varchar(20) default NULL AFTER `group_by2`");
@@ -1086,7 +1086,7 @@ if ($_POST) {
 <h2>DB Install</h2>
 <table width="80%" border="1" cellpadding="10" cellspacing="0">
   <tr>
-    <td width="80%"><b>Create database structure (v1.18.24)</b>
+    <td width="80%"><b>Create database structure (v1.18.26)</b>
     <br>(applies only to new installations, do not execute when updating)</br></td><td><input type="submit" name="crstructure" value="Create"></td>
   </tr>
 </table>
@@ -1131,8 +1131,8 @@ if ($_POST) {
   </tr>
   </tr>
   <tr valign="top">
-    <td>Update database structure (v1.17.97 to v1.18.24)</td>
-    <td><input type="submit" name="convert11797to11824" value="Update"></td>
+    <td>Update database structure (v1.17.97 to v1.18.26)</td>
+    <td><input type="submit" name="convert11797to11826" value="Update"></td>
   </tr>
 </table>
 

diff --git a/group_add.php b/group_add.php
new file mode 100644 (file)
index 0000000..8bb8d00
--- /dev/null
+++ b/group_add.php
@@ -0,0 +1,78 @@
+<?php
+// +----------------------------------------------------------------------+
+// | Anuko Time Tracker
+// +----------------------------------------------------------------------+
+// | Copyright (c) Anuko International Ltd. (https://www.anuko.com)
+// +----------------------------------------------------------------------+
+// | LIBERAL FREEWARE LICENSE: This source code document may be used
+// | by anyone for any purpose, and freely redistributed alone or in
+// | combination with other software, provided that the license is obeyed.
+// |
+// | There are only two ways to violate the license:
+// |
+// | 1. To redistribute this code in source form, with the copyright
+// |    notice or license removed or altered. (Distributing in compiled
+// |    forms without embedded copyright notices is permitted).
+// |
+// | 2. To redistribute modified versions of this code in *any* form
+// |    that bears insufficient indications that the modifications are
+// |    not the work of the original author(s).
+// |
+// | This license applies to this document only, not any other software
+// | that it may be combined with.
+// |
+// +----------------------------------------------------------------------+
+// | Contributors:
+// | https://www.anuko.com/time_tracker/credits.htm
+// +----------------------------------------------------------------------+
+
+require_once('initialize.php');
+import('form.Form');
+
+// Access checks.
+if (!ttAccessAllowed('manage_subgroups')) {
+  header('Location: access_denied.php');
+  exit();
+}
+// End of access checks.
+
+if ($request->isPost()) {
+  $cl_name = trim($request->getParameter('group_name'));
+  $cl_description = trim($request->getParameter('description'));
+}
+
+$form = new Form('groupForm');
+$form->addInput(array('type'=>'text','maxlength'=>'200','name'=>'group_name','value'=>$cl_group,'enable'=>$advanced_settings));
+$form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
+$form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
+
+if ($request->isPost()) {
+  // Validate user input.
+  if (!ttValidString($cl_name)) $err->add($i18n->get('error.field'), $i18n->get('label.thing_name'));
+  if (!ttValidString($cl_description, true)) $err->add($i18n->get('error.field'), $i18n->get('label.description'));
+/*
+  if ($err->no()) {
+    if (!ttProjectHelper::getProjectByName($cl_name)) {
+      if (ttProjectHelper::insert(array(
+        'group_id' => $user->getActiveGroup(),
+        'org_id' => $user->org_id,
+        'name' => $cl_name,
+        'description' => $cl_description,
+        'users' => $cl_users,
+        'tasks' => $cl_tasks,
+        'status' => ACTIVE))) {
+          header('Location: projects.php');
+          exit();
+        } else
+          $err->add($i18n->get('error.db'));
+    } else
+      $err->add($i18n->get('error.project_exists'));
+  }
+*/
+} // isPost
+
+$smarty->assign('forms', array($form->getName()=>$form->toArray()));
+//$smarty->assign('onload', 'onLoad="document.projectForm.project_name.focus()"');
+$smarty->assign('title', $i18n->get('title.add_group'));
+$smarty->assign('content_page_name', 'group_add.tpl');
+$smarty->display('index.tpl');