(#2976) Use Response Time even if FLUSH has happened

Author: squaregoldfish

WebApp/src/uk/ac/exeter/QuinCe/data/Dataset/ControsPco2MeasurementLocator.java

@@ -113,7 +113,8 @@ public List<Measurement> locateMeasurements(Connection conn,
             } else {
               // If there hasn't been a FLUSHING flag since the last zero,
               // flush for the default period calculated from the response time.
-              if (lastStatus == ZERO
+              // Or add the flushing time to the point after the FLUSH mode
+              if ((lastStatus == ZERO || lastStatus == FLUSHING)
                 && DateTimeUtils.secondsBetween(currentStatusStart,
                   recordTime) <= defaultFlushingTime) {