Skip to content

Commit

Permalink
Merge pull request #377 from micz/fastforward_115
Browse files Browse the repository at this point in the history
Merging version 2.2.1
  • Loading branch information
micz authored Sep 19, 2024
2 parents 43fc1d4 + 54009f7 commit 1c7979a
Show file tree
Hide file tree
Showing 21 changed files with 566 additions and 191 deletions.
16 changes: 15 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,21 @@




<h3>Version 2.2.1 - 19/09/2024</h3>
<ul>
<li>ThunderStats Version 2.* is now compatible also with Thunderbird version 115.*.</li>
<li>The option "When selecting a custom date range view, update the statistics immediately" is now true by default.</li>
<li>The toolbar button is now always visible.</li>
<li>Folders select dropdown text color fixed.</li>
<li>Weekdays chart fixed [<a href="https://github.com/micz/ThunderStats/issues/374">#374</a>].</li>
<li>Improved the positioning of the labels on the Inbox Zero Folders graphs [<a href="https://github.com/micz/ThunderStats/issues/370">#370</a>, <a href="https://github.com/micz/ThunderStats/issues/373">#373</a>].</li>
<li>In the advanced filters panel is now possible to check the "include subolders" checkbox clicking on its label [<a href="https://github.com/micz/ThunderStats/issues/371">#371</a>].</li>
<li>Inbox percentage loading indicator timing fixed [<a href="https://github.com/micz/ThunderStats/issues/376">#376</a>].</li>
<li>Fixed a label error in the weekdays chart, which misordered the days relative to the number of emails.</li>
<li>Time chart tooltip width fixed even with large numbers.</li>
<li>The "Current week", "last week" and "Two last weeks" bookmarks are now considering the start week day option.</li>
<li>Minor graphics fixes.</li>
</ul>
<h3>Version 2.2.0 - 11/09/2024</h3>
<ul>
<li>When executing a custom query for a single day, now is used the single day view [<a href="https://github.com/micz/ThunderStats/issues/315">#315</a>].</li>
Expand Down
20 changes: 20 additions & 0 deletions CHANGELOG_v1.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,26 @@

[Go to the release notes files for version 2.x](CHANGELOG.md)

<h3>Version 1.9.1 - 20/08/2024</h3>
<ul>
<li>Minor bug fixes.</li>
</ul>
<h3>Version 1.9.0 - 09/08/2024</h3>
<ul>
<li><b><i>This version 1.9 has been backported from ThunderStats version 2.0 to Thunderbird 115.</i></b></li>
<li>This is a complete rewrite of the original addon as a MailExtension, using Vue.js.</li>
<li>Added dark mode [<a href="https://github.com/micz/ThunderStats/issues/197">#197</a>].</li>
<li>It's now possibile to define a locale for the datepicker different from the default one [<a href="https://github.com/micz/ThunderStats/issues/238">#238</a>].</li>
<li>Added an option to choose to remember last opened tab [<a href="https://github.com/micz/ThunderStats/issues/232">#232</a>].</li>
<li>The Time Graph is now a line graph [<a href="https://github.com/micz/ThunderStats/issues/198">#198</a>].</li>
<li>Added info for the last days in the Yesterday Tab [<a href="https://github.com/micz/ThunderStats/issues/276">#276</a>].</li>
<li>The elaboration time is now shown [<a href="https://github.com/micz/ThunderStats/issues/218">#218</a>].</li>
<li>The results are displayed as they become available [<a href="https://github.com/micz/ThunderStats/issues/219">#219</a>].</li>
</ul>



### Version 1.4.5 - 16/12/2019
- Update for 68+ changes
- Compatibility 60, 68, 72(basic testing)
Expand Down
22 changes: 12 additions & 10 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "thunderstats",
"version": "2.2.0",
"version": "2.2.1",
"private": true,
"type": "module",
"scripts": {
Expand All @@ -10,7 +10,7 @@
},
"dependencies": {
"@imengyu/vue3-context-menu": "^1.4.1",
"@vueform/multiselect": "^2.6.9",
"@vueform/multiselect": "^2.6.10",
"@vuepic/vue-datepicker": "^8.7.0",
"chart.js": "^4.4.2",
"chartjs-plugin-datalabels": "^2.2.0",
Expand All @@ -19,7 +19,7 @@
"vue3-tabs-component": "^1.3.7"
},
"devDependencies": {
"@vitejs/plugin-vue": "^5.0.4",
"@vitejs/plugin-vue": "^5.1.4",
"vite": "^5.4.6"
}
}
7 changes: 4 additions & 3 deletions public/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,20 @@
"manifest_version": 2,
"name": "ThunderStats",
"description": "Do you remember the old good Eudora statistics? Do you miss them? Using this addon you can finally keep an eye on how you use your beloved Thunderbird!",
"version": "2.2.0",
"version": "2.2.1",
"author": "Mic ([email protected])",
"homepage_url": "http://micz.it/thunderbird-addon-thunderstats-your-thunderbird-statistics/",
"default_locale": "en",
"browser_specific_settings": {
"gecko": {
"id": "[email protected]",
"strict_min_version": "125.0"
"strict_min_version": "115.0"
}
},
"browser_action": {
"default_title": "Thunderstats",
"default_icon": "images/mzts-icon-32px.png"
"default_icon": "images/mzts-icon-32px.png",
"allowed_spaces": []
},
"permissions": [
"addressBooks",
Expand Down
7 changes: 7 additions & 0 deletions src/assets/base.css
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@
--section-gap: 160px;
}

.multiselect-option{
color: #313131;
}

@media (prefers-color-scheme: dark) {
:root {
--color-background: var(--vt-c-black);
Expand Down Expand Up @@ -95,6 +99,9 @@
--ms-empty-color: #D1D5DB;
}

.multiselect-option{
color: var(--ms-caret-color);
}
.multiselect-tags-search{
background-color: var(--ms-bg);
color: var(--ms-caret-color);
Expand Down
4 changes: 2 additions & 2 deletions src/assets/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ table.mzts-tinvolved tr.mzts-trow td.mzts-row-num{text-align:center;word-break:n
font-size: smaller;
position: absolute;
right: 46px;
top: 13px;
top: 12px;
min-width: 11em;
}
.mzts-last-exec{
Expand Down Expand Up @@ -110,7 +110,7 @@ table.mzts-tinvolved tr.mzts-trow td.mzts-row-num{text-align:center;word-break:n
border: 1px solid #cccccc;
background: #ededed;
color: #666666;
width: 15ch;
width: fit-content;
}
.tooltip-light .tooltip-content {
font-family: Arial, sans-serif;
Expand Down
12 changes: 8 additions & 4 deletions src/assets/squared.css
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,14 @@
}

.square_item:nth-child(1),
.square_item:nth-child(4) {
.square_item:nth-child(4),
.square_item:nth-child(5) {
background-color: #F1F9FD;
}

.square_item:nth-child(2),
.square_item:nth-child(3) {
.square_item:nth-child(3),
.square_item:nth-child(6) {
background-color: white;
}

Expand Down Expand Up @@ -78,12 +80,14 @@ h2.lowercase{
}

.square_item:nth-child(1),
.square_item:nth-child(4) {
.square_item:nth-child(4),
.square_item:nth-child(5) {
background-color: #333;
}

.square_item:nth-child(2),
.square_item:nth-child(3) {
.square_item:nth-child(3),
.square_item:nth-child(6) {
background-color: #444;
}

Expand Down
13 changes: 11 additions & 2 deletions src/components/graphs/GraphInboxZeroFolders.vue
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import { ref, computed } from 'vue'
import { Doughnut } from 'vue-chartjs'
import { Chart as ChartJS, ArcElement, Tooltip, Legend, Colors } from 'chart.js'
import { tsDoughnutLabelsLine } from '@statslib/chartjs-lib/plugin-doughnutlabels';
import { tsStore } from '@statslib/mzts-store';
ChartJS.register(ArcElement, Tooltip, Legend, Colors);
Expand Down Expand Up @@ -116,10 +117,18 @@ let chartOptions = ref({
break;
}
}
browser.mailTabs.update(currTab.id, {displayedFolder: chartData.value.folder_paths[activeEls[0].index]});
if(tsStore.isTB128plus){
browser.mailTabs.update(currTab.id, {displayedFolder: chartData.value.folder_paths[activeEls[0].index]});
}else{
browser.mailTabs.update(currTab.id, {displayedFolder: {...chartData.value.folder_paths[activeEls[0].index]}});
}
browser.tabs.update(currTab.id, {active: true});
} else {
browser.mailTabs.create({displayedFolder: chartData.value.folder_paths[activeEls[0].index]});
if(tsStore.isTB128plus){
browser.mailTabs.create({displayedFolder: chartData.value.folder_paths[activeEls[0].index]});
}else{
browser.mailTabs.create({displayedFolder: {...chartData.value.folder_paths[activeEls[0].index]}});
}
}
},
onHover: async (e, activeEls, chart) => {
Expand Down
51 changes: 26 additions & 25 deletions src/components/graphs/GraphWeeksDay.vue
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ import ChartDataLabels from 'chartjs-plugin-datalabels';
import { htmlLegendPlugin } from '@statslib/chartjs-lib/plugin-timegraph-legend';
import { tsCoreUtils } from '@statslib/mzts-statscore.utils';
import { tsStore } from '@statslib/mzts-store';
import { tsUtils } from '@statslib/mzts-utils';
Chart.register(Title, Tooltip, Legend, BarElement, CategoryScale, LinearScale, BarController);
Expand All @@ -62,11 +63,33 @@ let props = defineProps({
let weekdaysChartBar_ref = ref(null);
let legend_id = ref("weekdays-legend-container");
let maxY = ref(0);
let chartData = computed(() => props.chartData)
let is_loading = computed(() => props.is_loading)
let chartData = computed(() => {
if (props.chartData.datasets && props.chartData.datasets.length > 0) {
let data = tsUtils.safeConcat(props.chartData.datasets, 0)
.concat(tsUtils.safeConcat(props.chartData.datasets, 1));
let maxData = tsCoreUtils.getMaxFromData(data);
maxY.value = (Math.ceil(maxData / 5) * 5);
if(maxY.value == maxData) {
maxY.value = maxY.value + 3;
}
} else {
maxY.value = 5;
}
if(!chartOptions) return;
//console.log(">>>>>>>>>>>>>>>>>>>> maxY: " + maxY.value);
if(maxY.value < 20) {
chartOptions.value.scales.y.ticks.stepSize = 1;
}else{
chartOptions.value.scales.y.ticks.stepSize = 5;
}
chartOptions.value.scales.y.max = maxY.value;
let maxY = ref(0);
return props.chartData;
});
let is_loading = computed(() => props.is_loading)
var chartOptions = ref({
responsive: true,
Expand Down Expand Up @@ -151,28 +174,6 @@ var chartOptions = ref({
var chartPlugins = [ChartDataLabels, htmlLegendPlugin];
watch(props.chartData, (newChartData) => {
//console.log(">>>>>>>>>>>>> watch: " + JSON.stringify(newChartData));
if (newChartData.datasets && newChartData.datasets.length > 0) {
maxY.value = Math.ceil(tsCoreUtils.getMaxFromData(newChartData.datasets[0].data) / 5) * 5;
} else {
maxY.value = 5;
}
if(!chartOptions) return;
if(maxY.value < 20) {
chartOptions.value.scales.y.ticks.stepSize = 1;
}else{
chartOptions.value.scales.y.ticks.stepSize = 5;
}
chartOptions.value.scales.y.max = maxY.value;
if(tsStore.darkmode) {
Chart.defaults.color = 'white';
Chart.defaults.borderColor = 'rgba(255, 255, 255, 0.2)';
}
}, { immediate: true });
</script>


Expand Down
31 changes: 31 additions & 0 deletions src/components/options_tabs/OPTAB_Info.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,21 @@
<OptionDonationHeader />
<div>
<h1>ThunderStats Release Notes</h1>
<h3>Version 2.2.1 - 19/09/2024</h3>
<ul>
<li>ThunderStats Version 2.* is now compatible also with Thunderbird version 115.*.</li>
<li>The option "When selecting a custom date range view, update the statistics immediately" is now true by default.</li>
<li>The toolbar button is now always visible.</li>
<li>Folders select dropdown text color fixed.</li>
<li>Weekdays chart fixed [<a href="https://github.com/micz/ThunderStats/issues/374">#374</a>].</li>
<li>Improved the positioning of the labels on the Inbox Zero Folders graphs [<a href="https://github.com/micz/ThunderStats/issues/370">#370</a>, <a href="https://github.com/micz/ThunderStats/issues/373">#373</a>].</li>
<li>In the advanced filters panel is now possible to check the "include subolders" checkbox clicking on its label [<a href="https://github.com/micz/ThunderStats/issues/371">#371</a>].</li>
<li>Inbox percentage loading indicator timing fixed [<a href="https://github.com/micz/ThunderStats/issues/376">#376</a>].</li>
<li>Fixed a label error in the weekdays chart, which misordered the days relative to the number of emails.</li>
<li>Time chart tooltip width fixed even with large numbers.</li>
<li>The "Current week", "last week" and "Two last weeks" bookmarks are now considering the start week day option.</li>
<li>Minor graphics fixes.</li>
</ul>
<h3>Version 2.2.0 - 11/09/2024</h3>
<ul>
<li>When executing a custom query for a single day, now is used the single day view [<a href="https://github.com/micz/ThunderStats/issues/315">#315</a>].</li>
Expand Down Expand Up @@ -85,6 +100,22 @@
</div>
<div v-if="!show_v1"><button type="button" @click="show_v1 = true">__MSG_ShowRelNotes1x__</button></div>
<div v-if="show_v1">
<h3>Version 1.9.1 - 20/08/2024</h3>
<ul>
<li>Minor bug fixes.</li>
</ul>
<h3>Version 1.9.0 - 09/08/2024</h3>
<ul>
<li><b><i>This version 1.9 has been backported from ThunderStats version 2.0 to Thunderbird 115.</i></b></li>
<li>This is a complete rewrite of the original addon as a MailExtension, using Vue.js.</li>
<li>Added dark mode [<a href="https://github.com/micz/ThunderStats/issues/197">#197</a>].</li>
<li>It's now possibile to define a locale for the datepicker different from the default one [<a href="https://github.com/micz/ThunderStats/issues/238">#238</a>].</li>
<li>Added an option to choose to remember last opened tab [<a href="https://github.com/micz/ThunderStats/issues/232">#232</a>].</li>
<li>The Time Graph is now a line graph [<a href="https://github.com/micz/ThunderStats/issues/198">#198</a>].</li>
<li>Added info for the last days in the Yesterday Tab [<a href="https://github.com/micz/ThunderStats/issues/276">#276</a>].</li>
<li>The elaboration time is now shown [<a href="https://github.com/micz/ThunderStats/issues/218">#218</a>].</li>
<li>The results are displayed as they become available [<a href="https://github.com/micz/ThunderStats/issues/219">#219</a>].</li>
</ul>
<h3 id="version-1-4-5-16-12-2019">Version 1.4.5 - 16/12/2019</h3>
<ul>
<li>Update for 68+ changes</li>
Expand Down
Loading

0 comments on commit 1c7979a

Please sign in to comment.