diff --git a/.gitignore b/.gitignore
index 92a38ce..6fb2b2c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
testing
debugOut
+.idea
# ---> C
# Prerequisites
*.d
diff --git a/.idea/StudyPlanner.iml b/.idea/StudyPlanner.iml
new file mode 100644
index 0000000..1d4b40e
--- /dev/null
+++ b/.idea/StudyPlanner.iml
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file
diff --git a/.idea/editor.xml b/.idea/editor.xml
index b0d69ef..0792cc0 100644
--- a/.idea/editor.xml
+++ b/.idea/editor.xml
@@ -1,6 +1,103 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -170,7 +267,7 @@
-
+
@@ -198,25 +295,25 @@
-
-
-
-
-
+
+
+
+
+
-
-
+
+
-
-
-
-
+
+
+
+
@@ -236,7 +333,7 @@
-
+
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 0000000..c39cd37
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index bedf918..97e1ec6 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,10 +1,19 @@
+
+
+
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..be6b78b
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 0f27e84..7e8a0b2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
#compiler flags
CFLAGS=-Wall -Wextra -g
+INCLUDES = -Isrc
#files
diff --git a/src/db.c b/src/db.c
index a31bc6e..da737f6 100644
--- a/src/db.c
+++ b/src/db.c
@@ -37,9 +37,8 @@ void write_linkedlist_to_csv(llist *head, const char *filename) {
Task *task;
while (current != NULL) {
task = current->data;
-
// Write the task data to the CSV file
- fprintf(file, "%s, %lu, %lu, %d, %lu\n", task->name, task->created,
+ fprintf(file, "%s, %llu, %llu, %d, %llu\n", task->name, task->created,
task->deadline, task->priority, task->spare);
current = current->next;
@@ -97,7 +96,6 @@ llist *write_csv_to_llist(const char *filename) {
llistAppend(list, task);
}
}
-
fclose(file);
}
return list; // null on error
diff --git a/src/db.h b/src/db.h
index 73579c0..94dd6c0 100644
--- a/src/db.h
+++ b/src/db.h
@@ -5,5 +5,10 @@
#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