nowfocus 0.4.0__py3-none-any.whl → 0.4.4__py3-none-any.whl

nowfocus/connectors/vikunja.py

@@ -9,8 +9,6 @@ import requests
 import conf
 import utils
 
-# UPDATE sessions SET task_id = "Vikunja_t" || task_id WHERE todolist = 'Vikunja';
-# UPDATE sessions SET parent_id = "Vikunja_l" || parent_id WHERE todolist = 'Vikunja';
 
 def vikunja_item_id(id, item_type, user_conf):
     return user_conf['id'] +'_'+ item_type[0] + str(id)
@@ -20,7 +18,7 @@ def add_new_task(user_conf,parent_list,task_label):
     headers = {'content-type': 'application/json'}
     data = {'title': task_label}
 
-    utils.dbg('add_new_task() parent_list',parent_list, l=0)
+    utils.dbg('add_new_task() parent_list',parent_list, l=-1)
 
     response = requests.put(user_conf['url']+"api/v1/projects/"+str(parent_list['data']['id'])+"/tasks",json=data, headers=head)
 
@@ -104,7 +102,6 @@ def get_todos(user_conf):
         }
     
 
-    priorities = {'DO NOW':1,'Urgent':2,'high':3}
     headers = {"Authorization": "Bearer "+user_conf['token']}
     projects_lists = requests.get(user_conf['url']+"api/v1/projects", headers=headers).json()
 
@@ -139,6 +136,9 @@ def get_todos(user_conf):
         
         lists[id]['data']['accepts_tasks'] = True
 
+        # print(p['title']+' is_archived:',p['is_archived'])
+        # BUG: archived list aren't provided (But used to be ?) so sublists end up orphaned and dangerous... 
+
         if p['is_archived']: 
             lists[id]['status'] = -1
         else:
@@ -152,6 +152,10 @@ def get_todos(user_conf):
             if parent_id in lists:
                 lists[id]['parent_label'] = lists[parent_id]['label']
 
+                if lists[parent_id]['status'] == -1:
+                    lists[id]['status'] = -1
+
+
 
         # NOTE: Originally tasks where queried per list, however this no longer works well because it requires a 'view' id, which comes wih various un-predictable baked-in filters (like done=true). Using the tasks/all api endpoint avoids this but quickly hits the default maxitemsperpage limit (which could, less obviously, show up in the per list method). 
 
@@ -204,7 +208,6 @@ def get_todos(user_conf):
     # ?per_page=10000
 
 
-
     response = requests.get(user_conf['url']+"api/v1/tasks/all", headers=headers)
     all_tasks = response.json()
 
@@ -218,8 +221,6 @@ def get_todos(user_conf):
     # print(json.dumps(all_tasks, indent=4))
     utils.dbg("Got ",len(all_tasks),"Vikunja tasks", s='vikunja', l=2 )
 
-    utils.dbg("Got ",len(all_tasks),"Vikunja tasks", s='vikunja', l=2 )
-
     for i, itemIter in enumerate(all_tasks):
 
         t = all_tasks[i]
@@ -228,7 +229,7 @@ def get_todos(user_conf):
 
         # utils.dbg(t, s='vikunja', l=3)
 
-        # Limit to asks assigned, created by, or favorated by user
+        # Limit to tasks assigned, created by, or favorated by user
         if user_conf["username"]:
             if t['is_favorite'] != True:
 
@@ -264,13 +265,12 @@ def get_todos(user_conf):
                 tasks[id]['status'] = -1
 
         except Exception as e:
-            print("No list found for", t['title']," list_id",list_id)
+            utils.dbg("No list found for", t['title']," list_id",list_id, s='vikunja')
             # raise e
 
         if t['done'] == True:
             tasks[id]['status'] = 0
 
-        # Prioritize if "due_date" is soon or passed (and not: "0001-01-01T00:00:00Z")
         if 'due_date' in t and t['due_date'] != "0001-01-01T00:00:00Z":
 
             due_date = datetime.strptime(t['due_date'],'%Y-%m-%dT%H:%M:%SZ')
@@ -282,14 +282,13 @@ def get_todos(user_conf):
             if due_seconds > -86400:
                 tasks[id]['priority'] = 2
 
