add optional ImageUpload for Webhook (#3174)

* WIP add Webhook

* fix config html for webhook
add tooltips for webhook

* webhook: fix not enabling webhook

* send webhook as json

* Update ApiKey.md

* webhook: fix only sending last "Number"

* webhook JSON is now closer to the data log in CSV format

* webhook: add img upload

* webhoop added config for imgupload

* webhook html fixes

* webhook: drop timeStampTimeUTC and switch from timeStamp to lastvalue like lokal csv to fix no timestamp on error

* add checkbox for Webhook_UploadImg

* Update sd-card/html/edit_config_template.html

* Update edit_config_template.html

* Update edit_config_template.html

* Update edit_config_template.html

* added a long timestamp to both webhook requests

---------

Co-authored-by: CaCO3 <caco3@ruinelli.ch>

code/components/jomjol_flowcontroll/ClassFlowWebhook.cpp

@@ -8,6 +8,7 @@
 #include "interface_webhook.h"
 
 #include "ClassFlowPostProcessing.h"
+#include "ClassFlowAlignment.h"
 #include "esp_log.h"
 #include "../../include/defines.h"
 
@@ -20,11 +21,13 @@ static const char* TAG = "WEBHOOK";
 void ClassFlowWebhook::SetInitialParameter(void)
 {
     uri = "";
-    flowpostprocessing = NULL;  
+    flowpostprocessing = NULL;
+    flowAlignment = NULL;
     previousElement = NULL;
     ListFlowControll = NULL; 
     disabled = false;
     WebhookEnable = false;
+    WebhookUploadImg = 0;
 }       
 
 ClassFlowWebhook::ClassFlowWebhook()
@@ -43,6 +46,11 @@ ClassFlowWebhook::ClassFlowWebhook(std::vector<ClassFlow*>* lfc)
         {
             flowpostprocessing = (ClassFlowPostProcessing*) (*ListFlowControll)[i];
         }
+        if (((*ListFlowControll)[i])->name().compare("ClassFlowAlignment") == 0)
+        {
+            flowAlignment = (ClassFlowAlignment*) (*ListFlowControll)[i];
+        }
+
     }
 }
 
@@ -59,6 +67,10 @@ ClassFlowWebhook::ClassFlowWebhook(std::vector<ClassFlow*>* lfc, ClassFlow *_pre
         {
             flowpostprocessing = (ClassFlowPostProcessing*) (*ListFlowControll)[i];
         }
+        if (((*ListFlowControll)[i])->name().compare("ClassFlowAlignment") == 0)
+        {
+            flowAlignment = (ClassFlowAlignment*) (*ListFlowControll)[i];
+        }
     }
 }
 
@@ -93,6 +105,16 @@ bool ClassFlowWebhook::ReadParameter(FILE* pfile, string& aktparamgraph)
         {
             this->apikey = splitted[1];
         }
+        if (((toUpper(_param) == "UPLOADIMG")) && (splitted.size() > 1))
+        {
+            if (toUpper(splitted[1]) == "1")
+            {
+                this->WebhookUploadImg = 1;
+            } else if (toUpper(splitted[1]) == "2")
+            {
+                this->WebhookUploadImg = 2;
+            }
+        }
     }
     
     WebhookInit(uri,apikey);
@@ -135,7 +157,13 @@ bool ClassFlowWebhook::doFlow(string zwtime)
     if (flowpostprocessing)
     {
         printf("vor sende WebHook");
-        WebhookPublish(flowpostprocessing->GetNumbers());
+        bool numbersWithError = WebhookPublish(flowpostprocessing->GetNumbers());
+
+        #ifdef ALGROI_LOAD_FROM_MEM_AS_JPG
+            if ((WebhookUploadImg == 1 || (WebhookUploadImg != 0 && numbersWithError)) && flowAlignment && flowAlignment->AlgROI) {
+                WebhookUploadPic(flowAlignment->AlgROI);
+            }
+        #endif
     }
        
     return true;

code/components/jomjol_flowcontroll/ClassFlowWebhook.h

@@ -8,6 +8,7 @@
 #include "ClassFlow.h"
 
 #include "ClassFlowPostProcessing.h"
+#include "ClassFlowAlignment.h"
 
 #include <string>
 
@@ -16,8 +17,11 @@ class ClassFlowWebhook :
 {
 protected:
     std::string uri, apikey;
-	ClassFlowPostProcessing* flowpostprocessing;  
+	ClassFlowPostProcessing* flowpostprocessing;
+    ClassFlowAlignment* flowAlignment;
+
     bool WebhookEnable;
+    int WebhookUploadImg;
 
     void SetInitialParameter(void);