Changeset 112

Timestamp:

02/05/09 11:40:59 (16 months ago)

Author:

czue

Message:

Updating the form view to add zero values to the date range plots for histograms. Also re-added the legend back in and changed it to a line graph. Fixed a bug where charts crashed if there were no messages in the DB

Location:

trunk/rapidandroid/org.rapidandroid/src/org/rapidandroid/activity

Files:

• Dashboard.java (modified) (2 diffs)
• chart/ChartBroker.java (modified) (1 diff)
• chart/form/FormDataBroker.java (modified) (4 diffs)

trunk/rapidandroid/org.rapidandroid/src/org/rapidandroid/activity/Dashboard.java

@@ -506 +506 @@
                                 return;
                         }
-                        mListviewCursor.moveToLast();
-                        int msg_id = mListviewCursor.getInt(Message.COL_PARSED_MESSAGE_ID);
-                        Message m = MessageTranslator.GetMessage(this, msg_id);
-                        
-                        i.putExtra(ChartData.CallParams.START_DATE, m.getTimestamp().getTime());                        
+                        Date startDate;
+                        if (mListviewCursor.getCount() > 0) {
+                                mListviewCursor.moveToLast();
+                                int msg_id = mListviewCursor.getInt(Message.COL_PARSED_MESSAGE_ID);
+                                Message m = MessageTranslator.GetMessage(this, msg_id);
+                                startDate = m.getTimestamp();
+                        }else {
+                                Calendar startCal = Calendar.getInstance();
+                                startCal.add(Calendar.DATE, -7);
+                                startDate = startCal.getTime();
+                                
+                        }
+                        i.putExtra(ChartData.CallParams.START_DATE, startDate);                 
                         i.putExtra(ChartData.CallParams.CHART_FORM, mChosenForm.getFormId());
                 } else if (mShowAllMessages) {
@@ -522 +530 @@
                                 e.printStackTrace();
                                 Calendar cal = Calendar.getInstance();
-                                cal.set(Calendar.DATE, -7);
+                                cal.add(Calendar.DATE, -7);
                                 i.putExtra(ChartData.CallParams.START_DATE, cal.getTimeInMillis());
                         } 

trunk/rapidandroid/org.rapidandroid/src/org/rapidandroid/activity/chart/ChartBroker.java

@@ -229 +229 @@
         }
 
+        protected Date getNextValue(DateDisplayTypes displayType, Date date) {
+                Calendar cal = Calendar.getInstance();
+                cal.setTime(date);
+                switch (displayType) {
+                case Hourly:
+                        cal.add(Calendar.HOUR, 1);
+                        break;
+                case Daily:
+                        cal.add(Calendar.DATE, 1);
+                        break;
+                case Weekly:
+                        cal.add(Calendar.WEEK_OF_YEAR, 1);
+                        break;
+                case Monthly:
+                        cal.add(Calendar.MONTH, 1);
+                        break;
+                case Yearly:
+                        cal.add(Calendar.YEAR, 1);
+                        break;
+                default:
+                        throw new IllegalArgumentException("Bad display type: " + displayType); 
+                }
+                return cal.getTime();
+        }
+
+        protected boolean isBefore(DateDisplayTypes displayType, Date date1, Date date2) {
+                Calendar cal1 = Calendar.getInstance();
+                cal1.setTime(date1);
+                Calendar cal2 = Calendar.getInstance();
+                cal2.setTime(date2);
+                if (cal2.before(cal1)) {
+                        return false;
+                }
+                // i really feel like there should be a cleaner way to do this but it escapes me
+                if (cal1.get(Calendar.YEAR) < cal2.get(Calendar.YEAR)) {
+                        return true;
+                } else if (cal1.get(Calendar.YEAR) > cal2.get(Calendar.YEAR) || displayType == DateDisplayTypes.Yearly  ) {
+                        return false;
+                }
+                // we know the years are the same and we're comparing less than years
+                if (cal1.get(Calendar.MONTH) < cal2.get(Calendar.MONTH)) {
+                        return true;
+                } else if (cal1.get(Calendar.MONTH) > cal2.get(Calendar.MONTH) || displayType == DateDisplayTypes.Monthly) {
+                        return false;
+                }
+                // we know months and years are the same and we're comparing less than months
+                if (cal1.get(Calendar.WEEK_OF_YEAR) < cal2.get(Calendar.WEEK_OF_YEAR)) {
+                        return true;
+                } else if (cal1.get(Calendar.WEEK_OF_YEAR) > cal2.get(Calendar.WEEK_OF_YEAR) || displayType == DateDisplayTypes.Weekly) {
+                        return false;
+                }
+                // we know months, years, and weeks are the same and we're comparing less than weeks
+                if (cal1.get(Calendar.DATE) < cal2.get(Calendar.DATE)) {
+                        return true;
+                } else if (cal1.get(Calendar.DATE) > cal2.get(Calendar.DATE) || displayType == DateDisplayTypes.Daily) {
+                        return false;
+                }
+                // we know months, years,weeks, and days are the same and we're comparing less than days
+                if (cal1.get(Calendar.HOUR) < cal2.get(Calendar.HOUR)) {
+                        return true;
+                }  
+                // anything else is not before
+                return false;
+        }
+
+                
         protected Date getDate(DateDisplayTypes displayType, String string) {
                 // TODO Auto-generated method stub

trunk/rapidandroid/org.rapidandroid/src/org/rapidandroid/activity/chart/form/FormDataBroker.java

@@ -130 +130 @@
 //                              result.put("points", getShowTrue());
 //                              result.put("xaxis", getDateOptions());
-                                return new JSONGraphData(prepareDateData(xVals, yVals),loadOptionsForDateGraph(xVals) );
+                                return new JSONGraphData(prepareDateData(xVals, yVals),loadOptionsForDateGraph(xVals, false) );
                         } catch (Exception ex) {
 
@@ -166 +166 @@
         }
 
