Compare commits
86
Commits
plannerSim
..
bugfix
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6816c4eacf | ||
|
|
ac45c8cb65 | ||
|
|
aee1ab81a9 | ||
|
|
3612334ffc | ||
|
|
d794d1c59c | ||
|
|
1f54110aa5 | ||
|
|
60cfa51406 | ||
|
|
8d6d6b2870 | ||
|
|
5f65a91ffb | ||
|
|
14705844d7 | ||
|
|
2d0bd1341b | ||
|
|
6f3cd456f4 | ||
|
|
3b8bd5dc40 | ||
|
|
d7cf85b44f | ||
|
|
ca261158c6 | ||
|
|
52718c972e | ||
|
|
24150229d4 | ||
|
|
a925ca1678 | ||
|
|
053bf501b5 | ||
|
|
503182c0ca | ||
|
|
2b162f532f | ||
|
|
e4b1580d1e | ||
|
|
4acaefdd42 | ||
|
|
e27e6f0b28 | ||
|
|
33b0d3087b | ||
|
|
0c27b315a9 | ||
|
|
db3f7a4de7 | ||
|
|
10a36c4a88 | ||
|
|
7946b3e548 | ||
|
|
5d7e7d83b6 | ||
|
|
752f144113 | ||
|
|
7dfcf1500b | ||
|
|
87c5fa8225 | ||
|
|
42183a0747 | ||
|
|
809239492d | ||
|
|
5e3d89fb57 | ||
|
|
5d76c54213 | ||
|
|
9d903f62f2 | ||
|
|
b5dc110cd2 | ||
|
|
fdfdada4d8 | ||
|
|
9b3238978b | ||
|
|
a833bb456a | ||
|
|
08145cd4a2 | ||
|
|
f72c98de28 | ||
|
|
a302bfc4e8 | ||
|
|
78a0bc4806 | ||
|
|
ac8a64695f | ||
|
|
d428589063 | ||
|
|
1fb016296b | ||
|
|
dd88cd8b64 | ||
|
|
24f0e9e7ec | ||
|
|
63ee77f5c4 | ||
|
|
cf63dc4712 | ||
|
|
10dc2a7e04 | ||
|
|
81a0d68cc2 | ||
|
|
bf14307a71 | ||
|
|
b792eed3d2 | ||
|
|
ad20db3995 | ||
|
|
8cea008459 | ||
|
|
81c62f892d | ||
|
|
f6cea89dd2 | ||
|
|
7f6a2c865b | ||
|
|
b027a12354 | ||
|
|
b308dc4c95 | ||
|
|
834b3270b9 | ||
|
|
0ef20822fd | ||
|
|
e32c7d8951 | ||
|
|
5ebd852864 | ||
|
|
06a81ad27e | ||
|
|
9a9dddaad0 | ||
|
|
e34431e810 | ||
|
|
fe4f8e295b | ||
|
|
c1195de54b | ||
|
|
8c695e4eb7 | ||
|
|
e97cd55e28 | ||
|
|
36a3f8d28c | ||
|
|
7da1172d3a | ||
|
|
749c0400fa | ||
|
|
0504491668 | ||
|
|
85ea3ffca8 | ||
|
|
d86bcbfcf2 | ||
|
|
b6e51b6f06 | ||
|
|
381f2b3eb6 | ||
|
|
c6846c38dc | ||
|
|
385383d03e | ||
|
|
2751c5ca7b |
No files matched your search
+1
-2
@@ -1,7 +1,6 @@
|
|||||||
testing
|
testing
|
||||||
debugOut
|
debugOut
|
||||||
*.ics
|
.idea
|
||||||
*.csv
|
|
||||||
# ---> C
|
# ---> C
|
||||||
# Prerequisites
|
# Prerequisites
|
||||||
*.d
|
*.d
|
||||||
|
|||||||
@@ -0,0 +1,7 @@
|
|||||||
|
<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,11 +1,11 @@
|
|||||||
#compiler flags
|
#compiler flags
|
||||||
|
|
||||||
CFLAGS=-Wall -Wextra -g
|
CFLAGS=-Wall -Wextra -g
|
||||||
|
INCLUDES = -Isrc
|
||||||
|
|
||||||
|
|
||||||
#files
|
#files
|
||||||
UIF=src/ui.c src/ui.h #UI 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
|
PLF=src/planner.c src/planner.h #planner files
|
||||||
DBF=src/db.c src/db.h #db files
|
DBF=src/db.c src/db.h #db files
|
||||||
CALF=src/iCal.c src/iCal.h
|
CALF=src/iCal.c src/iCal.h
|
||||||
@@ -14,8 +14,8 @@ CONFIG=src/config.h #config file
|
|||||||
|
|
||||||
|
|
||||||
#targets
|
#targets
|
||||||
debug: test planner db iCal config llist uis
|
debug: test ui planner db iCal config llist
|
||||||
gcc test.o planner.o db.o iCal.o llist.o uis.o -o debugOut
|
gcc test.o ui.o planner.o db.o iCal.o llist.o -o debugOut
|
||||||
|
|
||||||
config: $(CONFIG)
|
config: $(CONFIG)
|
||||||
llist: $(LLST)
|
llist: $(LLST)
|
||||||
@@ -25,8 +25,6 @@ test: src/test.c
|
|||||||
iCal: $(CALF)
|
iCal: $(CALF)
|
||||||
gcc -c $(CFLAGS) $(CALF)
|
gcc -c $(CFLAGS) $(CALF)
|
||||||
ui: $(UIF)
|
ui: $(UIF)
|
||||||
uis: $(UISF)
|
|
||||||
gcc -c $(CFLAGS) $(UISF)
|
|
||||||
gcc -c $(CFLAGS) $(UIF)
|
gcc -c $(CFLAGS) $(UIF)
|
||||||
planner: $(PLF)
|
planner: $(PLF)
|
||||||
gcc -c $(CFLAGS) $(PLF)
|
gcc -c $(CFLAGS) $(PLF)
|
||||||
@@ -35,10 +33,10 @@ db: $(DBF)
|
|||||||
|
|
||||||
|
|
||||||
edit:
|
edit:
|
||||||
nvim $(PLF) Makefile $(LLST) src/test.c src/uis.c
|
nvim $(PLF) Makefile $(LLST) src/test.c
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -rf *.o debugOut src/*.gch *.ics *.csv
|
rm -rf *.o debugOut src/*.gch *.csv *.ics
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -0,0 +1,116 @@
|
|||||||
|
<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<div><br></div>" 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<div><br></div>" 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>
|
||||||
+2
-15
@@ -9,20 +9,7 @@
|
|||||||
#define hours(n) (60 * minutes(n))
|
#define hours(n) (60 * minutes(n))
|
||||||
#define days(n) (24 * hours(n))
|
#define days(n) (24 * hours(n))
|
||||||
|
|
||||||
static const time_t pauseLenght = minutes(10);
|
static const time_t pauseLenght = minutes(15);
|
||||||
static const time_t minIntervalLen = minutes(30);
|
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
|
#endif
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
/*
|
/* Create a database and handel it
|
||||||
|
* Created by Jan on 13.12.2024.
|
||||||
* INPUT: query for previous state
|
* INPUT: query for previous state
|
||||||
* linked list of tasks to store
|
* linked list of tasks to store
|
||||||
*
|
*
|
||||||
@@ -9,5 +10,98 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "llist.h"
|
||||||
#include "planner.h"
|
#include "planner.h"
|
||||||
#include <stdio.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
|
||||||
|
}
|
||||||
@@ -4,3 +4,6 @@
|
|||||||
#include "planner.h"
|
#include "planner.h"
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
void write_linkedlist_to_csv(llist *head, const char *filename);
|
||||||
|
llist *write_csv_to_llist(const char *filename);
|
||||||
@@ -1,5 +1,4 @@
|
|||||||
#include "llist.h"
|
#include "llist.h"
|
||||||
#include <asm-generic/errno.h>
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -24,6 +24,6 @@ void llistFree(llist *head);
|
|||||||
int llistLen(llist *head);
|
int llistLen(llist *head);
|
||||||
|
|
||||||
void llistPrintT(llist *head);
|
void llistPrintT(llist *head);
|
||||||
void llistPrintE(llist *head);
|
void llistPrintH(llist *head);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
+40
-94
@@ -15,8 +15,13 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
|
|
||||||
const uint intervalLen = 45; // min
|
#ifdef _WIN32
|
||||||
const uint pauseLen = 10; //
|
#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 char taskFormat[] =
|
const char taskFormat[] =
|
||||||
"Task { %.64s = {\n created={%lu},\n deadline={%lu},\n "
|
"Task { %.64s = {\n created={%lu},\n deadline={%lu},\n "
|
||||||
@@ -31,8 +36,6 @@ void llistPrintT(llist *head) {
|
|||||||
c = c->next;
|
c = c->next;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
int exportiCal(llist *ev_ll);
|
|
||||||
int taskLlToFile(llist *tll);
|
|
||||||
// print Event to stdout
|
// print Event to stdout
|
||||||
void printEvent(Event *s) {
|
void printEvent(Event *s) {
|
||||||
char st[26];
|
char st[26];
|
||||||
@@ -148,9 +151,7 @@ int cmpTaskN(const void *a, const void *b) {
|
|||||||
int cmpTaskP(const void *a, const void *b) {
|
int cmpTaskP(const void *a, const void *b) {
|
||||||
Task *aa = (Task *)a;
|
Task *aa = (Task *)a;
|
||||||
Task *bb = (Task *)b;
|
Task *bb = (Task *)b;
|
||||||
if (bb->priority - aa->priority != 0)
|
return bb->priority - aa->priority;
|
||||||
return bb->priority - aa->priority;
|
|
||||||
return aa->spare - bb->spare;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// cmp event by task name
|
// cmp event by task name
|
||||||
@@ -177,14 +178,12 @@ llist *genPlan(llist *head, time_t timeAvail) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// add Tasks from llist to arr
|
// add Tasks from llist to arr
|
||||||
// ignore tasks after deadline
|
|
||||||
llist *c = head;
|
llist *c = head;
|
||||||
time_t now = time(NULL);
|
|
||||||
for (int i = 0; c != NULL; i++) {
|
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;
|
sortedPrio[i] = *(Task *)c->data;
|
||||||
if (sortedPrio[i].deadline <= now)
|
|
||||||
sortedPrio[i].priority = 0;
|
|
||||||
|
|
||||||
c = c->next;
|
c = c->next;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -192,6 +191,12 @@ llist *genPlan(llist *head, time_t timeAvail) {
|
|||||||
// qsort(sortedNames, lLen, sizeof(Task), cmpTaskN);
|
// qsort(sortedNames, lLen, sizeof(Task), cmpTaskN);
|
||||||
qsort(sortedPrio, lLen, sizeof(Task), cmpTaskP);
|
qsort(sortedPrio, lLen, sizeof(Task), cmpTaskP);
|
||||||
|
|
||||||
|
// // test print
|
||||||
|
// planLog("sortendName", 0);
|
||||||
|
// for (int i = 0; i < lLen; i++) {
|
||||||
|
// printTask(sortedNames + i);
|
||||||
|
// }
|
||||||
|
|
||||||
planLog("sortendPrio", 0);
|
planLog("sortendPrio", 0);
|
||||||
for (int i = 0; i < lLen; i++) {
|
for (int i = 0; i < lLen; i++) {
|
||||||
printTask(sortedPrio + i);
|
printTask(sortedPrio + i);
|
||||||
@@ -200,12 +205,15 @@ llist *genPlan(llist *head, time_t timeAvail) {
|
|||||||
planLog("creating eventList", false);
|
planLog("creating eventList", false);
|
||||||
|
|
||||||
// genertate plan basen on priorities and available time
|
// genertate plan basen on priorities and available time
|
||||||
|
time_t now = time(NULL);
|
||||||
struct tm *lc = localtime(&now);
|
struct tm *lc = localtime(&now);
|
||||||
llist *events_ll = llistNew(NULL, cmpEvent);
|
llist *events_ll = llistNew(NULL, cmpEvent);
|
||||||
if (events_ll == NULL) {
|
if (events_ll == NULL) {
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
// time_t avail = mktime(timeAvail);
|
||||||
time_t start, end;
|
time_t start, end;
|
||||||
|
// (mktime(lc) < mktime(timeAvail))
|
||||||
do {
|
do {
|
||||||
start = mktime(lc); // start now
|
start = mktime(lc); // start now
|
||||||
lc->tm_min += intervalLen;
|
lc->tm_min += intervalLen;
|
||||||
@@ -218,33 +226,40 @@ llist *genPlan(llist *head, time_t timeAvail) {
|
|||||||
0); // use elem with wighest priority
|
0); // use elem with wighest priority
|
||||||
}
|
}
|
||||||
llistAppend(events_ll, c);
|
llistAppend(events_ll, c);
|
||||||
// printEvent(c);
|
printEvent(c);
|
||||||
|
// printEvent((Event *)((events_ll)->next)->data);
|
||||||
|
|
||||||
// decrement priority of first elem and resort list
|
// decrement priority of first elem and resort list
|
||||||
(*sortedPrio).priority -= 1;
|
(*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);
|
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
|
lc->tm_min += pauseLen; // add pause
|
||||||
|
|
||||||
} while (mktime(lc) < timeAvail && (*sortedPrio).priority > 0);
|
} 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);
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
|
||||||
// free empty head
|
// free empty head
|
||||||
llist *tmp = events_ll;
|
llist *tmp = events_ll;
|
||||||
events_ll = events_ll->next;
|
events_ll = events_ll->next;
|
||||||
tmp->next = NULL;
|
tmp->next = NULL;
|
||||||
llistFreeE(tmp);
|
llistFreeE(tmp);
|
||||||
|
printf("====EVENTSLL:\n");
|
||||||
llistPrintE(events_ll);
|
llistPrintE(events_ll);
|
||||||
|
printf("====EVENTSLL:\n");
|
||||||
// update prioriteis in original llist
|
// update prioriteis in original llist
|
||||||
for (int i = 0; i < lLen; i++) {
|
for (int i = 0; i < lLen; i++) {
|
||||||
llist *tmp = llistGet(head, sortedPrio + i);
|
llist *tmp = llistGet(head, sortedPrio + i);
|
||||||
@@ -255,9 +270,6 @@ llist *genPlan(llist *head, time_t timeAvail) {
|
|||||||
free(sortedPrio);
|
free(sortedPrio);
|
||||||
|
|
||||||
planLog("END GEN PLAN", 0);
|
planLog("END GEN PLAN", 0);
|
||||||
|
|
||||||
exportiCal(events_ll);
|
|
||||||
taskLlToFile(head);
|
|
||||||
// llistFreeT(head);
|
// llistFreeT(head);
|
||||||
// send updated tasks to db for storage
|
// send updated tasks to db for storage
|
||||||
|
|
||||||
@@ -275,54 +287,6 @@ const char *iCalEvent = "BEGIN:VEVENT\r\n"
|
|||||||
"SUMMARY:%s\r\n"
|
"SUMMARY:%s\r\n"
|
||||||
"END:VEVENT\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) {
|
int exportiCal(llist *events_ll) {
|
||||||
|
|
||||||
llist *ev_ll = events_ll;
|
llist *ev_ll = events_ll;
|
||||||
@@ -379,21 +343,3 @@ int exportiCal(llist *events_ll) {
|
|||||||
|
|
||||||
return 0;
|
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;
|
|
||||||
}
|
|
||||||
@@ -77,10 +77,13 @@ Event *newEvent(Task *t, time_t s, time_t e, uint64_t sp);
|
|||||||
*/
|
*/
|
||||||
void freeEvent(Event *e);
|
void freeEvent(Event *e);
|
||||||
void llistFreeE(llist *head);
|
void llistFreeE(llist *head);
|
||||||
|
void llistPrintE(llist *head);
|
||||||
int cmpEvent(const void *a, const void *b);
|
int cmpEvent(const void *a, const void *b);
|
||||||
/*
|
/*
|
||||||
* takes llist of tasks and returns llist of events
|
* takes llist of tasks and returns llist of events
|
||||||
*/
|
*/
|
||||||
llist *genPlan(llist *head, time_t timeAvail);
|
llist *genPlan(llist *head, time_t timeAvail);
|
||||||
|
|
||||||
|
int exportiCal(llist *head);
|
||||||
|
|
||||||
#endif // !PLANNER
|
#endif // !PLANNER
|
||||||
+2
-5
@@ -18,14 +18,13 @@ int test() {
|
|||||||
Task *t1 = newTask("LinAlg", now, now + days(5), 3, 0);
|
Task *t1 = newTask("LinAlg", now, now + days(5), 3, 0);
|
||||||
assert(t1 != NULL);
|
assert(t1 != NULL);
|
||||||
|
|
||||||
|
// Stack Allocated vars only for local use!
|
||||||
Task *t2 = newTask("Phys", now, now + days(2), 7, 0);
|
Task *t2 = newTask("Phys", now, now + days(2), 7, 0);
|
||||||
assert(t2 != NULL);
|
assert(t2 != NULL);
|
||||||
Task *t3 = newTask("Analysis", now, now + days(10), 5, 0);
|
Task *t3 = newTask("Analysis", now, now + days(10), 5, 0);
|
||||||
assert(t3 != NULL);
|
assert(t3 != NULL);
|
||||||
Task *t4 = newTask("TM1", now, now + days(1), 9, 0);
|
Task *t4 = newTask("TM1", now, now + days(1), 9, 0);
|
||||||
assert(t4 != NULL);
|
assert(t4 != NULL);
|
||||||
Task *t5 = newTask("Akt1", now, now, 9, 0);
|
|
||||||
assert(t5 != NULL);
|
|
||||||
|
|
||||||
printf("%s\n", ctime(&now));
|
printf("%s\n", ctime(&now));
|
||||||
|
|
||||||
@@ -34,14 +33,12 @@ int test() {
|
|||||||
llistAppend(list1, t2);
|
llistAppend(list1, t2);
|
||||||
llistAppend(list1, t3);
|
llistAppend(list1, t3);
|
||||||
llistAppend(list1, t4);
|
llistAppend(list1, t4);
|
||||||
llistAppend(list1, t5);
|
|
||||||
|
|
||||||
// gnerate plan from task list in time
|
// gnerate plan from task list in time
|
||||||
struct tm *lc = localtime(&now);
|
struct tm *lc = localtime(&now);
|
||||||
lc->tm_hour += 7; // add available time;
|
lc->tm_hour += 9; // add available time;
|
||||||
time_t maxTime = mktime(lc); // create timestamp
|
time_t maxTime = mktime(lc); // create timestamp
|
||||||
llist *l1 = genPlan(list1, maxTime); // return inked list of event;
|
llist *l1 = genPlan(list1, maxTime); // return inked list of event;
|
||||||
llistPrintE(l1);
|
|
||||||
llistFreeE(l1);
|
llistFreeE(l1);
|
||||||
|
|
||||||
// print test tasks
|
// print test tasks
|
||||||
|
|||||||
@@ -2,4 +2,189 @@
|
|||||||
* command line interface for user input
|
* command line interface for user input
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
/* 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 "planner.h" // for subject and event structs
|
||||||
|
#include <assert.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <time.h>
|
||||||
|
|
||||||
|
#ifdef _WIN32
|
||||||
|
#define localtime_r(T, Tm) (localtime_s(Tm, T) ? NULL : Tm)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
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
|
||||||
|
|
||||||
|
llist *listT = NULL;
|
||||||
|
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(" -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);
|
||||||
|
choice = 0;
|
||||||
|
continue;
|
||||||
|
};
|
||||||
|
|
||||||
|
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) {
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
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
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
return EXIT_SUCCESS;
|
||||||
|
// case 4: iCAl();break;
|
||||||
|
}
|
||||||
|
} while (choice < 6);
|
||||||
|
}
|
||||||
@@ -1,4 +1,7 @@
|
|||||||
#ifndef UI
|
#ifndef UI
|
||||||
#define UI
|
#define UI
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#endif // !UI
|
#endif // !UI
|
||||||
|
|
||||||
@@ -1,124 +0,0 @@
|
|||||||
#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);
|
|
||||||
}
|
|
||||||
Reference in new issue
Block a user