From 5871ffa0b6140baad0d841db8ff179ed4ea6987d Mon Sep 17 00:00:00 2001
From: Lucio Zambon <lucio.zambon@elettra.eu>
Date: Mon, 27 Sep 2021 09:22:07 +0200
Subject: [PATCH] update register popup
---
src/acs.cpp | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/acs.cpp b/src/acs.cpp
index 2444594..e57fa7e 100644
--- a/src/acs.cpp
+++ b/src/acs.cpp
@@ -65,7 +65,7 @@ void acs::web_read(char *url, const char *data) {
*/
time_t t;
t = time(NULL);
- if (t - ack_time < 86400) return;
+ if (t - ack_time < 600) return;
CURL *curl;
CURLcode res;
curl = curl_easy_init();
@@ -1782,8 +1782,7 @@ void acs::refresh()
ui.AsoPresenceButton->setIcon(QPixmap(imgpath+"list.png"));
ui.consentAso_2->setPixmap(QPixmap(imgpath+"permission_off.png"));
}
- strcpy(url, "http://fcsproxy.elettra.eu/docs/pss/register_alarm.php?user_inside=");
- web_read(url, linac_strstat.c_str());
+ // strcpy(url, "http://fcsproxy.elettra.eu/docs/pss/register_alarm.php?user_inside="); web_read(url, linac_strstat.c_str());
// set badge acknowledge
if (linacPlcStat && myReadString("Linac_badge_ack", strstat)) {
ui.userNameA0Label->setText(strstat.c_str());
@@ -2797,16 +2796,18 @@ std::string myexec(const char* cmd) {
void acs::open_version_panel()
{
vector<bool> stat;
- string strstat, panelVersion;
- panelVersion = myexec("/usr/bin/curl \"https://gitlab.elettra.eu/cs/gui/acs/-/tags\" -H \"Accept: text/html\" -s | grep Release | head -2 | tail -1");
- cout << "panelVersion: " << panelVersion.c_str() << endl;
+ string strstat, panelVersion, srvVersion;
+ panelVersion = myexec("/usr/bin/curl \"https://gitlab.elettra.eu/cs/gui/acs/-/tags\" -H \"Accept: text/html\" -s | grep \"Release \"| head -1");
+ srvVersion = myexec("/usr/bin/curl \"https://gitlab.elettra.eu/cs/ds/fsafety/-/tags\" -H \"Accept: text/html\" -s | grep \"Release \"| head -1");
+ cout << "panelVersion: " << panelVersion.c_str() << "srvVersion: " << srvVersion.c_str() << endl;
// set PLC status
if (myReadAttribute("Version")) {
myAttribute >> strstat;
- // strstat += "pan_ver: 1.30";
- strstat += "pan_ver: ";
+ if (strstat.find("srv:??") != string::npos) strstat = strstat.substr(0, strstat.length()-3) + srvVersion.substr(7,9);
+ // strstat += "panel: 1.30";
+ strstat += "panel: ";
// strstat += myversion.length()>17? myversion.substr(15,2): myversion;
- strstat += panelVersion;
+ strstat += panelVersion.substr(8,8);
// open procedure
try {
QMessageBox::question(this, "Versione", strstat.c_str(), "Esci");
--
GitLab