schurtisimon
/
StudyPlanner
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

merge into: schurtisimon:master
Branches Tags
schurtisimon:master
schurtisimon:carla
schurtisimon:bugfix
schurtisimon:bugfixMaster
schurtisimon:plannerSim
schurtisimon:ui.c
schurtisimon:planner
schurtisimon:sql
...
pull from: schurtisimon:plannerSim
Branches Tags
schurtisimon:master
schurtisimon:carla
schurtisimon:bugfix
schurtisimon:bugfixMaster
schurtisimon:plannerSim
schurtisimon:ui.c
schurtisimon:planner
schurtisimon:sql

11 Commits
master ... plannerSim

Author SHA1 Message Date
simon 3d53f7bd2f modified: .gitignore 2024-12-15 00:37:38 +01:00
Simon Schurti d2787c215e Delete 2024-12-14dayplan.ics 2024-12-15 00:36:43 +01:00
Simon Schurti 1f7fbbde20 Delete db.csv 2024-12-15 00:36:36 +01:00
Simon Schurti 38c9ed1829 Delete iCal.c 2024-12-15 00:36:27 +01:00
simon a1a5c7c478 new file: iCal.c 
new file:   src/uis.c
	new file:   src/uis.h
 2024-12-14 21:56:57 +01:00
simon 7356794c52 modified: src/planner.c 2024-12-14 20:59:11 +01:00
simon b2aca861b7 modified: Makefile 
modified:   src/planner.c
	modified:   src/test.c
 2024-12-14 20:26:12 +01:00
simon ba1322ac0d modified: src/planner.c 
modified:   src/test.c
 2024-12-14 13:14:30 +01:00
simon 93aa77bb5b modified: src/config.h 2024-12-14 10:49:50 +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
9 changed files with 313 additions and 156 deletions
Show Stats Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,5 +1,7 @@
testing
debugOut
*.ics
*.csv
# ---> C
# Prerequisites
*.d

11
Makefile
View File

@ -5,6 +5,7 @@ CFLAGS=-Wall -Wextra -g
#files
UIF=src/ui.c src/ui.h #UI files
UISF=src/uis.c src/uis.h #UI files
PLF=src/planner.c src/planner.h #planner files
DBF=src/db.c src/db.h #db files
CALF=src/iCal.c src/iCal.h
@ -13,8 +14,8 @@ CONFIG=src/config.h #config file
#targets
debug: test ui planner db iCal config llist
gcc test.o ui.o planner.o db.o iCal.o llist.o -o debugOut
debug: test planner db iCal config llist uis
gcc test.o planner.o db.o iCal.o llist.o uis.o -o debugOut
config: $(CONFIG)
llist: $(LLST)
@ -24,6 +25,8 @@ test: src/test.c
iCal: $(CALF)
gcc -c $(CFLAGS) $(CALF)
ui: $(UIF)
uis: $(UISF)
gcc -c $(CFLAGS) $(UISF)
gcc -c $(CFLAGS) $(UIF)
planner: $(PLF)
gcc -c $(CFLAGS) $(PLF)
@ -32,10 +35,10 @@ db: $(DBF)
edit:
nvim $(PLF) Makefile $(LLST) src/test.c
nvim $(PLF) Makefile $(LLST) src/test.c src/uis.c
clean:
rm -rf *.o debugOut src/*.gch
rm -rf *.o debugOut src/*.gch *.ics *.csv

116
doc/.$overview.drawio.bkp
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>

17
src/config.h
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

2
src/llist.h
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

186
src/planner.c
View File

@ -31,6 +31,8 @@ void llistPrintT(llist *head) {
c = c->next;
}
}
int exportiCal(llist *ev_ll);
int taskLlToFile(llist *tll);
// print Event to stdout
void printEvent(Event *s) {
char st[26];
@ -146,7 +148,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
@ -173,12 +177,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;
}
@ -186,12 +192,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);
@ -200,15 +200,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;
@ -222,30 +219,24 @@ llist *genPlan(llist *head, time_t timeAvail) {
}
llistAppend(events_ll, c);
// printEvent(c);
// printEvent((Event *)((events_ll)->next)->data);
// 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;
@ -264,8 +255,145 @@ llist *genPlan(llist *head, time_t timeAvail) {
free(sortedPrio);
planLog("END GEN PLAN", 0);
exportiCal(events_ll);
taskLlToFile(head);
// 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";
const char *iCalFileExtension = "ics";
/*
* Wikipedia
*
*The body of the iCalendar object (the icalbody) contains single-line Calendar
* Properties that apply to the entire calendar, as well as one or more blocks
* of multiple lines that each define a Calendar Component such as an event,
* journal entry, alarm, or one of several other types. Here is a simple example
* of an iCalendar object with a single calendar containing a single Calendar
* Component, a "Bastille Day Party" event starting at 5pm on July 14, 1997, and
* ending at 4am the following morning:[10]
BEGIN:VCALENDAR
VERSION:2.0
PRODID:-//hacksw/handcal//NONSGML v1.0//EN
BEGIN:VEVENT
UID:uid1@example.com
ORGANIZER;CN=John Doe:MAILTO:john.doe@example.com
DTSTART:19970714T170000Z
DTEND:19970715T040000Z
SUMMARY:Bastille Day Party
GEO:48.85299;2.36885
END:VEVENT
END:VCALENDAR
The UID field distributes updates when a scheduled event changes. When the event
is first generated a globally unique identifier is created. If a later event is
distributed with the same UID, it replaces the original one. An example UID
might be Y2007S2C131M5@example.edu, for the 5th meeting of class 131 in semester
2 at a hypothetical college. Email-style UIDs are now considered bad practice,
with a UUID recommended instead.[11]
The most common representation of date and time is a tz timestamp such as
20010911T124640Z with the format <year (4 digits)><month (2)><day (2)>T<hour
(2)><minute (2)><second (2)>Z for a total fixed length of 16 characters. Z
indicates the use of UTC (referring to its Zulu time zone).[12] When used in
DTSTART and DTEND properties, start times are inclusive while end times are not.
This allows an event's end time to be the same as a consecutive event's start
without those events overlapping and potentially creating (false) scheduling
conflicts.[13]
*/
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;
}
const char *taskFileFormat = "%s,%lu,%lu,%d,%lu\n";
int taskLlToFile(llist *tll) {
// open file
FILE *fp = fopen("db.csv", "w");
if (fp == NULL)
return -1;
llist *c = tll;
while (c != NULL) {
Task *ct = (Task *)c->data;
fprintf(fp, taskFileFormat, ct->name, ct->created, ct->deadline,
ct->priority, ct->spare);
c = c->next;
}
fclose(fp);
return 0;
}

