modified: src/planner.c

modified:   src/iCal.c
	modified:   src/iCal.h
	modified:   src/planner.c
	modified:   src/planner.h
	modified:   src/ui.c

.gitignore

@@ -1,6 +1,8 @@
 testing
 debugOut
 .idea
+.run
+.vscode
 # ---> C
 # Prerequisites
 *.d

.run/StudyPlanner.run.xml

@@ -1,7 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="StudyPlanner" type="CMakeRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" EMULATE_TERMINAL="false" PASS_PARENT_ENVS_2="true" RUN_PATH="$PROJECT_DIR$/Makefile" EXPLICIT_BUILD_TARGET_NAME="all">
-    <method v="2">
-      <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
-    </method>
-  </configuration>
-</component>

Makefile

@@ -12,10 +12,17 @@ CALF=src/iCal.c src/iCal.h
 LLST=src/llist.c src/llist.h
 CONFIG=src/config.h #config file
 
+ALLF=$(UIF) $(PLF) $(DBF) $(LLST)
 
+all: debug 
 #targets
 debug: test ui planner db iCal llist
-	gcc test.o ui.o planner.o db.o iCal.o llist.o -o debugOut 
+	gcc -DDEBUG test.o ui.o planner.o db.o iCal.o llist.o -o debugOut 
+
+
+# release: $(ALLF)
+	# gcc -DRELEASE -fPIC -shared -o  $(ALLF)
+
 
 # config: $(CONFIG)
 llist: $(LLST)
@@ -25,7 +32,7 @@ test: src/test.c
 iCal: $(CALF)
 	gcc -c $(CFLAGS) $(CALF)
 ui: $(UIF) 
-	gcc -c $(CFLAGS) $(UIF)
+	gcc -DDEBUG -c $(CFLAGS) $(UIF)
 planner: $(PLF)
 	gcc -c $(CFLAGS) $(PLF)
 db: $(DBF)
@@ -33,10 +40,10 @@ db: $(DBF)
 
 
 edit: 
-	nvim $(PLF) Makefile $(LLST) src/test.c
+	nvim $(PLF) Makefile $(ALLF)
 
 clean: 
