Skip to content

Colors theme: fix daygraph request #2399

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LKuemmel merged 3 commits into from
May 16, 2025
Merged

Colors theme: fix daygraph request #2399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c9ca836
fix daygraph request
cshagen May 14, 2025
ab70bb6
fix month and year graph
cshagen May 14, 2025
d19ae69
layout fixes
cshagen May 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/modules/web_themes/colors/source/src/components/batteryList/BatteryList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Hagen */
{{ batteryState }}
</WbBadge>
</template>
<div class="px-3 subgrid grid-12">
<div class="subgrid grid-12">
<InfoItem heading="Ladestand:" class="grid-left grid-col-4">
<BatterySymbol
color="var(--color-battery)"
Expand All @@ -40,7 +40,7 @@ Hagen */
v-for="[key, battery] in batteries"
:key="key"
:bat="battery"
class="px-4"
class="px-0"
/>
</WbWidgetFlex>
</template>
Expand Down
6 changes: 1 addition & 5 deletions packages/modules/web_themes/colors/source/src/components/counterList/CounterList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,7 @@
>
<span>Zähler</span>
</template>
<div
v-for="(counter, index) in counters"
:key="index"
class="subgrid pb-2 px-4"
>
<div v-for="(counter, index) in counters" :key="index" class="subgrid pb-2">
<ClCounter :counter="counter" />
</div>
</WBWidgetFlex>
Expand Down
6 changes: 1 addition & 5 deletions packages/modules/web_themes/colors/source/src/components/inverterList/InverterList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,7 @@
{{ formatWatt(sourceSummary.pv.power) }}
</WbBadge>
</template>
<div
v-for="[key, pvsystem] in pvSystems"
:key="key"
class="subgrid pb-2 px-4"
>
<div v-for="[key, pvsystem] in pvSystems" :key="key" class="subgrid pb-2">
<IlInverter :inverter="pvsystem" />
</div>
</WBWidgetFlex>
Expand Down
6 changes: 3 additions & 3 deletions packages/modules/web_themes/colors/source/src/components/powerGraph/model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ export const dayGraph = reactive({
graphData.waitForData = true
sendCommand({
command: 'getDailyLog',
data: { day: dateString },
data: { date: dateString },
})
}
},
Expand Down Expand Up @@ -208,7 +208,7 @@ export const monthGraph = reactive({
graphData.waitForData = true
sendCommand({
command: 'getMonthlyLog',
data: { month: dateString },
data: { date: dateString },
})
},
deactivate() {
Expand Down Expand Up @@ -256,7 +256,7 @@ export const yearGraph = reactive({
graphData.waitForData = true
sendCommand({
command: 'getYearlyLog',
data: { year: dateString },
data: { date: dateString },
})
},
deactivate() {
Expand Down
2 changes: 1 addition & 1 deletion packages/modules/web_themes/colors/source/src/components/shared/WbWidgetFlex.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<slot name="buttons" />
</div>
</div>
<div class="grid12 pb-3">
<div class="grid12 pb-3 px-3">
<slot />
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion ...hemes/colors/web/assets/index-B1IFxNDg.js → ...hemes/colors/web/assets/index-B-oIXkFa.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...emes/colors/web/assets/index-R7WEwZeK.css → ...emes/colors/web/assets/index-BmACv-mh.css
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions packages/modules/web_themes/colors/web/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
<link rel="apple-touch-icon" sizes="60x60" href="/openWB/web/img/favicons/apple-touch-icon-60x60.png">
<link rel="manifest" href="/openWB/web/manifest.json">
<title>openWB</title>
<script type="module" crossorigin src="/openWB/web/themes/colors/assets/index-B1IFxNDg.js"></script>
<script type="module" crossorigin src="/openWB/web/themes/colors/assets/index-B-oIXkFa.js"></script>
<link rel="modulepreload" crossorigin href="/openWB/web/themes/colors/assets/vendor-CmSLe-Fc.js">
<link rel="stylesheet" crossorigin href="/openWB/web/themes/colors/assets/index-R7WEwZeK.css">
<link rel="stylesheet" crossorigin href="/openWB/web/themes/colors/assets/index-BmACv-mh.css">
</head>

<body>
Expand Down