mirror of
https://github.com/pandorafms/pandorafms.git
synced 2025-07-28 08:14:38 +02:00
Merge branch 'fix/pandora_enterprise#6485' into 'develop'
Add local (as opposed to UTC) timestamps to data. See merge request artica/pandorafms!1778
This commit is contained in:
commit
4a3e5ab7ef
@ -32,7 +32,7 @@ using namespace Pandora;
|
|||||||
*/
|
*/
|
||||||
Pandora_Data::Pandora_Data (string value) {
|
Pandora_Data::Pandora_Data (string value) {
|
||||||
this->value = value;
|
this->value = value;
|
||||||
GetSystemTime (&(this->timestamp));
|
GetLocalTime (&(this->timestamp));
|
||||||
this->data_origin = pandora_data_unknown_source;
|
this->data_origin = pandora_data_unknown_source;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -68,7 +68,7 @@ Pandora_Data::Pandora_Data (string value, SYSTEMTIME *system_time) {
|
|||||||
*/
|
*/
|
||||||
Pandora_Data::Pandora_Data (string value, string data_origin) {
|
Pandora_Data::Pandora_Data (string value, string data_origin) {
|
||||||
this->value = value;
|
this->value = value;
|
||||||
GetSystemTime (&(this->timestamp));
|
GetLocalTime (&(this->timestamp));
|
||||||
this->data_origin = data_origin;
|
this->data_origin = data_origin;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -99,7 +99,7 @@ Pandora_Data::Pandora_Data (string value, SYSTEMTIME *system_time, string data_o
|
|||||||
*/
|
*/
|
||||||
Pandora_Data::Pandora_Data () {
|
Pandora_Data::Pandora_Data () {
|
||||||
this->value = "";
|
this->value = "";
|
||||||
GetSystemTime (&(this->timestamp));
|
GetLocalTime (&(this->timestamp));
|
||||||
this->data_origin = "";
|
this->data_origin = "";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user