gilles/hammond
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dates to ISO strings, getTimeZone gets timezone as string

Browse Source
This commit is contained in:
Alex H
2023-04-16 05:58:55 +00:00
parent d294db34fc
commit 654087b990
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ui/src/router/views/import-generic.vue
View File

@@ -81,6 +81,9 @@ export default {
getUsedHeadings() { getUsedHeadings() {
return Object.keys(this.fileHeadingMap).filter((k) => this.fileHeadingMap[k] != null) // filter non-null properties return Object.keys(this.fileHeadingMap).filter((k) => this.fileHeadingMap[k] != null) // filter non-null properties
}, },
getTimezone() {
return Intl.DateTimeFormat().resolvedOptions().timeZone
},
csvToJson() { csvToJson() {
const data = [] const data = []
const headings = this.getUsedHeadings().reduce((a, k) => ({ ...a, [k]: this.fileHeadingMap[k] }), {}) // create new object from filter const headings = this.getUsedHeadings().reduce((a, k) => ({ ...a, [k]: this.fileHeadingMap[k] }), {}) // create new object from filter
@@ -119,6 +122,8 @@ export default {
item[k] = setFullTank(row) item[k] = setFullTank(row)
} else if (this.invertFullTank) { } else if (this.invertFullTank) {
item[k] = !row[headings[k]] item[k] = !row[headings[k]]
} else if ('date') {
item[k] = new Date(row[headings[k]]).toISOString()
} else { } else {
item[k] = row[headings[k]] item[k] = row[headings[k]]
} }
@@ -133,6 +138,7 @@ export default {
const content = { const content = {
data: this.csvToJson(), data: this.csvToJson(),
vehicleId: this.selectedVehicle.Id, vehicleId: this.selectedVehicle.Id,
timezone: this.getTimezone()
} }
axios axios
.post('/api/import/generic', content) .post('/api/import/generic', content)
@@ -194,9 +200,7 @@ export default {
<li>{{ $t('importhintvehiclecreated') }}</li> <li>{{ $t('importhintvehiclecreated') }}</li>
<li v-html="$t('importhintcurrdist')"></li> <li v-html="$t('importhintcurrdist')"></li>
<li v-html="$t('importhintunits')"></li> <li v-html="$t('importhintunits')"></li>
<li <li><b>{{ $t('dontimportagain') }}</b></li>
><b>{{ $t('dontimportagain') }}</b></li
>
</ol> </ol>
</div> </div>
</div> </div>
@@ -264,7 +268,8 @@ export default {
</option> </option>
</b-select> </b-select>
</b-field> </b-field>
<b-field :label="$t('per', { '0': $t('price'), '1': $t('unit.short.' + selectedVehicle.fuelUnitDetail.key) })"> <b-field
:label="$t('per', { '0': $t('price'), '1': $t('unit.short.' + selectedVehicle.fuelUnitDetail.key) })">
<b-select v-model.number="fileHeadingMap.perUnitPrice" type="number" min="0" step=".001" expanded required> <b-select v-model.number="fileHeadingMap.perUnitPrice" type="number" min="0" step=".001" expanded required>
<option v-for="(option, index) in fileHeadings" :key="index" :value="index"> <option v-for="(option, index) in fileHeadings" :key="index" :value="index">
{{ option }} {{ option }}
@@ -328,7 +333,8 @@ export default {
</b-field> </b-field>
<br /> <br />
<b-field> <b-field>
<b-button tag="button" native-type="submit" type="is-primary" :value="$t('save')" :label="$t('import')" expanded /> <b-button tag="button" native-type="submit" type="is-primary" :value="$t('save')" :label="$t('import')"
expanded />
<p v-if="authError"> There was an error logging in to your account. </p> <p v-if="authError"> There was an error logging in to your account. </p>
</b-field> </b-field>
</span> </span>