mariano/deskmeter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

major fm updates

Browse Source
This commit is contained in:
buenosairesam
2025-12-19 22:47:38 -03:00
parent 0dde9f1f54
commit 23b4341842
7 changed files with 197 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

123
dmapp/dmweb/templates/calendar_view.html
View File

@@ -5,28 +5,29 @@
body {
margin: 20px;
font-family: monospace;
background: #fff;
background: #1a1a1a;
color: #e0e0e0;
}
.nav-tabs {
display: flex;
gap: 20px;
margin-bottom: 20px;
border-bottom: 2px solid #333;
border-bottom: 2px solid #444;
padding-bottom: 10px;
}
.nav-tabs a {
text-decoration: none;
color: #666;
color: #888;
font-size: 16pt;
padding: 5px 10px;
}
.nav-tabs a.active {
color: #000;
color: #e0e0e0;
font-weight: bold;
border-bottom: 3px solid #000;
border-bottom: 3px solid #6b9bd1;
}
.date-nav {
@@ -39,33 +40,37 @@
.date-nav a {
text-decoration: none;
color: #2563eb;
color: #6b9bd1;
font-size: 18pt;
}
.date-info {
font-weight: bold;
color: #e0e0e0;
}
.calendar-grid {
display: flex;
border: 1px solid #ddd;
border: 1px solid #333;
min-height: 600px;
background: #1a1a1a;
}
.time-column {
width: 60px;
border-right: 1px solid #ddd;
background: #f9f9f9;
border-right: 1px solid #333;
background: #222;
}
.time-slot {
height: 60px;
border-bottom: 1px solid #eee;
border-bottom: 1px solid #2a2a2a;
padding: 5px;
font-size: 10pt;
color: #666;
text-align: right;
display: flex;
align-items: flex-start;
justify-content: flex-end;
}
.days-grid {
@@ -75,8 +80,9 @@
.day-column {
flex: 1;
border-right: 1px solid #ddd;
border-right: 1px solid #333;
position: relative;
background: #1a1a1a;
}
.day-column:last-child {
@@ -85,13 +91,14 @@
.day-header {
height: 40px;
border-bottom: 2px solid #ddd;
background: #f0f0f0;
border-bottom: 2px solid #444;
background: #2a2a2a;
display: flex;
align-items: center;
justify-content: center;
font-weight: bold;
font-size: 11pt;
color: #e0e0e0;
}
.day-grid {
@@ -104,13 +111,11 @@
left: 0;
right: 0;
height: 60px;
border-bottom: 1px solid #eee;
border-bottom: 1px solid #2a2a2a;
}
.task-block {
position: absolute;
left: 2px;
right: 2px;
border-radius: 4px;
padding: 4px;
font-size: 9pt;
@@ -118,13 +123,14 @@
overflow: hidden;
cursor: pointer;
transition: all 0.2s;
box-shadow: 0 1px 3px rgba(0,0,0,0.2);
box-shadow: 0 2px 4px rgba(0,0,0,0.5);
border: 1px solid rgba(0,0,0,0.3);
}
.task-block:hover {
z-index: 100;
transform: scale(1.05);
box-shadow: 0 4px 8px rgba(0,0,0,0.3);
box-shadow: 0 4px 12px rgba(0,0,0,0.7);
}
.task-label {
@@ -140,8 +146,8 @@
.block-tooltip {
display: none;
position: absolute;
background: #333;
color: white;
background: #2a2a2a;
color: #e0e0e0;
padding: 8px 12px;
border-radius: 4px;
font-size: 10pt;
@@ -151,6 +157,8 @@
left: 100%;
top: 0;
margin-left: 10px;
border: 1px solid #444;
box-shadow: 0 4px 12px rgba(0,0,0,0.5);
}
.task-block:hover .block-tooltip {
@@ -162,19 +170,26 @@
{% block content %}
<div class="nav-tabs">
<a href="/calendar/daily/{{ base_date.year }}/{{ base_date.month }}/{{ base_date.day }}"
<a href="/calendar/daily/{{ base_date.year }}/{{ base_date.month }}/{{ base_date.day }}?grid={{ grid }}"
class="{% if scope == 'daily' %}active{% endif %}">Daily</a>
<a href="/calendar/weekly/{{ base_date.year }}/{{ base_date.month }}/{{ base_date.day }}"
<a href="/calendar/weekly/{{ base_date.year }}/{{ base_date.month }}/{{ base_date.day }}?grid={{ grid }}"
class="{% if scope == 'weekly' %}active{% endif %}">Weekly</a>
<a href="/calendar/monthly/{{ base_date.year }}/{{ base_date.month }}/{{ base_date.day }}"
<a href="/calendar/monthly/{{ base_date.year }}/{{ base_date.month }}/{{ base_date.day }}?grid={{ grid }}"
class="{% if scope == 'monthly' %}active{% endif %}">Monthly</a>
<span style="margin-left: auto;">
<span style="margin-left: auto; display: flex; gap: 15px; align-items: center;">
<span style="color: #999; font-size: 11pt;">Grid:</span>
<a href="/calendar/{{ scope }}/{{ base_date.year }}/{{ base_date.month }}/{{ base_date.day }}?grid=1"
class="{% if grid == 1 %}active{% endif %}" style="font-size: 11pt;">1h</a>
<a href="/calendar/{{ scope }}/{{ base_date.year }}/{{ base_date.month }}/{{ base_date.day }}?grid=3"
class="{% if grid == 3 %}active{% endif %}" style="font-size: 11pt;">3h</a>
<a href="/calendar/{{ scope }}/{{ base_date.year }}/{{ base_date.month }}/{{ base_date.day }}?grid=6"
class="{% if grid == 6 %}active{% endif %}" style="font-size: 11pt;">6h</a>
<a href="/switches/{{ scope }}/{{ base_date.year }}/{{ base_date.month }}/{{ base_date.day }}">View Switches</a>
</span>
</div>
<div class="date-nav">
<a href="/calendar/{{ scope }}/{{ prev_date.year }}/{{ prev_date.month }}/{{ prev_date.day }}">←</a>
<a href="/calendar/{{ scope }}/{{ prev_date.year }}/{{ prev_date.month }}/{{ prev_date.day }}?grid={{ grid }}">←</a>
{% if scope == 'daily' %}
<span class="date-info">{{ base_date.strftime('%Y-%m-%d %A') }}</span>
{% elif scope == 'weekly' %}
@@ -182,14 +197,14 @@
{% elif scope == 'monthly' %}
<span class="date-info">{{ base_date.strftime('%B %Y') }}</span>
{% endif %}
<a href="/calendar/{{ scope }}/{{ next_date.year }}/{{ next_date.month }}/{{ next_date.day }}">→</a>
<a href="/calendar/{{ scope }}/{{ next_date.year }}/{{ next_date.month }}/{{ next_date.day }}?grid={{ grid }}">→</a>
</div>
<div class="calendar-grid">
<div class="time-column">
<div class="day-header" style="height: 40px;"></div>
{% for hour in range(24) %}
<div class="time-slot">{{ '%02d:00'|format(hour) }}</div>
{% for hour in range(0, 24, grid) %}
<div class="time-slot" style="height: {{ grid * 60 }}px;">{{ '%02d:00'|format(hour) }}</div>
{% endfor %}
</div>
@@ -200,40 +215,60 @@
{{ day.strftime('%a %d') if scope != 'daily' else day.strftime('%A') }}
</div>
<div class="day-grid">
{% for hour in range(24) %}
<div class="hour-line" style="top: {{ hour * 60 }}px;"></div>
{% for hour in range(0, 24, grid) %}
<div class="hour-line" style="top: {{ hour * 60 }}px; height: {{ grid * 60 }}px;"></div>
{% endfor %}
{% set day_blocks = [] %}
{% for block in blocks %}
{% if block.start.date() == day.date() %}
{% set start_hour = block.start.hour + block.start.minute / 60.0 %}
{% set _ = day_blocks.append(block) %}
{% endif %}
{% endfor %}
{# Group blocks by hour for stacking #}
{% set hour_groups = {} %}
{% for block in day_blocks %}
{% set hour_key = block.hour %}
{% if hour_key not in hour_groups %}
{% set _ = hour_groups.update({hour_key: []}) %}
{% endif %}
{% set _ = hour_groups[hour_key].append(block) %}
{% endfor %}
{# Render blocks stacked within each hour #}
{% for hour_key, hour_blocks in hour_groups.items() %}
{% for block in hour_blocks %}
{% set idx = loop.index0 %}
{% set base_top_px = block.hour * 60 %}
{% set duration_hours = block.duration / 3600.0 %}
{% set top_px = start_hour * 60 %}
{% set height_px = duration_hours * 60 %}
{% if height_px < 2 %}{% set height_px = 2 %}{% endif %}
{% set task_hash = block.task_path|hash if block.task_path else 0 %}
{% set base_color_hue = task_hash % 360 %}
{% set active_color = 'hsl(%d, 60%%, 45%%)'|format(base_color_hue) %}
{# Create gradient: active color on left (0% to active_ratio%), idle color on right #}
{% set active_pct = (block.active_ratio * 100)|int %}
{% set active_color = 'hsl(%d, 70%%, 50%%)'|format(base_color_hue) %}
{% set idle_color = 'hsl(%d, 30%%, 70%%)'|format(base_color_hue) %}
{# Cascade effect: shift right and down for overlapping blocks #}
{# Each block shifts 8% right and 4px down #}
{% set offset_pct = idx * 8 %}
{% set width_pct = 100 - (idx * 8) - 2 %}
{% set vertical_offset_px = idx * 4 %}
{% set top_px = base_top_px + vertical_offset_px %}
<div class="task-block"
style="top: {{ top_px }}px; height: {{ height_px }}px;
background: linear-gradient(to right, {{ active_color }} 0%, {{ active_color }} {{ active_pct }}%, {{ idle_color }} {{ active_pct }}%, {{ idle_color }} 100%);">
left: {{ offset_pct }}%; width: {{ width_pct }}%;
background: {{ active_color }}; opacity: 0.9;">
<div class="task-label">{{ block.task_path }}</div>
<div class="task-time">{{ block.start.strftime('%H:%M') }} ({{ (block.duration // 60)|int }}m)</div>
<div class="task-time">{{ (block.duration // 60)|int }}m</div>
<div class="block-tooltip">
<strong>{{ block.task_path }}</strong><br>
{{ block.start.strftime('%H:%M') }} - {{ block.end.strftime('%H:%M') }}<br>
Duration: {{ (block.duration // 60)|int }} minutes<br>
Active: {{ (block.active_seconds // 60)|int }}m ({{ active_pct }}%)<br>
Idle: {{ (block.idle_seconds // 60)|int }}m
Hour: {{ '%02d:00'|format(block.hour) }}<br>
Duration: {{ (block.duration // 60)|int }} minutes
</div>
</div>
{% endif %}
{% endfor %}
{% endfor %}
</div>
</div>

9
dmapp/dmweb/templates/layout.html
View File

@@ -9,6 +9,13 @@
<meta http-equiv="refresh" content="5">
{% endif %}
<style>
body {
background-color: #1a1a1a;
color: #e0e0e0;
}
</style>
{% block head %}
{% endblock %}
@@ -21,6 +28,6 @@
</body>
</html>

6
dmapp/dmweb/templates/main.html
View File

@@ -13,14 +13,16 @@
justify-content: center;
height: 100vh; /* This ensures that the container takes the full height of the viewport */
margin: 0; /* Remove default margin */
background-color: #1a1a1a;
color: #e0e0e0;
}
.grey {
color:grey;
color: #888;
}
.blue {
color:blue;
color: #6b9bd1;
}
table {

4
dmapp/dmweb/templates/main_content.html
View File

@@ -1,7 +1,7 @@
{% if current_task_path and current_task_time %}
<div id="current-task-info" style="font-size: 48pt; margin-bottom: 40px; text-align: center;">
<div style="color: #333;">{{ current_task_path }}</div>
<div style="color: #666; font-size: 36pt;">{{ current_task_time }}</div>
<div style="color: #e0e0e0;">{{ current_task_path }}</div>
<div style="color: #999; font-size: 36pt;">{{ current_task_time }}</div>
</div>
{% endif %}
<table>

45
dmapp/dmweb/templates/switches_view.html
View File

@@ -5,27 +5,29 @@
body {
margin: 20px;
font-family: monospace;
background-color: #1a1a1a;
color: #e0e0e0;
}
.nav-tabs {
display: flex;
gap: 20px;
margin-bottom: 20px;
border-bottom: 2px solid #333;
border-bottom: 2px solid #444;
padding-bottom: 10px;
}
.nav-tabs a {
text-decoration: none;
color: #666;
color: #888;
font-size: 16pt;
padding: 5px 10px;
}
.nav-tabs a.active {
color: #000;
color: #e0e0e0;
font-weight: bold;
border-bottom: 3px solid #000;
border-bottom: 3px solid #6b9bd1;
}
.date-nav {
@@ -38,18 +40,19 @@
.date-nav a {
text-decoration: none;
color: #2563eb;
color: #6b9bd1;
font-size: 18pt;
}
.date-info {
font-weight: bold;
color: #e0e0e0;
}
.switches-container {
display: flex;
flex-direction: column;
gap: 4px;
gap: 2px;
}
.switch-row {
@@ -62,35 +65,37 @@
.switch-time {
width: 120px;
color: #666;
color: #aaa;
font-weight: bold;
}
.switch-workspace {
width: 80px;
font-weight: bold;
color: #e0e0e0;
}
.switch-task {
flex: 1;
color: #333;
color: #ccc;
}
.switch-duration {
width: 100px;
text-align: right;
color: #666;
color: #aaa;
}
/* Active vs idle workspace indicator */
.ws-active { font-weight: bold; }
.ws-idle { opacity: 0.6; }
.ws-idle { opacity: 0.5; }
.stats {
margin: 20px 0;
padding: 15px;
background: #f0f0f0;
background: #2a2a2a;
border-radius: 4px;
border: 1px solid #333;
}
.stats-row {
@@ -105,11 +110,12 @@
}
.stat-label {
color: #666;
color: #999;
}
.stat-value {
font-weight: bold;
color: #e0e0e0;
}
</style>
{% endblock head %}
@@ -156,14 +162,19 @@
<h3>All Switches ({{ switches|length }})</h3>
<div class="switches-container">
{% set max_delta = switches|map(attribute='delta')|max if switches else 1 %}
{% set base_height = 30 %}
{% set max_height = 200 %}
{% for switch in switches %}
{% set is_active = switch.workspace in ['Plan', 'Think', 'Work'] %}
{% set task_hash = switch.task_path|hash if switch.task_path else 0 %}
{% set border_hue = task_hash % 360 %}
{% set border_color = 'hsl(%d, 70%%, 50%%)'|format(border_hue) %}
{% set bg_color = 'hsl(%d, 70%%, 95%%)'|format(border_hue) %}
{% set bg_color = 'hsl(%d, 30%%, 20%%)'|format(border_hue) %}
{% set height_ratio = (switch.delta / max_delta) if max_delta > 0 else 0 %}
{% set cell_height = (base_height + (height_ratio * (max_height - base_height)))|int %}
<div class="switch-row {{ 'ws-active' if is_active else 'ws-idle' }}"
style="border-left-color: {{ border_color }}; background-color: {{ bg_color }};">
style="border-left-color: {{ border_color }}; background-color: {{ bg_color }}; height: {{ cell_height }}px;">
<div class="switch-time">{{ switch.date.strftime('%m/%d %H:%M:%S') }}</div>
<div class="switch-workspace">{{ switch.workspace }}</div>
<div class="switch-task">{{ switch.task_path }}</div>
@@ -182,4 +193,10 @@
<p style="text-align: center; color: #666; margin-top: 40px;">No switches in this period</p>
{% endif %}
<style>
h3 {
color: #e0e0e0;
}
</style>
{% endblock content %}