From 06a81ad27e789be67a282716af5e779ebfd272cb Mon Sep 17 00:00:00 2001
From: wildjan <jan.wild@stud.fhgr.ch>
Date: Sat, 14 Dec 2024 20:21:52 +0100
Subject: [PATCH] =?UTF-8?q?db.c=20von=20event=20auf=20task=20ge=C3=A4ndert?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/db.c | 34 ++++++++++------------------------
 1 file changed, 10 insertions(+), 24 deletions(-)

diff --git a/src/db.c b/src/db.c
index b83e02c..c670b3f 100644
--- a/src/db.c
+++ b/src/db.c
@@ -18,7 +18,7 @@
 #include "list.h"
 
 /*
-write a complete linkedlist to a Event csv file.
+write a complete linkedlist to a task csv file.
  */
 void write_linkedlist_to_csv(llist* head, const char* filename) {
 	//Open file with write permision
@@ -29,27 +29,20 @@ void write_linkedlist_to_csv(llist* head, const char* filename) {
   	}
   	else{
     	//write the file header
-    	fprintf(file, "TaskName, Created, Deadline, Priority, Spare, EventStartTime, EventEndTime, EventSpare\n");
+    	fprintf(file, "TaskName, Created, Deadline, Priority, Spare\n");
 
     	// Iterate through the linked list and write the data to the CSV
   		llist* current = head;
   		while (current != NULL) {
-    		// Extract data from the current node
-    		Event* event = (Event*)current->data;  // Assumed that current->data holds an Event pointer
 
-    		// Extract the associated task from the event
-    		Task* task = event->task;
-
-    		// Write the task and event data to the CSV file
-    		fprintf(file, "%s, %lu, %lu, %d, %lu, %lu, %lu, %lu\n",
+    		// Write the task data to the CSV file
+    		fprintf(file, "%s, %lu, %lu, %d, %lu\n",
             	task->name,
             	task->created,
             	task->deadline,
             	task->priority,
             	task->spare,
-            	event->plannedStartTime,
-            	event->plannedEndTime,
-            	event->spare);
+
 
     		current = current->next;
   		}
@@ -58,7 +51,7 @@ void write_linkedlist_to_csv(llist* head, const char* filename) {
 }
 
 /*
-read an event csv file and write the data in a linked list
+read a task csv file and write the data in a linked list
  */
 
 void write_csv_to_llist(const char* filename) {
@@ -83,18 +76,12 @@ void write_csv_to_llist(const char* filename) {
         char *tsakdeadline_dateSTR = strtok(NULL, ",");
         char *tsakprioritySTR = strtok(NULL, ",");
         char *tsakspareSTR = strtok(NULL, ",");
-        char *eventStartTimeSTR = strtok(NULL, ",");
-        char *eventEndTimeSTR = strtok(NULL, ",");
-        char *eventSpareSTR = strtok(NULL, ",");
+
 
         // convert char in integer and date
         unsigned long int taskcreation_date = strtoul(taskcreation_dateSTR,NULL,10);
         unsigned long int taskdeadline_date = strtoul(taskdeadline_dateSTR,NULL,10);
         unsigned long int taskspare = strtoul(taskspareSTR,NULL,10);
-        unsigned long int eventStartTime = strtoul(eventStartTimeSTR,NULL,10);
-        unsigned long int eventEndTime = strtoul(eventEndTimeSTR,NULL,10);
-        unsigned long int eventSpare = strtoul(eventSpareSTR,NULL,10);
-
         int priority = atoi(prioritySTR);
 
 
@@ -102,17 +89,16 @@ void write_csv_to_llist(const char* filename) {
         //create Task
         Task *task = newTask(taskname, taskcreation_date, taskdeadline_date, taskpriority, taskspare);
 
-        //create Event
-        Event *event = newEvent(task,eventStartTime, eventEndTime, eventSpare);
+
 
         // Insert task into the linked list
         if (list == NULL) {
             // If the list is empty, initialize it with the first task
-            list = llistNew(event, NULL);
+            list = llistNew(task, cmpTaskN);
         }
         else {
             // Append the task to the linked list
-            llistAppend(list, event);
+            llistAppend(list, task);
         }
     }