src/db.c

@@ -10,82 +10,84 @@
  *
  */
 
-#include "llist.h"
+
-#include "planner.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <time.h>
+#include "planner.h"
+#include "llist.h"
 
 /*
 write a complete linkedlist to a task csv file.
  */
 void write_linkedlist_to_csv(llist *head, const char *filename) {
-  // Open file with write permision
+    //Open file with write permission
     FILE *file = fopen(filename, "w");
-  // if there is no file or a wrong file path you becom an error
+    //if there is no file or a wrong file path you become an error
     if (file == NULL) {
-    fprintf(stderr, "Could not open file %s\n", filename);
+        perror("Could not open file\n");
-    exit(1);
+    }
 
-  } else {
     //write the file header
     fprintf(file, "TaskName, Created, Deadline, Priority, Spare\n");
 
     // Iterate through the linked list and write the data to the CSV
     llist *current = head;
-    Task *task;
     while (current != NULL) {
-      task = current->data;
         // Write the task data to the CSV file
-      fprintf(file, "%s, %llu, %llu, %d, %llu\n", task->name, task->created,
+        Task *task = (Task *) (current->data);
-              task->deadline, task->priority, task->spare);
+        fprintf(file, "%s, %llu, %llu, %d, %lu\n",
+                task->name,
+                task->created,
+                task->deadline,
+                task->priority,
+                task->spare);
+
 
         current = current->next;
     }
     fclose(file); // Close the file
 }
-}
+
 
 /*
 read a task csv file and write the data in a linked list
  */
 
 llist *write_csv_to_llist(const char *filename) {
-  llist *list = NULL; // list to return
+    //initialize list
-  // Open file with read permision
+    llist *list = NULL;
+    //Open file with read permission
     FILE *file = fopen(filename, "r");
     if (file == NULL) {
-    fprintf(stderr, "Could not open file %s\n", filename);
+        perror("Could not open file\n");
-
+    }
-  } else {
     char line[1024]; //Line Buffer
     int count = 0; //task counter
     fgets(line, sizeof(line), file); //read and ignore file head
-
     while (fgets(line, sizeof(line), file)) {
         count++;
         //remove newline sign
         line[strcspn(line, "\n")] = '\0';
 
         // column slice
-      char *taskname = strtok(line, ",");
+        char *task_name = strtok(line, ",");
-      char *taskcreation_dateSTR = strtok(NULL, ",");
+        char *task_creation_dateSTR = strtok(NULL, ",");
-      char *taskdeadline_dateSTR = strtok(NULL, ",");
+        char *task_deadline_dateSTR = strtok(NULL, ",");
-      char *taskprioritySTR = strtok(NULL, ",");
+        char *task_prioritySTR = strtok(NULL, ",");
-      char *taskspareSTR = strtok(NULL, ",");
+        char *task_spareSTR = strtok(NULL, ",");
+
 
         // convert char in integer and date
-      unsigned long int taskcreation_date =
+        unsigned long long int task_creation_date = (unsigned long long int)strtoul(task_creation_dateSTR, NULL, 10);
-          strtoul(taskcreation_dateSTR, NULL, 10);
+        unsigned long long int task_deadline_date = (unsigned long long int)strtoul(task_deadline_dateSTR,NULL, 10);
-      unsigned long int taskdeadline_date =
+        unsigned long int task_spare = (unsigned long int)strtoul(task_spareSTR,NULL, 10);
-          strtoul(taskdeadline_dateSTR, NULL, 10);
+        int task_priority = (int)strtol(task_prioritySTR, NULL, 10);
-      unsigned long int taskspare = strtoul(taskspareSTR, NULL, 10);
+
-      int priority = atoi(taskprioritySTR);
 
         //create Task
-      Task *task = newTask(taskname, taskcreation_date, taskdeadline_date,
+        Task *task = newTask(task_name, task_creation_date, task_deadline_date, task_priority, task_spare);
-                           priority, taskspare);
+
 
         // Insert task into the linked list
         if (list == NULL) {
@@ -97,6 +99,5 @@ llist *write_csv_to_llist(const char *filename) {
         }
     }
     fclose(file);
-  }
+    return list;
-  return list; // null on error
 }

src/db.h

@@ -5,10 +5,5 @@
 
 #endif
 
-<<<<<<< HEAD
-void write_linkedlist_to_csv(llist *head, const char *filename);
-llist *write_csv_to_llist(const char *filename);
-=======
 extern void write_linkedlist_to_csv(llist* head, const char* filename);
 extern void write_csv_to_llist(const char* filename);
