admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

IO-1600 Number of rental days on contract list.

Browse Source
This commit is contained in:
Patrick Fic
2021-12-28 10:06:01 -08:00
parent 6422b13c1a
commit 1218deeee7
5 changed files with 41 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
bodyshop_translations.babel
View File

@@ -10011,6 +10011,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>length</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node> <concept_node>
<name>localtax</name> <name>localtax</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>

18
client/src/components/contracts-list/contracts-list.component.jsx
View File

@@ -11,6 +11,7 @@ import { setModalContext } from "../../redux/modals/modals.actions";
import { connect } from "react-redux"; import { connect } from "react-redux";
import { createStructuredSelector } from "reselect"; import { createStructuredSelector } from "reselect";
import moment from "moment";
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
//currentUser: selectCurrentUser //currentUser: selectCurrentUser
}); });
@@ -86,7 +87,9 @@ export function ContractsList({
} ${record.courtesycar.make} ${record.courtesycar.model}${ } ${record.courtesycar.make} ${record.courtesycar.model}${
record.courtesycar.plate ? ` (${record.courtesycar.plate})` : "" record.courtesycar.plate ? ` (${record.courtesycar.plate})` : ""
}${ }${
record.courtesycar.fleetnumber ? ` (${record.courtesycar.fleetnumber})` : "" record.courtesycar.fleetnumber
? ` (${record.courtesycar.fleetnumber})`
: ""
}`}</Link> }`}</Link>
), ),
}, },
@@ -133,6 +136,19 @@ export function ContractsList({
<DateTimeFormatter>{record.actualreturn}</DateTimeFormatter> <DateTimeFormatter>{record.actualreturn}</DateTimeFormatter>
), ),
}, },
{
title: t("contracts.fields.length"),
dataIndex: "length",
key: "length",
render: (text, record) =>
(record.actualreturn &&
record.start &&
`${moment(record.actualreturn)
.diff(moment(record.start), "days", true)
.toFixed(1)} days`) ||
"",
},
]; ];
const handleTableChange = (pagination, filters, sorter) => { const handleTableChange = (pagination, filters, sorter) => {

1
client/src/translations/en_us/common.json
View File

@@ -615,6 +615,7 @@
"fuelout": "Fuel Out", "fuelout": "Fuel Out",
"kmend": "Mileage End", "kmend": "Mileage End",
"kmstart": "Mileage Start", "kmstart": "Mileage Start",
"length": "Length",
"localtax": "Local Taxes", "localtax": "Local Taxes",
"refuelcharge": "Refuel Charge (per liter/gallon)", "refuelcharge": "Refuel Charge (per liter/gallon)",
"scheduledreturn": "Scheduled Return", "scheduledreturn": "Scheduled Return",

1
client/src/translations/es/common.json
View File

@@ -615,6 +615,7 @@
"fuelout": "", "fuelout": "",
"kmend": "", "kmend": "",
"kmstart": "", "kmstart": "",
"length": "",
"localtax": "", "localtax": "",
"refuelcharge": "", "refuelcharge": "",
"scheduledreturn": "", "scheduledreturn": "",

1
client/src/translations/fr/common.json
View File

@@ -615,6 +615,7 @@
"fuelout": "", "fuelout": "",
"kmend": "", "kmend": "",
"kmstart": "", "kmstart": "",
"length": "",
"localtax": "", "localtax": "",
"refuelcharge": "", "refuelcharge": "",
"scheduledreturn": "", "scheduledreturn": "",