-        # prioritize favorites
-        if t['is_favorite'] == True:
+        if t['priority'] and t['priority'] > 1:
+            # Vikunja priority is 1 = lowest, 5 = highest
+            #   
+            tasks[id]['priority'] = utils.invert_number_scale(utils.clamp(utils.force_number(t['priority']),0,5))
+        elif t['is_favorite'] == True:
             tasks[id]['priority'] = 2
-        elif t['priority'] in priorities:
-            print("Priority task", t['title'])
-            tasks[id]['priority'] = priorities[t['priority']]
-            # print(tasks[id])
-
+       
     todos = {'lists':lists,'tasks':tasks}
     return todos
 

nowfocus/desktop-extras/nowfocus.desktop

@@ -3,7 +3,7 @@ Name=nowfocus
 GenericName=Task, Todo, Timer, timertacker
 Version=1.0
 Comment=Accomplish one worthwhile thing at a time.
-Exec=nowfocus
+Exec=nowfocus -f
 Icon=nowfocus
 Terminal=false
 Type=Application

nowfocus/example-todo.txt

@@ -5,9 +5,8 @@ Exercise
     Running
     Push-ups
     Yoga
-Set Up nowfocus
+Set Up Nowfocus
     1 Open Settings
     3 Add your real Todo List(s)
     2 Set up your Time Tracker(s)
     4 Notice how numbering tasks "hoists" them
-    5 Refresh List 

nowfocus/install.py

@@ -0,0 +1,92 @@
+import os.path
+import json
+import importlib
+from datetime import datetime, timezone
+from pathlib import Path
+import copy
+import subprocess, sys
+import shutil
+
+import gi
+gi.require_version('Gtk', '3.0')
+from gi.repository import Gtk, GLib, Gdk, Gio
+
+# Set working dir to file location 
+os.chdir(os.path.dirname(os.path.realpath(__file__)))
+
+# Add working dir to path
+sys.path.append(os.path.dirname(__file__))
+
+import conf
+from utils import *
+
+def run_first_load_actions():
+    db_init()
+    create_default_timetracking_csv()
+    create_default_todo()
+    copy_desktop_integration_files()
+
+
+def create_default_timetracking_csv():
+    target_file = conf.user_data_dir+'/nowfocus-timetracking-spreadsheet.csv'
+    
+    data = 'date,duration,project,task,start time'
+
+    if not os.path.isfile(target_file):
+        with open(target_file, 'w') as file:
+            file.writelines(data)
+        print("Created default timetracker at "+target_file)
+    else:
+        print("Default timetracker already exists at "+target_file)
+
+
+def create_default_todo():
+    source_file = 'example-todo.txt'
+    target_file = conf.user_data_dir+'/nowfocus-todo.txt'
+
+    if not os.path.isfile(target_file):
+        with open(source_file, 'r') as file:
+            data = file.readlines()
+
+            with open(target_file, 'w') as file:
+                file.writelines(data)
+
+
+def db_init():
+    if not os.path.isfile(conf.db_file):
+        print('initializing database')
+
+        db_query("CREATE TABLE lists (id TEXT, label TEXT DEFAULT '', parent_id TEXT DEFAULT '', parent_label TEXT DEFAULT '', todolist TEXT DEFAULT '', priority INTEGER DEFAULT 0, status INTEGER DEFAULT 1, extended_label TEXT DEFAULT '', data TEXT DEFAULT '{}');")
+
+        db_query("CREATE TABLE tasks (id TEXT, label TEXT DEFAULT '', parent_id TEXT DEFAULT '', parent_label TEXT  DEFAULT '', todolist TEXT DEFAULT '', priority INTEGER DEFAULT 0, status INTEGER DEFAULT 1, extended_label TEXT, data TEXT DEFAULT '{}');")
+
+        # , tags TEXT
+        
+        db_query("CREATE TABLE sessions (start_time TEXT, duration INTEGER, task_id TEXT, parent_id TEXT, todolist TEXT, extended_label TEXT, notes TEXT, timetracker TEXT);")
+
+        db_query("CREATE TABLE system (field TEXT PRIMARY KEY NOT NULL, value TEXT);")
+
+        db_query("INSERT INTO system(field, value) VALUES('db_schema_version', '0.4')")
+     
+
+def copy_desktop_integration_files():
+
+    home = GLib.get_home_dir()
+
+    files = (
+        (home+'/.local/share/icons/hicolor/scalable/apps','nowfocus.svg'),
+        (home+'/.local/share/icons','nowfocus.png'),
+        (home+'/.local/share/applications/','nowfocus.desktop'),
+        (home+'/.config/autostart/','nowfocus.desktop')
+    )
+
+
+    for file in files:
+        try:
+            Path(file[0]).mkdir(parents=True, exist_ok=True)
+            shutil.copy("desktop-extras/"+file[1],file[0])
+            print("Copied "+file[1]+" to "+file[0])
+
+        except Exception as e:
+            print("Error Copying "+file[1]+" to "+file[0],e)
+

nowfocus/session_options.py

@@ -139,7 +139,7 @@ class SessionOptionsDialog(Gtk.Dialog):
 
                 print(' start_time + ', session['start_time'])
 
-            # Or change session[duration] value  to reflect dropped / afk session 
+            # Or change session[duration] value to reflect dropped session 
             if response == 3:
                 # Create custom end time
                 custom_end_time = session['start_time'] + timedelta(seconds = (self.duration_input.get_value_as_int() * 60))

nowfocus/task_window.py

@@ -80,7 +80,6 @@ class TaskWindow(Gtk.Window):
 
         self.l_sidebar = Gtk.VBox(spacing=5)
         self.l_sidebar.get_style_context().add_class("subtle")
-
         self.outer_box.add(self.l_sidebar)
 
         self.center_box = Gtk.VBox(spacing=10)
@@ -94,18 +93,11 @@ class TaskWindow(Gtk.Window):
         
         self.recreate_header()
 
-        self.r_sidebar_outer = Gtk.ScrolledWindow()
-        self.r_sidebar_outer.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC)
-        self.outer_box.add(self.r_sidebar_outer)
 
         self.r_sidebar = Gtk.VBox(spacing=5)
         self.r_sidebar.get_style_context().add_class("subtle")
-
-        self.r_sidebar.add_events(Gdk.EventMask.ENTER_NOTIFY_MASK)
-        self.r_sidebar.add_events(Gdk.EventMask.LEAVE_NOTIFY_MASK)
-        self.r_sidebar.connect("enter-notify-event",self.test)
-
-        self.r_sidebar_outer.add(self.r_sidebar)
+        self.outer_box.add(self.r_sidebar)
+       
 
         self.tick_timer = GLib.timeout_add_seconds(1, self.tick)
 
@@ -125,15 +117,15 @@ class TaskWindow(Gtk.Window):
 
         if passed_data:
             dbg('taskwindow passed_data',passed_data,s='taskwindow')
-            if 'afk_time' in passed_data:
+            if 'user_inactive_time' in passed_data:
 
-                last_active_time = datetime.now() - timedelta(seconds=passed_data['afk_time'])
+                last_active_time = datetime.now() - timedelta(seconds=passed_data['user_inactive_time'])
 
                 last_active_str = time.strftime('%H:%M', last_active_time.timetuple())
 
-                afk_label = Gtk.Label()
-                afk_label.set_markup("<b>Inactive Since "+" "+str(last_active_str) +"</b>")
-                self.header.add(afk_label)
+                user_inactive_label = Gtk.Label()
+                user_inactive_label.set_markup("<b>Inactive Since "+" "+str(last_active_str) +"</b>")
+                self.header.add(user_inactive_label)
 
                 pause_then_button = Gtk.Button(label="Finish Then")
 
@@ -230,6 +222,7 @@ class TaskWindow(Gtk.Window):
         
         self.connect("destroy", self.on_destroy)
 
+
     def test(self=None, one=None, two=None, **kwargs):
         print('task_window test')
         print(one)
@@ -385,24 +378,48 @@ class TaskWindow(Gtk.Window):
         except Exception: 
             pass
     
+
     def create_sidebars(self):
         timeit()
+        
+        self.l_sidebar.foreach(lambda child: child.destroy()) 
+        self.r_sidebar.foreach(lambda child: child.destroy()) 
+
         if conf.user['open_task_window_fullscreen'] and conf.user['show_task_window_sidebars']:
-            self.r_sidebar_outer.set_size_request(350, -1)
             self.l_sidebar.set_size_request(350, -1)
+            self.r_sidebar.set_size_request(350, -1)
 
-            self.SessionEditDialog = SessionEditDialog # passed to show_sessions
+            focus_percent_label = Gtk.Label()
+            focus_percent_label.set_markup("<b>Focus: "+str(utils.get_percent_time_focused())+"%</b>")
+            self.r_sidebar.pack_start(focus_percent_label, False, True, 25)
 
