5 Commits
Author SHA1 Message Date
buechejuerge 97869f4530 Merge remote-tracking branch 'origin/planner' into planner 2024-12-14 10:50:44 +01:00
simon 93aa77bb5b modified: src/config.h 2024-12-14 10:49:50 +01:00
buechejuerge 59cac98023 minor changes 2024-12-14 10:37:22 +01:00
simon 3c0f48a28d modified: src/config.h
modified:   src/planner.c
	modified:   src/test.c
2024-12-14 10:08:40 +01:00
simon a4f31f9414 deleted: doc/.$overview.drawio.bkp
modified:   src/config.h
	modified:   src/llist.h
	modified:   src/planner.c
2024-12-13 22:01:43 +01:00
14 changed files with 164 additions and 509 deletions

No files matched your search

-1
View File
@@ -1,6 +1,5 @@
testing
debugOut
.idea
# ---> C
# Prerequisites
*.d
-7
View File
@@ -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>
+1 -2
View File
@@ -1,7 +1,6 @@
#compiler flags
CFLAGS=-Wall -Wextra -g
INCLUDES = -Isrc
#files
@@ -36,7 +35,7 @@ edit:
nvim $(PLF) Makefile $(LLST) src/test.c
clean:
rm -rf *.o debugOut src/*.gch *.csv *.ics
rm -rf *.o debugOut src/*.gch
-116
View File
@@ -1,116 +0,0 @@
<mxfile host="Electron" agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/25.0.2 Chrome/128.0.6613.186 Electron/32.2.7 Safari/537.36" version="25.0.2">
<diagram id="C5RBs43oDa-KdzZeNtuy" name="Page-1">
<mxGraphModel dx="1527" dy="2012" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
<root>
<mxCell id="WIyWlLk6GJQsqaUBKTNV-0" />
<mxCell id="WIyWlLk6GJQsqaUBKTNV-1" parent="WIyWlLk6GJQsqaUBKTNV-0" />
<mxCell id="sFZgEorzihY-HOV9npow-39" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;entryPerimeter=0;" edge="1" parent="WIyWlLk6GJQsqaUBKTNV-1" source="sFZgEorzihY-HOV9npow-5" target="sFZgEorzihY-HOV9npow-36">
<mxGeometry relative="1" as="geometry">
<mxPoint x="-10" y="-10" as="targetPoint" />
</mxGeometry>
</mxCell>
<mxCell id="sFZgEorzihY-HOV9npow-5" value="ui" style="ellipse;whiteSpace=wrap;html=1;" vertex="1" parent="WIyWlLk6GJQsqaUBKTNV-1">
<mxGeometry x="90" y="20" width="120" height="80" as="geometry" />
</mxCell>
<mxCell id="sFZgEorzihY-HOV9npow-6" value="db" style="ellipse;whiteSpace=wrap;html=1;" vertex="1" parent="WIyWlLk6GJQsqaUBKTNV-1">
<mxGeometry x="90" y="460" width="120" height="80" as="geometry" />
</mxCell>
<mxCell id="sFZgEorzihY-HOV9npow-20" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="WIyWlLk6GJQsqaUBKTNV-1" source="sFZgEorzihY-HOV9npow-7" target="sFZgEorzihY-HOV9npow-21">
<mxGeometry relative="1" as="geometry">
<mxPoint x="490" y="520" as="targetPoint" />
</mxGeometry>
</mxCell>
<mxCell id="sFZgEorzihY-HOV9npow-7" value="iCal" style="ellipse;whiteSpace=wrap;html=1;" vertex="1" parent="WIyWlLk6GJQsqaUBKTNV-1">
<mxGeometry x="430" y="360" width="120" height="80" as="geometry" />
</mxCell>
<mxCell id="sFZgEorzihY-HOV9npow-8" value="planner" style="ellipse;whiteSpace=wrap;html=1;" vertex="1" parent="WIyWlLk6GJQsqaUBKTNV-1">
<mxGeometry x="430" y="30" width="120" height="80" as="geometry" />
</mxCell>
<mxCell id="sFZgEorzihY-HOV9npow-10" value="" style="curved=1;endArrow=classic;html=1;rounded=0;entryX=0.025;entryY=0.313;entryDx=0;entryDy=0;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryPerimeter=0;" edge="1" parent="WIyWlLk6GJQsqaUBKTNV-1" source="sFZgEorzihY-HOV9npow-5" target="sFZgEorzihY-HOV9npow-6">
<mxGeometry width="50" height="50" relative="1" as="geometry">
<mxPoint x="180" y="240" as="sourcePoint" />
<mxPoint x="140" y="280" as="targetPoint" />
<Array as="points">
<mxPoint x="50" y="180" />
<mxPoint x="30" y="370" />
<mxPoint x="80" y="430" />
</Array>
</mxGeometry>
</mxCell>
<mxCell id="sFZgEorzihY-HOV9npow-11" value="get stored subjects&lt;div&gt;&lt;br&gt;&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="WIyWlLk6GJQsqaUBKTNV-1">
<mxGeometry x="30" y="290" width="60" height="30" as="geometry" />
</mxCell>
<mxCell id="sFZgEorzihY-HOV9npow-12" value="" style="curved=1;endArrow=classic;html=1;rounded=0;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" edge="1" parent="WIyWlLk6GJQsqaUBKTNV-1" source="sFZgEorzihY-HOV9npow-6" target="sFZgEorzihY-HOV9npow-5">
<mxGeometry width="50" height="50" relative="1" as="geometry">
<mxPoint x="290" y="310" as="sourcePoint" />
<mxPoint x="160" y="110" as="targetPoint" />
<Array as="points">
<mxPoint x="130" y="320" />
<mxPoint x="150" y="210" />
</Array>
</mxGeometry>
</mxCell>
<mxCell id="sFZgEorzihY-HOV9npow-13" value="return stored data" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="WIyWlLk6GJQsqaUBKTNV-1">
<mxGeometry x="130" y="280" width="60" height="30" as="geometry" />
</mxCell>
<mxCell id="sFZgEorzihY-HOV9npow-14" value="" style="endArrow=classic;html=1;rounded=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" edge="1" parent="WIyWlLk6GJQsqaUBKTNV-1" source="sFZgEorzihY-HOV9npow-5" target="sFZgEorzihY-HOV9npow-8">
<mxGeometry width="50" height="50" relative="1" as="geometry">
<mxPoint x="290" y="310" as="sourcePoint" />
<mxPoint x="340" y="260" as="targetPoint" />
<Array as="points" />
</mxGeometry>
</mxCell>
<mxCell id="sFZgEorzihY-HOV9npow-15" value="send subjects" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="WIyWlLk6GJQsqaUBKTNV-1">
<mxGeometry x="250" y="20" width="100" height="30" as="geometry" />
</mxCell>
<mxCell id="sFZgEorzihY-HOV9npow-18" value="" style="endArrow=classic;html=1;rounded=0;exitX=0.45;exitY=0.988;exitDx=0;exitDy=0;exitPerimeter=0;" edge="1" parent="WIyWlLk6GJQsqaUBKTNV-1" source="sFZgEorzihY-HOV9npow-8" target="sFZgEorzihY-HOV9npow-7">
<mxGeometry width="50" height="50" relative="1" as="geometry">
<mxPoint x="500" y="120" as="sourcePoint" />
<mxPoint x="340" y="260" as="targetPoint" />
</mxGeometry>
</mxCell>
<mxCell id="sFZgEorzihY-HOV9npow-19" value="send event list" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="WIyWlLk6GJQsqaUBKTNV-1">
<mxGeometry x="490" y="190" width="60" height="30" as="geometry" />
</mxCell>
<mxCell id="sFZgEorzihY-HOV9npow-21" value="generate and safe iCal file" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="WIyWlLk6GJQsqaUBKTNV-1">
<mxGeometry x="430" y="490" width="120" height="60" as="geometry" />
</mxCell>
<mxCell id="sFZgEorzihY-HOV9npow-22" value="" style="endArrow=classic;html=1;rounded=0;entryX=1;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="WIyWlLk6GJQsqaUBKTNV-1" source="sFZgEorzihY-HOV9npow-8" target="sFZgEorzihY-HOV9npow-6">
<mxGeometry width="50" height="50" relative="1" as="geometry">
<mxPoint x="290" y="310" as="sourcePoint" />
<mxPoint x="340" y="260" as="targetPoint" />
</mxGeometry>
</mxCell>
<mxCell id="sFZgEorzihY-HOV9npow-23" value="send updated subjects" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="WIyWlLk6GJQsqaUBKTNV-1">
<mxGeometry x="260" y="270" width="60" height="30" as="geometry" />
</mxCell>
<mxCell id="sFZgEorzihY-HOV9npow-24" value="subject db file" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="WIyWlLk6GJQsqaUBKTNV-1">
<mxGeometry x="90" y="620" width="120" height="60" as="geometry" />
</mxCell>
<mxCell id="sFZgEorzihY-HOV9npow-25" value="" style="endArrow=classic;html=1;rounded=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" edge="1" parent="WIyWlLk6GJQsqaUBKTNV-1" source="sFZgEorzihY-HOV9npow-6" target="sFZgEorzihY-HOV9npow-24">
<mxGeometry width="50" height="50" relative="1" as="geometry">
<mxPoint x="290" y="440" as="sourcePoint" />
<mxPoint x="340" y="390" as="targetPoint" />
<Array as="points" />
</mxGeometry>
</mxCell>
<mxCell id="sFZgEorzihY-HOV9npow-26" value="" style="endArrow=classic;startArrow=classic;html=1;rounded=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="WIyWlLk6GJQsqaUBKTNV-1" source="sFZgEorzihY-HOV9npow-6" target="sFZgEorzihY-HOV9npow-24">
<mxGeometry width="50" height="50" relative="1" as="geometry">
<mxPoint x="290" y="440" as="sourcePoint" />
<mxPoint x="340" y="390" as="targetPoint" />
<Array as="points" />
</mxGeometry>
</mxCell>
<mxCell id="sFZgEorzihY-HOV9npow-27" value="serialise/deserialise&lt;div&gt;&lt;br&gt;&lt;/div&gt;" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="WIyWlLk6GJQsqaUBKTNV-1">
<mxGeometry x="150" y="573" width="130" height="40" as="geometry" />
</mxCell>
<mxCell id="sFZgEorzihY-HOV9npow-36" value="" style="shape=actor;whiteSpace=wrap;html=1;" vertex="1" parent="WIyWlLk6GJQsqaUBKTNV-1">
<mxGeometry x="-30" y="-80" width="40" height="60" as="geometry" />
</mxCell>
<mxCell id="sFZgEorzihY-HOV9npow-40" value="ask human for input" style="text;html=1;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="WIyWlLk6GJQsqaUBKTNV-1">
<mxGeometry x="-10" y="20" width="60" height="30" as="geometry" />
</mxCell>
</root>
</mxGraphModel>
</diagram>
</mxfile>
+15 -2
View File
@@ -9,7 +9,20 @@
#define hours(n) (60 * minutes(n))
#define days(n) (24 * hours(n))
static const time_t pauseLenght = minutes(15);
static const time_t pauseLenght = minutes(10);
static const time_t minIntervalLen = minutes(30);
//
// static const char *iCalHeader = "BEGIN:VCALENDAR"
// "VERSION:2.0"
// "PRODID:-//hacksw/handcal//NONSGML v1.0//EN";
//
// static const char *iCalEvent =
// "BEGIN:VEVENT"
// "UID:uid1@example.com"
// "ORGANIZER:CN=John Doe : MAILTO: john.doe@example.com"
// "DTSTART:19970714T170000Z"
// "DTEND:19970715T040000Z"
// "SUMMARY:Bastille Day Party"
// "END:VEVENT ";
//
#endif
+1 -95
View File
@@ -1,5 +1,4 @@
/* Create a database and handel it
* Created by Jan on 13.12.2024.
/*
* INPUT: query for previous state
* linked list of tasks to store
*
@@ -10,98 +9,5 @@
*
*/
#include "llist.h"
#include "planner.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <time.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
FILE *file = fopen(filename, "w");
// if there is no file or a wrong file path you becom an error
if (file == NULL) {
fprintf(stderr, "Could not open file %s\n", filename);
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->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
// Open file with read permision
FILE *file = fopen(filename, "r");
if (file == NULL) {
fprintf(stderr, "Could not open file %s\n", filename);
} else {
char *line = NULL; // Line Buffer
size_t nnread, len;
int count = 0; // task counter
getline(&line, &len, file);
free(line);
line = NULL;
while ((nnread = getline(&line, &len, file)) != -1) {
count++;
// remove newline sign
line[strcspn(line, "\n")] = '\0';
// column slice
char *taskname = strtok(line, ",");
char *taskcreation_dateSTR = strtok(NULL, ",");
char *taskdeadline_dateSTR = strtok(NULL, ",");
char *taskprioritySTR = strtok(NULL, ",");
char *taskspareSTR = strtok(NULL, ",");
printf(" Der Name des Task ist %s\n", taskname);
// 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);
int priority = atoi(taskprioritySTR);
// create Task
Task *task = newTask(taskname, taskcreation_date, taskdeadline_date,
priority, taskspare);
// Insert task into the linked list
if (list == NULL) {
// If the list is empty, initialize it with the first task
list = llistNew(task, cmpTaskN);
} else {
// Append the task to the linked list
llistAppend(list, task);
}
line = NULL;
}
fclose(file);
}
return list; // null on error
}
-3
View File
@@ -4,6 +4,3 @@
#include "planner.h"
#endif
void write_linkedlist_to_csv(llist *head, const char *filename);
llist *write_csv_to_llist(const char *filename);
+1
View File
@@ -1,4 +1,5 @@
#include "llist.h"
#include <asm-generic/errno.h>
#include <stdlib.h>
#include <string.h>
+1 -1
View File
@@ -24,6 +24,6 @@ void llistFree(llist *head);
int llistLen(llist *head);
void llistPrintT(llist *head);
void llistPrintH(llist *head);
void llistPrintE(llist *head);
#endif
+24 -108
View File
@@ -15,13 +15,8 @@
#include <string.h>
#include <time.h>
#ifdef _WIN32
#define ctime_r(T, Tm) (localtime_s(Tm, T) ? NULL : Tm)
#define localtime_r(T, Tm) (localtime_s(Tm, T) ? NULL : Tm)
#endif /* ifdef _WIN32 */
const unsigned int intervalLen = 45; // min
const unsigned int pauseLen = 10; //
const uint intervalLen = 45; // min
const uint pauseLen = 10; //
const char taskFormat[] =
"Task { %.64s = {\n created={%lu},\n deadline={%lu},\n "
@@ -151,7 +146,9 @@ int cmpTaskN(const void *a, const void *b) {
int cmpTaskP(const void *a, const void *b) {
Task *aa = (Task *)a;
Task *bb = (Task *)b;
if (bb->priority - aa->priority != 0)
return bb->priority - aa->priority;
return aa->spare - bb->spare;
}
// cmp event by task name
@@ -178,12 +175,14 @@ llist *genPlan(llist *head, time_t timeAvail) {
}
// add Tasks from llist to arr
// ignore tasks after deadline
llist *c = head;
time_t now = time(NULL);
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 <= now)
sortedPrio[i].priority = 0;
c = c->next;
}
@@ -191,12 +190,6 @@ llist *genPlan(llist *head, time_t timeAvail) {
// 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,15 +198,12 @@ llist *genPlan(llist *head, time_t timeAvail) {
planLog("creating eventList", false);
// genertate plan basen on priorities and available time
time_t 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 {
start = mktime(lc); // start now
lc->tm_min += intervalLen;
@@ -226,40 +216,33 @@ llist *genPlan(llist *head, time_t timeAvail) {
0); // use elem with wighest priority
}
llistAppend(events_ll, c);
printEvent(c);
// printEvent((Event *)((events_ll)->next)->data);
// printEvent(c);
// decrement priority of first elem and resort list
(*sortedPrio).priority -= 1;
// increment spare(used as counter)
// counter counts how often a task hsa been in addet to event list
// this is used to break ties if priorites are equal
(*sortedPrio).spare += 1;
// sort again
qsort(sortedPrio, lLen, sizeof(Task), cmpTaskP);
planLog("sortendPrio", 0);
for (int i = 0; i < lLen; i++) {
printTask(sortedPrio + i);
}
lc->tm_min += pauseLen; // add pause
} 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);
// }
//
} while (mktime(lc) < timeAvail && (*sortedPrio).priority > 0);
// 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,76 +253,9 @@ 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;
}
-3
View File
@@ -77,13 +77,10 @@ Event *newEvent(Task *t, time_t s, time_t e, uint64_t sp);
*/
void freeEvent(Event *e);
void llistFreeE(llist *head);
void llistPrintE(llist *head);
int cmpEvent(const void *a, const void *b);
/*
* takes llist of tasks and returns llist of events
*/
llist *genPlan(llist *head, time_t timeAvail);
int exportiCal(llist *head);
#endif // !PLANNER
+6 -2
View File
@@ -9,7 +9,7 @@
#include <stdlib.h>
#include <time.h>
int test() {
int main() {
time_t now = time(NULL);
@@ -25,6 +25,8 @@ int test() {
assert(t3 != NULL);
Task *t4 = newTask("TM1", now, now + days(1), 9, 0);
assert(t4 != NULL);
Task *t5 = newTask("Akt1", now, now, 9, 0);
assert(t5 != NULL);
printf("%s\n", ctime(&now));
@@ -33,12 +35,14 @@ int test() {
llistAppend(list1, t2);
llistAppend(list1, t3);
llistAppend(list1, t4);
llistAppend(list1, t5);
// gnerate plan from task list in time
struct tm *lc = localtime(&now);
lc->tm_hour += 9; // add available time;
lc->tm_hour += 4; // add available time;
time_t maxTime = mktime(lc); // create timestamp
llist *l1 = genPlan(list1, maxTime); // return inked list of event;
llistPrintE(l1);
llistFreeE(l1);
// print test tasks
+115 -166
View File
@@ -3,188 +3,137 @@
*
*/
/* Created by Juergen Buechel, 13.12.2024/
*/
#include "ui.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 <string.h>
#include <time.h>
#include "ui.h"
#include "planner.h"
#include "iCal.h"
#include "db.h"
#ifdef _WIN32
#define localtime_r(T, Tm) (localtime_s(Tm, T) ? NULL : Tm)
#endif
void dump_buffer(FILE *fp){
int ch;
while((ch = fgetc(fp)) != EOF && ch != '\n');
}
const char *dbName = "db.csv";
int main(void) {
int taskcreation_date = 0;
int taskdeadline_date = 0;
int taskpriority = 0;
int taskspare = 0;
char *taskname = NULL; // taskName Buffer
void insertTask(task_ptr newtask)
{
task_ptr TaskPointer;
if (firsttask == NULL){
firsttask = newtask;
newtask->nextTask ;
}
else {
TaskPointer = firsttask;
while(TaskPointer->nextTask!=NULL)
{
TaskPointer = TaskPointer->nextTask;
}
TaskPointer->nextTask = newtask;
newtask ->nextTask;
}
}
llist *listT = NULL;
llist *listE = NULL;
void newTask (void)
{
task_ptr new = malloc(sizeof(task_1));
if (new == NULL){
printf("Die Liste ist leer?!\n");
}
printf(" Neues Fach eigeben: ");
if(scanf("%d", &newTask)!=1)
{
dump_buffer(stdin);
printf("Fehlerhafte eingabe\n");
free(new);
return;
}
dump_buffer (stdin);
insertTask(new);
}
void inserttime(time_ptr newtime)
{
time_ptr TimePointer;
if (firsttime == NULL){
firsttime = newtime;
newtime->nextTime =NULL;
}
else {
TimePointer = firsttime;
while(TimePointer->nextTime!=NULL)
{
TimePointer = TimePointer->nextTime;
}
TimePointer->nextTime = newtime;
newtime ->nextTime = NULL;
}
}
void newTime(void)
{
time_ptr newtime = malloc(sizeof(task_1));
if (newtime == NULL){
printf("Die Liste ist leer?!\n");
}
printf(" Neue Zeit eingeben: ");
if(scanf("%d",&newTime)!=1)
{
dump_buffer(stdin);
printf("Fehlerhafte eingabe\n");
free(newtime);
return;
}
dump_buffer (stdin);
inserttime(newtime);
}
void tasklisting(void){
task_ptr TaskPointer = firsttask;
printf("Erfasste Fächer:\n");
while(TaskPointer!=NULL)
printf("\t->%d\n", TaskPointer->name);
TaskPointer = TaskPointer->nextTask;
}
void getlink (void)
{
}
int main(void)
{
int choice = 0, i = 0;
do {
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);
printf(" -5- Planer beenden\n");
if( scanf("%d", &choice) != 1){
printf("Falsche Eingabe\n");};
choice = 0;
continue;
};
dump_buffer(stdin);
taskname = NULL;
size_t nameLen;
size_t nnread;
switch (choice) {
case 1:
printf(" Geben sie das gewünschte Fach ein: \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: \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: \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) {
switch (choice)
{
case 1: newTask();break;
case 2: newTime();break;
case 3: if( firsttask == 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;
else{
tasklisting();
}break;
case 4: iCAl();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
// }
// }
}while (choice !=5);
return EXIT_SUCCESS;
// case 4: iCAl();break;
}
} while (choice < 6);
}
-3
View File
@@ -1,7 +1,4 @@
#ifndef UI
#define UI
#endif // !UI