Commit 9304535c authored by Stephane Mankowski's avatar Stephane Mankowski
Browse files

Dashboard readability improvement

parent ac0936f3
......@@ -7,6 +7,7 @@ skrooge (2.21.0)
*Correction bug D22508: Get rid of obsolete methods
*Correction bug D24327: Build flatpak with latest libofx 0.9.15
*Correction: Import CSV file with footer line
*Correction: Dashboard readability improvement (see: https://forum.kde.org/viewtopic.php?f=210&t=162650)
*Feature D22484: Support using category, account, payee or unit properties in reports
*Feature: New source of unite: ratesapi.io (see: https://forum.kde.org/viewtopic.php?f=210&t=162312&sid=c31044c567a38f04e7276263d3720df8)
......
......@@ -7,7 +7,7 @@
<th align="center">{{ report.portfolio.0.3 }}</th>
<th align="center">{{ report.portfolio.0.4 }}</th>
<th align="center">{{ report.portfolio.0.5 }}</th>
<th align="center">{{ report.portfolio.0.6 }}</th>
<th align="center" colspan="2">{{ report.portfolio.0.6 }}</th>
</tr>
</thead>
<tbody>
......@@ -20,7 +20,8 @@
<td align="right">{{ item.3|money|safe }}</td>
<td align="right">{{ item.4|money|safe }}</td>
<td align="right">{{ item.5|money|safe }}</td>
<td align="right">{{ item.6|money|safe }} ({{ item.7|percent|safe }})</td>
<td align="right">{{ item.6|money|safe }}</td>
<td align="right">({{ item.7|percent|safe }})</td>
</tr>
{% endif %}
{% endfor %}
......@@ -28,4 +29,4 @@
</table>
{% else %}
{{ msg_no_share|safe }}
{% endif %}
\ No newline at end of file
{% endif %}
......@@ -33,7 +33,7 @@ RowLayout {
}
Repeater {
model: 6
model: 7
ColumnLayout {
spacing: 0
property var modelId: modelData + 1
......@@ -47,9 +47,9 @@ RowLayout {
font.bold: index == 0
value: index == 0 || parent.modelId <=2 ? null : modelData[parent.modelId]
max: index == 0 || parent.modelId <=3 || parent.modelId ==6 ? null : maxValues(m, parent.modelId)
max: index == 0 || parent.modelId <=3 || parent.modelId >=6 ? null : maxValues(m, parent.modelId)
backgroundColor: '#' + (value == null || value < 0 ? color_negativetext : color_positivetext)
text: index == 0 || parent.modelId <=2 ? modelData[parent.modelId] : document.formatPrimaryMoney(modelData[parent.modelId]) + (index != 0 && parent.modelId ==6 ? " (" + document.formatPercentage(modelData[parent.modelId+1]) + ")": "")
text: index == 0 || parent.modelId <=2 ? parent.modelId==7 ? "%" : modelData[parent.modelId] : parent.modelId==7 ? document.formatPercentage(modelData[parent.modelId]) : document.formatPrimaryMoney(modelData[parent.modelId])
url: font.bold || parent.modelId != 5 ? "" : "skg://Skrooge_operation_plugin/?operationWhereClause=t_UNIT='"+ modelData[0] + "'&title=Operations with unit equal to '"+ modelData[1] + "'&title_icon=view-currency-list&currentPage=-1"
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment