Compare commits
97 Commits
Author | SHA1 | Date |
---|---|---|
ketrptr | 6bf5d08b9b | |
ketrptr | 7f487016dc | |
ketrptr | cd7094263a | |
ketrptr | 809efb512a | |
ketrptr | cb6571a0d6 | |
carlaTechnulgy | 0943d4f321 | |
ketrptr | bc53d5bcf3 | |
ketrptr | c616b98589 | |
ketrptr | 0922b8d6b8 | |
ketrptr | bcb08c6da9 | |
ketrptr | e5b5fd3b50 | |
ketrptr | 602da76bca | |
ketrptr | 17ee289f7e | |
Jürgen Büchel | 39493a82c5 | |
Jürgen Büchel | 0e15dee719 | |
ketrptr | 756bdd432b | |
ketrptr | 6816c4eacf | |
ketrptr | ac45c8cb65 | |
Jürgen Büchel | aee1ab81a9 | |
Jürgen Büchel | 3612334ffc | |
ketrptr | d794d1c59c | |
ketrptr | 1f54110aa5 | |
ketrptr | 60cfa51406 | |
Jan Wild | 8d6d6b2870 | |
Jan Wild | 5f65a91ffb | |
Jan Wild | 14705844d7 | |
Jan Wild | 2d0bd1341b | |
Jan Wild | 6f3cd456f4 | |
ketrptr | 3b8bd5dc40 | |
ketrptr | d7cf85b44f | |
Jürgen Büchel | ca261158c6 | |
Jürgen Büchel | 52718c972e | |
Jürgen Büchel | 24150229d4 | |
Jürgen Büchel | a925ca1678 | |
Jürgen Büchel | 053bf501b5 | |
Jürgen Büchel | 503182c0ca | |
ketrptr | 2b162f532f | |
ketrptr | e4b1580d1e | |
Jan Wild | 4acaefdd42 | |
Jürgen Büchel | e27e6f0b28 | |
Jürgen Büchel | 33b0d3087b | |
ketrptr | 0c27b315a9 | |
Jürgen Büchel | db3f7a4de7 | |
Jürgen Büchel | 10a36c4a88 | |
Jürgen Büchel | 7946b3e548 | |
ketrptr | 5d7e7d83b6 | |
ketrptr | 752f144113 | |
ketrptr | 7dfcf1500b | |
ketrptr | 87c5fa8225 | |
ketrptr | 42183a0747 | |
ketrptr | 809239492d | |
ketrptr | 5e3d89fb57 | |
ketrptr | 5d76c54213 | |
Simon Schurti | 9d903f62f2 | |
ketrptr | b5dc110cd2 | |
Jan Wild | fdfdada4d8 | |
ketrptr | 9b3238978b | |
Jan Wild | a833bb456a | |
Jürgen Büchel | 08145cd4a2 | |
simon | f72c98de28 | |
simon | a302bfc4e8 | |
Jan Wild | 78a0bc4806 | |
Jan Wild | ac8a64695f | |
Jürgen Büchel | d428589063 | |
Jürgen Büchel | 1fb016296b | |
simon | dd88cd8b64 | |
simon | 24f0e9e7ec | |
simon | 63ee77f5c4 | |
Jürgen Büchel | cf63dc4712 | |
Jan Wild | 10dc2a7e04 | |
Jan Wild | 81a0d68cc2 | |
Jürgen Büchel | bf14307a71 | |
Jürgen Büchel | b792eed3d2 | |
Jürgen Büchel | ad20db3995 | |
Jan Wild | 8cea008459 | |
Jürgen Büchel | 81c62f892d | |
Jürgen Büchel | f6cea89dd2 | |
Jan Wild | 7f6a2c865b | |
Jan Wild | b027a12354 | |
simon | b308dc4c95 | |
Jürgen Büchel | 834b3270b9 | |
Jürgen Büchel | 0ef20822fd | |
Jan Wild | e32c7d8951 | |
Jan Wild | 5ebd852864 | |
Jan Wild | 06a81ad27e | |
Jan Wild | 9a9dddaad0 | |
Jan Wild | e34431e810 | |
Jan Wild | fe4f8e295b | |
Jan Wild | c1195de54b | |
Jürgen Büchel | 8c695e4eb7 | |
Jan Wild | e97cd55e28 | |
Jürgen Büchel | 36a3f8d28c | |
Jürgen Büchel | 7da1172d3a | |
Jürgen Büchel | 749c0400fa | |
Jan Wild | 0504491668 | |
Jan Wild | 85ea3ffca8 | |
Jürgen Büchel | d86bcbfcf2 |
|
@ -1,5 +1,8 @@
|
|||
testing
|
||||
debugOut
|
||||
.idea
|
||||
.run
|
||||
.vscode
|
||||
# ---> C
|
||||
# Prerequisites
|
||||
*.d
|
||||
|
|
|
@ -0,0 +1,28 @@
|
|||
{
|
||||
"tasks": [
|
||||
{
|
||||
"type": "cppbuild",
|
||||
"label": "C/C++: gcc.exe build active file",
|
||||
"command": "C:\\MinGW\\bin\\gcc.exe",
|
||||
"args": [
|
||||
"-fdiagnostics-color=always",
|
||||
"-g",
|
||||
"${file}",
|
||||
"-o",
|
||||
"${fileDirname}\\${fileBasenameNoExtension}.exe"
|
||||
],
|
||||
"options": {
|
||||
"cwd": "${fileDirname}"
|
||||
},
|
||||
"problemMatcher": [
|
||||
"$gcc"
|
||||
],
|
||||
"group": {
|
||||
"kind": "build",
|
||||
"isDefault": true
|
||||
},
|
||||
"detail": "Task generated by Debugger."
|
||||
}
|
||||
],
|
||||
"version": "2.0.0"
|
||||
}
|
29
Makefile
29
Makefile
|
@ -1,6 +1,7 @@
|
|||
#compiler flags
|
||||
|
||||
CFLAGS=-Wall -Wextra -g
|
||||
INCLUDES = -Isrc
|
||||
|
||||
|
||||
#files
|
||||
|
@ -11,20 +12,19 @@ CALF=src/iCal.c src/iCal.h
|
|||
LLST=src/llist.c src/llist.h
|
||||
CONFIG=src/config.h #config file
|
||||
|
||||
ALLF=$(UIF) $(PLF) $(DBF) $(LLST)
|
||||
|
||||
all: debug
|
||||
#targets
|
||||
debug: db test ui planner iCal config llist
|
||||
gcc test.o ui.o planner.o db.o iCal.o llist.o -o debugOut
|
||||
|
||||
config: $(CONFIG)
|
||||
db: $(DBF)
|
||||
curl -L https://sqlite.org/2024/sqlite-amalgamation-3470200.zip --output src/sqlite.zip
|
||||
unzip src/sqlite.zip
|
||||
mv sqlite-amalgamation-3470200/* src/
|
||||
rm -rf sqlite-amalgamation-3470200
|
||||
gcc -c $(CFLAGS) $(DBF)
|
||||
debug: test ui planner db iCal llist
|
||||
gcc -DDEBUG test.o ui.o planner.o db.o iCal.o llist.o -o debugOut
|
||||
|
||||
|
||||
# release: $(ALLF)
|
||||
# gcc -DRELEASE -fPIC -shared -o $(ALLF)
|
||||
|
||||
|
||||
# config: $(CONFIG)
|
||||
llist: $(LLST)
|
||||
gcc -c $(CFLAGS) $(LLST)
|
||||
test: src/test.c
|
||||
|
@ -32,15 +32,18 @@ test: src/test.c
|
|||
iCal: $(CALF)
|
||||
gcc -c $(CFLAGS) $(CALF)
|
||||
ui: $(UIF)
|
||||
gcc -c $(CFLAGS) $(UIF)
|
||||
gcc -DDEBUG -c $(CFLAGS) $(UIF)
|
||||
planner: $(PLF)
|
||||
gcc -c $(CFLAGS) $(PLF)
|
||||
db: $(DBF)
|
||||
gcc -c $(CFLAGS) $(DBF)
|
||||
|
||||
|
||||
edit:
|
||||
nvim $(PLF) Makefile $(LLST) src/test.c
|
||||
nvim $(PLF) Makefile $(ALLF)
|
||||
|
||||
clean:
|
||||
rm -rf *.o debugOut src/*.gch
|
||||
rm -rf *.o debugOut src/*.gch *.csv *.ics *.so
|
||||
|
||||
|
||||
|
||||
|
|
10
README.md
10
README.md
|
@ -13,6 +13,16 @@
|
|||
|
||||
Time management optimisation tool.
|
||||
|
||||
# How to use
|
||||
|
||||
- to use program directly compile with
|
||||
make debug
|
||||
. this creates executable binary.
|
||||
|
||||
- to integrate in other software use:
|
||||
make release
|
||||
. This creates shared library. use StudyPlanner.h (untested)
|
||||
|
||||
# Procedure
|
||||
|
||||
## User input
|
||||
|
|
|
@ -0,0 +1,6 @@
|
|||
#ifndef SPLANNER
|
||||
#define SPLANNER
|
||||
|
||||
int StudyPlanner();
|
||||
|
||||
#endif // StudyPlanner
|
132
src/db.c
132
src/db.c
|
@ -1,4 +1,5 @@
|
|||
/*
|
||||
/* Create a database and handel it
|
||||
* Created by Jan on 13.12.2024.
|
||||
* INPUT: query for previous state
|
||||
* linked list of tasks to store
|
||||
*
|
||||
|
@ -9,60 +10,99 @@
|
|||
*
|
||||
*/
|
||||
|
||||
/************************************************************
|
||||
*Create a database and handel it
|
||||
*Created by Jan on 13.12.2024.
|
||||
*
|
||||
************************************************************/
|
||||
#include "llist.h"
|
||||
#include "planner.h"
|
||||
#include <sqlite3.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <time.h>
|
||||
|
||||
extern struct llist;
|
||||
/*
|
||||
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);
|
||||
|
||||
// Initialize a new Database if there no one.
|
||||
void init_db(sqlite3 *db) {
|
||||
const char *sql_LinkedList = "CREATE TABLE LinkedList ("
|
||||
"id INTEGER PRIMARY KEY AUTOINCREMENT,"
|
||||
"data TEXT;)";
|
||||
|
||||
// Checks the SQL answer and if it's not ok prints the error code
|
||||
char *errmsg = NULL;
|
||||
if (sqlite3_exec(db, sql_LinkedList, NULL, NULL, &errmsg) != SQLITE_OK) {
|
||||
fprintf(stderr, "Error in creation Table: %s\n", errmsg);
|
||||
sqlite3_free(errmsg);
|
||||
}
|
||||
}
|
||||
|
||||
// Save a single node of the linkedlist in the database
|
||||
// node needs to be replaced with the correct name and pointer
|
||||
void save_node_to_db(sqlite3 *db, Node *node) {
|
||||
|
||||
char *errmsg = NULL;
|
||||
sqlite3_stmt *stmt;
|
||||
const char *sql = "INSERT INTO LinkedList (id, data) VALUES (?, ?);";
|
||||
if (sqlite3_prepare_v2(db, sql, -1, &stmt, NULL) != SQLITE_OK) {
|
||||
fprintf(stderr, "Failed to prepare statement: %s\n", sqlite3_errmsg(db));
|
||||
} else {
|
||||
sqlite3_bind_int(stmt, 1, node->id); // ? -> node->id
|
||||
sqlite3_bind_text(stmt, 2, node->data, -1,
|
||||
SQLITE_STATIC); // ? -> node->data
|
||||
if (sqlite3_step(stmt) != SQLITE_DONE) {
|
||||
fprintf(stderr, "Execution failed: %s\n", sqlite3_errmsg(db));
|
||||
} else {
|
||||
printf("Node with ID %d saved.\n", node->id);
|
||||
// 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
|
||||
}
|
||||
sqlite3_finalize(stmt);
|
||||
}
|
||||
|
||||
// save a whole linkedlist in the database
|
||||
// node needs to be replaced with the correct name and pointer
|
||||
void save_linked_list_to_db(sqlite3 *db, Node *head) {
|
||||
Node *current = head;
|
||||
while (current != NULL) {
|
||||
save_node_to_db(db, current);
|
||||
current = current->next;
|
||||
/*
|
||||
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
|
||||
ssize_t nnread;
|
||||
size_t 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
|
||||
}
|
||||
|
|
6
src/db.h
6
src/db.h
|
@ -3,8 +3,6 @@
|
|||
|
||||
#include "planner.h"
|
||||
|
||||
void write_linkedlist_to_csv(llist *head, const char *filename);
|
||||
llist *write_csv_to_llist(const char *filename);
|
||||
#endif
|
||||
|
||||
extern void init_db(sqlite3 *db);
|
||||
extern void save_node_to_db(sqlite3 *db, Node *node);
|
||||
extern void save_linked_list_to_db(sqlite3* db, Node* head);
|
148
src/iCal.c
148
src/iCal.c
|
@ -1,7 +1,143 @@
|
|||
/* INPUT: linked list of events
|
||||
*
|
||||
* OUTPUT: Ical File, OK to caller
|
||||
*
|
||||
*/
|
||||
|
||||
#include "planner.h" // for task and event structs
|
||||
#include "llist.h"
|
||||
#include "planner.h"
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
const char *iCalHeader =
|
||||
"BEGIN:VCALENDAR\r\n" // definition of commands for final iCal file
|
||||
"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"; // doctype
|
||||
|
||||
/*
|
||||
* 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]
|
||||
|
||||
|
||||
*/
|
||||
// exportical function: generates ical file from llist
|
||||
int exportiCal(llist *events_ll) {
|
||||
|
||||
llist *ev_ll = events_ll; // input from llist
|
||||
|
||||
llistPrintE(ev_ll);
|
||||
|
||||
printf("%s", iCalHeader);
|
||||
|
||||
time_t now = time(NULL); // current time is captured an formatted
|
||||
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) {
|
||||
printf("fopen failed!!");
|
||||
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(¤t->plannedStartTime, &startlc);
|
||||
localtime_r(¤t->plannedEndTime, &endlc);
|
||||
char timeStartBuf[17];
|
||||
char timeEndBuf[17];
|
||||
char timeStamp[17];
|
||||
strftime(timeStamp, 17, "%Y%m%dT%k%M%SZ",
|
||||
&lc); // strftime to match ical format
|
||||
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;
|
||||
}
|
||||
|
||||
// export data from llist to csv file
|
||||
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; // if file cannot be opend, return -1
|
||||
llist *c = tll;
|
||||
while (c != NULL) {
|
||||
Task *ct = (Task *)c->data; // loop to go through tasks(name, created time,
|
||||
// deadline, priority, etc.)
|
||||
fprintf(fp, taskFileFormat, ct->name, ct->created, ct->deadline,
|
||||
ct->priority, ct->spare);
|
||||
c = c->next;
|
||||
}
|
||||
fclose(fp);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -0,0 +1,7 @@
|
|||
#ifndef iCAL
|
||||
#define iCAL
|
||||
|
||||
#include "llist.h"
|
||||
int exportiCal(llist *events_ll);
|
||||
|
||||
#endif
|
|
@ -1,5 +1,4 @@
|
|||
#include "llist.h"
|
||||
#include <asm-generic/errno.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
|
|
|
@ -15,8 +15,13 @@
|
|||
#include <string.h>
|
||||
#include <time.h>
|
||||
|
||||
const uint intervalLen = 45; // min
|
||||
const uint pauseLen = 10; //
|
||||
#ifdef _WIN32
|
||||
#define ctime_r(T, Tm) (_localtime64_s(Tm, T) ? NULL : Tm)
|
||||
#define localtime_r(T, Tm) (_localtime64_s(Tm, T) ? NULL : Tm)
|
||||
#endif /* ifdef _WIN32 */
|
||||
|
||||
const unsigned int intervalLen = 45; // min
|
||||
const unsigned int pauseLen = 10; //
|
||||
|
||||
const char taskFormat[] =
|
||||
"Task { %.64s = {\n created={%lu},\n deadline={%lu},\n "
|
||||
|
@ -156,6 +161,14 @@ int cmpEvent(const void *a, const void *b) {
|
|||
return cmpTaskN(aa->task, bb->task);
|
||||
}
|
||||
|
||||
void resetPrio(Task **sortedPrio, int len) {
|
||||
for (int i = 0; i < len; i++) {
|
||||
if ((*sortedPrio)[i].priority < 0) // ignore past deadline
|
||||
continue;
|
||||
printf("incrementing prio!\n");
|
||||
(*sortedPrio)[i].priority += 10;
|
||||
}
|
||||
}
|
||||
llist *genPlan(llist *head, time_t timeAvail) {
|
||||
|
||||
// map llist to pointer arr & sort by priority
|
||||
|
@ -165,7 +178,7 @@ llist *genPlan(llist *head, time_t timeAvail) {
|
|||
printf("len: %d\n", lLen);
|
||||
llistPrintT(head);
|
||||
|
||||
// Task *sortedNames = calloc(lLen, sizeof(Task));
|
||||
time_t now = time(NULL);
|
||||
Task *sortedPrio = calloc(lLen, sizeof(Task));
|
||||
if (/*sortedNames == NULL ||*/ sortedPrio == NULL) {
|
||||
planLog("gen plan : calloc failed!!\n", true);
|
||||
|
@ -175,23 +188,16 @@ llist *genPlan(llist *head, time_t timeAvail) {
|
|||
// add Tasks from llist to arr
|
||||
llist *c = head;
|
||||
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 + 1 < now) {
|
||||
sortedPrio[i].priority = -1; // ignore past deadlines
|
||||
}
|
||||
c = c->next;
|
||||
}
|
||||
|
||||
// sort
|
||||
// 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);
|
||||
|
@ -199,17 +205,21 @@ llist *genPlan(llist *head, time_t timeAvail) {
|
|||
|
||||
planLog("creating eventList", false);
|
||||
|
||||
// genertate plan basen on priorities and available time
|
||||
time_t now = time(NULL);
|
||||
// genertate plan based on priorities and available time
|
||||
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 {
|
||||
if ((*sortedPrio).priority < 0) {
|
||||
continue;
|
||||
} else if ((*sortedPrio).priority == 0) {
|
||||
printf("All tasks have priority <0!!");
|
||||
resetPrio(&sortedPrio, lLen);
|
||||
}
|
||||
start = mktime(lc); // start now
|
||||
lc->tm_min += intervalLen;
|
||||
end = mktime(lc); //
|
||||
|
@ -220,9 +230,9 @@ llist *genPlan(llist *head, time_t timeAvail) {
|
|||
c = newEvent(tmp->data, start, end,
|
||||
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;
|
||||
|
@ -232,28 +242,12 @@ llist *genPlan(llist *head, time_t timeAvail) {
|
|||
|
||||
} 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
|
||||
llist *tmp = events_ll;
|
||||
events_ll = events_ll->next;
|
||||
tmp->next = NULL;
|
||||
llistFreeE(tmp);
|
||||
llistPrintE(events_ll);
|
||||
|
||||
// llistPrintE(events_ll);
|
||||
// update prioriteis in original llist
|
||||
for (int i = 0; i < lLen; i++) {
|
||||
llist *tmp = llistGet(head, sortedPrio + i);
|
||||
|
@ -264,7 +258,6 @@ 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;
|
||||
|
|
|
@ -77,10 +77,13 @@ 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
|
||||
|
|
33362
src/shell.c
33362
src/shell.c
File diff suppressed because it is too large
Load Diff
|
@ -9,7 +9,7 @@
|
|||
#include <stdlib.h>
|
||||
#include <time.h>
|
||||
|
||||
int main() {
|
||||
int test() {
|
||||
|
||||
time_t now = time(NULL);
|
||||
|
||||
|
|
196
src/ui.c
196
src/ui.c
|
@ -2,4 +2,200 @@
|
|||
* command line interface for user input
|
||||
*
|
||||
*/
|
||||
/* Created by Juergen Buechel, 13.12.2024/
|
||||
*/
|
||||
#define _GNU_SOURCE
|
||||
#include "ui.h"
|
||||
#include "StudyPlanner.h"
|
||||
#include "db.h"
|
||||
#include "iCal.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>
|
||||
|
||||
#ifdef _WIN32
|
||||
#define localtime_r(T, Tm) (_localtime64_s(Tm, T) ? NULL : Tm)
|
||||
#endif
|
||||
|
||||
#define minutes(n) (60 * n)
|
||||
#define hours(n) (60 * minutes(n))
|
||||
#define days(n) (24 * hours(n))
|
||||
|
||||
const char *dbName = "db.csv";
|
||||
#define DEBUG
|
||||
#ifdef DEBUG
|
||||
int main(void) {
|
||||
#endif
|
||||
#ifdef RELEASE
|
||||
int StudyPlanner() {
|
||||
#endif
|
||||
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;
|
||||
ssize_t nnread;
|
||||
switch (choice) {
|
||||
case 1:
|
||||
printf(" Geben sie das gewünschte Fach ein (Name): \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(1-10): \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
|
||||
time_t deadline = now + days(taskdeadline_date);
|
||||
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 "
|
||||
"(geplante arbeitsstunden huete): \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);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue