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

renamed 4 variables to better describe what they're for, fixed if logic

Browse Source
This commit is contained in:
Alex H
2023-04-14 19:07:32 -04:00
parent df165dae6e
commit 845dcb242a
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,11 +26,11 @@ export default {
fileHeadings: null, fileHeadings: null,
myVehicles: [], myVehicles: [],
selectedVehicle: null, selectedVehicle: null,
invert: false, invertFullTank: false,
filledValue: null, filledValueString: null,
notFilledValue: null, notFilledValueString: null,
isFullTankString: false, isFullTankString: false,
fillupModel: { fileHeadingMap: {
fuelQuantity: null, fuelQuantity: null,
perUnitPrice: null, perUnitPrice: null,
totalAmount: null, totalAmount: null,
@@ -79,9 +79,9 @@ export default {
Papa.parse(this.file, this.papaConfig) Papa.parse(this.file, this.papaConfig)
}, },
importData() { importData() {
if (this.errors.length !== 0) { if (this.errors.length === 0) {
const content = { const content = {
headings: this.fillupModel, headings: this.fileHeadingMap,
data: this.fileData.splice(1, this.fileData.length), data: this.fileData.splice(1, this.fileData.length),
fullTankInverted: this.inverted, fullTankInverted: this.inverted,
vehicleId: this.selectedVehicle.id, vehicleId: this.selectedVehicle.id,
@@ -92,7 +92,7 @@ export default {
} }
}, },
checkFieldString() { checkFieldString() {
const tankFull = this.fileData[1][this.fillupModel.isTankFull] const tankFull = this.fileData[1][this.fileHeadingMap.isTankFull]
if (typeof tankFull !== 'boolean') { if (typeof tankFull !== 'boolean') {
if (typeof tankFull === 'string' && tankFull.length > 0) { if (typeof tankFull === 'string' && tankFull.length > 0) {
this.isFullTankString = true this.isFullTankString = true
@@ -172,35 +172,35 @@ export default {
</b-field> </b-field>
<span v-if="selectedVehicle !== null"> <span v-if="selectedVehicle !== null">
<b-field :label="$t('fillupdate')"> <b-field :label="$t('fillupdate')">
<b-select v-model="fillupModel.date" equired expanded> <b-select v-model="fileHeadingMap.date" equired expanded>
<option v-for="(option, index) in fileHeadings" :key="index" :value="index"> <option v-for="(option, index) in fileHeadings" :key="index" :value="index">
{{ option }} {{ option }}
</option> </option>
</b-select> </b-select>
</b-field> </b-field>
<b-field :label="$t('fuelsubtype')"> <b-field :label="$t('fuelsubtype')">
<b-select v-model="fillupModel.fuelSubType" expanded> <b-select v-model="fileHeadingMap.fuelSubType" expanded>
<option v-for="(option, index) in fileHeadings" :key="index" :value="index"> <option v-for="(option, index) in fileHeadings" :key="index" :value="index">
{{ option }} {{ option }}
</option> </option>
</b-select> </b-select>
</b-field> </b-field>
<b-field :label="$t('quantity')"> <b-field :label="$t('quantity')">
<b-select v-model="fillupModel.fuelQuantity" expanded required> <b-select v-model="fileHeadingMap.fuelQuantity" 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 }}
</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="fillupModel.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 }}
</option> </option>
</b-select> </b-select>
</b-field> </b-field>
<b-field :label="$t('totalamountpaid')"> <b-field :label="$t('totalamountpaid')">
<b-select v-model.number="fillupModel.totalAmount" expanded required> <b-select v-model.number="fileHeadingMap.totalAmount" expanded required>
<option value="-1">Calculated</option> <option value="-1">Calculated</option>
<option v-for="(option, index) in fileHeadings" :key="index" :value="index"> <option v-for="(option, index) in fileHeadings" :key="index" :value="index">
{{ option }} {{ option }}
@@ -208,18 +208,18 @@ export default {
</b-select> </b-select>
</b-field> </b-field>
<b-field :label="$t('odometer')"> <b-field :label="$t('odometer')">
<b-select v-model.number="fillupModel.odoReading" expanded required> <b-select v-model.number="fileHeadingMap.odoReading" 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 }}
</option> </option>
</b-select> </b-select>
</b-field> </b-field>
<b-field :label="$t('tankpartialfull')"> <b-field :label="$t('tankpartialfull')">
<b-radio-button v-model="invert" native-value="false">{{ $t('fulltank') }}</b-radio-button> <b-radio-button v-model="invertFullTank" native-value="false">{{ $t('fulltank') }}</b-radio-button>
<b-radio-button v-model="invert" native-value="true">{{ $t('partialfillup') }}</b-radio-button> <b-radio-button v-model="invertFullTank" native-value="true">{{ $t('partialfillup') }}</b-radio-button>
</b-field> </b-field>
<b-field> <b-field>
<b-select v-model="fillupModel.isTankFull" @input="checkFieldString"> <b-select v-model="fileHeadingMap.isTankFull" @input="checkFieldString">
<option v-for="(option, index) in fileHeadings" :key="index" :value="index"> <option v-for="(option, index) in fileHeadings" :key="index" :value="index">
{{ option }} {{ option }}
</option> </option>
@@ -227,28 +227,28 @@ export default {
</b-field> </b-field>
<span v-if="isFullTankString === true"> <span v-if="isFullTankString === true">
<b-field label="Value when tank is filled"> <b-field label="Value when tank is filled">
<b-input v-model="filledValue"></b-input> <b-input v-model="filledValueString"></b-input>
</b-field> </b-field>
<b-field label="Value when tank was not completely filled"> <b-field label="Value when tank was not completely filled">
<b-input v-model="notFilledValue"></b-input> <b-input v-model="notFilledValueString"></b-input>
</b-field> </b-field>
</span> </span>
<b-field :label="$t('missedfillup')"> <b-field :label="$t('missedfillup')">
<b-select v-model="fillupModel.hasMissedFillup"> <b-select v-model="fileHeadingMap.hasMissedFillup">
<option v-for="(option, index) in fileHeadings" :key="index" :value="index"> <option v-for="(option, index) in fileHeadings" :key="index" :value="index">
{{ option }} {{ option }}
</option> </option>
</b-select> </b-select>
</b-field> </b-field>
<b-field :label="$t('fillingstation')"> <b-field :label="$t('fillingstation')">
<b-select v-model="fillupModel.fillingStation"> <b-select v-model="fileHeadingMap.fillingStation">
<option v-for="(option, index) in fileHeadings" :key="index" :value="index"> <option v-for="(option, index) in fileHeadings" :key="index" :value="index">
{{ option }} {{ option }}
</option> </option>
</b-select> </b-select>
</b-field> </b-field>
<b-field :label="$t('comments')"> <b-field :label="$t('comments')">
<b-select v-model="fillupModel.comments" type="textarea" multiple expanded> <b-select v-model="fileHeadingMap.comments" type="textarea" multiple expanded>
<option v-for="(option, index) in fileHeadings" :key="index" :value="index"> <option v-for="(option, index) in fileHeadings" :key="index" :value="index">
{{ option }} {{ option }}
</option> </option>