Add a "Calendar view"

models/view/summary.go

@@ -1,9 +1,11 @@
 package view
 
 import (
+	"time"
+
+	"github.com/duke-git/lancet/v2/slice"
 	conf "github.com/muety/wakapi/config"
 	"github.com/muety/wakapi/models"
-	"time"
 )
 
 type SummaryViewModel struct {
@@ -14,11 +16,38 @@ type SummaryViewModel struct {
 	EditorColors        map[string]string
 	LanguageColors      map[string]string
 	OSColors            map[string]string
+	DailyStats          []*DailyProjectViewModel
 	RawQuery            string
 	UserFirstData       time.Time
 	DataRetentionMonths int
 }
 
+type DailyProjectViewModel struct {
+	Date     time.Time                      `json:"date"`
+	Projects []*DailySingleProjectViewModel `json:"projects"`
+}
+
+type DailySingleProjectViewModel struct {
+	Name     string        `json:"name"`
+	Duration time.Duration `json:"duration"`
+}
+
+func NewDailyProjectStats(summaries []*models.Summary) []*DailyProjectViewModel {
+	dailyProjects := make([]*DailyProjectViewModel, 0)
+	for _, summary := range summaries {
+		dailyProjects = append(dailyProjects, &DailyProjectViewModel{
+			Date: summary.FromTime.T(),
+			Projects: slice.Map(summary.Projects, func(_ int, curProject *models.SummaryItem) *DailySingleProjectViewModel {
+				return &DailySingleProjectViewModel{
+					Name:     curProject.Key,
+					Duration: curProject.Total,
+				}
+			}),
+		})
+	}
+	return dailyProjects
+}
+
 func (s SummaryViewModel) UserDataExpiring() bool {
 	cfg := conf.Get()
 	return cfg.Subscriptions.Enabled &&

routes/summary.go

@@ -2,6 +2,9 @@ package routes
 
 import (
 	"fmt"
+	"net/http"
+	"time"
+
 	"github.com/go-chi/chi/v5"
 	conf "github.com/muety/wakapi/config"
 	"github.com/muety/wakapi/helpers"
@@ -10,8 +13,7 @@ import (
 	"github.com/muety/wakapi/models/view"
 	su "github.com/muety/wakapi/routes/utils"
 	"github.com/muety/wakapi/services"
-	"net/http"
-	"time"
+	"github.com/muety/wakapi/utils"
 )
 
 type SummaryHandler struct {
@@ -86,6 +88,16 @@ func (h *SummaryHandler) GetIndex(w http.ResponseWriter, r *http.Request) {
 		firstData, _ = time.Parse(time.RFC822Z, firstDataKv.Value)
 	}
 
+	dailyStats := []*view.DailyProjectViewModel{}
+	if summaryParams.From.Add(time.Hour*24*31).After(summaryParams.To) && summaryParams.From.Add(time.Hour*24*3).Before(summaryParams.To) {
+		dailyStatsSummaries, err := h.fetchSummaryForDailyProjectStats(summaryParams)
+		if err != nil {
+			conf.Log().Request(r).Error("failed to load daily stats", "error", err)
+		} else {
+			dailyStats = view.NewDailyProjectStats(dailyStatsSummaries)
+		}
+	}
+
 	vm := view.SummaryViewModel{
 		SharedLoggedInViewModel: view.SharedLoggedInViewModel{
 			SharedViewModel: view.NewSharedViewModel(h.config, nil),
@@ -100,6 +112,7 @@ func (h *SummaryHandler) GetIndex(w http.ResponseWriter, r *http.Request) {
 		RawQuery:            rawQuery,
 		UserFirstData:       firstData,
 		DataRetentionMonths: h.config.App.DataRetentionMonths,
+		DailyStats:          dailyStats,
 	}
 
 	templates[conf.SummaryTemplate].Execute(w, vm)
@@ -112,3 +125,16 @@ func (h *SummaryHandler) buildViewModel(r *http.Request, w http.ResponseWriter)
 		},
 	}, r, w)
 }
+
+func (h *SummaryHandler) fetchSummaryForDailyProjectStats(params *models.SummaryParams) ([]*models.Summary, error) {
+	summaries := make([]*models.Summary, 0)
+	intervals := utils.SplitRangeByDays(params.From, params.To)
+	for _, interval := range intervals {
+		curSummary, err := h.summarySrvc.Aliased(interval[0], interval[1], params.User, h.summarySrvc.Retrieve, params.Filters, false)
+		if err != nil {
+			return nil, err
+		}
+		summaries = append(summaries, curSummary)
+	}
+	return summaries, nil
+}

routes/utils/summary_utils.go

@@ -35,6 +35,7 @@ func LoadUserSummaryByParams(ss services.ISummaryService, params *models.Summary
 		return nil, err, http.StatusInternalServerError
 	}
 
+	summary.User = params.User
 	summary.FromTime = models.CustomTime(summary.FromTime.T().In(params.User.TZ()))
 	summary.ToTime = models.CustomTime(summary.ToTime.T().In(params.User.TZ()))
 

static/assets/js/summary.js

@@ -15,6 +15,7 @@ const labelsCanvas = document.getElementById('chart-label')
 const branchesCanvas = document.getElementById('chart-branches')
 const entitiesCanvas = document.getElementById('chart-entities')
 const categoriesCanvas = document.getElementById('chart-categories')
+const dailyCanvas = document.getElementById('chart-daily-projects')
 
 const projectContainer = document.getElementById('project-container')
 const osContainer = document.getElementById('os-container')
@@ -25,10 +26,11 @@ const labelContainer = document.getElementById('label-container')
 const branchContainer = document.getElementById('branch-container')
 const entityContainer = document.getElementById('entity-container')
 const categoryContainer = document.getElementById('category-container')
+const dailyContainer = document.getElementById('daily-container')
 
-const containers = [projectContainer, osContainer, editorContainer, languageContainer, machineContainer, labelContainer, branchContainer, entityContainer, categoryContainer]
-const canvases = [projectsCanvas, osCanvas, editorsCanvas, languagesCanvas, machinesCanvas, labelsCanvas, branchesCanvas, entitiesCanvas, categoriesCanvas]
-const data = [wakapiData.projects, wakapiData.operatingSystems, wakapiData.editors, wakapiData.languages, wakapiData.machines, wakapiData.labels, wakapiData.branches, wakapiData.entities, wakapiData.categories]
+const containers = [projectContainer, osContainer, editorContainer, languageContainer, machineContainer, labelContainer, branchContainer, entityContainer, categoryContainer, dailyContainer]
+const canvases = [projectsCanvas, osCanvas, editorsCanvas, languagesCanvas, machinesCanvas, labelsCanvas, branchesCanvas, entitiesCanvas, categoriesCanvas, dailyCanvas]
+const data = [wakapiData.projects, wakapiData.operatingSystems, wakapiData.editors, wakapiData.languages, wakapiData.machines, wakapiData.labels, wakapiData.branches, wakapiData.entities, wakapiData.categories, wakapiData.dailyStats]
 
 let topNPickers = [...document.getElementsByClassName('top-picker')]
 topNPickers.sort(((a, b) => parseInt(a.attributes['data-entity'].value) - parseInt(b.attributes['data-entity'].value)))
@@ -63,6 +65,13 @@ String.prototype.toHHMMSS = function () {
     return `${hours}:${minutes}:${seconds}`
 }
 
+function filterLegendItem(item) {
+    if (!item || !item.text) return false;
+    item.text = item.text.length > LEGEND_CHARACTERS ? item.text.slice(0, LEGEND_CHARACTERS - 3).padEnd(LEGEND_CHARACTERS, '.') : item.text
+    item.text = item.text.padEnd(LEGEND_CHARACTERS + 3)
+    return true
+}
+
 function draw(subselection) {
     function getTooltipOptions(key, stacked) {
         return {
@@ -79,12 +88,6 @@ function draw(subselection) {
         }
     }
 
-    function filterLegendItem(item) {
-        item.text = item.text.length > LEGEND_CHARACTERS ? item.text.slice(0, LEGEND_CHARACTERS - 3).padEnd(LEGEND_CHARACTERS, '.') : item.text
-        item.text = item.text.padEnd(LEGEND_CHARACTERS + 3)
-        return true
-    }
-
     function shouldUpdate(index) {
         return !subselection || (subselection.includes(index) && data[index].length >= showTopN[index])
     }
@@ -102,7 +105,7 @@ function draw(subselection) {
             data: {
                 datasets: [{
                     data: wakapiData.projects
-                    .slice(0, Math.min(showTopN[0], wakapiData.projects.length))
+                        .slice(0, Math.min(showTopN[0], wakapiData.projects.length))
                         .map(p => parseInt(p.total)),
                     backgroundColor: wakapiData.projects.map((p, i) => {
                         const c = hexToRgb(vibrantColors ? getRandomColor(p.key) : getColor(p.key, i % baseColors.length))
@@ -455,7 +458,7 @@ function draw(subselection) {
                             callback: (label) => label.toString().toHHMMSS(),
                         },
                         stacked: true,
-                        max: wakapiData.categories.map(c => c.total).reduce((a, b) => a+b, 0)
+                        max: wakapiData.categories.map(c => c.total).reduce((a, b) => a + b, 0)
                     },
                     y: {
                         stacked: true,
@@ -503,7 +506,7 @@ function togglePlaceholders(mask) {
 }
 
 function getPresentDataMask() {
-    return data.map(list => (list ? list.reduce((acc, e) => acc + e.total, 0) : 0) > 0)
+    return data.map(list => (list ? list.reduce((acc, e) => acc + (e.total ? e.total : (e.projects ? e.projects.reduce((acc, f) => acc + f.duration, 0) : 0)), 0) : 0) > 0)
 }
 
 function getColor(seed, index) {
@@ -547,11 +550,83 @@ function extractFile(filePath) {
 }
 
 function updateNumTotal() {
-    for (let i = 0; i < data.length; i++) {
+    // Why length - 1:
+    //  We don't have a 'topN' for the DailyProjectStats
+    //  So there isn't a input for it.
+    for (let i = 0; i < data.length - 1; i++) {
         document.querySelector(`span[data-entity='${i}']`).innerText = data[i].length.toString()
     }
 }
 
+function drawDailyProjectChart(dailyStats) {
+    if (!dailyCanvas || dailyCanvas.classList.contains('hidden')) return
+    const formattedStats = dailyStats.map(stat => ({
+        ...stat,
+        date: new Date(stat.date).toLocaleDateString() // convert to YYYY-MM-DD format
+    }));
+
+    const projects = formattedStats.flatMap(day => day.projects.map(project => project.name)).sort().filter((value, index, self) => self.indexOf(value) === index)
+
+    const data = formattedStats.map(day => {
+        var curdata = {}
+        for (const key in day.projects) {
+            curdata[day.projects[key].name] = day.projects[key].duration
+        }
+        return curdata
+    })
+
+    new Chart(dailyCanvas.getContext('2d'), {
+        type: 'bar',
+        data: {
+            labels: formattedStats.map(day => day.date),
+            datasets: projects.map(project => ({
+                label: project,
+                data: data.map(day => day[project] || 0),
+                backgroundColor: getRandomColor(project),
+                barPercentage: 0.95,
+            }))
+        },
+        options: {
+            responsive: true,
+            maintainAspectRatio: false,
+            scales: {
+                x: {
+                    stacked: true,
+                    title: {
+                        display: true,
+                        text: 'Date'
+                    }
+                },
+                y: {
+                    stacked: true,
+                    title: {
+                        display: true,
+                        text: 'Duration (hh:mm:ss)'
+                    },
+                    ticks: {
+                        callback: value => value.toString().toHHMMSS()
+                    }
+                }
+            },
+            plugins: {
+                tooltip: {
+                    callbacks: {
+                        label: (context) => {
+                            return `${context.dataset.label}: ${context.raw.toString().toHHMMSS()}`
+                        }
+                    }
+                },
+                legend: {
+                    position: 'right',
+                    labels: {
+                        filter: filterLegendItem
+                    }
+                }
+            }
+        }
+    })
+}
+
 window.addEventListener('load', function () {
     topNPickers.forEach(e => e.addEventListener('change', () => {
         parseTopN()
@@ -562,4 +637,7 @@ window.addEventListener('load', function () {
     togglePlaceholders(getPresentDataMask())
     draw()
     updateNumTotal()
+    if (wakapiData.dailyStats && wakapiData.dailyStats.length > 0) {
+        drawDailyProjectChart(wakapiData.dailyStats)
+    }
 })

views/summary.tpl.html

@@ -290,6 +290,19 @@ <h4 class="font-semibold text-lg text-gray-500">{{ .TotalTime | duration }}</h4>
                     <span class="text-md font-semibold text-gray-500 mt-4">No data</span>
                 </div>
             </div>
+
+            <div class="row-span-1 col-span-1 sm:row-span-3 sm:col-span-3 md:row-span-3 md:col-span-3 p-4 px-6 pb-10 bg-gray-850 text-gray-300 rounded-md shadow flex flex-col w-full no-break"
+            id="daily-container" style="max-height: 224px;">
+                <div class="flex justify-between">
+                    <div class="flex items-center gap-x-2">
+                        <span class="font-semibold text-lg w-1/2 flex-1 whitespace-nowrap">Daily Project Time {{ if .IsProjectDetails }} For this Project {{ end }}</span>
+                    </div>
+                </div>
+                <canvas id="chart-daily-projects" class="mt-2"></canvas>
+                <div class="hidden placeholder-container flex items-center justify-center h-full flex-col">
+                    <span class="text-md font-semibold text-gray-500 mt-4">No data / Interval longer than a month or shorter than 3 days</span>
+                </div>
+            </div>
         </div>
 
         <div class="mt-12 flex flex-col space-y-2 text-gray-300 w-full no-break">
@@ -358,6 +371,7 @@ <h1 class="font-semibold text-3xl text-white m-0 mb-2">Setup Instructions</h1>
     wakapiData.machines = {{ .Machines | json }}
     wakapiData.labels = {{ .Labels | json }}
     wakapiData.categories = {{ .Categories | json }}
+    wakapiData.dailyStats = {{ .DailyStats | json }}
     {{ if .IsProjectDetails }}
     wakapiData.branches = {{ .Branches | json }}
     wakapiData.entities = {{ .Entities | json }}