Changeset 19450 for trunk

Timestamp:

03/18/19 22:46:48 (6 years ago)

Author:

Daniela Dorner

Message:

fixed bug for two resumes scheduled without suspend inbetween

File:

• trunk/www/dch/obs_summary.php (modified) (4 diffs)

trunk/www/dch/obs_summary.php

@@ -80 +80 @@
 
 $suspend = false;
+$doubleresume=false;
 $prev_data = array();
 
@@ -94 +95 @@
         // Sanity check: There is not much we can do
         if (empty($prev_data) || !$suspend)
+        {
+           $doubleresume=true;
            continue;
+        }
 
         $prev_data['fStart'] = $array[$i]['fStart'];
@@ -116 +120 @@
     $data .= "'".$array[$i]['fSourceName']."',";
     $data .= fmt($array[$i]['fStart']).",";
-    $data .= fmt($array[$i+1]['fStart']).",";
+    // in case two resumes are scheduled without suspend inbetween, the stop of a later observations needs to be used
+    if ($array[$i+1]['fMeasurementTypeName']=='Resume' && !$suspend)
+        $data .= fmt($array[$i+2]['fStart']).",";
+    else
+        $data .= fmt($array[$i+1]['fStart']).",";
     $data .= "],\n";
 
@@ -122 +130 @@
     $html2 .= "  <td>".$array[$i]['fStart']."|</td>\n";
     $html2 .= "  <td>".$array[$i]["fSourceName"]."</td>\n";
-    $html2 .= "  <td>|".$array[$i+1]["fStart"]."|</td>\n";
+    // in case two resumes are scheduled without suspend inbetween, the stop of a later observations needs to be used
+    if ($array[$i+1]['fMeasurementTypeName']=='Resume' && !$suspend)
+        $html2 .= "  <td>|".$array[$i+2]["fStart"]."|</td>\n";
+    else
+        $html2 .= "  <td>|".$array[$i+1]["fStart"]."|</td>\n";
     $html2 .= " </tr>\n";
+    $doubleresume=false;
 }