From 77fcb445554ff59a05f45c7c6366d9eac9eb8517 Mon Sep 17 00:00:00 2001
From: "Xuezhi.Wei" <Xuezhi.Wei@noaa.gov>
Date: Mon, 8 Dec 2014 19:10:51 +0000
Subject: [PATCH] ASM #634 - Missing Data not getting into HML file

Change-Id: I4f2358f28ef7d7945813cbffa6d36517e162e40b

Former-commit-id: ac19b4b08d8caa1b4cb62b11c93a4e523dd799ff [formerly 947f9dd3435219ff32890cc4a26d8ae5e43686cf]
Former-commit-id: e40018f2e1d444106727ced9bbf182f882a6771e
---
 .../timeseries/TimeSeriesDataManager.java     | 41 +++----------------
 .../timeseries/TimeSeriesDisplayDlg.java      |  2 +
 2 files changed, 8 insertions(+), 35 deletions(-)

diff --git a/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDataManager.java b/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDataManager.java
index f437538b94..2247e53457 100644
--- a/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDataManager.java
+++ b/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDataManager.java
@@ -72,7 +72,9 @@ import com.raytheon.viz.hydrocommon.util.DbUtils;
  * Feb  22 2013 14676      lbousaidi   check when producttime is null
  * Mar 25, 2013  1781      mpduff      Constrain time series table query with a start time.
  * May 12  2014  16705     lbousaidi   update revision and shef_qual_code in edit routine.
- * </pre>
+ * Dec 14, 2014  16388     xwei        updated the insertion of rejecteddata table. 
+ * 
+</pre>
  * 
  * @author dhladky
  * @version 1.0
@@ -946,11 +948,10 @@ public class TimeSeriesDataManager extends HydroDataManager {
         for (ForecastData dr : deleteList) {
 
             int probability = -1;
-            int revision = 0;
-            if (dr.getTs().toUpperCase().startsWith("F")
-                    || dr.getTs().toUpperCase().startsWith("C")) {
+            int revision = 1;
+            
+            if ( dr.getTs().toUpperCase().startsWith("F") || dr.getTs().toUpperCase().startsWith("C") ) {
                 probability = 0;
-                revision = 1;
             }
 
             Date productTime = dr.getProductTime();
@@ -1196,36 +1197,6 @@ public class TimeSeriesDataManager extends HydroDataManager {
 
             sql.setWhereClause(where.toString());
 
-            if (data.getValue() == HydroConstants.MISSING_VALUE) {
-                DataRecord dr = new DataRecord();
-                Date productTime = data.getProductTime();
-                if (productTime == null) {
-                    productTime = now;
-                }
-
-                dr.setDur(data.getDur());
-                dr.setExt(data.getExtremum().toUpperCase());
-                dr.setLid(data.getLid());
-                dr.setObsTime(data.getObsTime());
-                dr.setPe(data.getPe().toUpperCase());
-                dr.setPostingTime(now);
-                dr.setQualityCode(TimeSeriesUtil.DEFAULT_QC_VALUE);
-                dr.setRevision(data.getRevision());
-                dr.setShefQualCode("M");
-                dr.setTs(data.getTs().toUpperCase());
-                dr.setValue(data.getPreviousValue());
-                dr.setProductTime(productTime);
-                dr.setProductId(data.getProductID());
-                if (data.getValidTime() != null) {
-                    dr.setValidTime(data.getValidTime());
-                    dr.setBasisTime(dateFormat.format(data.getBasisTime()));
-                } else {
-                    dr.setValidTime(data.getObsTime());
-                }
-
-                insertRejectedData(dr);
-            }
-
             AppsDefaults ad = AppsDefaults.getInstance();
             boolean debug = ad.getBoolean(HydroConstants.DEBUG_HYDRO_DB_TOKEN,
                     false);
diff --git a/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java b/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
index fde6e81bca..6dc06100b8 100644
--- a/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
+++ b/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
@@ -94,6 +94,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
  * 30 Jan 2012 15459     mpduff        Redmine 1560 - Make graph canvases redraw on page up/down.
  * 06 Feb 2013 1578      rferrel       Code cleanup for non-blocking dialogs.
  * 24 Apr 2013  1921     mpduff        Fix zoom reset to only reset the "active" graph
+ * 14 May 2014 16388     xwei          updated the insertion of rejecteddata table. 
  * 
  * </pre>
  * 
@@ -888,6 +889,7 @@ public class TimeSeriesDisplayDlg extends CaveSWTDialog {
 
                     if (editList.size() > 0) {
                         try {
+                        	dataManager.insertRejectedData(editList);
                             dataManager.edit(editList);
                             updateMaxFcst(editList);
                         } catch (VizException e) {