->>>>>>> 9d903f62f26133fd6f309036b3da11400168e705

src/planner.c

@@ -269,71 +269,3 @@ llist *genPlan(llist *head, time_t timeAvail) {
 
   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/planner.h

@@ -83,6 +83,4 @@ int cmpEvent(const void *a, const void *b);
  */
 llist *genPlan(llist *head, time_t timeAvail);
 
-int exportiCal(llist *head);
-
 #endif // !PLANNER

src/test.c

@@ -9,7 +9,7 @@
 #include <stdlib.h>
 #include <time.h>
 
-int test() {
+int main() {
 
   time_t now = time(NULL);
 

src/ui.c

@@ -5,15 +5,12 @@
 /* Created by Juergen Buechel, 13.12.2024/
  */
 #include "ui.h"
-#include "db.h"
+// #include "db.h"
 #include "llist.h"
 #include "planner.h" // for subject and event structs
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <time.h>
-
-const char *dbName = "db.csv";
 
 int main(void) {
   char taskname[256]; // taskName Buffer
@@ -22,34 +19,30 @@ int main(void) {
   int taskpriority = 0;
   int taskspare = 0;
 
-  llist *listT = NULL;
+  llist *list = llistNew(NULL, cmpTaskN);
-  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(" -5- Planer beenden\n");
-    printf(" -6- Planer beenden\n");
     printf(" Wähle die gewünschte Option aus\n");
     if (scanf("%d", &choice) != 1) {
       printf("Falsche Eingabe\n");
     };
-    // choice = 0;
+    choice = 0;
 
+    while ((choice < 1 || choice > 5)) {
       switch (choice) {
-    case 1:
+      case 1: {
         printf(" Geben sie das gewünschte Fach ein: \n");
-      time_t now = time(NULL);
+        if (scanf("%c", taskname) != 1) {
-      struct tm lc;
-      localtime_r(&now, &lc);
-      if (fscanf(stdin, "%s", taskname) <= 0) {
           printf("Ungültige Eingabe für den Namen.\n");
           return -1;
         }
 
-      printf(" Wie viel Zeit bleibt ihnen (tage bis deadline):\n");
+        printf(" Wie viel Zeit bleibt ihnen:\n");
         if (scanf("%d", &taskdeadline_date) != 1) {
           printf("Ungültige Eingabe.\n");
           return -1;
@@ -61,42 +54,22 @@ int main(void) {
           return -1;
         }
 
-      // printf(" Wie viel Zeit habe Sie für dieses Fach: \n");
+        printf(" Wie viel Zeit habe Sie für dieses Fach: \n");
-      // if (scanf("%d", &taskspare) != 1) {
+        if (scanf("%d", &taskspare) != 1) {
-      //   printf("Ungültige Eingabe.\n");
+          printf("Ungültige Eingabe.\n");
-      //   return -1;
+          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 Fächer an: \n");
-      scanf("%d", &taskspare);
+        scanf("%c", &taskspare);
-      // if list exists use it to generate plan
-      if (listT != NULL) {
-        listE = genPlan(listT, taskspare);
-        write_linkedlist_to_csv(listT, dbName);
-      } else {
-        printf("list is empty!");
-        return -1;
-      }
         break;
 
       case 3:
-      if (listT == NULL) {
+        // if (task == NULL) {
-        printf("Die Liste ist leer");
+        //   printf("Die Liste ist leer");
-      } else {
+        // } else {
-        llistPrintT(listT);
         //   llist *iterator = list;
         //   while (iterator != NULL) {
         //     Task *currentTask = (Task *)(iterator->data); // Cast zu Task
@@ -105,51 +78,35 @@ int main(void) {
         //            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: 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(
-        printf("vor Export erst task list erstellen, dann verfuegbare zeit "
+            "Geben Sie die zur verfuegung stehende Zeit für die Fächer an: \n");
-               "eingeben!\n");
+        scanf("%d", &taskspare);
         break;
-      }
-      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 {
@@ -162,8 +119,13 @@ int main(void) {
         //     iterator = iterator->next; // Gehe zum nächsten Listenelement
         //   }
         // }
-      return EXIT_SUCCESS;
+        break;
         // case 4: iCAl();break;
       }
-  } while (choice < 6);
+      }
+    }
+  } while (choice != 5);
+  {
+    return EXIT_SUCCESS;
+  }
 }