Changeset 105

Timestamp:

02/04/09 10:20:59 (12 months ago)

Author:

dmyung

Message:

random message generator tweaked 3 month window instead of 10 years.
default dashboard view is 1 week now

Location:

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

Files:

• ChartData.java (modified) (1 diff)
• Dashboard.java (modified) (3 diffs)
• FormReviewer.java (modified) (3 diffs)

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

@@ -103 +103 @@
         wv.addJavascriptInterface(mBroker, JAVASCRIPT_PROPERTYNAME);
         wv.loadUrl(CHART_FILE);
-        
-        
+        //mBroker.loadGraph();        
         wv.debugDump();
         }

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

@@ -106 +106 @@
         private int selectedListViewPosition = -1;
         
-        private Date mStartDate;
-        private Date mEndDate;
+        private Date mStartDate = Constants.NULLDATE;
+        private Date mEndDate = Constants.NULLDATE;
         private int mScreenWidth;
         
@@ -168 +168 @@
                 mEndDate = new Date();
                 mStartDate = new Date();
-                mStartDate.setDate(mEndDate.getDate() - 1);             
+                mStartDate.setDate(mEndDate.getDate() - 7);             
         }
         
@@ -496 +496 @@
         if(mListviewCursor == null) {
                 if(mChosenForm != null && !mShowAllMessages) {
-                        String whereclause = " rapidandroid_message.time >= '" + Message.SQLDateFormatter.format(mStartDate) + "' AND time <= '" + Message.SQLDateFormatter.format(mEndDate) + "'";
-                        mListviewCursor = getContentResolver().query(Uri.parse(RapidSmsDBConstants.FormData.CONTENT_URI_PREFIX + mChosenForm.getFormId()), null,whereclause,null,null);
+                        String whereclause = " rapidandroid_message.time >= '"
+                                                        + Message.SQLDateFormatter.format(mStartDate) + "' AND time <= '"
+                                                        + Message.SQLDateFormatter.format(mEndDate) + "'";
+                                        mListviewCursor = getContentResolver().query(Uri.parse(RapidSmsDBConstants.FormData.CONTENT_URI_PREFIX + mChosenForm.getFormId()), null,whereclause,null,null);
+                        
+                        
+                        
                         
                 } else if(mShowAllMessages && mChosenForm == null) {

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

@@ -366 +366 @@
 
                         // first, let's get the
-                        String token = Long.toString(Math.abs(r.nextLong()), 36);
+                        String token = phones[r.nextInt(phones.length)];//Long.toString(Math.abs(r.nextLong()), 36);
                         Monitor monitor = MessageTranslator.GetMonitorAndInsertIfNew(this, token);
                         
@@ -396 +396 @@
         private Date getRandomDate() {
                 Calendar cdr = Calendar.getInstance();
-                cdr.set(1999, 1, 1);
-                cdr.set(Calendar.HOUR_OF_DAY, 6);
+                //cdr.set(1999, 1, 1);
+                cdr.set(Calendar.MONTH,cdr.get(Calendar.MONTH) -3);
+                cdr.set(Calendar.HOUR_OF_DAY, 0);
                 cdr.set(Calendar.MINUTE, 0);
                 cdr.set(Calendar.SECOND, 0);
                 long val1 = cdr.getTimeInMillis();
 
-                cdr.set(2009, 1, 29);
+                cdr = Calendar.getInstance();
                 cdr.set(Calendar.HOUR_OF_DAY, 23);
-                cdr.set(Calendar.MINUTE, 0);
+                cdr.set(Calendar.MINUTE, 59);
                 cdr.set(Calendar.SECOND, 0);
                 long val2 = cdr.getTimeInMillis();
@@ -425 +426 @@
                         "lun", "lhr", "asvasd", "alksjwlejrwer", "bshdkghk", "akhsdwer",
                         "tiwowuy", "xvcxbxkhcvb" };
+        private static String[] phones = new String[] {"5558675309","6175803100", "2128246918", "2123267768", "6175803103"};
         
         private static String[] floats = new String[] { "0.24", "0.54", "1.5","50%", "25 pct","33 %", "15pct", "2/3",  "3:2"};