-	rm -rf *.o debugOut src/*.gch  *.csv *.ics
+	rm -rf *.o debugOut src/*.gch  *.csv *.ics *.so
 
 
 

README.md

@@ -13,6 +13,16 @@
 
 Time management optimisation tool.
 
+# How to use
+
+    - to use program directly compile with
+          make debug
+      . this creates executable binary.
+
+    - to integrate in other software use:
+          make release
+      . This creates shared library. use StudyPlanner.h (untested)
+
 # Procedure
 
 ## User input

src/StudyPlanner.h

@@ -0,0 +1,6 @@
+#ifndef SPLANNER
+#define SPLANNER
+
+int StudyPlanner();
+
+#endif // StudyPlanner

src/db.h

@@ -3,7 +3,6 @@
 
 #include "planner.h"
 
-#endif
-
 void write_linkedlist_to_csv(llist *head, const char *filename);
 llist *write_csv_to_llist(const char *filename);
+#endif

src/planner.c

@@ -161,6 +161,14 @@ int cmpEvent(const void *a, const void *b) {
   return cmpTaskN(aa->task, bb->task);
 }
 
+void resetPrio(Task **sortedPrio, int len) {
+  for (int i = 0; i < len; i++) {
+    if ((*sortedPrio)[i].priority < 0) // ignore past deadline
+      continue;
+    printf("incrementing prio!\n");
+    (*sortedPrio)[i].priority += 10;
+  }
+}
 llist *genPlan(llist *head, time_t timeAvail) {
 
   // map llist to pointer arr & sort by priority
@@ -170,7 +178,7 @@ llist *genPlan(llist *head, time_t timeAvail) {
   printf("len: %d\n", lLen);
   llistPrintT(head);
 
-  // Task *sortedNames = calloc(lLen, sizeof(Task));
+  time_t now = time(NULL);
   Task *sortedPrio = calloc(lLen, sizeof(Task));
   if (/*sortedNames == NULL ||*/ sortedPrio == NULL) {
     planLog("gen plan : calloc failed!!\n", true);
@@ -180,23 +188,16 @@ llist *genPlan(llist *head, time_t timeAvail) {
   // add Tasks from llist to arr
   llist *c = head;
   for (int i = 0; c != NULL; i++) {
-    // sortedNames[i] = *copyTask(c->data);
-    // sortedPrio[i] = *copyTask(c->data);
-    // sortedNames[i] = *(Task *)c->data;
     sortedPrio[i] = *(Task *)c->data;
+    if (sortedPrio[i].deadline + 1 < now) {
+      sortedPrio[i].priority = -1; // ignore past deadlines
+    }
     c = c->next;
   }
 
   // sort
-  // qsort(sortedNames, lLen, sizeof(Task), cmpTaskN);
   qsort(sortedPrio, lLen, sizeof(Task), cmpTaskP);
 
-  // // test print
-  // planLog("sortendName", 0);
-  // for (int i = 0; i < lLen; i++) {
-  //   printTask(sortedNames + i);
-  // }
-
   planLog("sortendPrio", 0);
   for (int i = 0; i < lLen; i++) {
     printTask(sortedPrio + i);
@@ -205,16 +206,20 @@ llist *genPlan(llist *head, time_t timeAvail) {
   planLog("creating eventList", false);
 
   // genertate plan based on priorities and available time
-  time_t now = time(NULL);
+  now = time(NULL);
   struct tm *lc = localtime(&now);
   llist *events_ll = llistNew(NULL, cmpEvent);
   if (events_ll == NULL) {
     exit(1);
   }
-  // time_t avail = mktime(timeAvail);
   time_t start, end;
-  // (mktime(lc) < mktime(timeAvail))
   do {
+    if ((*sortedPrio).priority < 0) {
+      continue;
+    } else if ((*sortedPrio).priority == 0) {
+      printf("All tasks have priority <0!!");
+      resetPrio(&sortedPrio, lLen);
+    }
     start = mktime(lc); // start now
     lc->tm_min += intervalLen;
     end = mktime(lc); //
@@ -225,9 +230,9 @@ llist *genPlan(llist *head, time_t timeAvail) {
       c = newEvent(tmp->data, start, end,
                    0); // use elem with wighest priority
     }
+
     llistAppend(events_ll, c);
     printEvent(c);
-    // printEvent((Event *)((events_ll)->next)->data);
 
     // decrement priority of first elem and resort list
     (*sortedPrio).priority -= 1;
@@ -237,29 +242,12 @@ llist *genPlan(llist *head, time_t timeAvail) {
 
   } while (mktime(lc) < timeAvail);
 
-  // for (int i = 0; i < lLen; i++) {
-  //   time_t start = mktime(lc);
-  //
-  //   printf("start:: %s\n", ctime(&start));
-  //   lc->tm_min += 45;
-  //   time_t end = mktime(lc);
-  //   printf("end:: %s\n", ctime(&end));
-  //
-  //   Event *c = newEvent(sortedPrio + i, start, end, 0);
-  //   printEvent(c);
-  //   lc->tm_min += 15;
-  //   llistAppend(events_ll, c);
-  // }
-  //
-
   // free empty head
   llist *tmp = events_ll;
   events_ll = events_ll->next;
   tmp->next = NULL;
   llistFreeE(tmp);
-  printf("====EVENTSLL:\n");
-  llistPrintE(events_ll);
-  printf("====EVENTSLL:\n");
+  // llistPrintE(events_ll);
   // update prioriteis in original llist
   for (int i = 0; i < lLen; i++) {
     llist *tmp = llistGet(head, sortedPrio + i);
@@ -270,77 +258,7 @@ llist *genPlan(llist *head, time_t timeAvail) {
   free(sortedPrio);
 
   planLog("END GEN PLAN", 0);
-  // llistFreeT(head);
   // send updated tasks to db for storage
 
   return events_ll;
 }
-//
-// const char *iCalHeader = "BEGIN:VCALENDAR\r\n"
-//                          "VERSION:2.0\r\n"
-//                          "PRODID:-//hacksw/handcal//NONSGML v1.0//EN\r\n";
-// const char *iCalEvent = "BEGIN:VEVENT\r\n"
-//                         "UID:%s%d\r\n"
-//                         "DTSTAMP:%s\r\n"
-//                         "DTSTART:%s\r\n"
-//                         "DTEND:%s\r\n"
-//                         "SUMMARY:%s\r\n"
-//                         "END:VEVENT\r\n";
-//
-// int exportiCal(llist *events_ll) {
-//
-//   llist *ev_ll = events_ll;
-//
-//   llistPrintE(ev_ll);
-//
-//   printf("%s", iCalHeader);
-//
-//   time_t now = time(NULL);
-//   struct tm lc;
-//   localtime_r(&now, &lc);
-//
-//   // gen filename & open for write
-//   char nameBuf[32];
-//   strftime(nameBuf, 32 - 12, "%F", &lc);
-//   strcat(nameBuf, "dayplan.ics");
-//   FILE *fp = fopen(nameBuf, "w");
-//   if (fp == NULL) {
-//     planLog("fopen failed!!", 1);
-//     return 1;
-//   }
-//   // write iCal header to file
-//   fprintf(fp, "%s", iCalHeader);
-//
-//   // for every event in events_ll create VEVENT str and write to fp
-//   int count = 0;
-//   while (ev_ll != NULL) {
-//     // gen iCal compatible time str
-//     Event *current = ev_ll->data;
-//     struct tm startlc;
-//     struct tm endlc;
-//     localtime_r(&current->plannedStartTime, &startlc);
-//     localtime_r(&current->plannedEndTime, &endlc);
-//     char timeStartBuf[17];
-//     char timeEndBuf[17];
-//     char timeStamp[17];
-//     strftime(timeStamp, 17, "%Y%m%dT%k%M%SZ", &lc);
-//     printf("%s\n", timeStamp);
-//     strftime(timeStartBuf, 17, "%Y%m%dT%k%M%SZ", &startlc);
-//     printf("%s\n", timeStartBuf);
-//     strftime(timeEndBuf, 17, "%Y%m%dT%k%M%SZ", &endlc);
-//     printf("%s\n", timeEndBuf);
-//
-//     fprintf(fp, iCalEvent, current->task->name, count, timeStamp,
-//     timeStartBuf,
-//             timeEndBuf, current->task->name);
-//     ev_ll = ev_ll->next;
-//     count += 1;
-//   }
-//
-//   // after all events are written end cal with
-//   // END:VCALENDAR
-//   fprintf(fp, "END:VCALENDAR\r\n");
-//   fclose(fp);
-//
-//   return 0;
-// }

src/ui.c

@@ -6,6 +6,7 @@
  */
 #define _GNU_SOURCE
 #include "ui.h"
+#include "StudyPlanner.h"
 #include "db.h"
 #include "iCal.h"
 #include "llist.h"
@@ -20,105 +21,170 @@
 #define localtime_r(T, Tm) (_localtime64_s(Tm, T) ? NULL : Tm)
 #endif
 
+#define minutes(n) (60 * n)
+#define hours(n) (60 * minutes(n))
+#define days(n) (24 * hours(n))
+
 const char *dbName = "db.csv";
-
+#define DEBUG
+#ifdef DEBUG
 int main(void) {
-  int taskcreation_date = 0;
-  int taskdeadline_date = 0;
-  int taskpriority = 0;
-  int taskspare = 0;
-  char *taskname = NULL; // taskName Buffer
+#endif
+#ifdef RELEASE
+  int StudyPlanner() {
+#endif
+    int taskcreation_date = 0;
+    int taskdeadline_date = 0;
+    int taskpriority = 0;
+    int taskspare = 0;
+    char *taskname = NULL; // taskName Buffer
 
-  llist *listT = NULL;
-  llist *listE = NULL;
-  int choice = 0, i = 0;
-  do {
-    printf(" -1- Neues Fach eingeben\n");
-    printf(" -2- Verfuegbare Zeit eingeben\n");
-    printf(" -3- Alle vorhandenen Faecher aufliesten\n");
-    printf(" -4- Kalenderlink ausgeben\n");
-    printf(" -5- Faecher Importieren\n");
-    printf(" -6- Planer beenden\n");
-    printf(" Waehle die gewuenschte Option aus\n");
-    volatile int r = scanf("%d", &choice);
-    if (r != 1) {
-      printf("Falsche Eingabe\n");
-      fgetc(stdin);
-      choice = 0;
-      continue;
-    };
+    llist *listT = NULL;
+    llist *listE = NULL;
+    int choice = 0, i = 0;
+    do {
+      printf(" -1- Neues Fach eingeben\n");
+      printf(" -2- Verfuegbare Zeit eingeben\n");
+      printf(" -3- Alle vorhandenen Faecher aufliesten\n");
+      printf(" -4- Kalenderlink ausgeben\n");
+      printf(" -5- Faecher Importieren\n");
+      printf(" -6- Planer beenden\n");
+      printf(" Waehle die gewuenschte Option aus\n");
+      volatile int r = scanf("%d", &choice);
+      if (r != 1) {
+        printf("Falsche Eingabe\n");
+        fgetc(stdin);
+        choice = 0;
+        continue;
+      };
 
-    taskname = NULL;
-    size_t nameLen;
-    ssize_t nnread;
-    switch (choice) {
-    case 1:
-      printf(" Geben sie das gewünschte Fach ein (Name): \n");
-      time_t now = time(NULL);
-      struct tm lc;
-      localtime_r(&now, &lc);
-      fgetc(stdin);
-      nnread = getline(&taskname, &nameLen, stdin);
-      taskname[nnread - 1] = '\0';
-      if (nnread < 0) {
-        printf("Ungültige Eingabe für den Namen.\n");
-        return -1;
-      }
-
-      printf(" Wie viel Zeit bleibt ihnen (tage bis deadline):\n");
-      if (scanf("%d", &taskdeadline_date) != 1) {
-        printf("Ungueltige Eingabe.\n");
-        return -1;
-      }
-
-      printf(" Gib die Prioritaet des Faches an(1-10): \n");
-      if (scanf("%d", &taskpriority) != 1) {
-        printf("Ungueltige Eingabe.\n");
-        return -1;
-      }
-
-      // printf(" Wie viel Zeit habe Sie für dieses Fach: \n");
-      // if (scanf("%d", &taskspare) != 1) {
-      //   printf("Ungültige Eingabe.\n");
-      //   return -1;
-      // }
-
-      // create deadline timestamp
-      lc.tm_yday += taskdeadline_date;
-      time_t deadline = mktime(&lc);
-      Task *newT = newTask(taskname, now, deadline, taskpriority, 0);
-      if (listT == NULL) {
-        listT = llistNew(newT, cmpTaskN);
-      } else {
-        llistAppend(listT, newT);
-      }
-
-      break;
-    case 2:
-      printf("Geben Sie die zur verfuegung stehende Zeit für die Faecher an "
-             "(geplante arbeitsstunden huete): \n");
-      scanf("%d", &taskspare);
-      // if list exists use it to generate plan
-      if (listT != NULL) {
+      taskname = NULL;
+      size_t nameLen;
+      ssize_t nnread;
+      switch (choice) {
+      case 1:
+        printf(" Geben sie das gewünschte Fach ein (Name): \n");
+        time_t now = time(NULL);
         struct tm lc;
-        now = time(NULL);
         localtime_r(&now, &lc);
-        lc.tm_hour += taskspare;
-        time_t avail = mktime(&lc);
-        listE = genPlan(listT, avail);
-        write_linkedlist_to_csv(listT, dbName);
-      } else {
-        printf("list is empty!");
-        return -1;
-      }
-      break;
+        fgetc(stdin);
+        nnread = getline(&taskname, &nameLen, stdin);
+        taskname[nnread - 1] = '\0';
+        if (nnread < 0) {
+          printf("Ungültige Eingabe für den Namen.\n");
+          return -1;
+        }
+
+        printf(" Wie viel Zeit bleibt ihnen (tage bis deadline):\n");
+        if (scanf("%d", &taskdeadline_date) != 1) {
+          printf("Ungueltige Eingabe.\n");
+          return -1;
+        }
+
+        printf(" Gib die Prioritaet des Faches an(1-10): \n");
+        if (scanf("%d", &taskpriority) != 1) {
+          printf("Ungueltige Eingabe.\n");
+          return -1;
+        }
+
+        // printf(" Wie viel Zeit habe Sie für dieses Fach: \n");
+        // if (scanf("%d", &taskspare) != 1) {
+        //   printf("Ungültige Eingabe.\n");
+        //   return -1;
+        // }
+
+        // create deadline timestamp
+        time_t deadline = now + days(taskdeadline_date);
+        Task *newT = newTask(taskname, now, deadline, taskpriority, 0);
+        if (listT == NULL) {
+          listT = llistNew(newT, cmpTaskN);
+        } else {
+          llistAppend(listT, newT);
+        }
 
-    case 3:
-      if (listT == NULL) {
-        printf("Die Liste ist leer");
         break;
-      } else {
-        llistPrintT(listT);
+      case 2:
+        printf("Geben Sie die zur verfuegung stehende Zeit für die Faecher an "
+               "(geplante arbeitsstunden huete): \n");
+        scanf("%d", &taskspare);
+        // if list exists use it to generate plan
+        if (listT != NULL) {
+          struct tm lc;
+          now = time(NULL);
+          localtime_r(&now, &lc);
+          lc.tm_hour += taskspare;
+          time_t avail = mktime(&lc);
+          listE = genPlan(listT, avail);
+          write_linkedlist_to_csv(listT, dbName);
+        } else {
+          printf("list is empty!");
+          return -1;
+        }
+        break;
+
+      case 3:
+        if (listT == NULL) {
+          printf("Die Liste ist leer");
+          break;
+        } else {
+          llistPrintT(listT);
+          //   llist *iterator = list;
+          //   while (iterator != NULL) {
+          //     Task *currentTask = (Task *)(iterator->data); // Cast zu Task
+          //     printf("Fach: %s, Deadline: %ld, Priorität: %d\n",
+          //            currentTask->name, currentTask->deadline,
+          //            currentTask->priority);
+          //     iterator = iterator->next; // Gehe zum nächsten Listenelement
+          //   }
+        }
+        break;
+        // // case 4: iCAl();break;
+        //
+        // printf(" Wie viel Zeit bleibt ihnen:\n");
+        // if (scanf("%d", &taskdeadline_date) != 1) {
+        //   printf("Ungültige Eingabe.\n");
+        //   return -1;
+        // }
+        //
+        // printf(" Gib die Priorität des Faches an: \n");
+        // if (scanf("%d", &taskpriority) != 1) {
+        //   printf("Ungültige Eingabe.\n");
+        //   return -1;
+        // }
+        //
+        // printf(" Wie viel Zeit habe Sie für dieses Fach: \n");
+        // if (scanf("%d", &taskspare) != 1) {
+        //   printf("Ungültige Eingabe.\n");
+        //   return -1;
+        // }
+        // break;
+      case 4:
+        if (listE == NULL || taskspare <= 0) {
+          printf("vor Export erst task list erstellen, dann verfuegbare zeit "
+                 "eingeben!\n");
+          break;
+        }
+        llistPrintE(listE);
+        exportiCal(listE);
+        // printf(
+        //     "Geben Sie die zur verfuegung stehende Zeit für die Fächer an:
+        //     \n");
+        // scanf("%d", &taskspare);
+
+        break;
+      case 5:
+        listT = write_csv_to_llist(dbName);
+        break;
+
+      case 6:
+        printf("Goodbye!\n");
+        if (listE != NULL)
+          llistFreeE(listE);
+        if (listT != NULL)
+          llistPrintT(listT);
+        // if (task == NULL) {//task?
+        //   printf("Die Liste ist leer");
+        // } else {
         //   llist *iterator = list;
         //   while (iterator != NULL) {
         //     Task *currentTask = (Task *)(iterator->data); // Cast zu Task
@@ -127,66 +193,9 @@ int main(void) {
         //            currentTask->priority);
         //     iterator = iterator->next; // Gehe zum nächsten Listenelement
         //   }
+        // }
+        return EXIT_SUCCESS;
+        // case 4: iCAl();break;
       }
-      break;
-      // // case 4: iCAl();break;
-      //
-      // printf(" Wie viel Zeit bleibt ihnen:\n");
-      // if (scanf("%d", &taskdeadline_date) != 1) {
-      //   printf("Ungültige Eingabe.\n");
-      //   return -1;
-      // }
-      //
-      // printf(" Gib die Priorität des Faches an: \n");
-      // if (scanf("%d", &taskpriority) != 1) {
-      //   printf("Ungültige Eingabe.\n");
-      //   return -1;
-      // }
-      //
-      // printf(" Wie viel Zeit habe Sie für dieses Fach: \n");
-      // if (scanf("%d", &taskspare) != 1) {
-      //   printf("Ungültige Eingabe.\n");
-      //   return -1;
-      // }
-      // break;
-    case 4:
-      if (listE == NULL || taskspare <= 0) {
-        printf("vor Export erst task list erstellen, dann verfuegbare zeit "
-               "eingeben!\n");
-        break;
-      }
-      llistPrintE(listE);
-      exportiCal(listE);
-      // printf(
-      //     "Geben Sie die zur verfuegung stehende Zeit für die Fächer an:
-      //     \n");
-      // scanf("%d", &taskspare);
-
-      break;
-    case 5:
-      listT = write_csv_to_llist(dbName);
-      break;
-
-    case 6:
-      printf("Goodbye!\n");
-      if (listE != NULL)
-        llistFreeE(listE);
-      if (listT != NULL)
-        llistPrintT(listT);
-      // if (task == NULL) {//task?
-      //   printf("Die Liste ist leer");
-      // } else {
-      //   llist *iterator = list;
-      //   while (iterator != NULL) {
-      //     Task *currentTask = (Task *)(iterator->data); // Cast zu Task
-      //     printf("Fach: %s, Deadline: %ld, Priorität: %d\n",
-      //            currentTask->name, currentTask->deadline,
-      //            currentTask->priority);
-      //     iterator = iterator->next; // Gehe zum nächsten Listenelement
-      //   }
-      // }
-      return EXIT_SUCCESS;
-      // case 4: iCAl();break;
-    }
-  } while (choice < 6);
-}
+    } while (choice < 6);
+  }