PoliEcho/bakatui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make timetable request specific date

Browse Source
This commit is contained in:
PoliEcho 2025-03-31 11:27:48 +02:00
parent 522b6fa517
commit 64b4797908
4 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/marks.cpp
View File

@ -32,11 +32,11 @@ void win_show(WINDOW *win, wchar_t *label, int label_color, int width,
int height, json marks_json, int SubjectIndex); int height, json marks_json, int SubjectIndex);
void marks_page() { void marks_page() {
// DONT FORGET TO UNCOMMENT json resp_from_api;
json resp_from_api = bakaapi::get_data_from_endpoint("api/3/marks"); {
// std::ifstream f("test-data/marks3.json"); std::string endpoint = "api/3/marks";
// json resp_from_api = json::parse(f); resp_from_api = bakaapi::get_data_from_endpoint(endpoint);
}
WINDOW **my_wins; WINDOW **my_wins;
size_t size_my_wins = resp_from_api["Subjects"].size(); size_t size_my_wins = resp_from_api["Subjects"].size();
my_wins = new (std::nothrow) WINDOW *[size_my_wins]; my_wins = new (std::nothrow) WINDOW *[size_my_wins];

5
src/net.cpp
View File

@ -162,11 +162,14 @@ void is_access_token_empty() {
} }
// supports all endpoints that only require access_token // supports all endpoints that only require access_token
json get_data_from_endpoint(std::string endpoint) { json get_data_from_endpoint(std::string &endpoint, std::string additional_data) {
is_access_token_empty(); is_access_token_empty();
access_token_refreshed: access_token_refreshed:
std::string req_data = std::string req_data =
std::format("Authorization=Bearer&access_token={}", access_token); std::format("Authorization=Bearer&access_token={}", access_token);
if(!additional_data.empty()) {
req_data.append(std::format("&{}", additional_data));
}
auto [response, http_code] = send_curl_request(endpoint, GET, req_data); auto [response, http_code] = send_curl_request(endpoint, GET, req_data);

2
src/net.h
View File

@ -11,6 +11,6 @@ extern CURL *curl;
namespace bakaapi { namespace bakaapi {
void login(std::string username, std::string password); void login(std::string username, std::string password);
void refresh_access_token(); void refresh_access_token();
json get_data_from_endpoint(std::string endpoint); json get_data_from_endpoint(std::string &endpoint, std::string data = "");
} // namespace bakaapi } // namespace bakaapi
#endif #endif

13
src/timetable.cpp
View File

@ -11,6 +11,7 @@
#include <ncurses.h> #include <ncurses.h>
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>
#include <panel.h> #include <panel.h>
#include <sstream>
#include <string> #include <string>
#include <sys/types.h> #include <sys/types.h>
#include <vector> #include <vector>
@ -80,11 +81,15 @@ json *find_atom_by_indexes(json &resp_from_api, uint8_t day_index,
} }
void timetable_page() { void timetable_page() {
// DONT FORGET TO UNCOMMENT const auto dateSelected = std::chrono::system_clock::now();
std::time_t date_time_t = std::chrono::system_clock::to_time_t(dateSelected);
std::tm local_time = *std::localtime(&date_time_t);
std::stringstream date_stringstream;
date_stringstream << std::put_time(&local_time, "%Y-%m-%d");
std::string date_string = "date=" + date_stringstream.str();
std::string endpoint = "api/3/timetable/actual";
json resp_from_api = json resp_from_api =
bakaapi::get_data_from_endpoint("api/3/timetable/actual"); bakaapi::get_data_from_endpoint(endpoint, date_string);
/*std::ifstream f("test-data/timetable.json");
json resp_from_api = json::parse(f);*/
// this may be unnecessary but i dont have enaugh data to test it // this may be unnecessary but i dont have enaugh data to test it
// it sorts the hours by start time // it sorts the hours by start time