-            #show lists on left 
-            self.l_sidebar.foreach(lambda child: child.destroy()) 
+            self.sessions_scrolledwindow = Gtk.ScrolledWindow()
+            self.sessions_scrolledwindow.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC)
+            self.r_sidebar.pack_start(self.sessions_scrolledwindow, True, True, 0)
+
+            self.sessions_box = Gtk.VBox(spacing=5)
+            # self.sessions_box.get_style_context().add_class("subtle")
+            self.sessions_scrolledwindow.add(self.sessions_box)
+
+            # self.r_sidebar.add_events(Gdk.EventMask.ENTER_NOTIFY_MASK)
+            # self.r_sidebar.add_events(Gdk.EventMask.LEAVE_NOTIFY_MASK)
+            # self.r_sidebar.connect("enter-notify-event",self.test)
+           
 
             self.l_sidebar.add(choose_from_lists(self.select_list_callback, 'None', None, False))
 
-            #show sessions on right
-            show_sessions(None, self, self.r_sidebar, None, 'start_time', '30',None, 30)
+            self.SessionEditDialog = SessionEditDialog # passed to show_sessions
+            show_sessions(None, self, self.sessions_box, None, 'start_time', '30',None, 30)
+
             self.l_sidebar.show_all()
             self.r_sidebar.show_all()
-            timeit()
+        else:
+            self.r_sidebar.set_size_request(-1, -1)
+            self.l_sidebar.set_size_request(-1, -1)
+
+            self.l_sidebar.hide()
+            self.r_sidebar.hide()
+        timeit()
 
 
     def on_notes_changed(self,buffer):
@@ -628,11 +645,14 @@ class TaskWindow(Gtk.Window):
             self.unfullscreen()
             self.get_style_context().remove_class("large")
             conf.user['open_task_window_fullscreen'] = False
+            self.create_sidebars()
 
         else:
             self.fullscreen()
             self.get_style_context().add_class("large")
             conf.user['open_task_window_fullscreen'] = True
+            self.create_sidebars()
+
 
         utils.save_user_settings()
 

nowfocus/utils.py

@@ -29,8 +29,6 @@ notify.init(conf.app_name)
 
 lists = {}
 
