From: Nik Okuntseff <support@anuko.com>
Date: Fri, 8 Mar 2019 16:54:19 +0000 (+0000)
Subject: Work in progress on templates.php.
X-Git-Tag: timetracker_1.19-1~200
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=acd436b6c7d3bc585bb3841d4d69dbe15cd8d140;p=timetracker.git

Work in progress on templates.php.
---

diff --git a/WEB-INF/lib/ttGroupHelper.class.php b/WEB-INF/lib/ttGroupHelper.class.php
index 762fffb6..251fb9e7 100644
--- a/WEB-INF/lib/ttGroupHelper.class.php
+++ b/WEB-INF/lib/ttGroupHelper.class.php
@@ -518,6 +518,48 @@ class ttGroupHelper {
     return $result;
   }
 
+  // getActiveTemplates - returns an array of active templates for a group.
+  static function getActiveTemplates()
+  {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $sql = "select id, name, description 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();
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        $result[] = $val;
+      }
+    }
+    return $result;
+  }
+
+  // getInactiveTemplates - returns an array of active templates for a group.
+  static function getInactiveTemplates()
+  {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    $sql = "select id, name, description from tt_templates".
+      " where group_id = $group_id and org_id = $org_id and status = 0 order by upper(name)";
+    $res = $mdb2->query($sql);
+    $result = array();
+    if (!is_a($res, 'PEAR_Error')) {
+      while ($val = $res->fetchRow()) {
+        $result[] = $val;
+      }
+    }
+    return $result;
+  }
+
   // validateCheckboxGroupInput - validates user input in a group of checkboxes
   // in context of a specific database table.
   //
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index eddafc93..db04f818 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -425,6 +425,10 @@ $i18n_key_words = array(
 'form.timesheets.active_timesheets' => 'Active Timesheets',
 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',
 
+ // Templates form. See example at https://timetracker.anuko.com/templates.php
+'form.templates.active_templates' => 'Active Templates',
+'form.templates.inactive_templates' => 'Inactive Templates',
+
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 'form.invoice.number' => 'Invoice number',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 11597100..e693b467 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.55.4843 | 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.55.4844 | 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/WEB-INF/templates/templates.tpl b/WEB-INF/templates/templates.tpl
index 177f32cf..0e8f220a 100644
--- a/WEB-INF/templates/templates.tpl
+++ b/WEB-INF/templates/templates.tpl
@@ -3,14 +3,17 @@
   <tr>
     <td valign="top">
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
+{if $inactive_templates}
+        <tr><td class="sectionHeaderNoBorder">{$i18n.form.templates.active_templates}</td></tr>
+{/if}
         <tr>
           <td class="tableHeader">{$i18n.label.thing_name}</td>
           <td class="tableHeader">{$i18n.label.description}</td>
           <td class="tableHeader">{$i18n.label.edit}</td>
           <td class="tableHeader">{$i18n.label.delete}</td>
         </tr>
-  {if $templates}
-    {foreach $templates as $template}
+  {if $active_templates}
+    {foreach $active_templates as $template}
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$template['name']|escape}</td>
           <td>{$template['description']|escape}</td>
diff --git a/templates.php b/templates.php
index e2d0e779..6bf6ae39 100644
--- a/templates.php
+++ b/templates.php
@@ -51,11 +51,13 @@ if ($request->isPost()) {
   }
 } else {
   $form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
-  $predefinedExpenses = ttGroupHelper::getPredefinedExpenses();
+  $activeTemplates = ttGroupHelper::getActiveTemplates();
+  $inactiveTemplates = ttGroupHelper::getInactiveTemplates();
 }
 
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-$smarty->assign('predefined_expenses', $predefinedExpenses);
+$smarty->assign('active_templates', $activeTemplates);
+$smarty->assign('inactive_templates', $inactiveTemplates);
 $smarty->assign('title', $i18n->get('title.templates'));
 $smarty->assign('content_page_name', 'templates.tpl');
 $smarty->display('index.tpl');