patrick/OpenDTU
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'pr799' into dev

Browse Source
This commit is contained in:
Thomas Basler 2023-04-12 19:32:07 +02:00
commit 9d45c5d68a
2 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
webapp/src/views/DeviceAdminView.vue
View File

@ -27,9 +27,8 @@
<div class="col-sm-10">
<select class="form-select" id="inputPinProfile"
v-model="deviceConfigList.curPin.name">
<option v-for="device in pinMappingList" :value="device.name"
:key="device.name">
{{ device.name }}
<option v-for="device in pinMappingList" :value="device.name" :key="device.name">
{{ device.name === "Default" ? $t('deviceadmin.DefaultProfile') : device.name }}
</option>
</select>
</div>
@ -63,8 +62,8 @@
</label>
<div class="col-sm-10">
<select class="form-select" v-model="deviceConfigList.display.rotation">
<option v-for="rotation in displayRotationList" :key="rotation.key" :value="rotation.key">
{{ rotation.value }}
<option v-for="(rotation, index) in displayRotationList" :key="index" :value="index">
{{ $t(`deviceadmin.` + rotation) }}
</option>
</select>
</div>
@ -119,10 +118,10 @@ export default defineComponent({
alertType: "info",
showAlert: false,
displayRotationList: [
{ key: 0, value: this.$t('deviceadmin.rot0') },
{ key: 1, value: this.$t('deviceadmin.rot90') },
{ key: 2, value: this.$t('deviceadmin.rot180') },
{ key: 3, value: this.$t('deviceadmin.rot270') },
'rot0',
'rot90',
'rot180',
'rot270',
],
}
},
@ -144,10 +143,8 @@ export default defineComponent({
this.pinMappingList = Array<Device>();
})
.finally(() => {
this.pinMappingList.push({
"name": this.$t('deviceadmin.DefaultProfile')
} as Device);
this.pinMappingList.sort((a, b) => (a.name < b.name) ? -1 : 1);
this.pinMappingList.splice(0, 0, { "name": "Default" } as Device);
this.pinMappingLoading = false;
});
},

12
webapp/src/views/DtuAdminView.vue
View File

@ -23,8 +23,8 @@
</label>
<div class="col-sm-10">
<select class="form-select" v-model="dtuConfigList.dtu_palevel">
<option v-for="palevel in palevelList" :key="palevel.key" :value="palevel.key">
{{ palevel.value }}
<option v-for="(palevel, index) in palevelList" :key="index" :value="index">
{{ $t(`dtuadmin.` + palevel) }}
</option>
</select>
</div>
@ -58,10 +58,10 @@ export default defineComponent({
dataLoading: true,
dtuConfigList: {} as DtuConfig,
palevelList: [
{ key: 0, value: this.$t('dtuadmin.Min') },
{ key: 1, value: this.$t('dtuadmin.Low') },
{ key: 2, value: this.$t('dtuadmin.High') },
{ key: 3, value: this.$t('dtuadmin.Max') },
'Min',
'Low',
'High',
'Max',
],
alertMessage: "",
alertType: "info",