Commit 601836c0 authored by Manfred Kutas's avatar Manfred Kutas

ZP-899 Add sensitivity of appointment to rocompare, print

body/description in the notification email.

Released under the Affero GNU General Public License (AGPL) version 3.
parent 9e7ebc62
...@@ -122,7 +122,8 @@ class SyncAppointment extends SyncObject { ...@@ -122,7 +122,8 @@ class SyncAppointment extends SyncObject {
// 2 = Private // 2 = Private
// 3 = Confident // 3 = Confident
SYNC_POOMCAL_SENSITIVITY => array ( self::STREAMER_VAR => "sensitivity", SYNC_POOMCAL_SENSITIVITY => array ( self::STREAMER_VAR => "sensitivity",
self::STREAMER_CHECKS => array( self::STREAMER_CHECK_ONEVALUEOF => array(0,1,2,3) )), self::STREAMER_CHECKS => array( self::STREAMER_CHECK_ONEVALUEOF => array(0,1,2,3) ),
self::STREAMER_RONOTIFY => true),
// Busystatus values // Busystatus values
// 0 = Free // 0 = Free
......
...@@ -231,11 +231,14 @@ abstract class SyncObject extends Streamer { ...@@ -231,11 +231,14 @@ abstract class SyncObject extends Streamer {
$t = str_replace("\r", "", stream_get_contents($this->$val)); $t = str_replace("\r", "", stream_get_contents($this->$val));
$o = str_replace("\r", "", stream_get_contents($odo->$val)); $o = str_replace("\r", "", stream_get_contents($odo->$val));
if ($this instanceof SyncBaseBody) { if ($this instanceof SyncBaseBody) {
$out["Body/Description"] = (trim($t) == trim($o)) ? "No changes made" : "Body/description changed"; $out["Body/Description"] = (trim($t) == trim($o)) ? "No changes made" : $t." - ". $odoName .": ".$o;
} }
else { else if($v[self::STREAMER_TYPE] == self::STREAMER_TYPE_STREAM_ASPLAIN) {
$out[$keyprefix.$val] = (trim($t) == trim($o)) ? $t : $t." - ". $odoName .": ".$o; $out[$keyprefix.$val] = (trim($t) == trim($o)) ? $t : $t." - ". $odoName .": ".$o;
} }
else {
$out[$keyprefix.$val] = "Binary data changed";
}
} }
// do the nice date formatting // do the nice date formatting
else if ($v[self::STREAMER_TYPE] == self::STREAMER_TYPE_DATE || $v[self::STREAMER_TYPE] == self::STREAMER_TYPE_DATE_DASHES) { else if ($v[self::STREAMER_TYPE] == self::STREAMER_TYPE_DATE || $v[self::STREAMER_TYPE] == self::STREAMER_TYPE_DATE_DASHES) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment