A bit more work in progress on remote work plugin.

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index bd10be9..6e00cf3 100644 (file)
--- 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.19.1.4968 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.19.1.4969 | 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/projects.tpl b/WEB-INF/templates/projects.tpl
index 81ef96b..92348e7 100644 (file)
--- a/WEB-INF/templates/projects.tpl
+++ b/WEB-INF/templates/projects.tpl
@@ -10,16 +10,16 @@
   {if $inactive_projects}
         <tr><td class="sectionHeaderNoBorder">{$i18n.form.projects.active_projects}</td></tr>
   {/if}
+  {if $active_projects}
         <tr>
           <td width="35%" class="tableHeader">{$i18n.label.thing_name}</td>
           <td width="35%" class="tableHeader">{$i18n.label.description}</td>
-  {if $show_files}
+    {if $show_files}
           <td></td>
-  {/if}
+    {/if}
           <td></td>
           <td></td>
         </tr>
-  {if $active_projects}
     {foreach $active_projects as $project}
         <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$project.name|escape}</td>

diff --git a/WEB-INF/templates/work_add.tpl b/WEB-INF/templates/work_add.tpl
new file mode 100644 (file)
index 0000000..74209f4
--- /dev/null
+++ b/WEB-INF/templates/work_add.tpl
@@ -0,0 +1,35 @@
+{$forms.workForm.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.workForm.project_name.control}</td>
+        </tr>
+        <tr>
+          <td align = "right">{$i18n.label.description}:</td>
+          <td>{$forms.workForm.description.control}</td>
+        </tr>
+{if $show_files}
+        <tr>
+          <td align="right">{$i18n.label.file}:</td>
+          <td>{$forms.workForm.newfile.control}</td>
+        </tr>
+{/if}
+        <tr>
+          <td></td>
+          <td>{$i18n.label.required_fields}</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td colspan="2" align="center" height="50">{$forms.workForm.btn_add.control}</td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+{$forms.workForm.close}

diff --git a/work_add.php b/work_add.php
index 2abe84d..20d0ac0 100644 (file)
--- a/work_add.php
+++ b/work_add.php
@@ -33,47 +33,40 @@ import('ttGroupHelper');
 import('ttFileHelper');
 
 // Access checks.
-if (!ttAccessAllowed('manage_projects')) {
+if (!ttAccessAllowed('manage_work')) {
   header('Location: access_denied.php');
   exit();
 }
-if (MODE_PROJECTS != $user->getTrackingMode() && MODE_PROJECTS_AND_TASKS != $user->getTrackingMode()) {
+if (!$user->isPluginEnabled('wk')) {
   header('Location: feature_disabled.php');
   exit();
 }
 // End of access checks.
 
 $showFiles = $user->isPluginEnabled('at');
-$users = ttGroupHelper::getActiveUsers();
-foreach ($users as $user_item)
-  $all_users[$user_item['id']] = $user_item['name'];
-
-$tasks = ttGroupHelper::getActiveTasks();
-foreach ($tasks as $task_item)
-  $all_tasks[$task_item['id']] = $task_item['name'];
-$show_tasks = MODE_PROJECTS_AND_TASKS == $user->getTrackingMode() && count($tasks) > 0;
 
 if ($request->isPost()) {
-  $cl_name = trim($request->getParameter('project_name'));
+  $cl_name = trim($request->getParameter('work_name'));
   $cl_description = trim($request->getParameter('description'));
-  $cl_users = $request->getParameter('users', array());
-  $cl_tasks = $request->getParameter('tasks', array());
-} else {
-  foreach ($users as $user_item)
-    $cl_users[] = $user_item['id'];
-  foreach ($tasks as $task_item)
-    $cl_tasks[] = $task_item['id'];
 }
 
-$form = new Form('projectForm');
-$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'project_name','style'=>'width: 250px;','value'=>$cl_name));
+$form = new Form('workForm');
+
+
+
+
+$form->addInput(array('type'=>'text','maxlength'=>'100','name'=>'work_name','style'=>'width: 250px;','value'=>$cl_name));
 $form->addInput(array('type'=>'textarea','name'=>'description','style'=>'width: 250px; height: 40px;','value'=>$cl_description));
 if ($showFiles)
   $form->addInput(array('type'=>'upload','name'=>'newfile','value'=>$i18n->get('button.submit')));
-$form->addInput(array('type'=>'checkboxgroup','name'=>'users','data'=>$all_users,'layout'=>'H','value'=>$cl_users));
-if ($show_tasks)
-  $form->addInput(array('type'=>'checkboxgroup','name'=>'tasks','data'=>$all_tasks,'layout'=>'H','value'=>$cl_tasks));
-$form->addInput(array('type'=>'submit','name'=>'btn_add','value'=>$i18n->get('button.add')));
+
+// Should not we get it from server?
+// $CURRENCY_OPTIONS = array(array('id'=>'.','name'=>'.'),array('id'=>',','name'=>','));
+// $form->addInput(array('type'=>'combobox','name'=>'decimal_mark','style'=>'width: 150px','data'=>$DECIMAL_MARK_OPTIONS,'datakeys'=>array('id','name'),'value'=>$cl_decimal_mark,
+//  'onchange'=>'adjustDecimalPreview()'));
+
+
+
 
 if ($request->isPost()) {
   // Validate user input.
@@ -114,5 +107,5 @@ $smarty->assign('show_files', $showFiles);
 $smarty->assign('show_users', count($users) > 0);
 $smarty->assign('show_tasks', $show_tasks);
 $smarty->assign('title', $i18n->get('title.add_work'));
-$smarty->assign('content_page_name', 'project_add.tpl');
+$smarty->assign('content_page_name', 'work_add.tpl');
 $smarty->display('index.tpl');