diff --git a/FinalProject/Date.cpp b/FinalProject/Date.cpp index 7ef4e97..3340ea8 100644 --- a/FinalProject/Date.cpp +++ b/FinalProject/Date.cpp @@ -41,7 +41,7 @@ std::string Date::toString() const { char buffer[20]; tm curTime; -#ifdef __APPLE__ +#if defined __APPLE__ || defined __linux__ curTime = *(localtime(&this->time)); #endif diff --git a/FinalProject/ListDisplay.cpp b/FinalProject/ListDisplay.cpp index 71a4cb4..d72c2c3 100644 --- a/FinalProject/ListDisplay.cpp +++ b/FinalProject/ListDisplay.cpp @@ -263,7 +263,7 @@ void ListDisplay::promptForFromDate() { time_t originTime = this->fromDate.getTime(); tm curDate; -#ifdef __APPLE__ +#if defined __APPLE__ || defined __linux__ curDate = *(localtime(&originTime)); #endif @@ -333,7 +333,7 @@ void ListDisplay::promptForToDate() { tm curDate; -#ifdef __APPLE__ +#if defined __APPLE__ || defined __linux__ curDate = *(localtime(&originTime)); #endif diff --git a/FinalProject/Record.cpp b/FinalProject/Record.cpp index 599aa67..5c01ba1 100644 --- a/FinalProject/Record.cpp +++ b/FinalProject/Record.cpp @@ -49,7 +49,7 @@ void BaseRecord::promptForNewDate(bool showOriginal) { tm curDate; -#ifdef __APPLE__ +#if defined __APPLE__ || defined __linux__ curDate = *(localtime(&originTime)); #endif diff --git a/FinalProject/StudentInfoManager.cpp b/FinalProject/StudentInfoManager.cpp index e8dcc45..0279596 100644 --- a/FinalProject/StudentInfoManager.cpp +++ b/FinalProject/StudentInfoManager.cpp @@ -262,12 +262,13 @@ void StudentInfoManager::closeFile() { } this->hasChangePendingSave = false; - Iterator iter = this->recordPtrList.iterate(); - while (iter) { - delete iter.next(); - } - this->recordPtrList.clear(); } + Iterator iter = this->recordPtrList.iterate(); + while (iter) { + delete iter.next(); + } + this->recordPtrList.clear(); + this->displayer.reapplyFilter(); } bool StudentInfoManager::cmdNew() { @@ -353,7 +354,7 @@ bool StudentInfoManager::cmdNew() { tm curDate; -#ifdef __APPLE__ +#if defined __APPLE__ || defined __linux__ curDate = *(localtime(&curTime)); #endif @@ -934,6 +935,8 @@ void StudentInfoManager::mainloop() { else if (cmd == infoManagerCommand::home::closeFile) { this->closeFile(); this->promptForFileName(); + this->readFile(); + this->displayer.reapplyFilter(); } else if (cmd == infoManagerCommand::home::quit) { this->closeFile(); diff --git a/FinalProject/Tools.cpp b/FinalProject/Tools.cpp index 2ec05d4..80b2e8c 100644 --- a/FinalProject/Tools.cpp +++ b/FinalProject/Tools.cpp @@ -1,7 +1,7 @@ #include "Tools.hpp" #include -#ifdef __APPLE__ +#if defined __APPLE__ || defined __linux__ #include #include #endif @@ -133,7 +133,7 @@ const std::string setMiddle(const std::string str, const int targetLength, return result; } -#ifdef __APPLE__ +#if defined __APPLE__ || defined __linux__ void clearScreen() { system("clear"); } @@ -166,7 +166,7 @@ void enableEchoBack() { const termSize getConsoleSize() { winsize size; ioctl(STDOUT_FILENO, TIOCGWINSZ, &size); - return termSize{.height = size.ws_row, .width = size.ws_col}; + return termSize{.width = size.ws_col, .height = size.ws_row}; } #endif