Skip to content

Commit

Permalink
bugfixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Richardsl committed Feb 24, 2022
1 parent b217718 commit 3f036f3
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 15 deletions.
15 changes: 15 additions & 0 deletions createExamples.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
@echo off
for /l %%a in (1,1,15) do (
>>2022-04-%%a.md echo ---
>>2022-04-%%a.md echo moneySpent: 275
>>2022-04-%%a.md echo exercise: 30 minutes
>>2022-04-%%a.md echo alcohol: 30 minutes
>>2022-04-%%a.md echo ---
>>2022-04-%%a.md echo ## day no %%a
>>2022-04-%%a.md echo today is a good day!
>>2022-04-%%a.md echo i went to the park with my friend [person/greg: 1 hours 15 minutes]
>>2022-04-%%a.md echo
>>2022-04-%%a.md echo i did some writing [writing:: true]
>>2022-04-%%a.md echo
>>2022-04-%%a.md echo lorem ipsum lorem ipsum lorem ipsum lorem ipsum lorem ipsum
)
31 changes: 16 additions & 15 deletions main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ colors: {
orange: ["#ffa244","#fd7f00","#dd6f00","#bf6000","#9b4e00"],
pink: ["#ff96cb","#ff70b8","#ff3a9d","#ee0077","#c30062"],
orangeToRed: ["#ffdf04","#ffbe04","#ff9a03","#ff6d02","#ff2c01"]
},
*/

Expand Down Expand Up @@ -106,33 +105,35 @@ export default class HeatmapCalendar extends Plugin {
console.log("calEntries", calEntries)

const intensities: Array<number> = []
calEntries.forEach(e => e.intensity && intensities.push(e.intensity))
calEntries.forEach(e => {
if(e.intensity){
intensities.push(e.intensity)
}
})

const minimumIntensity = Math.min(...intensities) ?? 1;
const averageIntensity = intensities.reduce((a,b) => a + b, 0) / intensities.length ?? 3
const maximumIntensity = Math.max(...intensities) ?? 5;
/*
if(intensities.length != 0){
}else{
}
*/

console.log("minimumIntensity",minimumIntensity)
console.log("maximumIntensity",maximumIntensity)
console.log("averageIntensity",averageIntensity)




const mappedEntries: Array<Entry> = []

calEntries.forEach(e => {
console.log("cal foreach")
if (new Date(e.date).getFullYear() == year) {
console.log("if year")
const newEntry = { ...e }
newEntry.intensity = newEntry.intensity ?? this.settings.defaultEntryIntensity
newEntry.intensity = e.intensity ?? this.settings.defaultEntryIntensity;
console.log("newEntry.intensity", newEntry.intensity)

newEntry.intensity = Math.round(this.map(newEntry.intensity, minimumIntensity, maximumIntensity,1,5))
if(minimumIntensity==maximumIntensity){
newEntry.intensity = 5;
}else{
newEntry.intensity = Math.round(this.map(newEntry.intensity, minimumIntensity, maximumIntensity,1,5))
}
//if (!newEntry.intensity) { newEntry.intensity = this.settings.defaultEntryIntensity }
mappedEntries[this.daysIntoYear(new Date(e.date))] = newEntry

Expand Down

0 comments on commit 3f036f3

Please sign in to comment.