fix: project task form dialog.

This commit is contained in:
elforjani13
2022-09-19 22:37:48 +02:00
parent 01e2c24387
commit 860378f00d
7 changed files with 16 additions and 8 deletions

View File

@@ -40,6 +40,9 @@ function ProjectDetailActionsBar({
// Handle new transaction button click. // Handle new transaction button click.
const handleNewTransactionBtnClick = ({ path }) => { const handleNewTransactionBtnClick = ({ path }) => {
switch (path) { switch (path) {
case 'project_task':
openDialog('project-task-form', { projectId });
break;
case 'invoincing': case 'invoincing':
openDialog('project-invoicing-form'); openDialog('project-invoicing-form');
break; break;

View File

@@ -36,11 +36,11 @@ export function TaskAccessor(row) {
<TaskTitle>{row.name}</TaskTitle> <TaskTitle>{row.name}</TaskTitle>
</TaskHeader> </TaskHeader>
<TaskContent> <TaskContent>
{row.charge_type === 'hourly_rate' {row.charge_type === 'TIME'
? intl.get('project_task.rate', { ? intl.get('project_task.rate', {
rate: row.rate, rate: row.rate,
}) })
: intl.get(row.charge_type)} : row.charge_type}
<TaskDescription> <TaskDescription>
{row.estimate_minutes && {row.estimate_minutes &&
intl.get('project_task.estimate_minutes', { intl.get('project_task.estimate_minutes', {

View File

@@ -1,6 +1,7 @@
import intl from 'react-intl-universal'; import intl from 'react-intl-universal';
export const projectTranslations = [ export const projectTranslations = [
{ name: intl.get('project_details.new_task'), path: 'project_task' },
{ name: intl.get('project_details.new_invoicing'), path: 'invoincing' }, { name: intl.get('project_details.new_invoicing'), path: 'invoincing' },
{ name: intl.get('project_details.new_expense'), path: 'expense' }, { name: intl.get('project_details.new_expense'), path: 'expense' },
{ {

View File

@@ -12,7 +12,7 @@ import withDialogActions from '@/containers/Dialog/withDialogActions';
const defaultInitialValues = { const defaultInitialValues = {
name: '', name: '',
charge_type: 'fixed_price', charge_type: 'fixed',
estimate_minutes: '', estimate_minutes: '',
cost_estimate: 0, cost_estimate: 0,
rate: '0.00', rate: '0.00',

View File

@@ -60,7 +60,7 @@ function ProjectTaskFormFields({
/> />
<FInputGroup <FInputGroup
name="rate" name="rate"
disabled={values?.charge_type === 'non_chargeable'} disabled={values?.charge_type === 'non_chargable'}
/> />
</ControlGroup> </ControlGroup>
</FFormGroup> </FFormGroup>

View File

@@ -1,9 +1,9 @@
import intl from 'react-intl-universal'; import intl from 'react-intl-universal';
export const taskChargeOptions = [ export const taskChargeOptions = [
{ name: intl.get('project_task.dialog.hourly_rate'), value: 'hourly_rate' }, { name: intl.get('project_task.dialog.hourly_rate'), value: 'time' },
{ name: intl.get('project_task.dialog.fixed_price'), value: 'fixed_price' }, { name: intl.get('project_task.dialog.fixed_price'), value: 'fixed' },
{ name: intl.get('project_task.dialog.non_chargeable'), value: 'non_chargeable' }, { name: intl.get('project_task.dialog.non_chargeable'), value: 'non_chargable' },
]; ];
export const expenseChargeOption = [ export const expenseChargeOption = [

View File

@@ -2108,6 +2108,7 @@
"project_details.label.purchases": "Purchases", "project_details.label.purchases": "Purchases",
"project_details.label.sales": "Sales", "project_details.label.sales": "Sales",
"project_details.label.journals": "Journals", "project_details.label.journals": "Journals",
"project_details.new_task": "New Task",
"project_details.new_invoicing": "New Invoicing", "project_details.new_invoicing": "New Invoicing",
"project_details.new_expense": "New Expense", "project_details.new_expense": "New Expense",
"project_details.new_estimated_expense": "New Estimated Expense", "project_details.new_estimated_expense": "New Estimated Expense",
@@ -2208,5 +2209,8 @@
"project_invoicing.dialog.all_time_entries": "All time entries", "project_invoicing.dialog.all_time_entries": "All time entries",
"project_invoicing.dialog.all_unbilled_expenses": "All unbilled expenses", "project_invoicing.dialog.all_unbilled_expenses": "All unbilled expenses",
"project_invoicing.dialog.all_bills": "All bills", "project_invoicing.dialog.all_bills": "All bills",
"project_invoicing.dialog.bill_to": "Bill To" "project_invoicing.dialog.bill_to": "Bill To",
"project_billable_entries.dialog.label": "Add Project Entries",
"project_billable_entries.dialog.filter_by_date": "Filter by Date",
"project_billable_entries.dialog.filter_by_type":"Filter by Type"
} }