andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-07 00:09:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix up/download scheduler files

Browse Source
This commit is contained in:
MichaelDvP
2023-03-22 17:33:34 +01:00
parent a5d2beb3e7
commit aea2277e26
4 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
interface/src/framework/system/GeneralFileUpload.tsx
View File

@@ -69,7 +69,7 @@ const GeneralFileUpload: FC<UploadFileProps> = ({ uploadGeneralFile }) => {
const downloadSchedule = async () => { const downloadSchedule = async () => {
try { try {
const response = await EMSESP.readSchedule(); const response = await EMSESP.getSchedule();
if (response.status !== 200) { if (response.status !== 200) {
toast.error(LL.PROBLEM_LOADING()); toast.error(LL.PROBLEM_LOADING());
} else { } else {

4
interface/src/project/api.ts
View File

@@ -96,6 +96,10 @@ export function getCustomizations(): AxiosPromise<void> {
return AXIOS.get('/getCustomizations'); return AXIOS.get('/getCustomizations');
} }
export function getSchedule(): AxiosPromise<Schedule> {
return AXIOS.get('/getSchedule');
}
export function readSchedule(): AxiosPromise<Schedule> { export function readSchedule(): AxiosPromise<Schedule> {
return AXIOS.get('/schedule'); return AXIOS.get('/schedule');
} }

13
src/web/WebAPIService.cpp
View File

@@ -36,6 +36,7 @@ WebAPIService::WebAPIService(AsyncWebServer * server, SecurityManager * security
server->on(GET_CUSTOMIZATIONS_PATH, server->on(GET_CUSTOMIZATIONS_PATH,
HTTP_GET, HTTP_GET,
securityManager->wrapRequest(std::bind(&WebAPIService::getCustomizations, this, _1), AuthenticationPredicates::IS_ADMIN)); securityManager->wrapRequest(std::bind(&WebAPIService::getCustomizations, this, _1), AuthenticationPredicates::IS_ADMIN));
server->on(GET_SCHEDULE_PATH, HTTP_GET, securityManager->wrapRequest(std::bind(&WebAPIService::getSchedule, this, _1), AuthenticationPredicates::IS_ADMIN));
} }
// HTTP GET // HTTP GET
@@ -196,4 +197,16 @@ void WebAPIService::getCustomizations(AsyncWebServerRequest * request) {
request->send(response); request->send(response);
} }
void WebAPIService::getSchedule(AsyncWebServerRequest * request) {
auto * response = new AsyncJsonResponse(false, FS_BUFFER_SIZE);
JsonObject root = response->getRoot();
root["type"] = "schedule";
System::extractSettings(EMSESP_SCHEDULER_FILE, "Schedule", root, FS_BUFFER_SIZE);
response->setLength();
request->send(response);
}
} // namespace emsesp } // namespace emsesp

2
src/web/WebAPIService.h
View File

@@ -22,6 +22,7 @@
#define EMSESP_API_SERVICE_PATH "/api" #define EMSESP_API_SERVICE_PATH "/api"
#define GET_SETTINGS_PATH "/rest/getSettings" #define GET_SETTINGS_PATH "/rest/getSettings"
#define GET_CUSTOMIZATIONS_PATH "/rest/getCustomizations" #define GET_CUSTOMIZATIONS_PATH "/rest/getCustomizations"
#define GET_SCHEDULE_PATH "/rest/getSchedule"
namespace emsesp { namespace emsesp {
@@ -51,6 +52,7 @@ class WebAPIService {
void getSettings(AsyncWebServerRequest * request); void getSettings(AsyncWebServerRequest * request);
void getCustomizations(AsyncWebServerRequest * request); void getCustomizations(AsyncWebServerRequest * request);
void getSchedule(AsyncWebServerRequest * request);
}; };
} // namespace emsesp } // namespace emsesp