+        private JSONArray prepareDateHistogramData(DateDisplayTypes displayType, Date[] xvals, int[] yvals, String legend) throws JSONException {
+                JSONArray outerArray = new JSONArray();
+                JSONArray innerArray = new JSONArray();
+                int datalen = xvals.length;
+                Date prevVal = null;
+                for (int i = 0; i < datalen; i++) {
+                        Date thisVal = xvals[i];
+                        if (prevVal != null) {
+                                // add logic to fill in zeros
+                                Date nextInSeries = getNextValue(displayType, prevVal);
+                                while (isBefore(displayType, nextInSeries, thisVal))
+                                {
+                                        JSONArray elem = new JSONArray();
+                                        elem.put(nextInSeries.getTime());
+                                        elem.put(0);
+                                        innerArray.put(elem);
+                                        nextInSeries = getNextValue(displayType, nextInSeries);
+                                }
+                        }
+                        JSONArray elem = new JSONArray();
+                        elem.put(xvals[i].getTime());
+                        elem.put(yvals[i]);
+                        innerArray.put(elem);
+                        prevVal = thisVal;
+                }
+                JSONObject finalObj = new JSONObject();
+                finalObj.put("data", innerArray);
+                finalObj.put("label", legend);
+                outerArray.put(finalObj);
+                return outerArray;
+        }
+        
         private JSONArray prepareDateData(Date[] xvals, int[] yvals) {
                 JSONArray outerArray = new JSONArray();
@@ -237 +269 @@
                                 //result.put("xaxis", getXaxisOptions(xVals));
                                 // todo 
-                                return new JSONGraphData(prepareDateData(xVals, yVals),loadOptionsForDateGraph(xVals) );
+                                return new JSONGraphData(prepareDateHistogramData(displayType, xVals, yVals, legend),loadOptionsForDateGraph(xVals, true) );
                                 
                         } catch (Exception ex) {
@@ -350 +382 @@
                 return arr;
         }
-
-        private JSONObject loadOptionsForDateGraph(Date[] vals) throws JSONException {
+        
+        private JSONObject loadOptionsForDateGraph(Date[] vals, boolean displayLegend) throws JSONException {
 
                 JSONObject toReturn = new JSONObject();
                 //bars: { show: true }, points: { show: false }, xaxis: { mode: "time", timeformat:"%y/%m/%d" }
-                toReturn.put("bars", getShowTrue());
+                toReturn.put("bars", getShowFalse());
+                toReturn.put("lines", getShowTrue());
                 toReturn.put("points", getShowFalse());
                 toReturn.put("xaxis", getXaxisOptionsForDate());
+                if (displayLegend) {
+                        toReturn.put("legend", getShowTrue());
+                } 
                 return toReturn;
         }