From 8dade986970598d2c58e2484342e413bf30be4db Mon Sep 17 00:00:00 2001 From: Nik Okuntseff Date: Mon, 22 Apr 2019 16:19:31 +0000 Subject: [PATCH] A bit more work in progress on remote work plugin. --- WEB-INF/templates/footer.tpl | 2 +- WEB-INF/templates/projects.tpl | 6 ++--- WEB-INF/templates/work_add.tpl | 35 +++++++++++++++++++++++++++ work_add.php | 43 ++++++++++++++-------------------- 4 files changed, 57 insertions(+), 29 deletions(-) create mode 100644 WEB-INF/templates/work_add.tpl diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index bd10be9e..6e00cf34 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
- {/if} + {if $active_projects} - {if $show_files} + {if $show_files} - {/if} + {/if} - {if $active_projects} {foreach $active_projects as $project} diff --git a/WEB-INF/templates/work_add.tpl b/WEB-INF/templates/work_add.tpl new file mode 100644 index 00000000..74209f48 --- /dev/null +++ b/WEB-INF/templates/work_add.tpl @@ -0,0 +1,35 @@ +{$forms.workForm.open} +
 Anuko Time Tracker 1.19.1.4968 | Copyright © Anuko | +  Anuko Time Tracker 1.19.1.4969 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/WEB-INF/templates/projects.tpl b/WEB-INF/templates/projects.tpl index 81ef96b8..92348e7a 100644 --- a/WEB-INF/templates/projects.tpl +++ b/WEB-INF/templates/projects.tpl @@ -10,16 +10,16 @@ {if $inactive_projects}
{$i18n.form.projects.active_projects}
{$i18n.label.thing_name} {$i18n.label.description}
{$project.name|escape}
+ + + +
+ + + + + + + + + +{if $show_files} + + + + +{/if} + + + + + + + + + + + +
{$i18n.label.thing_name} (*):{$forms.workForm.project_name.control}
{$i18n.label.description}:{$forms.workForm.description.control}
{$i18n.label.file}:{$forms.workForm.newfile.control}
{$i18n.label.required_fields}
 
{$forms.workForm.btn_add.control}
+
+{$forms.workForm.close} diff --git a/work_add.php b/work_add.php index 2abe84d5..20d0ac01 100644 --- 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'); -- 2.20.1