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

add task feature

Browse Source
This commit is contained in:
buenosairesam
2025-01-25 07:04:22 -03:00
parent cbb7bf657a
commit 2da2f2641a
14 changed files with 666 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
dmapp/dm.err Normal file
View File

@@ -0,0 +1,65 @@
WARNING: This is a development server. Do not use it in a production deployment. Use a production WSGI server instead.
* Running on all addresses (0.0.0.0)
* Running on http://127.0.0.1:5000
* Running on http://127.0.0.1:5000
Press CTRL+C to quit
* Restarting with stat
* Debugger is active!
* Debugger PIN: 446-089-149
127.0.0.1 - - [24/Jan/2025 23:13:35] "GET / HTTP/1.1" 200 -
127.0.0.1 - - [24/Jan/2025 23:13:35] "GET /favicon.ico HTTP/1.1" 404 -
127.0.0.1 - - [24/Jan/2025 23:13:37] "GET / HTTP/1.1" 200 -
127.0.0.1 - - [24/Jan/2025 23:13:40] "GET / HTTP/1.1" 200 -
127.0.0.1 - - [24/Jan/2025 23:13:41] "GET / HTTP/1.1" 200 -
127.0.0.1 - - [24/Jan/2025 23:13:42] "GET / HTTP/1.1" 200 -
127.0.0.1 - - [24/Jan/2025 23:13:42] "GET / HTTP/1.1" 200 -
127.0.0.1 - - [24/Jan/2025 23:13:43] "GET / HTTP/1.1" 200 -
127.0.0.1 - - [24/Jan/2025 23:13:44] "GET / HTTP/1.1" 200 -
127.0.0.1 - - [24/Jan/2025 23:13:44] "GET / HTTP/1.1" 200 -
127.0.0.1 - - [24/Jan/2025 23:13:45] "GET / HTTP/1.1" 200 -
127.0.0.1 - - [25/Jan/2025 03:49:01] "GET / HTTP/1.1" 200 -
127.0.0.1 - - [25/Jan/2025 03:49:04] "GET /weel HTTP/1.1" 404 -
127.0.0.1 - - [25/Jan/2025 03:49:08] "GET /week HTTP/1.1" 200 -
127.0.0.1 - - [25/Jan/2025 03:51:00] "GET /totals HTTP/1.1" 200 -
127.0.0.1 - - [25/Jan/2025 03:54:52] "GET / HTTP/1.1" 200 -
* Detected change in '/home/mariano/wdir/def/deskmeter/dmapp/dmweb/dm.py', reloading
* Restarting with stat
* Debugger is active!
* Debugger PIN: 446-089-149
* Detected change in '/home/mariano/wdir/def/deskmeter/dmapp/dmweb/dm.py', reloading
* Restarting with stat
Traceback (most recent call last):
File "/home/mariano/wdir/def/deskmeter/dmapp/run.py", line 4, in <module>
app = create_app()
^^^^^^^^^^^^
File "/home/mariano/wdir/def/deskmeter/dmapp/dmweb/__init__.py", line 9, in create_app
app.register_blueprint(dm.dmbp)
File "/home/mariano/wdir/venv/dm/lib/python3.12/site-packages/flask/sansio/scaffold.py", line 47, in wrapper_func
return f(self, *args, **kwargs)
^^^^^^^^^^^^^^^^^^^^^^^^
File "/home/mariano/wdir/venv/dm/lib/python3.12/site-packages/flask/sansio/app.py", line 595, in register_blueprint
blueprint.register(self, options)
File "/home/mariano/wdir/venv/dm/lib/python3.12/site-packages/flask/sansio/blueprints.py", line 335, in register
deferred(state)
File "/home/mariano/wdir/venv/dm/lib/python3.12/site-packages/flask/sansio/blueprints.py", line 434, in <lambda>
lambda s: s.add_url_rule(
^^^^^^^^^^^^^^^
File "/home/mariano/wdir/venv/dm/lib/python3.12/site-packages/flask/sansio/blueprints.py", line 110, in add_url_rule
self.app.add_url_rule(
File "/home/mariano/wdir/venv/dm/lib/python3.12/site-packages/flask/sansio/scaffold.py", line 47, in wrapper_func
return f(self, *args, **kwargs)
^^^^^^^^^^^^^^^^^^^^^^^^
File "/home/mariano/wdir/venv/dm/lib/python3.12/site-packages/flask/sansio/app.py", line 653, in add_url_rule
self.url_map.add(rule_obj)
File "/home/mariano/wdir/venv/dm/lib/python3.12/site-packages/werkzeug/routing/map.py", line 177, in add
rule.bind(self)
File "/home/mariano/wdir/venv/dm/lib/python3.12/site-packages/werkzeug/routing/rules.py", line 581, in bind
self.compile()
File "/home/mariano/wdir/venv/dm/lib/python3.12/site-packages/werkzeug/routing/rules.py", line 726, in compile
self._parts.extend(self._parse_rule(rule))
File "/home/mariano/wdir/venv/dm/lib/python3.12/site-packages/werkzeug/routing/rules.py", line 632, in _parse_rule
convobj = self.get_converter(
^^^^^^^^^^^^^^^^^^^
File "/home/mariano/wdir/venv/dm/lib/python3.12/site-packages/werkzeug/routing/rules.py", line 595, in get_converter
raise LookupError(f"the converter {converter_name!r} does not exist")
LookupError: the converter 'str' does not exist

2
dmapp/dm.out Normal file
View File

@@ -0,0 +1,2 @@
* Serving Flask app 'deskmeter'
* Debug mode: on

206
dmapp/dmweb/dm.py
View File

@@ -1,68 +1,87 @@
from collections import Counter
import datetime
from collections import Counter
from pprint import pprint
import pytz
from flask import Blueprint, render_template
from pymongo import MongoClient
import pytz
client = MongoClient()
db = client.deskmeter
switches = db.switch
dmbp = Blueprint("deskmeter", __name__, url_prefix="/", template_folder='templates')
dmbp = Blueprint("deskmeter", __name__, url_prefix="/", template_folder="templates")
task_file = "/home/mariano/LETRAS/org/task/main"
def extract(line):
if line.rstrip().endswith("*"):
pipe_index = line.find("|")
if pipe_index != -1 and len(line) > pipe_index + 8:
value = line[pipe_index + 1 : pipe_index + 9]
return value
return None
def read_and_extract(file_path):
with open(file_path, "r") as file:
for line in file:
value = extract(line)
if value:
return value
return None
@dmbp.route("/favicon.ico")
def favicon():
return "", 204 # No Content
@dmbp.route("/")
def index():
@dmbp.route("/<string:task>")
def index(task=None):
"""
Show total time used in each desktop for today
Show total time used in each desktop for today
"""
if not task:
task = read_and_extract(task_file)
start = datetime.datetime.today().replace(hour=0,
minute=0,
second=0)
if task == "all":
task = None
end = datetime.datetime.today().replace (hour=23,
minute=59,
second=59)
start = datetime.datetime.today().replace(hour=0, minute=0, second=0)
rows = get_period_totals( local_date(start),
local_date(end))
end = datetime.datetime.today().replace(hour=23, minute=59, second=59)
return render_template("pages.html", rows=rows)
rows = get_period_totals(local_date(start), local_date(end), task)
return render_template("main.html", rows=rows)
@dmbp.route("/day/<int:month>/<int:day>")
def oneday(month,day):
def oneday(month, day):
start = datetime.datetime(2020, month, day).replace(hour=0, minute=0, second=0)
start = datetime.datetime(2020, month, day).replace(hour=0,
minute=0,
second=0)
end = datetime.datetime(2020, month, day).replace(hour=23, minute=59, second=59)
end = datetime.datetime(2020, month, day).replace (hour=23,
minute=59,
second=59)
rows = get_period_totals( local_date(start),
local_date(end))
rows = get_period_totals(local_date(start), local_date(end))
return render_template("pages.html", rows=rows)
@dmbp.route("/period/<start>/<end>")
def period(start,end):
def period(start, end):
start = datetime.datetime(*map(int, start.split("-"))).replace(
hour=0, minute=0, second=0
)
start = datetime.datetime(*map(int, start.split("-"))).replace(hour=0,
minute=0,
second=0)
end = datetime.datetime(*map(int, end.split("-"))).replace(
hour=23, minute=59, second=59
)
end = datetime.datetime(*map(int, end.split("-"))).replace (hour=23,
minute=59,
second=59)
rows = get_period_totals( local_date(start),
local_date(end))
rows = get_period_totals(local_date(start), local_date(end))
return render_template("pages.html", rows=rows)
@@ -70,48 +89,59 @@ def period(start,end):
@dmbp.route("/totals")
def totals():
"""
Show total time used in each desktop for all time
Show total time used in each desktop for all time
"""
pipe = [{'$group': {'_id':"$workspace",'totals': {'$sum': '$delta'}}},
{'$sort': { "_id": 1}}]
pipe = [
{"$group": {"_id": "$workspace", "totals": {"$sum": "$delta"}}},
{"$sort": {"_id": 1}},
]
rows = []
rows = []
for total in switches.aggregate(pipeline=pipe):
rows.append( {"ws" : total["_id"],
"total": str(datetime.timedelta(seconds=total["totals"]))})
rows.append(
{
"ws": total["_id"],
"total": str(datetime.timedelta(seconds=total["totals"])),
}
)
return render_template("pages.html", rows=rows)
def get_period_totals(start, end):
def get_period_totals(start, end, task=None):
"""
TODOs: refactor to have available the ws array and the active ws function in order to remove
the delta = 0 thing
refactor to pass in the timezone and make the variable names clearer
"""
task_query = {"task": task} if task else {}
queries = {
"period" : {"date": {"$gt" : start, "$lt" : end }},
"previous_doc" : {"date" : {"$lt" : start }}
#"next_doc" : {"date":{"$lt":start}}
"period": {"date": {"$gt": start, "$lt": end}},
"previous_doc": {"date": {"$lt": start}},
"task": task_query
# "next_doc" : {"date":{"$lt":start}}
}
length = switches.count_documents(queries["period"])
docs = switches.find(queries["period"]).sort([("date", 1)])
docs = switches.find(queries["period"]).sort([("date", 1)])
if not length:
return [{"ws": "No Data", "total": ""}]
#next_doc = switches.find_one(queries["next_doc"])
last_doc = docs[length-1]
# next_doc = switches.find_one(queries["next_doc"])
last_doc = docs[length - 1]
first_date = local_date(docs[0]["date"], True)
last_date = local_date(last_doc["date"], True)
pipe = [ {'$match': queries["period"] },
{'$group': { '_id':"$workspace",'totals': {'$sum': '$delta'}}},
{'$sort': { "_id": 1}}]
match_query = {**queries["period"], **queries["task"]}
pipe = [
{"$match": match_query},
{"$group": {"_id": "$workspace", "totals": {"$sum": "$delta"}}},
{"$sort": {"_id": 1}},
]
pre_rows = Counter({})
for total in switches.aggregate(pipeline=pipe):
@@ -119,45 +149,75 @@ def get_period_totals(start, end):
time_corrections = []
if first_date > start:
#TODO if its the first record it fails write test
# TODO if its the first record it fails write test
try:
previous_doc = switches.find(queries["previous_doc"]).sort([("date", -1)]).limit(1)[0]
time_corrections.append(Counter({previous_doc["workspace"] : split_entry(previous_doc, start)}))
previous_doc = (
switches.find(queries["previous_doc"]).sort([("date", -1)]).limit(1)[0]
)
time_corrections.append(
Counter({previous_doc["workspace"]: split_entry(previous_doc, start)})
)
except IndexError:
pass
now = local_date(datetime.datetime.now())
if task != read_and_extract(task_file):
now = local_date(last_doc["date"]) - datetime.timedelta(hours=3)
if end > now:
time_corrections.append(Counter({ last_doc["workspace"] : split_entry(last_doc, now, after=False)}))
time_corrections.append(
Counter({last_doc["workspace"]: split_entry(last_doc, now, after=False)})
)
if end > last_date and now > end:
time_corrections.append(Counter({ last_doc["workspace"] : split_entry(last_doc, end, after=False)}))
time_corrections.append(
Counter({last_doc["workspace"]: split_entry(last_doc, end, after=False)})
)
for correction in time_corrections:
pre_rows += correction
#TODO _1 remove
#day = 0
# TODO _1 remove
# day = 0
rows = []
active_vs_idle = {"active": 0, "idle": 0}
for ws, total in pre_rows.items():
#TODO _1 remove
#day += total
rows.append( {"ws": ws,
"total" : convert_timedelta(datetime.timedelta(seconds=total)) })
# parche por comportamiento weird
if task and ws == "Think":
total -= 1080
#TODO _1 remove
#rows.append({"ws":"sum","total": day})
if ws in ["Think", "Plan", "Work"]:
active_vs_idle["active"] += total
if ws in ["Away", "Other"]:
active_vs_idle["idle"] += total
rows.append(
{"ws": ws, "total": convert_timedelta(datetime.timedelta(seconds=total))}
)
if task == None:
task = "all"
active_vs_idle["active"] = convert_timedelta(
datetime.timedelta(seconds=active_vs_idle["active"])
)
active_vs_idle["idle"] = convert_timedelta(
datetime.timedelta(seconds=active_vs_idle["idle"])
)
rows.append({"ws": "Active", "total": active_vs_idle["active"]})
rows.append({"ws": "Idle", "total": active_vs_idle["idle"]})
# TODO _1 remove
# rows.append({"ws":"sum","total": day})
return rows
def split_entry(entry, split_time, after=True):
"""
entry must have a date an number
split_time must be timezone aware
after bolean to return the time after the split time
entry must have a date an number
split_time must be timezone aware
after bolean to return the time after the split time
"""
first_half = round((split_time - local_date(entry["date"], True)).total_seconds())
last_half = entry["delta"] - first_half
@@ -178,5 +238,5 @@ def convert_timedelta(duration):
days, seconds = duration.days, duration.seconds
hours = days * 24 + seconds // 3600
minutes = (seconds % 3600) // 60
seconds = (seconds % 60)
seconds = seconds % 60
return "{}:{:02d}:{:02d}".format(hours, minutes, seconds)

128
dmapp/dmweb/dmcal.py
View File

@@ -1,125 +1,140 @@
import calendar
from datetime import datetime
from pprint import pprint
from flask import Blueprint, render_template
import pytz
import calendar
from dmweb.dm import dmbp, get_period_totals, local_date
from flask import Blueprint, render_template
class DMHTMLCalendar(calendar.HTMLCalendar):
# def formatmonth(self, theyear, themonth, withyear=True):
# self.dmmonth = themonth
# super().formatmonth(self, theyear, themonth)
def setcalmonth(self, month):
self.dmmonth = month
def setcalyear(self, year):
self.dmyear = year
def oneday(self,month,day):
def settask(self, task):
self.task = task
def oneday(self, month, day):
current_year = datetime.today().year
start = datetime(self.dmyear, month, day).replace(hour=0,
minute=0,
second=0)
start = datetime(self.dmyear, month, day).replace(hour=0, minute=0, second=0)
end = datetime(self.dmyear, month, day).replace (hour=23,
minute=59,
second=59)
end = datetime(self.dmyear, month, day).replace(hour=23, minute=59, second=59)
rows = get_period_totals( local_date(start),
local_date(end))
rows = get_period_totals(local_date(start), local_date(end), self.task)
returnstr = "<table class='totaltable'>"
for row in rows:
returnstr += "<tr><td>{}</td><td>{}</td></tr>".format(row["ws"],row["total"])
returnstr += "<tr><td>{}</td><td>{}</td></tr>".format(
row["ws"], row["total"]
)
returnstr += "</table>"
return returnstr
def oneweek(self,month,week):
return returnstr
def oneweek(self, month, week):
start_day = None
end_day = None
for (d, wd) in week:
for d, wd in week:
if d == 0:
continue
else:
start_day = d
break
for (d, wd) in reversed(week):
for d, wd in reversed(week):
if d == 0:
continue
else:
end_day = d
break
start = datetime(self.dmyear, month, start_day).replace(
hour=0, minute=0, second=0
)
start = datetime(self.dmyear, month, start_day).replace(hour=0,
minute=0,
second=0)
end = datetime(self.dmyear, month, end_day).replace(
hour=23, minute=59, second=59
)
end = datetime(self.dmyear, month, end_day).replace (hour=23,
minute=59,
second=59)
rows = get_period_totals( local_date(start),
local_date(end))
rows = get_period_totals(local_date(start), local_date(end))
returnstr = "<table class='totaltable'>"
for row in rows:
returnstr += "<tr><td>{}</td><td>{}</td></tr>".format(row["ws"],row["total"])
returnstr += "<tr><td>{}</td><td>{}</td></tr>".format(
row["ws"], row["total"]
)
returnstr += "</table>"
return returnstr
return returnstr
def formatweekheader(self):
"""
Return a header for a week as a table row.
"""
s = ''.join(self.formatweekday(i) for i in self.iterweekdays())
s = "".join(self.formatweekday(i) for i in self.iterweekdays())
s += "<td>Week Totals</td>"
return '<tr>%s</tr>' % s
return "<tr>%s</tr>" % s
def formatweek(self, theweek):
"""
Return a complete week as a table row.
"""
s = ''.join(self.formatday(d, wd) for (d, wd) in theweek)
s = "".join(self.formatday(d, wd) for (d, wd) in theweek)
s += "<td>{}</td>".format(self.oneweek(self.dmmonth, theweek))
return '<tr>%s</tr>' % s
return "<tr>%s</tr>" % s
def formatday(self, day, weekday):
"""
Return a day as a table cell.
"""
if day == 0:
return '<td class="noday">&nbsp;</td>' # day outside month
else:
return '<td class="%s">%s</td>' % (self.cssclasses[weekday], self.oneday(self.dmmonth, day))
"""
Return a day as a table cell.
"""
if day == 0:
return '<td class="noday">&nbsp;</td>' # day outside month
else:
return '<td class="%s">%s</td>' % (
self.cssclasses[weekday],
self.oneday(self.dmmonth, day),
)
@dmbp.route("/month")
@dmbp.route("/month/<int:month>")
@dmbp.route("/month/<int:month>/<int:year>")
@dmbp.route("/month/task/<string:task>")
@dmbp.route("/month/<int:month>/task/<string:task>")
@dmbp.route("/month/<int:month>/<int:year>/task/<string:task>")
def month(month=None, year=None, task=None):
usemonth = datetime.today().month
useyear = datetime.today().year
@dmbp.route("/calendar")
@dmbp.route("/calendar/<int:month>")
def calmain(month=None):
if month:
usemonth = month
if year:
useyear = year
cal = DMHTMLCalendar(calendar.SATURDAY)
cal.settask(None)
if task:
cal.settask(task)
cal.setcalmonth(usemonth)
cal.setcalyear(useyear)
return render_template("calendar.html", content=cal.formatmonth(useyear, usemonth))
@dmbp.route("/week")
@dmbp.route("/week/<int:week>")
def week(month=None):
usemonth = datetime.today().month
useyear = datetime.today().year
if month:
@@ -129,6 +144,5 @@ def calmain(month=None):
cal.setcalmonth(usemonth)
cal.setcalyear(useyear)
return render_template("calendar.html", content=cal.formatmonth(useyear,usemonth))
return render_template("calendar.html", content=cal.formatmonth(useyear, usemonth))

44
dmapp/dmweb/templates/main.html Normal file
View File

@@ -0,0 +1,44 @@
<html>
<head>
<!-- <link rel="stylesheet" href="{{ url_for('static', filename='styles/dm.css') }}"> -->
{% block head %}
{% endblock %}
<style>
body
{
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
height: 100vh; /* This ensures that the container takes the full height of the viewport */
margin: 0; /* Remove default margin */
}
table {
font-size: 84pt
}
td {
padding-right: 100px;
}
</style>
</head>
<body>
<!-- agregar función que me diga cuanto tiempo hace que esta activo el escritorio
(calcular el delta con el ultimo switch y pasarlo a mm:ss) -->
{% block content %}
<table>
{% for row in rows %}
<tr>
<td>{{ row["ws"] }}</td>
<td>{{ row["total"] }}</td>
</tr>
{% endfor %}
</table>
{% endblock %}
</body>
</html>