17 Commits
Author SHA1 Message Date
buechejuerge 08145cd4a2 minor changes 2024-12-14 23:01:50 +01:00
simon f72c98de28 Merge branch 'master' of https://gitea.fhgr.ch/schurtisimon/StudyPlanner
merge
2024-12-14 22:58:02 +01:00
simon a302bfc4e8 modified: src/ui.c 2024-12-14 22:57:44 +01:00
buechejuerge d428589063 Merge remote-tracking branch 'origin/master' 2024-12-14 22:46:27 +01:00
buechejuerge 1fb016296b minor changes 2024-12-14 22:46:11 +01:00
simon dd88cd8b64 Merge branch 'master' of https://gitea.fhgr.ch/schurtisimon/StudyPlanner
modified:   src/ui.c
2024-12-14 22:44:45 +01:00
simon 24f0e9e7ec new file: src/iCal.c 2024-12-14 22:42:37 +01:00
simon 63ee77f5c4 deleted: src/iCal.c
modified:   src/ui.c
2024-12-14 22:40:29 +01:00
buechejuerge cf63dc4712 minor changes 2024-12-14 22:37:18 +01:00
buechejuerge bf14307a71 minor changes 2024-12-14 22:26:40 +01:00
buechejuerge b792eed3d2 changes 2024-12-14 22:23:02 +01:00
buechejuerge ad20db3995 changes 2024-12-14 22:20:10 +01:00
buechejuerge 81c62f892d changes 2024-12-14 22:14:56 +01:00
buechejuerge f6cea89dd2 changes 2024-12-14 22:14:17 +01:00
simon b308dc4c95 modified: src/ui.c 2024-12-14 21:44:35 +01:00
buechejuerge 834b3270b9 changes 2024-12-14 21:36:09 +01:00
buechejuerge 0ef20822fd changes 2024-12-14 21:31:32 +01:00
2 changed files with 108 additions and 133 deletions

No files matched your search

+106 -133
View File
@@ -4,155 +4,128 @@
*/
/* Created by Juergen Buechel, 13.12.2024/
*/
#include "ui.h"
// #include "db.h"
#include "llist.h"
#include "planner.h" // for subject and event structs
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include "ui.h"
#include "planner.h"
#include "iCal.h"
#include "db.h"
typedef struct task {
char name;
int priority;
struct task *nextTask;
};
int main(void) {
char taskname[256]; // taskName Buffer
int taskcreation_date = 0;
int taskdeadline_date = 0;
int taskpriority = 0;
int taskspare = 0;
typedef struct task task_1;
typedef struct task* task_ptr;
task_ptr firsttask = NULL;
typedef struct time {
int time;
struct time *nextTime;
};
typedef struct time time_1;
typedef struct time* time_ptr;
time_ptr firsttime = NULL;
void dump_buffer(FILE *fp){
int ch;
while((ch = fgetc(fp)) != EOF && ch != '\n');
}
void insertTask(task_ptr newtask)
{
task_ptr TaskPointer;
if (firsttask == NULL){
firsttask = newtask;
newtask->nextTask ;
}
else {
TaskPointer = firsttask;
while(TaskPointer->nextTask!=NULL)
{
TaskPointer = TaskPointer->nextTask;
}
TaskPointer->nextTask = newtask;
newtask ->nextTask;
}
}
void newTask (void)
{
task_ptr new = malloc(sizeof(task_1));
if (new == NULL){
printf("Die Liste ist leer?!\n");
}
printf(" Neues Fach eigeben: ");
if(scanf("%d", &newTask)!=1)
{
dump_buffer(stdin);
printf("Fehlerhafte eingabe\n");
free(new);
return;
}
dump_buffer (stdin);
insertTask(new);
}
void inserttime(time_ptr newtime)
{
time_ptr TimePointer;
if (firsttime == NULL){
firsttime = newtime;
newtime->nextTime =NULL;
}
else {
TimePointer = firsttime;
while(TimePointer->nextTime!=NULL)
{
TimePointer = TimePointer->nextTime;
}
TimePointer->nextTime = newtime;
newtime ->nextTime = NULL;
}
}
void newTime(void)
{
time_ptr newtime = malloc(sizeof(task_1));
if (newtime == NULL){
printf("Die Liste ist leer?!\n");
}
printf(" Neue Zeit eingeben: ");
if(scanf("%d",&newTime)!=1)
{
dump_buffer(stdin);
printf("Fehlerhafte eingabe\n");
free(newtime);
return;
}
dump_buffer (stdin);
inserttime(newtime);
}
void tasklisting(void){
task_ptr TaskPointer = firsttask;
printf("Erfasste Fächer:\n");
while(TaskPointer!=NULL)
printf("\t->%d\n", TaskPointer->name);
TaskPointer = TaskPointer->nextTask;
}
void getlink (void)
{
}
int main(void)
{
llist *list = llistNew(NULL, cmpTaskN);
int choice = 0, i = 0;
do
{
do {
printf(" -1- Neues Fach eingeben\n");
printf(" -2- Verfuegbare Zeit eingeben\n");
printf(" -3- Alle vorhandenen Faecher aufliesten\n");
printf(" -4- Kalenderlink ausgeben\n");
printf(" -5- Planer beenden\n");
printf(" Wähle die gewünschte Option aus\n");
if (scanf("%d", &choice) != 1) {
printf("Falsche Eingabe\n");};
printf("Falsche Eingabe\n");
};
choice = 0;
dump_buffer(stdin);
switch (choice)
{
case 1: newTask();break;
case 2: newTime();break;
case 3: if( firsttask == NULL){
printf("Die Liste ist leer");
while ((choice < 1 || choice > 5)) {
switch (choice) {
case 1: {
printf(" Geben sie das gewünschte Fach ein: \n");
if (scanf("%c", taskname) != 1) {
printf("Ungültige Eingabe für den Namen.\n");
return -1;
}
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 2:
printf(
"Geben Sie die zur verfuegung stehende Zeit für die Fächer an: \n");
scanf("%c", &taskspare);
break;
case 3:
// if (task == NULL) {
// 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
// }
// }
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:
printf(
"Geben Sie die zur verfuegung stehende Zeit für die Fächer an: \n");
scanf("%d", &taskspare);
break;
case 5:
// 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
// }
// }
break;
// case 4: iCAl();break;
}
}
else{
tasklisting();
}break;
case 4: iCAl();break;
}
} while (choice != 5);
{
return EXIT_SUCCESS;
}
}
+2
View File
@@ -2,4 +2,6 @@
#define UI
#endif // !UI