9
src/test.c
View File

@ -9,7 +9,7 @@
#include <stdlib.h>
#include <time.h>
int main() {
int test() {
time_t now = time(NULL);
@ -18,13 +18,14 @@ int main() {
Task *t1 = newTask("LinAlg", now, now + days(5), 3, 0);
assert(t1 != NULL);
// Stack Allocated vars only for local use!
Task *t2 = newTask("Phys", now, now + days(2), 7, 0);
assert(t2 != NULL);
Task *t3 = newTask("Analysis", now, now + days(10), 5, 0);
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 +34,14 @@ int main() {
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 += 7; // 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

124
src/uis.c Normal file
View File

@ -0,0 +1,124 @@
#include "llist.h"
#include "planner.h"
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <time.h>
typedef struct {
char *name;
char *helpStr;
void (*handler)(int argc, char **argv, void *ret);
} Command;
void addTask(int argc, char **argv, void *ret);
void getTasks(int argc, char **argv, void *ret);
void createPlan(int argc, char **argv, void *ret);
void help_handler(int argc, char **argv, void *ret);
void quit_handler(int argc, char **argv, void *ret);
// Define a list of commands
Command commands[] = {
{"add",
"add task with: add <taskName> <deadline(days from today> <priority>",
addTask},
{"getTasks", "TO BE IMPLEMENTED", getTasks},
{"gen", "Generate timetable with: gen <available time in h>", createPlan},
{"help", "Display Help", help_handler},
{"quit", "Quit program", quit_handler},
};
int main() {
printf("Time Management optimizer!\n");
llist *taskL = llistNew(NULL, cmpTaskN);
assert(taskL != NULL);
while (1) {
// Read user input
char *input = NULL;
size_t inputLen;
printf("> ");
getline(&input, &inputLen, stdin);
assert(input != NULL);
// Parse input into individual commands and arguments
char *token = strtok(input, " \n");
int argc = 0;
char **argv = NULL;
while (token) {
argv = realloc(argv, (argc + 1) * sizeof(char *));
argv[argc++] = token;
token = strtok(NULL, " ");
}
// Find matchin command handler
for (int i = 0; i < sizeof(commands) / sizeof(commands[0]); i++) {
if (strcmp(commands[i].name, argv[0]) == 0) {
commands[i].handler(argc, argv, taskL);
break;
}
}
free(input);
}
return 0;
}
/*
* to add task write <add> name deadline(days from now) priority
*/
void addTask(int argc, char **argv, void *ret) {
if (argc != 4) { // invalig input
help_handler(1, &argv[0], NULL);
} else {
llist *tasksLL = ret;
int days, prio;
char *name = strdup(argv[1]);
// parse task
if (sscanf(argv[2], "%d", &days) < 0 || sscanf(argv[3], "%d", &prio) < 0) {
printf("addTasksscanferr\n");
exit(1);
}
time_t now = time(NULL);
struct tm *lc = localtime(&now);
lc->tm_mon += days;
time_t deadline = mktime(lc);
Task *r = newTask(name, now, deadline, prio, 0);
llistAppend(tasksLL, r);
printf("added task:\n");
printTask(r);
printf("currentTaskList:\n");
llistPrintT(tasksLL->next);
}
}
/*
* generate plan, store to ical and store updated tasks to db
*/
void createPlan(int argc, char **argv, void *ret) {
printf("creating plan\n");
llist *taskLL = ret;
taskLL = taskLL->next;
llistPrintT(taskLL);
time_t now = time(NULL);
struct tm *lc = localtime(&now);
lc->tm_hour += atoi(argv[1]);
genPlan(taskLL, mktime(lc));
}
void help_handler(int argc, char **argv, void *ret) {
printf("available Commands:\n");
for (int i = 0; i < sizeof(commands) / sizeof(commands[0]); i++) {
printf("%s:%s\n", commands[i].name, commands[i].helpStr);
}
}
void getTasks(int argc, char **argv, void *ret) {
// TODO get form db
}
void quit_handler(int argc, char **argv, void *ret) {
printf("Goodbye!\n");
llistFreeT((llist *)ret);
exit(0);
}

0
src/uis.h Normal file
View File