Skip to content
This repository has been archived by the owner on Nov 6, 2023. It is now read-only.

Undo #44

Merged
merged 1 commit into from
Nov 2, 2023
Merged

Undo #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/Process.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ enum class TypeOfRequest {
Print_Student_List,
Batch,
Save,
Undo,
PopHistory,
};

/**
Expand Down
87 changes: 65 additions & 22 deletions src/Runtime.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,36 +295,42 @@ void Runtime::process_args(std::vector<std::string> args) {
return;
}

if (args[0] == "undo") {
if (args.size() != 0) {
std::cerr << "ERROR: USAGE: undo" << std::endl;
} else {
Process t(TypeOfRequest::Undo);
procs.push(t);
}
return;
}

if (args[0] == "help") {
std::cout
<< "The available commands are:\n"
<< " print student: takes 1 argument: print student "
"<student_code>\n"
<< " print student: takes 1 argument: print student <student_code>\n"
<< " Prints the student name, enrolled classes and schedule.\n\n"
<< " print uc: takes 1 argument: print uc <uc_code>\n"
<< " print uc: takes 1 argument: print uc <uc_code>\n"
<< " Prints all the classes associated with this UC.\n\n"
<< " print class: takes 2 argument: print class <uc_code> "
"<class_code>\n"
<< " Prints the number of students enrolled and the "
"schedule.\n\n"
<< " add: takes 3 arguments: add "
"<student_code> <uc_code> <class_code>\n"
<< " print class: takes 2 argument: print class <uc_code> <class_code>\n"
<< " Prints the number of students enrolled and the schedule.\n\n"
<< " add: takes 3 arguments: add <student_code> <uc_code> <class_code>\n"
<< " Adds a student to a class if possible.\n\n"
<< " remove: takes 2 arguments: remove "
"<student_code> <uc_code>\n"
<< " remove: takes 2 arguments: remove <student_code> <uc_code>\n"
<< " Removes a student from a class if possible.\n\n"
<< " switch: takes 3 arguments: switch "
"<student_code> <student_code> <uc_code>\n"
<< " switch: takes 3 arguments: switch <student_code> <student_code> <uc_code>\n"
<< " Switches the class of two students.\n\n"
<< " student_count: takes 0 arguments: student_count\n"
<< " student_count: takes 0 arguments: student_count\n"
<< " Displays the number of students enrolled.\n\n"
<< " student_list: takes 0 or 2 arguments: student_count [<first_position> <number_of_students>]\n"
<< " student_list: takes 0 or 2 arguments: student_count [<first_position> <number_of_students>]\n"
<< " Displays the students enrolled with the option (denoted in []) of specifying a beginning and number of students to display.\n\n"
<< " quit: takes 0 arguments: quit\n"
<< " undo: takes 0 arguments: undo\n"
<< " Reverts the last change.\n\n"
<< " quit: takes 0 arguments: quit\n"
<< " Quits the program.\n\n"
<< " save: takes 0 or 1 arguments: save [<filename>]\n"
<< " save: takes 0 or 1 arguments: save [<filename>]\n"
<< " Saves the changes to the csv which contains the students and their relations to the classes, and optionally takes a filename.\n\n"
<< " help: takes 0 arguments: help\n"
<< " help: takes 0 arguments: help\n"
<< " Prints this help.\n\n";
return;
}
Expand All @@ -337,7 +343,7 @@ void Runtime::process_args(std::vector<std::string> args) {
void Runtime::handle_process(Process p) {
std::vector<std::string> ops = p.get_ops();

// handle remove
// handle remove------------------------------------------------------------------------------------------------------
if (p.get_type() == TypeOfRequest::Remove) {
uint32_t student_code;
try {
Expand All @@ -356,9 +362,12 @@ void Runtime::handle_process(Process p) {
if (a->get_uc_code() == uc_code) {
// std::cout << "Lookup: " << uc_code << "\nFound: " <<
// a->get_uc_code() << std::endl;
std::string class_code;
a->class_to_str(class_code);
s.remove_from_class(a);
students.erase(s);
students.insert(s);
p.add_operand(class_code);
history.push(p);
return;
}
Expand All @@ -370,7 +379,7 @@ void Runtime::handle_process(Process p) {
return;
}

// handle print student
// handle print student-----------------------------------------------------------------------------------------------
if (p.get_type() == TypeOfRequest::Print_Student) {
uint32_t student_code;
try {
Expand Down Expand Up @@ -430,7 +439,7 @@ void Runtime::handle_process(Process p) {
return;
}

// handle print uc
// handle print uc----------------------------------------------------------------------------------------------------
if (p.get_type() == TypeOfRequest::Print_UC) {
uint16_t uc_code = parse_uc_gen(ops[0]);
std::vector<ClassSchedule *> classes_found = find_uc(uc_code);
Expand All @@ -449,7 +458,7 @@ void Runtime::handle_process(Process p) {
return;
}

// handle print class
// handle print class-------------------------------------------------------------------------------------------------
if (p.get_type() == TypeOfRequest::Print_Class) {
uint16_t uc_code = parse_uc_gen(ops[0]);
uint16_t class_code = parse_class_gen(ops[1]);
Expand All @@ -468,12 +477,14 @@ void Runtime::handle_process(Process p) {
return;
}

// handle student_count-----------------------------------------------------------------------------------------------
if (p.get_type() == TypeOfRequest::Print_Student_Count) {
std::cout << "There are " << this->students.size() << " students enrolled."
<< std::endl;
return;
}

// handle student_list------------------------------------------------------------------------------------------------
if (p.get_type() == TypeOfRequest::Print_Student_List) {
std::vector<std::string> args = p.get_ops();
uint64_t start = 0;
Expand Down Expand Up @@ -505,13 +516,45 @@ void Runtime::handle_process(Process p) {
return;
}

// handle save--------------------------------------------------------------------------------------------------------
if(p.get_type() == TypeOfRequest::Save) {
if (p.get_ops().size() != 0) {
this->students_classes_->set_filename(p.get_ops()[0]);
}
this->save_all();
this->students_classes_->write_to_file();
return;
}

// handle undo--------------------------------------------------------------------------------------------------------
if (p.get_type() == TypeOfRequest::Undo) {
Process to_revert = history.top();
history.pop();
if (to_revert.get_type() == TypeOfRequest::Remove) {
Process t = Process(TypeOfRequest::Add);
t.add_operand(to_revert.get_ops()[0]);
t.add_operand(to_revert.get_ops()[1]);
t.add_operand(to_revert.get_ops()[2]);
procs.push(t);
}
if (to_revert.get_type() == TypeOfRequest::Add) {
Process t = Process(TypeOfRequest::Remove);
t.add_operand(to_revert.get_ops()[0]);
t.add_operand(to_revert.get_ops()[1]);
procs.push(t);
}
if (to_revert.get_type() == TypeOfRequest::Switch) {
procs.push(to_revert);
}
Process pop = Process(TypeOfRequest::PopHistory);
procs.push(pop);
return;
}

// handle pop
if (p.get_type() == TypeOfRequest::PopHistory) {
history.pop();
}
}

void Runtime::print_schedule(const std::vector<Lesson *> &schedule) const {
Expand Down
2 changes: 1 addition & 1 deletion src/Student.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**
/**
* @file Student.hpp
*/
#ifndef STUDENT_H
Expand Down