-db_file = conf.user_data_dir+"/data.db"
-
 
 def dbg(*data, **kwargs):
     ''' Any number of positional args then kwargs 
@@ -318,7 +316,7 @@ def first(i, default = None):
 def save_user_settings():
     print("Save updated user_settings")
     dbg(conf.user)
-    with open(conf.user_settings_dir+"/user_settings.json","w") as settings_file:
+    with open(conf.settings_file,"w") as settings_file:
         json.dump(conf.user, settings_file)
 
 
@@ -326,8 +324,7 @@ def db_query(sql,parameters=None,key=None,error_handling=1):
     '''error_handling: 2 = raise error, 1 = notify error, 0 = ignore errors '''
     # print('db_query parameters type: ',type(parameters))
     # print('first(parameters)',first(parameters))
-    global db_file   
-    c = sqlite3.connect(db_file)
+    c = sqlite3.connect(conf.db_file)
     c.row_factory = sqlite3.Row
     try:
         with c:
@@ -368,23 +365,6 @@ def db_query(sql,parameters=None,key=None,error_handling=1):
             return []
 
 
-def db_init():
-    if not os.path.isfile(db_file):
-        print('initializing database')
-
-        db_query("CREATE TABLE lists (id TEXT, label TEXT DEFAULT '', parent_id TEXT DEFAULT '', parent_label TEXT DEFAULT '', todolist TEXT DEFAULT '', priority INTEGER DEFAULT 0, status INTEGER DEFAULT 1, extended_label TEXT DEFAULT '', data TEXT DEFAULT '{}');")
-
-        db_query("CREATE TABLE tasks (id TEXT, label TEXT DEFAULT '', parent_id TEXT DEFAULT '', parent_label TEXT  DEFAULT '', todolist TEXT DEFAULT '', priority INTEGER DEFAULT 0, status INTEGER DEFAULT 1, extended_label TEXT, data TEXT DEFAULT '{}');")
-
-        # , tags TEXT
-        
-        db_query("CREATE TABLE sessions (start_time TEXT, duration INTEGER, task_id TEXT, parent_id TEXT, todolist TEXT, extended_label TEXT, notes TEXT, timetracker TEXT);")
-
-        db_query("CREATE TABLE system (field TEXT PRIMARY KEY NOT NULL, value TEXT);")
-
-        db_query("INSERT INTO system(field, value) VALUES('db_schema_version', '0.4')")
-        
-
 def db_schema_update():
 
     try:
@@ -464,7 +444,7 @@ def reindex(t=None):
 
 def reindex_all():
         
-    db_query("DROP TABLE taskindex",None,None,0)
+    db_query("DROP TABLE IF EXISTS taskindex",None,None,0)
     db_query("CREATE VIRTUAL TABLE taskindex USING fts5(id, extended_label, priority, status)")
     db_query("INSERT INTO taskindex(id, extended_label, priority, status) SELECT id, extended_label, priority, status FROM tasks WHERE tasks.status IS NOT '-1' ")
 
@@ -903,6 +883,19 @@ def get_total_time(id, category = 'tasks', start_time = None, end_time = None, g
     return result
 
 
+def get_percent_time_focused():
+
+    rand_seconds = db_query("SELECT SUM(duration) as seconds FROM sessions WHERE sessions.task_id = 'Randomness' AND "+ sessions_timeframe_sql())[0]['seconds']
+
+    focus_seconds = db_query("SELECT SUM(duration) as seconds FROM sessions WHERE sessions.task_id != 'Randomness' AND "+ sessions_timeframe_sql())[0]['seconds']
+
+    percent = round(divide(focus_seconds,(focus_seconds + rand_seconds)) * 100, 2)
+
+    dbg('get_percent_time_focused', str(percent)+"%", 'focus_seconds', focus_seconds, 'rand_seconds', rand_seconds)
+
+    return percent
+
+
 def get_recent_tasks(count = 15):
     data = db_query("SELECT DISTINCT tasks.* FROM tasks JOIN sessions ON sessions.task_id = tasks.id WHERE tasks.status = 1 GROUP BY tasks.id ORDER BY MAX(sessions.start_time) DESC LIMIT ?",(count,))
     o = {}
@@ -964,6 +957,25 @@ def force_number(i):
       return o
 
 
+def divide(a, b):
+    a = force_number(a)
+    b = force_number(b)
+
+    if a == 0 or b == 0:
+        return 0
+    else:
+        return (a / b)
+
+def clamp(value, min_limit, max_limit):
+    return max(min_limit, min(value, max_limit))
+
+
+def invert_number_scale(i, max=5):
+    ''' Flips a positive number within a given range '''
+    o = abs(i - max )
+    return o
+
+
 def num_is_multiple_of(i,devisor = 2):
     try:
         i = int(i)
@@ -1157,7 +1169,11 @@ def choose_from_lists(callback, selected_list_id = None, session = None, accepts
             # new buttongroup for new todolist
             todolist = l['todolist']
             l['header'] = Gtk.Label()
-            l['header'].set_markup("<b>"+conf.user['todolists'][todolist]["label"]+"</b>")
+            try:
+                l['header'].set_markup("<b>"+conf.user['todolists'][todolist]["label"]+"</b>")
+            except Exception as e:
+                dbg('Exception creating button group header for list',l, e=e, l=0)
+                
             box.add(l['header'])
             
         if l['id'] == selected_list_id:
@@ -1216,7 +1232,7 @@ def add_todos_to_menu(target_menu = None, menu_tasks = None, list_menus = None,
     # separator after priority tasks
     target_menu.prepend(Gtk.SeparatorMenuItem.new())
 
-    # Create list sub menus 
+    # Create menu for each list 
     for list_id, l in lists.items():
         if l['status'] != 1:
             continue
@@ -1228,19 +1244,25 @@ def add_todos_to_menu(target_menu = None, menu_tasks = None, list_menus = None,
         list_menu_items[list_id] = Gtk.MenuItem.new_with_label(lists[list_id]['label']) # the "item" that gets added 
         list_menu_items[list_id].set_submenu(list_menus[list_id])
 
-    # Add sub menus (items) to parents (sub_menus)
+    # Add each list to parents (sub_menus)
     for list_id, l in lists.items():
         if l['status'] == 1:
 
-            if not toplevel_todos and l['id'] == l['todolist']:
-                continue
+            try:
+
+                if not toplevel_todos and l['id'] == l['todolist']:
+                    continue
+                
+                if 'priority' in l and l['priority']:
+                    target_menu.prepend(list_menu_items[list_id])
+                elif (toplevel_todos and l['id'] == l['todolist']) or (not toplevel_todos and l['parent_id'] == l['todolist']):
+                    target_menu.append(list_menu_items[list_id])
+                else:
+                    list_menus[l['parent_id']].append(list_menu_items[list_id])
             
-            if 'priority' in l and l['priority']:
-                target_menu.prepend(list_menu_items[list_id])
-            elif (toplevel_todos and l['id'] == l['todolist']) or (not toplevel_todos and l['parent_id'] == l['todolist']):
-                target_menu.append(list_menu_items[list_id])
-            else:
-                list_menus[l['parent_id']].append(list_menu_items[list_id])
+            except Exception as e:
+                dbg('Error adding list to menu',l,e=e,l=0)
+
 
 
     for id, t in tasks.items():
@@ -1288,27 +1310,29 @@ def add_todos_to_menu(target_menu = None, menu_tasks = None, list_menus = None,
 
     target_menu.show_all()
 
+
 def datetime_minus_calendar_unit(unit = 'days', num = 1, ref_date = None):
     ''' returns a datetime for the start of the unit num units ago (from the optional ref_date) 
     unit can be days, weeks, months, or years (plural or singular)
