From: anuko Date: Sun, 12 Feb 2017 18:23:28 +0000 (+0000) Subject: Initial implementation of predefined expenses. X-Git-Tag: timetracker_1.19-1~1574 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=79617794bc7e8d41291caf0ec7ef8be2b0a917b3;p=timetracker.git Initial implementation of predefined expenses. --- diff --git a/WEB-INF/templates/expense_edit.tpl b/WEB-INF/templates/expense_edit.tpl index a679820e..00b1ae53 100644 --- a/WEB-INF/templates/expense_edit.tpl +++ b/WEB-INF/templates/expense_edit.tpl @@ -6,25 +6,33 @@ // project_names[325] = "Time Tracker"; // Project name. // Prepare an array of project ids for clients. -project_ids = new Array(); +var project_ids = new Array(); {foreach $client_list as $client} project_ids[{$client.id}] = "{$client.projects}"; {/foreach} // Prepare an array of project names. -project_names = new Array(); +var project_names = new Array(); {foreach $project_list as $project} project_names[{$project.id}] = "{$project.name|escape:'javascript'}"; {/foreach} // We'll use this array to populate project dropdown when client is not selected. var idx = 0; -projects = new Array(); +var projects = new Array(); {foreach $project_list as $project} projects[idx] = new Array("{$project.id}", "{$project.name|escape:'javascript'}"); idx++; {/foreach} // Mandatory top option for project dropdown. -empty_label_project = "{$i18n.dropdown.select|escape:'javascript'}"; +var empty_label_project = "{$i18n.dropdown.select|escape:'javascript'}"; + +// Prepare an array of predefined expenses. +idx = 0; +var defined_expenses = new Array(); +{foreach $predefined_expenses as $predefined_expense} + defined_expenses[idx] = new Array("{$predefined_expense.id}", "{$predefined_expense.name|escape:'javascript'}", "{$predefined_expense.cost}"); + idx++; +{/foreach} // The fillProjectDropdown function populates the project combo box with // projects associated with a selected client (client id is passed here as id). @@ -66,6 +74,34 @@ function get_date() { var date = new Date(); return date.strftime("%Y-%m-%d"); } + +// The recalculateCost function recalculates cost based on the current selection +// of predefined expense and quantity and also changes the comment accordingly. +function recalculateCost() { + var quantity_control = document.getElementById("quantity"); + // Set quantity to 1 if it is not set already. + if (!quantity_control.value) { + quantity_control.value = "1"; + } + + var comment_control = document.getElementById("item_name"); + var cost_control = document.getElementById("cost"); + + // Calculate cost. + var dropdown = document.getElementById("predefined_expense"); + if (dropdown.selectedIndex == 0) { + quantity_control.value = ""; + comment_control.value = ""; + cost_control.value = ""; + } else { + comment_control.value = defined_expenses[dropdown.selectedIndex - 1][1] + " - " + quantity_control.value; + var quantity = quantity_control.value; + if (isNaN(quantity)) + cost_control.value = ""; + else + cost_control.value = (quantity_control.value * defined_expenses[dropdown.selectedIndex - 1][2]).toFixed(2); + } +} {$forms.expenseItemForm.open} @@ -87,9 +123,19 @@ function get_date() { {$i18n.label.project} (*): {$forms.expenseItemForm.project.control} +{/if} +{if $predefined_expenses} + + {$i18n.label.expense}: + {$forms.expenseItemForm.predefined_expense.control} + + + {$i18n.label.quantity}: + {$forms.expenseItemForm.quantity.control} + {/if} - {$i18n.label.item}: + {$i18n.label.comment}: {$forms.expenseItemForm.item_name.control} diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index b599e308..433ac9b9 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
-
 Anuko Time Tracker 1.9.37.3578 | Copyright © Anuko | +  Anuko Time Tracker 1.10.38.3579 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/expense_edit.php b/expense_edit.php index db26f1b6..7a256d65 100644 --- a/expense_edit.php +++ b/expense_edit.php @@ -119,6 +119,19 @@ if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->t 'empty'=>array(''=>$i18n->getKey('dropdown.select')))); } } +// If predefined expenses are configured, add controls to select an expense and quantity. +$predefined_expenses = ttTeamHelper::getPredefinedExpenses($user->team_id); +if ($predefined_expenses) { + $form->addInput(array('type'=>'combobox', + 'onchange'=>'recalculateCost();', + 'name'=>'predefined_expense', + 'style'=>'width: 250px;', + 'value'=>$cl_predefined_expense, + 'data'=>$predefined_expenses, + 'datakeys'=>array('id', 'name'), + 'empty'=>array(''=>$i18n->getKey('dropdown.select')))); + $form->addInput(array('type'=>'text','onchange'=>'recalculateCost();','maxlength'=>'40','name'=>'quantity','style'=>'width: 100px;','value'=>$cl_quantity)); +} $form->addInput(array('type'=>'textarea','maxlength'=>'800','name'=>'item_name','style'=>'width: 250px; height:'.NOTE_INPUT_HEIGHT.'px;','value'=>$cl_item_name)); $form->addInput(array('type'=>'text','maxlength'=>'40','name'=>'cost','style'=>'width: 100px;','value'=>$cl_cost)); $form->addInput(array('type'=>'datefield','name'=>'date','maxlength'=>'20','value'=>$cl_date)); @@ -198,6 +211,7 @@ if ($request->isPost()) { } } // isPost +$smarty->assign('predefined_expenses', $predefined_expenses); $smarty->assign('client_list', $client_list); $smarty->assign('project_list', $project_list); $smarty->assign('task_list', $task_list); diff --git a/expenses.php b/expenses.php index 91fabecd..93161f08 100644 --- a/expenses.php +++ b/expenses.php @@ -130,17 +130,16 @@ if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->t // If predefined expenses are configured, add controls to select an expense and quantity. $predefined_expenses = ttTeamHelper::getPredefinedExpenses($user->team_id); if ($predefined_expenses) { - $form->addInput(array('type'=>'combobox', - 'onchange'=>'recalculateCost();', - 'name'=>'predefined_expense', - 'style'=>'width: 250px;', - 'value'=>$cl_predefined_expense, - 'data'=>$predefined_expenses, - 'datakeys'=>array('id', 'name'), - 'empty'=>array(''=>$i18n->getKey('dropdown.select')))); - $form->addInput(array('type'=>'text','onchange'=>'recalculateCost();','maxlength'=>'40','name'=>'quantity','style'=>'width: 100px;','value'=>$cl_quantity)); + $form->addInput(array('type'=>'combobox', + 'onchange'=>'recalculateCost();', + 'name'=>'predefined_expense', + 'style'=>'width: 250px;', + 'value'=>$cl_predefined_expense, + 'data'=>$predefined_expenses, + 'datakeys'=>array('id', 'name'), + 'empty'=>array(''=>$i18n->getKey('dropdown.select')))); + $form->addInput(array('type'=>'text','onchange'=>'recalculateCost();','maxlength'=>'40','name'=>'quantity','style'=>'width: 100px;','value'=>$cl_quantity)); } - $form->addInput(array('type'=>'textarea','maxlength'=>'800','name'=>'item_name','style'=>'width: 250px; height:'.NOTE_INPUT_HEIGHT.'px;','value'=>$cl_item_name)); $form->addInput(array('type'=>'text','maxlength'=>'40','name'=>'cost','style'=>'width: 100px;','value'=>$cl_cost)); $form->addInput(array('type'=>'calendar','name'=>'date','highlight'=>'expenses','value'=>$cl_date)); // calendar