Compare commits
1 Commits
Author | SHA1 | Date |
---|---|---|
simon | d53c0762be |
|
@ -1,8 +1,5 @@
|
||||||
testing
|
testing
|
||||||
debugOut
|
debugOut
|
||||||
.idea
|
|
||||||
.run
|
|
||||||
.vscode
|
|
||||||
# ---> C
|
# ---> C
|
||||||
# Prerequisites
|
# Prerequisites
|
||||||
*.d
|
*.d
|
||||||
|
|
|
@ -1,28 +0,0 @@
|
||||||
{
|
|
||||||
"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,7 +1,6 @@
|
||||||
#compiler flags
|
#compiler flags
|
||||||
|
|
||||||
CFLAGS=-Wall -Wextra -g
|
CFLAGS=-Wall -Wextra -g
|
||||||
INCLUDES = -Isrc
|
|
||||||
|
|
||||||
|
|
||||||
#files
|
#files
|
||||||
|
@ -12,19 +11,20 @@ CALF=src/iCal.c src/iCal.h
|
||||||
LLST=src/llist.c src/llist.h
|
LLST=src/llist.c src/llist.h
|
||||||
CONFIG=src/config.h #config file
|
CONFIG=src/config.h #config file
|
||||||
|
|
||||||
ALLF=$(UIF) $(PLF) $(DBF) $(LLST)
|
|
||||||
|
|
||||||
all: debug
|
|
||||||
#targets
|
#targets
|
||||||
debug: test ui planner db iCal llist
|
debug: db test ui planner iCal config llist
|
||||||
gcc -DDEBUG test.o ui.o planner.o db.o iCal.o llist.o -o debugOut
|
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)
|
||||||
|
|
||||||
|
|
||||||
# release: $(ALLF)
|
|
||||||
# gcc -DRELEASE -fPIC -shared -o $(ALLF)
|
|
||||||
|
|
||||||
|
|
||||||
# config: $(CONFIG)
|
|
||||||
llist: $(LLST)
|
llist: $(LLST)
|
||||||
gcc -c $(CFLAGS) $(LLST)
|
gcc -c $(CFLAGS) $(LLST)
|
||||||
test: src/test.c
|
test: src/test.c
|
||||||
|
@ -32,18 +32,15 @@ test: src/test.c
|
||||||
iCal: $(CALF)
|
iCal: $(CALF)
|
||||||
gcc -c $(CFLAGS) $(CALF)
|
gcc -c $(CFLAGS) $(CALF)
|
||||||
ui: $(UIF)
|
ui: $(UIF)
|
||||||
gcc -DDEBUG -c $(CFLAGS) $(UIF)
|
gcc -c $(CFLAGS) $(UIF)
|
||||||
planner: $(PLF)
|
planner: $(PLF)
|
||||||
gcc -c $(CFLAGS) $(PLF)
|
gcc -c $(CFLAGS) $(PLF)
|
||||||
db: $(DBF)
|
|
||||||
gcc -c $(CFLAGS) $(DBF)
|
|
||||||
|
|
||||||
|
|
||||||
edit:
|
edit:
|
||||||
nvim $(PLF) Makefile $(ALLF)
|
nvim $(PLF) Makefile $(LLST) src/test.c
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -rf *.o debugOut src/*.gch *.csv *.ics *.so
|
rm -rf *.o debugOut src/*.gch
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
10
README.md
10
README.md
|
@ -13,16 +13,6 @@
|
||||||
|
|
||||||
Time management optimisation tool.
|
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
|
# Procedure
|
||||||
|
|
||||||
## User input
|
## User input
|
||||||
|
|
|
@ -1,6 +0,0 @@
|
||||||
#ifndef SPLANNER
|
|
||||||
#define SPLANNER
|
|
||||||
|
|
||||||
int StudyPlanner();
|
|
||||||
|
|
||||||
#endif // StudyPlanner
|
|
128
src/db.c
128
src/db.c
|
@ -1,5 +1,4 @@
|
||||||
/* 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
|
||||||
*
|
*
|
||||||
|
@ -10,99 +9,60 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "llist.h"
|
/************************************************************
|
||||||
|
*Create a database and handel it
|
||||||
|
*Created by Jan on 13.12.2024.
|
||||||
|
*
|
||||||
|
************************************************************/
|
||||||
#include "planner.h"
|
#include "planner.h"
|
||||||
|
#include <sqlite3.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <time.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);
|
|
||||||
|
|
||||||
} else {
|
// Initialize a new Database if there no one.
|
||||||
// write the file header
|
void init_db(sqlite3 *db) {
|
||||||
fprintf(file, "TaskName, Created, Deadline, Priority, Spare\n");
|
const char *sql_LinkedList = "CREATE TABLE LinkedList ("
|
||||||
|
"id INTEGER PRIMARY KEY AUTOINCREMENT,"
|
||||||
|
"data TEXT;)";
|
||||||
|
|
||||||
// Iterate through the linked list and write the data to the CSV
|
// Checks the SQL answer and if it's not ok prints the error code
|
||||||
llist *current = head;
|
char *errmsg = NULL;
|
||||||
Task *task;
|
if (sqlite3_exec(db, sql_LinkedList, NULL, NULL, &errmsg) != SQLITE_OK) {
|
||||||
while (current != NULL) {
|
fprintf(stderr, "Error in creation Table: %s\n", errmsg);
|
||||||
task = current->data;
|
sqlite3_free(errmsg);
|
||||||
// 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
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
// Save a single node of the linkedlist in the database
|
||||||
read a task csv file and write the data in a linked list
|
// node needs to be replaced with the correct name and pointer
|
||||||
*/
|
void save_node_to_db(sqlite3 *db, Node *node) {
|
||||||
|
|
||||||
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);
|
|
||||||
|
|
||||||
|
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 {
|
} else {
|
||||||
char *line = NULL; // Line Buffer
|
sqlite3_bind_int(stmt, 1, node->id); // ? -> node->id
|
||||||
ssize_t nnread;
|
sqlite3_bind_text(stmt, 2, node->data, -1,
|
||||||
size_t len;
|
SQLITE_STATIC); // ? -> node->data
|
||||||
int count = 0; // task counter
|
if (sqlite3_step(stmt) != SQLITE_DONE) {
|
||||||
getline(&line, &len, file);
|
fprintf(stderr, "Execution failed: %s\n", sqlite3_errmsg(db));
|
||||||
free(line);
|
} else {
|
||||||
line = NULL;
|
printf("Node with ID %d saved.\n", node->id);
|
||||||
|
|
||||||
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
|
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;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
6
src/db.h
6
src/db.h
|
@ -3,6 +3,8 @@
|
||||||
|
|
||||||
#include "planner.h"
|
#include "planner.h"
|
||||||
|
|
||||||
void write_linkedlist_to_csv(llist *head, const char *filename);
|
|
||||||
llist *write_csv_to_llist(const char *filename);
|
|
||||||
#endif
|
#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);
|
144
src/iCal.c
144
src/iCal.c
|
@ -1,143 +1,7 @@
|
||||||
|
/* INPUT: linked list of events
|
||||||
#include "llist.h"
|
*
|
||||||
#include "planner.h"
|
* OUTPUT: Ical File, OK to caller
|
||||||
#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
|
#include "planner.h" // for task and event structs
|
||||||
|
|
||||||
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;
|
|
||||||
}
|
|
||||||
|
|
|
@ -1,7 +0,0 @@
|
||||||
#ifndef iCAL
|
|
||||||
#define iCAL
|
|
||||||
|
|
||||||
#include "llist.h"
|
|
||||||
int exportiCal(llist *events_ll);
|
|
||||||
|
|
||||||
#endif
|
|
|
@ -1,4 +1,5 @@
|
||||||
#include "llist.h"
|
#include "llist.h"
|
||||||
|
#include <asm-generic/errno.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
|
|
|
@ -15,13 +15,8 @@
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
|
|
||||||
#ifdef _WIN32
|
const uint intervalLen = 45; // min
|
||||||
#define ctime_r(T, Tm) (_localtime64_s(Tm, T) ? NULL : Tm)
|
const uint pauseLen = 10; //
|
||||||
#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[] =
|
const char taskFormat[] =
|
||||||
"Task { %.64s = {\n created={%lu},\n deadline={%lu},\n "
|
"Task { %.64s = {\n created={%lu},\n deadline={%lu},\n "
|
||||||
|
@ -161,14 +156,6 @@ int cmpEvent(const void *a, const void *b) {
|
||||||
return cmpTaskN(aa->task, bb->task);
|
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) {
|
llist *genPlan(llist *head, time_t timeAvail) {
|
||||||
|
|
||||||
// map llist to pointer arr & sort by priority
|
// map llist to pointer arr & sort by priority
|
||||||
|
@ -178,7 +165,7 @@ llist *genPlan(llist *head, time_t timeAvail) {
|
||||||
printf("len: %d\n", lLen);
|
printf("len: %d\n", lLen);
|
||||||
llistPrintT(head);
|
llistPrintT(head);
|
||||||
|
|
||||||
time_t now = time(NULL);
|
// Task *sortedNames = calloc(lLen, sizeof(Task));
|
||||||
Task *sortedPrio = calloc(lLen, sizeof(Task));
|
Task *sortedPrio = calloc(lLen, sizeof(Task));
|
||||||
if (/*sortedNames == NULL ||*/ sortedPrio == NULL) {
|
if (/*sortedNames == NULL ||*/ sortedPrio == NULL) {
|
||||||
planLog("gen plan : calloc failed!!\n", true);
|
planLog("gen plan : calloc failed!!\n", true);
|
||||||
|
@ -188,16 +175,23 @@ llist *genPlan(llist *head, time_t timeAvail) {
|
||||||
// add Tasks from llist to arr
|
// add Tasks from llist to arr
|
||||||
llist *c = head;
|
llist *c = head;
|
||||||
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 + 1 < now) {
|
|
||||||
sortedPrio[i].priority = -1; // ignore past deadlines
|
|
||||||
}
|
|
||||||
c = c->next;
|
c = c->next;
|
||||||
}
|
}
|
||||||
|
|
||||||
// sort
|
// sort
|
||||||
|
// 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);
|
||||||
|
@ -205,21 +199,17 @@ llist *genPlan(llist *head, time_t timeAvail) {
|
||||||
|
|
||||||
planLog("creating eventList", false);
|
planLog("creating eventList", false);
|
||||||
|
|
||||||
// genertate plan based on priorities and available time
|
// genertate plan basen on priorities and available time
|
||||||
now = time(NULL);
|
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 {
|
||||||
if ((*sortedPrio).priority < 0) {
|
|
||||||
continue;
|
|
||||||
} else if ((*sortedPrio).priority == 0) {
|
|
||||||
printf("All tasks have priority <0!!");
|
|
||||||
resetPrio(&sortedPrio, lLen);
|
|
||||||
}
|
|
||||||
start = mktime(lc); // start now
|
start = mktime(lc); // start now
|
||||||
lc->tm_min += intervalLen;
|
lc->tm_min += intervalLen;
|
||||||
end = mktime(lc); //
|
end = mktime(lc); //
|
||||||
|
@ -230,9 +220,9 @@ llist *genPlan(llist *head, time_t timeAvail) {
|
||||||
c = newEvent(tmp->data, start, end,
|
c = newEvent(tmp->data, start, end,
|
||||||
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;
|
||||||
|
@ -242,12 +232,28 @@ llist *genPlan(llist *head, time_t timeAvail) {
|
||||||
|
|
||||||
} while (mktime(lc) < 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
|
// 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);
|
||||||
// llistPrintE(events_ll);
|
llistPrintE(events_ll);
|
||||||
|
|
||||||
// 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);
|
||||||
|
@ -258,6 +264,7 @@ llist *genPlan(llist *head, time_t timeAvail) {
|
||||||
free(sortedPrio);
|
free(sortedPrio);
|
||||||
|
|
||||||
planLog("END GEN PLAN", 0);
|
planLog("END GEN PLAN", 0);
|
||||||
|
// llistFreeT(head);
|
||||||
// send updated tasks to db for storage
|
// send updated tasks to db for storage
|
||||||
|
|
||||||
return events_ll;
|
return events_ll;
|
||||||
|
|
|
@ -77,13 +77,10 @@ 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
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -9,7 +9,7 @@
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
|
|
||||||
int test() {
|
int main() {
|
||||||
|
|
||||||
time_t now = time(NULL);
|
time_t now = time(NULL);
|
||||||
|
|
||||||
|
|
196
src/ui.c
196
src/ui.c
|
@ -2,200 +2,4 @@
|
||||||
* command line interface for user input
|
* 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 "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