Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.idea/editor.xml
#	.idea/misc.xml
This commit is contained in:
wildjan committed 2024-12-14 14:50:22 +01:00
commit fe4f8e295b
4 files changed
+18 -113

No files matched your search

+18 -5
View File
@@ -2,21 +2,27 @@
* command line interface for user input
*
*/
/* Created by Juergen Buechel, 13.12.2024/
*/
#include "planner.h" // for subject and event structs
#include <stdio.h>
#include <stdlib.h>
#include "ui.h"
#include "planner.h"
#include "iCal.h"
#include "db.h"
typedef struct task_elements {
typedef struct task {
char name;
int priority;
struct task *nextTask;
};
typedef struct task task_1;
typedef struct task* task_ptr;
task_ptr firsttask = NULL;
typedef struct time_elements {
typedef struct time {
int time;
struct time *nextTime;
};
@@ -91,7 +97,7 @@ void newTime(void)
if (newtime == NULL){
printf("Die Liste ist leer?!\n");
}
printf(" Neue Zeit eigneben: ");
printf(" Neue Zeit eingeben: ");
if(scanf("%d",&newTime)!=1)
{
dump_buffer(stdin);
@@ -111,6 +117,11 @@ void tasklisting(void){
TaskPointer = TaskPointer->nextTask;
}
void getlink (void)
{
}
int main(void)
{
int choice = 0, i = 0;
@@ -119,7 +130,8 @@ int main(void)
printf(" -1- Neues Fach eingeben\n");
printf(" -2- Verfuegbare Zeit eingeben\n");
printf(" -3- Alle vorhandenen Faecher aufliesten\n");
printf(" -4- Planer beenden\n");
printf(" -4- Kalenderlink ausgeben\n");
printf(" -5- Planer beenden\n");
if( scanf("%d", &choice) != 1){
printf("Falsche Eingabe\n");};
choice = 0;
@@ -135,8 +147,9 @@ int main(void)
else{
tasklisting();
}break;
case 4: iCAl();break;
}
}while (choice != 4);
}while (choice !=5);
return EXIT_SUCCESS;
}
-8
View File
@@ -2,12 +2,4 @@
#define UI
typedef struct task_elements{
char name;
int priority;
};
typedef struct time{
int time;
};
#endif // !UI