-
     ''' 
-    # Looks weird but...
+
     num = num - 1 
+
     if not ref_date:
         ref_date = start_of_day()
+
     if unit in ['day','days']:
         o = ref_date - timedelta(days=num) 
-        if num > 0: o = o - timedelta(days=num)
-    if unit in ['week','weeks']:
+    elif unit in ['week','weeks']:
         o = ref_date - timedelta(days=ref_date.weekday())
         if num > 0: o = o + relativedelta(dt1= o, weeks= - num)
-    if unit in ['month','months']:
+    elif unit in ['month','months']:
         o = ref_date.replace(day=1)
         if num > 0: o = o + relativedelta(dt1= o, months= - num)
-    if unit in ['year','years']:
+    elif unit in ['year','years']:
         o = ref_date.replace(month=1,day=1)
         if num > 0: o = o + relativedelta(dt1= o, years= - num)
+
     return o
 
 def get_time_target_data(i, item_type = 'tasks'):
@@ -1359,11 +1383,11 @@ def hours_search_timeframes(frame_name = None):
     ''' returns a tuple with start and end time for given frame (if one is provided) or a dict of frame_options. 
     '''
 
-    default = "this year"
+    default = "all time"
 
     frames = {
         'today':(datetime_minus_calendar_unit('day',1),now()),
-        'yesterday':(datetime_minus_calendar_unit('day',1)),
+        'yesterday':(datetime_minus_calendar_unit('day',2),datetime_minus_calendar_unit('day',1)),
         'this week':(datetime_minus_calendar_unit('week',1),now()),
         'last week':(datetime_minus_calendar_unit('week',2),datetime_minus_calendar_unit('week',1)),
         '7 days':(datetime_minus_calendar_unit('days',7),now()),
@@ -1392,4 +1416,6 @@ def sessions_timeframe_sql():
     timeframe = hours_search_timeframes(conf.user['hours_search_timeframe'])
 
     timeframe_sql = " sessions.start_time > '"+timeframe[0].strftime("%Y-%m-%d %H:%M:%S")+"' AND sessions.start_time < '"+timeframe[1].strftime("%Y-%m-%d %H:%M:%S")+"' " 
+
+    # dbg('sessions_timeframe_sql',timeframe_sql,s='search')
     return timeframe_sql

nowfocus/version_migrator.py

@@ -0,0 +1,20 @@
+
+# update time_target format 
+for id, tt in user['time_targets']['lists'].items():
+    if 'within_value' not in tt:
+        print("Updating time target to new format ",tt)
+        tt['within_value'] = tt['num_days']
+        tt['within_unit'] = 'days'
+        print(tt)
+    if 'status' not in tt:
+        tt['status'] = True
+
+        
+for id, tt in user['time_targets']['tasks'].items():
+    if 'within_value' not in tt:
+        print("Updating time target to new format ",tt)
+        tt['within_value'] = tt['num_days']
+        tt['within_unit'] = 'days'
+        print(tt)
+    if 'status' not in tt:
+        tt['status'] = True