added cal project

dmapp/.env

@@ -0,0 +1,5 @@
+// dmcore
+task_file = "/home/mariano/LETRAS/adm/task/main"
+desktops = ("Plan", "Think", "Work", "Other", "Away", "Work", "Work", "Work")
+work_desktops = {2: "default", 5: "dlt", 6: "vhs", 7: "cal"}
+unlabeled = "Away"

dmapp/dm.sh

@@ -1,9 +1,9 @@
 sudo systemctl start mongod.service
 . /home/mariano/wdir/venv/dm/bin/activate
-cd /home/mariano/wdir/def/deskmeter
-nohup python3 dmmain.py >dm.out 2>dm.err &
+cd /home/mariano/wdir/def/deskmeter/dmapp/dmcore
+nohup python3 main.py >dm.out 2>dm.err &
 
-cd /home/mariano/wdir/def/deskmeter/dmapp
+cd /home/mariano/wdir/def/deskmeter/dmapp/dmweb
 nohup python3 run.py >dm.out 2>dm.err &
 
 cd ~

dmapp/dmcore/main.py

@@ -9,8 +9,8 @@ import task
 from config import logger, switches
 from zoneinfo import ZoneInfo
 
-desktops = ("Plan", "Think", "Work", "Other", "Away", "Work", "Work")
-work_desktops = {2: "default", 5: "dlt", 6: "vhs"}
+desktops = ("Plan", "Think", "Work", "Other", "Away", "Work", "Work", "Work")
+work_desktops = {2: "default", 5: "dlt", 6: "vhs", 7: "cal"}
 
 unlabeled = "Away"
 
@@ -60,7 +60,6 @@ while True:
     current_mtime = state.retrieve("current").get("filetime")
     file_mtime = task.get_file_mtime(None)
 
-    logger.debug(f"current_mtime: {current_mtime}, file_mtime:{file_mtime}")
     # First handle file changes
     if current_mtime != file_mtime:
         task_id = task.read_and_extract(None)
@@ -86,9 +85,6 @@ while True:
             f"work/{work_desktops[current_workspace]}"
         )
         work_task_ids = {t["task_id"] for t in workspace_tasks if "task_id" in t}
-        logger.debug(
-            f"work_task_ids:{work_task_ids}, current_work_task: {current_work_task},current_task: {current_task}"
-        )
 
         # if current_task in work_task_ids and current_task != current_work_task:
         if current_task not in work_task_ids:
@@ -97,6 +93,7 @@ while True:
                 current_task = current_work_task
                 state.save("current", task=current_task)
                 task.db_to_file_as_is(None)
+
         elif current_task != current_work_task:
             # Update work state when switching to a different valid task
             state.update_work_state(work_desktops[current_workspace], current_task)

dmapp/dmcore/task.py

@@ -7,7 +7,7 @@ import state
 from bson import ObjectId
 from config import logger, tasks
 
-task_file = "/home/mariano/wdir/def/deskmeter/dmapp/dmcore/sample_task_file"
+task_file = "/home/mariano/LETRAS/adm/task/main"
 
 
 def parse_line(line: str) -> tuple[Optional[str], Optional[str]]:

dmapp/dmweb/__init__.py

@@ -1,13 +1,12 @@
 from flask import Flask
-from dmweb import dm, dmcal
+
+from . import dm, dmcal
+
 
 def create_app():
-
-    app = Flask("deskmeter") 
+    app = Flask("deskmeter")
 
     app.debug = True
     app.register_blueprint(dm.dmbp)
 
     return app
-
-

dmapp/dmweb/dm.py

@@ -24,6 +24,7 @@ def index(task=None):
     end = datetime.today().replace(hour=23, minute=59, second=59, tzinfo=timezone)
 
     rows = get_period_totals(start, end, task)
+    print(rows)
 
     return render_template("main.html", rows=rows)
 

dmapp/dmweb/dmcal.py

@@ -2,10 +2,10 @@ import calendar
 from datetime import datetime
 from pprint import pprint
 
-# import pytz
-from dmweb.dm import dmbp
 from flask import Blueprint, render_template
 
+# import pytz
+from .dm import dmbp
 from .get_period_times import (
     get_period_totals,
     read_and_extract,
@@ -77,6 +77,8 @@ class DMHTMLCalendar(calendar.HTMLCalendar):
 
         rows = get_period_totals(start, end, self.task)
 
+        print(rows)
+
         returnstr = "<table class='totaltable'>"
         for row in rows:
             returnstr += "<tr><td>{}</td><td>{}</td></tr>".format(

dmapp/dmweb/get_period_times.py

@@ -178,8 +178,6 @@ def get_period_totals(start, end, task=None):
 
     aux_results = list(switches.aggregate(pipeline_before_after))
 
-    print(aux_results)
-
     bfirst = aux_results[0]["before_first"]
 
     if bfirst:

dmapp/dmweb/run.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from dmweb import create_app
 
 app = create_app()