From f7948d9951163ec888d3873ba8c90125752316ac Mon Sep 17 00:00:00 2001 From: Sophia Oliinik Date: Wed, 17 Jul 2024 11:53:39 -0700 Subject: [PATCH 1/7] Initial commit --- output.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/output.cpp b/output.cpp index 0585c3b..4f22977 100644 --- a/output.cpp +++ b/output.cpp @@ -640,9 +640,11 @@ void start_table_output( bool /*for_instructor*/, } std::string gradeable_id = GRADEABLES[g].getID(j); std::string gradeable_name = ""; + std::string gradeable_url = "https://submitty.org/grading_details/" + gradeable_id; if (GRADEABLES[g].hasCorrespondence(gradeable_id)) { gradeable_name = GRADEABLES[g].getCorrespondence(gradeable_id).second; //gradeable_name = spacify(gradeable_name); + gradeable_name = "" + gradeable_name + ""; } if (gradeable_name == "") gradeable_name = "future " From b8954a5a2ce6e414c8cf6588c5b6492f86c17f53 Mon Sep 17 00:00:00 2001 From: Sophia Oliinik Date: Wed, 17 Jul 2024 11:54:31 -0700 Subject: [PATCH 2/7] Add missing open curly brace --- output.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/output.cpp b/output.cpp index 4f22977..78f5e1f 100644 --- a/output.cpp +++ b/output.cpp @@ -646,7 +646,7 @@ void start_table_output( bool /*for_instructor*/, //gradeable_name = spacify(gradeable_name); gradeable_name = "" + gradeable_name + ""; } - if (gradeable_name == "") + if (gradeable_name == "") { gradeable_name = "future " + tolower(gradeable_to_string(g)) + ""; table.set(0,counter++,TableCell("ffffff",gradeable_name)); From 3413d5afd4f74d46046ffa9fac835f5f9f406936 Mon Sep 17 00:00:00 2001 From: Sophia Oliinik Date: Fri, 19 Jul 2024 09:20:39 -0700 Subject: [PATCH 3/7] Update gradeable title look --- output.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/output.cpp b/output.cpp index 78f5e1f..e0b8d3f 100644 --- a/output.cpp +++ b/output.cpp @@ -644,7 +644,7 @@ void start_table_output( bool /*for_instructor*/, if (GRADEABLES[g].hasCorrespondence(gradeable_id)) { gradeable_name = GRADEABLES[g].getCorrespondence(gradeable_id).second; //gradeable_name = spacify(gradeable_name); - gradeable_name = "" + gradeable_name + ""; + gradeable_name = "" + gradeable_name + "   "; } if (gradeable_name == "") { gradeable_name = "future " From 5bb168a2f1527b82077a14e350d1e0e745665be7 Mon Sep 17 00:00:00 2001 From: Sophia Oliinik Date: Fri, 19 Jul 2024 09:21:07 -0700 Subject: [PATCH 4/7] Remove previously added open curly brace --- output.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/output.cpp b/output.cpp index e0b8d3f..8028197 100644 --- a/output.cpp +++ b/output.cpp @@ -646,7 +646,7 @@ void start_table_output( bool /*for_instructor*/, //gradeable_name = spacify(gradeable_name); gradeable_name = "" + gradeable_name + "   "; } - if (gradeable_name == "") { + if (gradeable_name == "") gradeable_name = "future " + tolower(gradeable_to_string(g)) + ""; table.set(0,counter++,TableCell("ffffff",gradeable_name)); From 1f32c8b92fae188d0c4dc5991b5249499860c040 Mon Sep 17 00:00:00 2001 From: Sophia Oliinik Date: Tue, 30 Jul 2024 14:41:00 -0700 Subject: [PATCH 5/7] using base_url --- output.cpp | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/output.cpp b/output.cpp index 8028197..41de966 100644 --- a/output.cpp +++ b/output.cpp @@ -138,6 +138,13 @@ int convertMajor(const std::string &major) { else return 10; } +std::string getBaseUrl() { + std::ifstream i("/var/local/submitty/courses/f24/sample/reports/base_url.json"); + nlohmann::json j; + i >> j; + return j["base_url"].get(); +} + // ========================================================== class Color { @@ -632,6 +639,7 @@ void start_table_output( bool /*for_instructor*/, // ---------------------------- // DETAILS OF EACH GRADEABLE if (DISPLAY_GRADE_DETAILS) { + Student* this_student = new Student(); for (unsigned int i = 0; i < ALL_GRADEABLES.size(); i++) { GRADEABLE_ENUM g = ALL_GRADEABLES[i]; for (int j = 0; j < GRADEABLES[g].getCount(); j++) { @@ -640,11 +648,16 @@ void start_table_output( bool /*for_instructor*/, } std::string gradeable_id = GRADEABLES[g].getID(j); std::string gradeable_name = ""; - std::string gradeable_url = "https://submitty.org/grading_details/" + gradeable_id; + std::string section = ""; + std::string base_url = getBaseUrl(); + std::string gradeable_url = base_url + gradeable_id; + std::string fullUrl = base_url + "/" + section + "/gradeable/" + gradeable_id; + if (GRADEABLES[g].hasCorrespondence(gradeable_id)) { gradeable_name = GRADEABLES[g].getCorrespondence(gradeable_id).second; + section = this_student->getSection(); //gradeable_name = spacify(gradeable_name); - gradeable_name = "" + gradeable_name + "   "; + gradeable_name = "" + gradeable_name + "   "; } if (gradeable_name == "") gradeable_name = "future " From ff935a813f02aedb34b5e1ea710cc94d259f48a9 Mon Sep 17 00:00:00 2001 From: Sophia Oliinik Date: Thu, 1 Aug 2024 11:44:06 -0700 Subject: [PATCH 6/7] updating static url --- output.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/output.cpp b/output.cpp index 41de966..f514468 100644 --- a/output.cpp +++ b/output.cpp @@ -639,7 +639,6 @@ void start_table_output( bool /*for_instructor*/, // ---------------------------- // DETAILS OF EACH GRADEABLE if (DISPLAY_GRADE_DETAILS) { - Student* this_student = new Student(); for (unsigned int i = 0; i < ALL_GRADEABLES.size(); i++) { GRADEABLE_ENUM g = ALL_GRADEABLES[i]; for (int j = 0; j < GRADEABLES[g].getCount(); j++) { @@ -648,14 +647,13 @@ void start_table_output( bool /*for_instructor*/, } std::string gradeable_id = GRADEABLES[g].getID(j); std::string gradeable_name = ""; - std::string section = ""; std::string base_url = getBaseUrl(); - std::string gradeable_url = base_url + gradeable_id; - std::string fullUrl = base_url + "/" + section + "/gradeable/" + gradeable_id; + std::string semester = "f24/"; + std::string course = "sample"; + std::string fullUrl = base_url + "courses/" + semester + course + "/gradeable/" + gradeable_id; if (GRADEABLES[g].hasCorrespondence(gradeable_id)) { gradeable_name = GRADEABLES[g].getCorrespondence(gradeable_id).second; - section = this_student->getSection(); //gradeable_name = spacify(gradeable_name); gradeable_name = "" + gradeable_name + "   "; } From 050ef8fba20e3a8a3222760951766549849921ee Mon Sep 17 00:00:00 2001 From: Sophia Oliinik Date: Thu, 8 Aug 2024 10:44:26 -0700 Subject: [PATCH 7/7] term and course update --- output.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/output.cpp b/output.cpp index f514468..53fa8bf 100644 --- a/output.cpp +++ b/output.cpp @@ -138,11 +138,14 @@ int convertMajor(const std::string &major) { else return 10; } -std::string getBaseUrl() { +std::tuple getCourseDetails() { std::ifstream i("/var/local/submitty/courses/f24/sample/reports/base_url.json"); nlohmann::json j; i >> j; - return j["base_url"].get(); + std::string baseUrl = j["base_url"].get(); + std::string term = j["term"].get(); + std::string course = j["course"].get(); + return {baseUrl, term, course}; } // ========================================================== @@ -645,12 +648,10 @@ void start_table_output( bool /*for_instructor*/, if (g != GRADEABLE_ENUM::NOTE) { student_data.push_back(counter); } + auto [base_url, semester, course] = getCourseDetails(); std::string gradeable_id = GRADEABLES[g].getID(j); std::string gradeable_name = ""; - std::string base_url = getBaseUrl(); - std::string semester = "f24/"; - std::string course = "sample"; - std::string fullUrl = base_url + "courses/" + semester + course + "/gradeable/" + gradeable_id; + std::string fullUrl = base_url + "courses/" + semester + "/" + course + "/gradeable/" + gradeable_id; if (GRADEABLES[g].hasCorrespondence(gradeable_id)) { gradeable_name = GRADEABLES[g].getCorrespondence(gradeable_id).second;