lots of fixes

[taskasaur.git] / render.c

diff --git a/render.c b/render.c
index 657b8c6..ee77fe6 100644 (file)
--- a/render.c
+++ b/render.c
@@ -129,7 +129,12 @@ todolist_to_menuitem(TodoItem** item_list, int list_length)
 
     items = malloc((list_length+1)*sizeof(MenuItem*));
     for (int i = 0; i < list_length; i++) {
-        items[i] = create_menuitem(item_list[i]->item_name);
+        MenuItem* new_menuitem;
+        new_menuitem =  create_menuitem(item_list[i]->item_name);
+        /* using same struct, careful if it gets freed */
+        set_menuitem_userdata(new_menuitem, item_list[i]);
+
+        items[i] = new_menuitem;
     }
 
     items[list_length] = 0; //null terminate
@@ -155,14 +160,25 @@ boardmenu_to_board(BoardMenu* boardmenu)
 
         for (int j = 0; j < get_menu_length(curmenu); j++) {
             MenuItem* curmenuitem = get_menu_item(curmenu, j);
+            TodoItem* itemdata = get_menuitem_userdata(curmenuitem);
 
             TodoItem* new_todoitem = malloc(sizeof(TodoItem));
+            SubTask** new_subtask_list = malloc(itemdata->subtask_count*sizeof(SubTask*));
 
             new_todoitem->item_name = strdup(get_menuitem_title(curmenuitem));
-            new_todoitem->description = strdup(get_menuitem_descrip(curmenuitem));
-            new_todoitem->due = strdup(""); //TEMP! 
-            new_todoitem->subtask_list = malloc(0); //TEMP!
-            new_todoitem->subtask_count = 0; //TEMP!
+            new_todoitem->description = strdup(itemdata->description);
+            new_todoitem->due = strdup(itemdata->due);
+            new_todoitem->subtask_count = itemdata->subtask_count;
+            for (int k = 0; k < itemdata->subtask_count; k++) {
+                SubTask* new_subtask = malloc(sizeof(SubTask));
+
+                new_subtask->subtask_name = itemdata->subtask_list[k]->subtask_name;
+                new_subtask->done = itemdata->subtask_list[k]->done;
+
+                new_subtask_list[k] = new_subtask;
+            }
+
+            new_todoitem->subtask_list = new_subtask_list;
 
             new_item_list[j] = new_todoitem;
         }
@@ -195,6 +211,7 @@ set_selected_menu(BoardMenu* boardmenu, int index)
     /* also try to jump to a similar position if possible */
     /* rn theres a bug if old menu is empty */
     new_pos = min(get_selected_item(old_menu), get_menu_length(new_menu)-1);
+    if (new_pos < 0) new_pos = 0;
     set_selected_item(new_menu, new_pos);
 
     boardmenu->selected = index;
@@ -227,6 +244,52 @@ swap_menu(BoardMenu* boardmenu, int src_index, int dest_index)
     return 0;
 }
 
+/* menuitem */
+int
+update_menuitem_descrip(MenuItem* menuitem)
+{ /* need to do something about colored text */
+
+    TodoItem* item_data;    
+    char* new_descrip;
+
+    item_data = (TodoItem*)get_menuitem_userdata(menuitem);
+    new_descrip = strdup("");
+
+    if (strlen(item_data->description) > 0) {
+        /* strcat(new_descrip, "☰ "); */
+        strcat(new_descrip, "# ");
+    }
+    if (strlen(item_data->due) > 0) {
+        strcat(new_descrip, item_data->due);
+        strcat(new_descrip, " ");
+    }
+    if (item_data->subtask_count > 0) {
+
+        int tasks_complete = 0;
+        for (int i = 0; i < item_data->subtask_count; i++) {
+            if (item_data->subtask_list[i]->done == SubTaskState_done) {
+                tasks_complete += 1;
+            }
+        }
+
+        /* [, # done, /, # total, ], null */
+        char subtask_done[4]; // assume there wont be more than 999 subtasks (possibly danger?)
+        snprintf(subtask_done, 4, "%d", tasks_complete);
+        int substask_len = 1+item_data->subtask_count+1+strlen(subtask_done)+1+1;
+        char subtask_text[substask_len];
+        sprintf(subtask_text, "[%s/%d]", subtask_done, item_data->subtask_count);
+        strcat(new_descrip, subtask_text);
+    }
+
+    /* free old string */
+    if (strlen(new_descrip) > 0) {
+        free(get_menuitem_descrip(menuitem));
+        set_menuitem_descrip(menuitem, new_descrip); 
+    }
+
+    return 0;
+}
+
 /* popup */
 WINDOW*
 create_popup_win()
@@ -234,7 +297,7 @@ create_popup_win()
     return NULL;
 }
 
-
+/* helpers */
 int
 ungetstr(char* str)
 {