src/helper_funcs.cpp

@@ -13,7 +13,6 @@
 #include <string>
 #include <termios.h>
 #include <unistd.h>
-#include "main.h"
 
 void safe_exit(int code) {
   switch (code) {
@@ -151,10 +150,7 @@ void wprint_in_middle(WINDOW *win, int starty, int startx, int width,
   temp = (width - length) / 2;
   x = startx + (int)temp;
   wattron(win, color);
-  if (mvwaddwstr(win, y, x, string) == ERR) {
+  mvwaddwstr(win, y, x, string);
-    if(config.verbose){
-    std::wcerr << RED"[ERROR]"<< RESET" wprint_in_middle failed to print " << string << "\n";
-  }}
   wattroff(win, color);
   refresh();
 }

src/main_menu.cpp

@@ -5,7 +5,9 @@
 #include <cstdlib>
 #include <cstring>
 #include <curses.h>
+#include <locale>
 #include <menu.h>
+#include <string>
 
 #include "marks.h"
 

src/marks.cpp

@@ -8,6 +8,8 @@
 #include <cstring>
 #include <curses.h>
 #include <format>
+#include <iostream>
+#include <locale>
 #include <menu.h>
 #include <nlohmann/json.hpp>
 #include <panel.h>
@@ -45,7 +47,6 @@ void marks_page() {
   size_t size_my_panels = resp_from_api["Subjects"].size();
   my_panels = new (std::nothrow) PANEL *[size_my_panels];
 
-  // trows compiler warning for some reason but cannot be removed
   PANEL *top;
   int ch;
 
@@ -136,7 +137,7 @@ void init_wins(WINDOW **wins, int n, json marks_json) {
   x = DEFAULT_X_OFFSET;
   uint8_t curent_color = 0;
 
-  unsigned int MaxHight = 0;
+  int MaxHight = 0;
   // this loop through subjects
   for (i = 0; i < n; ++i) {
 
@@ -153,7 +154,7 @@ void init_wins(WINDOW **wins, int n, json marks_json) {
              wsub_name.c_str(), wsub_avg_s.c_str());
 
     size_t max_text_length = wcslen(label);
-    for (unsigned int j = 0; j < static_cast<unsigned int>(marks_json["Subjects"][i]["Marks"].size()); j++) {
+    for (int j = 0; j < marks_json["Subjects"][i]["Marks"].size(); j++) {
       std::string caption =
           rm_tr_le_whitespace(marks_json["Subjects"][i]["Marks"][j]["Caption"]);
       std::string theme =
@@ -178,7 +179,8 @@ void init_wins(WINDOW **wins, int n, json marks_json) {
       MaxHight = 0;
     }
 
-    if (static_cast<unsigned int>(marks_json["Subjects"][i]["Marks"].size()) * 2 + DEFAULT_PADDING > MaxHight) {
+    if (marks_json["Subjects"][i]["Marks"].size() * 2 + DEFAULT_PADDING >
+        MaxHight) {
       MaxHight =
           marks_json["Subjects"][i]["Marks"].size() * 2 + DEFAULT_PADDING;
     }
@@ -196,8 +198,6 @@ void init_wins(WINDOW **wins, int n, json marks_json) {
 /* Show the window with a border and a label */
 void win_show(WINDOW *win, wchar_t *label, int label_color, int width,
               int height, json marks_json, int SubjectIndex) {
-  
-  // is the compiler smoking weed or something, why is it thinking starty is not used ??
   int startx, starty;
 
   wresize(win, height, width);

src/net.cpp

@@ -129,9 +129,8 @@ void login(std::string username, std::string password) {
 }
 
 void refresh_access_token() {
-  if(config.verbose) {
+  // DEBUG
   std::clog << "refreshing access token please wait...\n";
-  }
 
   json authfile_parsed = json::parse(SoRAuthFile(false, ""));
 
@@ -158,7 +157,6 @@ void refresh_access_token() {
 
   access_token = resp_parsed["access_token"];
 }
-
 void is_access_token_empty() {
   if (access_token.empty()) {
     json authfile_parsed = json::parse(SoRAuthFile(false, ""));
@@ -169,7 +167,6 @@ void is_access_token_empty() {
 // supports all endpoints that only require access_token
 json get_data_from_endpoint(std::string endpoint) {
   is_access_token_empty();
-  access_token_refreshed:
   std::string req_data =
       std::format("Authorization=Bearer&access_token={}", access_token);
 
@@ -181,7 +178,6 @@ json get_data_from_endpoint(std::string endpoint) {
               << " code: " << http_code << "\nrequest: " << req_data
               << "\nresponse: " << response << std::endl;
     refresh_access_token();
-    goto access_token_refreshed;
   }
 
   return json::parse(response);

src/timetable.cpp

@@ -7,6 +7,7 @@
 #include <cstdint>
 #include <curses.h>
 #include <cwchar>
+#include <fstream>
 #include <iostream>
 #include <ncurses.h>
 #include <nlohmann/json.hpp>
@@ -23,11 +24,7 @@ using nlohmann::json;
 const wchar_t *day_abriviations[] = {nullptr, L"Mo", L"Tu", L"We",
                                      L"Th",   L"Fr", L"Sa", L"Su"};
 
-void draw_days(WINDOW**& day_windows, uint16_t cell_height,uint8_t num_of_days, json &resp_from_api);
+void refresh_cells(uint8_t num_of_columns, uint8_t num_of_days,
-
-void draw_lessons(WINDOW**& lesson_windows, uint8_t num_of_columns, uint16_t cell_width, std::vector<uint8_t> &HourIdLookupTable, json &resp_from_api);
-
-void draw_cells(uint8_t num_of_columns, uint8_t num_of_days,
                    uint16_t cell_width, uint16_t cell_height,
                    std::vector<std::vector<WINDOW *>> &cells,
                    std::vector<uint8_t> &HourIdLookupTable,
@@ -79,9 +76,10 @@ json *find_atom_by_indexes(json &resp_from_api, uint8_t day_index,
 
 void timetable_page() {
   // DONT FORGET TO UNCOMMENT
-  json resp_from_api = bakaapi::get_data_from_endpoint("api/3/timetable/actual");
+  // json resp_from_api =
-  /*std::ifstream f("test-data/timetable.json");
+  // bakaapi::get_data_from_endpoint("api/3/timetable/actual");
-  json resp_from_api = json::parse(f);*/
+  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
   // it sorts the hours by start time
@@ -179,21 +177,67 @@ void timetable_page() {
   std::vector<std::vector<WINDOW *>> cells(
       num_of_days, std::vector<WINDOW *>(num_of_columns));
 
-  // init day windows 
   for (uint8_t i = 0; i < num_of_days; i++) {
     day_windows[i] = newwin(cell_height, DEFAULT_OFFSET,
                             i * cell_height + DEFAULT_OFFSET, 0);
-  }
+    // this wont draw left boarder window making it so it looks partially
-  draw_days(day_windows, cell_height,num_of_days, resp_from_api);
+    // offscreen
+    wborder(day_windows[i], ' ', 0, 0, 0, ACS_HLINE, 0, ACS_HLINE, 0);
+    const wchar_t *day_abriv =
+        day_abriviations[resp_from_api["Days"][i]["DayOfWeek"].get<uint8_t>()];
 
+    wprint_in_middle(day_windows[i], cell_height / 2, 0, wcslen(day_abriv),
+                     day_abriv, COLOR_PAIR(0));
+    wrefresh(day_windows[i]);
+  }
 
   for (uint8_t i = 0; i < num_of_columns; i++) {
+
     lesson_windows[i] =
         newwin(DEFAULT_OFFSET, cell_width, 0, i * cell_width + DEFAULT_OFFSET);
-  }
+    wborder(lesson_windows[i], 0, 0, ' ', 0, ACS_VLINE, ACS_VLINE, 0, 0);
-	draw_lessons(lesson_windows, num_of_columns, cell_width, HourIdLookupTable, resp_from_api);
+    std::wstring caption;
+    std::wstring start_time;
+    std::wstring end_time;
+
+    for (uint8_t j = 0; j < resp_from_api["Hours"].size(); j++) {
+      if (resp_from_api["Hours"][j]["Id"].get<uint8_t>() ==
+          HourIdLookupTable[i]) {
+        // DEBUG
+        // std::clog <<
+        // resp_from_api["Hours"][j]["Caption"].get<std::string>();
+
+        std::string caption_ascii =
+            resp_from_api["Hours"][j]["Caption"].get<std::string>();
+        std::string start_time_ascii =
+            resp_from_api["Hours"][j]["BeginTime"].get<std::string>();
+        std::string end_time_ascii =
+            resp_from_api["Hours"][j]["EndTime"].get<std::string>();
+
+        caption = string_to_wstring(caption_ascii);
+        start_time = string_to_wstring(start_time_ascii);
+        end_time = string_to_wstring(end_time_ascii);
+
+        goto hour_id_found;
+      }
+    }
+    std::cerr << RED "[ERROR]" << RESET " Hour with id " << HourIdLookupTable[i]
+              << " not found\n";
+    safe_exit(128);
+
+  hour_id_found:
+
+    wprint_in_middle(lesson_windows[i], 0, cell_width / 2, caption.length(),
+                     caption.c_str(), COLOR_PAIR(0));
+    wprint_in_middle(lesson_windows[i], 1, 1, start_time.length(),
+                     start_time.c_str(), COLOR_PAIR(0));
+    print_in_middle(lesson_windows[i], 1, cell_width / 2, 1, "-",
+                    COLOR_PAIR(0));
+    wprint_in_middle(lesson_windows[i], 1, cell_width - end_time.length() - 1,
+                     end_time.length(), end_time.c_str(), COLOR_PAIR(0));
+    wrefresh(lesson_windows[i]);
+  }
 
-  // init the cell windows
   for (uint8_t i = 0; i < num_of_days; i++) {
     for (uint8_t j = 0; j < num_of_columns; j++) {
       cells[i][j] =
@@ -201,7 +245,7 @@ void timetable_page() {
                  j * cell_width + DEFAULT_OFFSET);
     }
   }
-  draw_cells(num_of_columns, num_of_days, cell_width, cell_height, cells,
+  refresh_cells(num_of_columns, num_of_days, cell_width, cell_height, cells,
                 HourIdLookupTable, resp_from_api);
 
   refresh();
@@ -251,27 +295,23 @@ void timetable_page() {
   int ch;
   while ((ch = getch()) != KEY_F(1)) {
     if (is_info_box_open) {
-
+      werase(infobox_window);
+      wrefresh(infobox_window);
       hide_panel(infobox_panel);
       del_panel(infobox_panel);
-    
       delwin(infobox_window);
-      
+      wclear(infobox_window);
       touchwin(stdscr);
       refresh();
-      
+      refresh_cells(num_of_columns, num_of_days, cell_width, cell_height, cells,
-      // Redraw everithing
-			draw_days(day_windows, cell_height,num_of_days, resp_from_api);
-			draw_lessons(lesson_windows, num_of_columns, cell_width, HourIdLookupTable, resp_from_api);
-      draw_cells(num_of_columns, num_of_days, cell_width, cell_height, cells,
                     HourIdLookupTable, resp_from_api);
-
       for (uint8_t i = 0; i < selector_panels.size(); i++) {
         top_panel(selector_panels[i]);
       }
+
       update_panels();
       doupdate();
-      
+      refresh();
       is_info_box_open = false;
       continue;
     }
@@ -303,7 +343,6 @@ void timetable_page() {
 
       infobox_window = newwin(LINES * 0.6, COLS * 0.6, LINES * 0.2, COLS * 0.2);
       infobox_panel = new_panel(infobox_window);
-      is_info_box_open = true;
 
       wattron(infobox_window, COLOR_PAIR(COLOR_MAGENTA));
       box(infobox_window, 0, 0);
@@ -329,70 +368,45 @@ void timetable_page() {
         }
       }
 
-			std::wstring Teacher= L"";
+      std::wstring Teacher = get_data_for_atom(resp_from_api, atom, "Teachers",
-			try {
-      Teacher = get_data_for_atom(resp_from_api, atom, "Teachers",
                                                "TeacherId", "Name");
-			} catch(...) {
-				__asm__("nop");
-			}
-      Teacher.insert(0,L"Teacher: ");
 
-      std::wstring Groups = L"";
+      std::wstring groups = L"";
+
       try {
-        for (uint8_t i = 0; i < atom->at("GroupIds").size(); i++) {
+        for (uint8_t i = 0; i < atom->at("GroupsIds").size(); i++) {
           for (uint8_t j = 0; j < resp_from_api["Groups"].size(); j++) {
-            if (resp_from_api["Groups"][j]["Id"].get<std::string>() ==
+            if (resp_from_api["Groups"][j]["GroupId"].get<std::string>() ==
-                atom->at("GroupIds")[i].get<std::string>()) {
+                atom->at("GroupsIds")[i].get<std::string>()) {
-              Groups.append(string_to_wstring(
+              groups.append(string_to_wstring(
                   resp_from_api["Groups"][j]["Name"].get<std::string>()));
-              if (static_cast<size_t>(i + 1) < atom->at("GroupIds").size()) {
+              if (i + 1 < atom->at("GroupsIds").size()) {
-                Groups.append(L", ");
+                groups.append(L", ");
               }
             }
           }
         }
-      } catch (const std::exception &e) {
-        std::cerr << RED "[ERROR]" << RESET " " << e.what() << "\n";
-      }
-      Groups = wrm_tr_le_whitespace(Groups);
-      Groups.insert(0, L"Groups: ");
-
-      std::wstring Room= L"";
-      try {
-        Room = get_data_for_atom(resp_from_api, atom, "Rooms", "RoomId", "Name");
-        if(Room.empty()) {
-          Room = get_data_for_atom(resp_from_api, atom, "Rooms", "RoomId", "Abbrev");;
-        }
       } catch (...) {
         __asm__("nop");
       }
-      Room.insert(0, L"Room: ");
 
-      std::wstring Theme= L"";
+      std::wstring Room =
-      try {
+          get_data_for_atom(resp_from_api, atom, "Rooms", "RoomId", "Name");
-        Theme = wrm_tr_le_whitespace(string_to_wstring(atom->at("Theme").get<std::string>()));
-      } catch (...) {
-        __asm__("nop");
-      }
-      Theme.insert(0, L"Theme: ");
 
       wprint_in_middle(
-        infobox_window, 1, 0, getmaxx(infobox_window), Caption.c_str(),
+          infobox_window, 1,
-        COLOR_PAIR(COLOR_CYAN));
+          //                 COLS * 0.6 - wcslen(Caption.c_str()) / 2,
+          1, wcslen(Caption.c_str()), Caption.c_str(),
+          COLOR_PAIR(COLOR_PAIR(COLOR_CYAN)));
 
-      // printing out of order to reduce wattro* directives
+      wprint_in_middle(infobox_window, 3, 1, wcslen(Teacher.c_str()),
-      wattron(infobox_window, COLOR_PAIR(COLOR_YELLOW));
+                       Teacher.c_str(), COLOR_PAIR(COLOR_YELLOW));
-      mvwaddwstr(infobox_window, 3, 1, Teacher.c_str());
-      mvwaddwstr(infobox_window, 5, 1, Room.c_str());
-      wattroff(infobox_window, COLOR_PAIR(COLOR_YELLOW));
-
-      wattron(infobox_window, COLOR_PAIR(COLOR_CYAN));
-      mvwaddwstr(infobox_window, 4, 1, Groups.c_str());
-      mvwaddwstr(infobox_window, 6, 1, Theme.c_str());
-      wattroff(infobox_window, COLOR_PAIR(COLOR_CYAN));
 
+      wprint_in_middle(infobox_window, 4, 1, wcslen(groups.c_str()),
+                       groups.c_str(), COLOR_PAIR(COLOR_CYAN));
 
+      wprint_in_middle(infobox_window, 5, 1, wcslen(Room.c_str()), Room.c_str(),
+                       COLOR_PAIR(COLOR_YELLOW));
 
       top_panel(infobox_panel);
       update_panels();
@@ -422,7 +436,7 @@ void timetable_page() {
                      DEFAULT_OFFSET + y_offset + selected_cell.y * cell_height,
                      DEFAULT_OFFSET + x_offset + selected_cell.x * cell_width);
         }
-        draw_cells(num_of_columns, num_of_days, cell_width, cell_height,
+        refresh_cells(num_of_columns, num_of_days, cell_width, cell_height,
                       cells, HourIdLookupTable, resp_from_api);
         update_panels();
         doupdate();
@@ -438,59 +452,7 @@ void timetable_page() {
   endwin();
 }
 
-void draw_days(WINDOW**& day_windows, uint16_t cell_height,uint8_t num_of_days, json &resp_from_api) {
+void refresh_cells(uint8_t num_of_columns, uint8_t num_of_days,
-  for (uint8_t i = 0; i < num_of_days; i++) {
-  // this wont draw left boarder window making it so it looks partially
-    // offscreen
-    wborder(day_windows[i], ' ', 0, 0, 0, ACS_HLINE, 0, ACS_HLINE, 0);
-
-    mvwaddwstr(day_windows[i], cell_height / 2, 0,day_abriviations[resp_from_api["Days"][i]["DayOfWeek"].get<uint8_t>()]);
-    wrefresh(day_windows[i]);
-  }
-}
-
-void draw_lessons(WINDOW**& lesson_windows, uint8_t num_of_columns, uint16_t cell_width, std::vector<uint8_t> &HourIdLookupTable, json &resp_from_api) {
-	for (uint8_t i = 0; i < num_of_columns; i++) {
-	wborder(lesson_windows[i], 0, 0, ' ', 0, ACS_VLINE, ACS_VLINE, 0, 0);
-    std::wstring caption;
-    std::wstring start_time;
-    std::wstring end_time;
-
-    for (uint8_t j = 0; j < resp_from_api["Hours"].size(); j++) {
-      if (resp_from_api["Hours"][j]["Id"].get<uint8_t>() ==
-          HourIdLookupTable[i]) {
-				
-        std::string caption_ascii =
-            resp_from_api["Hours"][j]["Caption"].get<std::string>();
-        std::string start_time_ascii =
-            resp_from_api["Hours"][j]["BeginTime"].get<std::string>();
-        std::string end_time_ascii =
-            resp_from_api["Hours"][j]["EndTime"].get<std::string>();
-
-        caption = string_to_wstring(caption_ascii);
-        start_time = string_to_wstring(start_time_ascii);
-        end_time = string_to_wstring(end_time_ascii);
-
-        goto hour_id_found;
-      }
-    }
-    std::cerr << RED "[ERROR]" << RESET " Hour with id " << HourIdLookupTable[i]
-              << " not found\n";
-    safe_exit(128);
-
-  hour_id_found:
-
-    wprint_in_middle(lesson_windows[i], 0, 0, cell_width,
-                     caption.c_str(), COLOR_PAIR(0));
-    mvwaddwstr(lesson_windows[i], 1, 1, start_time.c_str());
-    print_in_middle(lesson_windows[i], 1, 0, cell_width, "-",
-                    COLOR_PAIR(0));
-    mvwaddwstr(lesson_windows[i], 1, cell_width - end_time.length() - 1, end_time.c_str());
-    wrefresh(lesson_windows[i]);
-		}
-}
-
-void draw_cells(uint8_t num_of_columns, uint8_t num_of_days,
                    uint16_t cell_width, uint16_t cell_height,
                    std::vector<std::vector<WINDOW *>> &cells,
                    std::vector<uint8_t> &HourIdLookupTable,
@@ -563,13 +525,16 @@ void draw_cells(uint8_t num_of_columns, uint8_t num_of_days,
         }
 
         wprint_in_middle(cells[i][j], cell_height / 2,
-                         0,
+                         cell_width / 2 - wcslen(Subject_Abbrev.c_str()) / 2,
-                         cell_width, Subject_Abbrev.c_str(),
+                         wcslen(Subject_Abbrev.c_str()), Subject_Abbrev.c_str(),
+                         COLOR_PAIR(0));
+        wprint_in_middle(cells[i][j], cell_height - 2,
+                         cell_width - wcslen(Room_Abbrev.c_str()) - 1,
+                         wcslen(Room_Abbrev.c_str()), Room_Abbrev.c_str(),
+                         COLOR_PAIR(0));
+        wprint_in_middle(cells[i][j], cell_height - 2, 1,
+                         wcslen(Teacher_Abbrev.c_str()), Teacher_Abbrev.c_str(),
                          COLOR_PAIR(0));
-        mvwaddwstr(cells[i][j], cell_height - 2,
-                         cell_width - wcslen(Room_Abbrev.c_str()) - 1, Room_Abbrev.c_str());
-
-        mvwaddwstr(cells[i][j], cell_height - 2, 1, Teacher_Abbrev.c_str());
         wrefresh(cells[i][j]);
       } catch (const std::exception &e) {
         std::cerr << RED "[ERROR]" << RESET " " << e.what() << "\n";