Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 8a3ec278ce | |||
| 602b538830 | |||
| 86873d2a21 | |||
| ce50467816 | |||
| 1e63b900ab | |||
| dd29c7324f |
@@ -116,15 +116,13 @@ bool util::isPasswordValid(const std::string& password)
|
||||
* usersMap - map of user objects keyed by identifier
|
||||
* Returns:
|
||||
* bool - true if the username is already in use by an active user, false otherwise
|
||||
* Notes:
|
||||
* - Only considers users with state util::State::ACTIVE
|
||||
*/
|
||||
bool util::isUsernameDuplicate(const std::string& username, const util::Map<std::string, User*>& usersMap)
|
||||
{
|
||||
int index = usersMap.findIf(
|
||||
[&](const std::string&, User* user)
|
||||
{
|
||||
return (user->getUserName() == username && user->getState() == util::State::ACTIVE);
|
||||
return (user->getUserName() == username);
|
||||
}
|
||||
);
|
||||
return index != -1;
|
||||
|
||||
@@ -736,7 +736,7 @@ inline std::string selectJobCardToUpdate(util::Map<std::string, const JobCard*>&
|
||||
util::Map<int, const JobCard* > incompleteJobCards;
|
||||
if (assignedJobCards.getSize() == 0)
|
||||
{
|
||||
std::cout << "No jobs available.\n\n";
|
||||
std::cout << "\nNo jobs available.\n\n";
|
||||
return "";
|
||||
}
|
||||
int currentIndex = 1;
|
||||
@@ -744,12 +744,12 @@ inline std::string selectJobCardToUpdate(util::Map<std::string, const JobCard*>&
|
||||
if (selectedJobStatusType == util::ServiceJobStatus::STARTED)
|
||||
{
|
||||
util::clear();
|
||||
std::cout << "Select a job to update to Inprogress\n";
|
||||
std::cout << "Select a job to mark as In Progress\n";
|
||||
}
|
||||
else if (selectedJobStatusType == util::ServiceJobStatus::IN_PROGRESS)
|
||||
{
|
||||
util::clear();
|
||||
std::cout << "Select a job to update to Completed\n";
|
||||
std::cout << "Select a job to mark as Completed\n";
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -780,7 +780,7 @@ inline std::string selectJobCardToUpdate(util::Map<std::string, const JobCard*>&
|
||||
incompleteJobCards.insert(currentIndex++, currentJobCard);
|
||||
}
|
||||
}
|
||||
std::cout << "Select the Job Card to Update (Index): ";
|
||||
std::cout << "Enter the job index to update: ";
|
||||
util::read(choice);
|
||||
int selectedJobCardIndex = incompleteJobCards.find(choice);
|
||||
if (selectedJobCardIndex != -1)
|
||||
|
||||
@@ -121,7 +121,7 @@ void TechnicianMenu::updateJobStatus()
|
||||
std::string selectedJobID;
|
||||
util::ServiceJobStatus selectedJobStatus = util::ServiceJobStatus::PENDING;
|
||||
util::Map<std::string, const JobCard*> assignedJobCards = m_controller.getJobCardsByUser();
|
||||
std::cout << "Select the type of job you want to update\n1.Started\n2.Inprogress\nChoice: ";
|
||||
std::cout << "Select the type of job you want to update:\n1.Started\n2.In Progress\nChoice: ";
|
||||
util::read(choice);
|
||||
if (choice == 1)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user