Changeset 191 for trunk/phpbms/common

Timestamp:

02/22/07 10:44:47 (5 years ago)

Author:

brieb

Message:

Implemented #46. Started coding for #46. Fixed several SQL install errors with invoices, tabledefs, and invoicestatuses.

Location:

trunk/phpbms/common

Files:

• javascript/common.js (modified) (1 diff)
• javascript/datepicker.js (modified) (1 diff)
• javascript/fields.js (modified) (1 diff)
• javascript/timepicker.js (modified) (1 diff)
• stylesheet/mozilla/base.css (modified) (1 diff)
• stylesheet/mozilla/boxes.css (modified) (3 diffs)
• stylesheet/mozilla/sizes.css (modified) (1 diff)

trunk/phpbms/common/javascript/common.js

@@ -215 +215 @@
 }
 
+/* DATE AND TIME --------------------------------------------------------------- */
+/* ----------------------------------------------------------------------------- */
+function stringToDate(sDate,format){
+        if (!format) format=DATE_FORMAT;
+        var thedate="";
+
+        if(sDate){
+                var sep;
+                var month;
+                var day;
+                var year;
+                switch(format){
+                        case "SQL":
+                                sep="-";
+                                year=parseInt(sDate.substring(0,sDate.indexOf(sep)),10);
+                                month=parseInt(sDate.substring(sDate.indexOf(sep)+1,sDate.indexOf(sep,sDate.indexOf(sep)+1)),10)-1;
+                                day=parseInt(sDate.substring(sDate.lastIndexOf(sep)+1),10);
+                        break;
+                        case "English, US":
+                                sep="/";
+                                month=parseInt(sDate.substring(0,sDate.indexOf(sep)),10)-1;
+                                day=parseInt(sDate.substring(sDate.indexOf(sep)+1,sDate.indexOf(sep,sDate.indexOf(sep)+1)),10);
+                                year=parseInt(sDate.substring(sDate.lastIndexOf(sep)+1),10);
+                                if(year<100) year+=2000;
+                        break;
+                }
+                thedate=new Date(year,month,day);
+        }
+        return thedate
+}
+
+
+function dateToString(thedate,format){
+        if(!format) format=DATE_FORMAT;
+        var sdate="";
+        
+        if(thedate){
+                var sep;
+                switch(format){
+                        case "SQL":
+                                sep="-";
+                                sdate= thedate.getFullYear()+sep+(thedate.getMonth()+1)+sep+thedate.getDate();
+                        break;
+                        
+                        case "English, US":
+                                sep="/";
+                                sdate= (thedate.getMonth()+1)+sep+thedate.getDate()+sep+thedate.getFullYear();
+                        break;
+                }
+        }
+        return sdate;
+}
+
+function stringToTime(sTime,format){
+        if(!format) format=TIME_FORMAT;
+        var thetime="";
+        if(sTime){
+                var timeArray;
+                switch(format){
+                        case "24 Hour":
+                                timeArray=sTime.split(":");
+                                if(timeArray.length=3)
+                                        thetime=new Date(0,0,0,parseInt(timeArray[0],10),parseInt(timeArray[1],10),parseInt(timeArray[2],10));
+                        break;
+                        
+                        case "12 Hour":
+                                timeadd=0;
+                                if(sTime.indexOf(" PM"))
+                                        timeadd=12;
+                                sTime=sTime.replace(/ AM/,"");
+                                sTime=sTime.replace(/ PM/,"");
+                                timeArray=sTime.split(":");
+                                if(timeArray.length=2){
+                                        var hour=parseInt(timeArray[0],10);
+                                        if (hour!=12)
+                                                hour=hour+timeadd;
+                                                thetime=new Date(0,0,0,hour,parseInt(timeArray[1],10));                                         
+                                }
+                        break;
+                }
+        }
+        return thetime;
+}
+
+function timeToString(thetime,format){
+        sTime="";
+        if(!format) format=TIME_FORMAT;
+        if(thetime){
+                var hours=thetime.getHours();
+                var minutes=thetime.getMinutes();
+                var seconds=thetime.getSeconds();
+                var sep=":"
+                switch(format){
+                        case "24 Hour":
+                                if(hours<10) hours="0"+hours;
+                                if(minutes<10) minutes="0"+minutes;
+                                if(seconds<10) seconds="0"+seconds;
+                                sTime=hours+sep+minutes+sep+seconds;
+                        break;
+                        
+                        case "12 Hour":
+                                var ampm=" AM";
+                                if(hours>12)
+                                        hours=hours-12;
+                                if(hours>11)
+                                        ampm=" PM";
+                                if (hours=0) hours=12;
+                                if(minutes<10) minutes="0"+minutes;                             
+                                sTime=hours+sep+minutes+ampm;
+                        break;
+                }
+        }
+        return sTime;
+}
+
+/* MODAL ----------------------------------------------------------------------- */
 /* ----------------------------------------------------------------------------- */
 

trunk/phpbms/common/javascript/datepicker.js

@@ -116 +116 @@
 }
 
-function stringToDate(sDate){
-        var sep="/";
-        var month=sDate.substring(0,sDate.indexOf(sep))
-        var day=sDate.substring(sDate.indexOf(sep)+1,sDate.indexOf(sep,sDate.indexOf(sep)+1))
-        var year=sDate.substring(sDate.lastIndexOf(sep)+1);
-        year=parseInt(year,10);
-        if(year<100) year+=2000;
-        return new Date(year,parseInt(month,10)-1,parseInt(day,10));
-}
-
-function mysqlstringToDate(sDate){
-        var sep="-";
-        var year=sDate.substring(0,sDate.indexOf(sep))
-        var month=sDate.substring(sDate.indexOf(sep)+1,sDate.indexOf(sep,sDate.indexOf(sep)+1))
-        var day=sDate.substring(sDate.lastIndexOf(sep)+1);
-        
-        return Date(year,month,day);
-}
-
-function dateToString(thedate){
-        var sep="/";
-        return (thedate.getMonth()+1)+sep+thedate.getDate()+sep+thedate.getFullYear();
-}
 
 function formatDateField(thefield){
-        if(validateDate(thefield.value)){
-                thefield.value=thefield.value.replace(/\-/g,"/");
-                var thedate=stringToDate(thefield.value);
-                thefield.value=dateToString(thedate);
-        } else
-        thefield.value="";
+        thefield.value=dateToString(stringToDate(thefield.value));
 }

trunk/phpbms/common/javascript/fields.js

@@ -148 +148 @@
 //validate a time (12 hour)
 function validateTime(strValue){
-        var objRegExp= /^([1-9]|1[0-2]|0[1-9]){1}(:[0-5][0-9]\ [aApP][mM]){1}$/;
-        if(!objRegExp.test(strValue))
-                return false;
-        else
-                return true;
+        return (strValue == timeToString(stringToTime(strValue)))
 }
 
 // validate dates
 function validateDate(strValue) {
-  var objRegExp = /^\d{1,2}(\-|\/|\.)\d{1,2}\1\d{2,4}$/
-
-  //check to see if in correct format
-  if(!objRegExp.test(strValue))
-    return false; //doesn't match pattern, bad date
-  else{
-  
-        for (var i=1;i<strValue.length;i++){
-                if (strValue.charAt(i)=="." || strValue.charAt(i)=="/" || strValue.charAt(i)=="-"){
-                    var strSeparator = strValue.substring(i,i+1) //find date separator
-                        break;
-                }
-        }
-    var arrayDate = strValue.split(strSeparator); //split date into month, day, year
-    //create a lookup for months not equal to Feb.
-    var arrayLookup = { 1 : 31, 3 : 31, 4 : 30, 5 : 31, 6 : 30, 7 : 31,
-                        8 : 31, 9 : 30, 10 : 31, 11 : 30, 12 : 31}
-    var intDay = parseInt(arrayDate[1],10);
-    //check if month value and day value agree
-    var intMonth = parseInt(arrayDate[0],10);
-    if(arrayLookup[intMonth] != null) {   
-      if(intDay <= arrayLookup[intMonth] && intDay != 0)
-        return true; //found in lookup table, good date
-    }
-
-    //check for February
-    var intYear = parseInt(arrayDate[2],10);
-        if (intYear <1000) intYear=intYear+2000;
-    if( ((intYear % 4 == 0 && intDay <= 29) || (intYear % 4 != 0 && intDay <=28)) && intDay !=0 && intMonth==2)
-      return true; //Feb. had valid number of days
-  }
-  return false; //any other values, bad date
+  return (strValue == dateToString(stringToDate(strValue)));
 }
 

trunk/phpbms/common/javascript/timepicker.js

@@ -93 +93 @@
 function tpClickHour(hour){
         var timeField=getObjectFromID(showTP.timeField);
-        var ampm;
-        if(!validateTime(timeField.value)) timeField.value="12:00 AM";
         
-        var minutes=timeField.value.substr(timeField.value.indexOf(":")+1,2)
-        
-        if(hour>11) {ampm=" PM"; hour=hour-12}else ampm=" AM";
-        if (hour==0) hour=12;
-        
-        timeField.value=hour+":"+minutes+ampm;
+        var thetime=stringToTime(timeField.value);
+        thetime.setHours(hour);
+        timeField.value=timeToString(thetime);
+
         if(timeField.onchange) timeField.onchange();
 }
 function tpClickMinute(thetd){
-        var minutes=thetd.innerHTML;
+        var minutes=parseInt(thetd.innerHTML.replace(/:/,""));
         var timeField=getObjectFromID(showTP.timeField);
-        if(!validateTime(timeField.value)) timeField.value="12:00 AM";
-
-        var hours=timeField.value.substring(0,timeField.value.indexOf(":"));
-        var ampm=timeField.value.substr(timeField.value.indexOf(" "));
-        timeField.value=hours+minutes+ampm;
+        
+        var thetime=stringToTime(timeField.value);
+        thetime.setMinutes(minutes);
+        timeField.value=timeToString(thetime);
+        
         if(timeField.onchange) timeField.onchange();
         closeTPBox();

trunk/phpbms/common/stylesheet/mozilla/base.css

@@ -25 +25 @@
 #footerAbout{float:left;}
 #footerTop{float:right;}
-
-
-/* ============================================================================== */
-/* Query Results                                                                  */
-/* ============================================================================== */
 
 /* ============================================================================== */

trunk/phpbms/common/stylesheet/mozilla/boxes.css

@@ -14 +14 @@
 .bodyline{
         clear:both;
-        border-color:#ABB1B1;
+        border-color:#CAD1D1;
         border-style:solid;
         -moz-border-radius:0;
@@ -21 +21 @@
 
 FIELDSET,.box{
-        border-color:#74879C;
+        border-color:#ACB7C4;
         border-width:1px;
         border-style:solid;
@@ -30 +30 @@
 .box{
         background-color:#EFF9F9;
-        border:1px solid #999999;       
+        border:1px solid #CCCCCC;       
 }

trunk/phpbms/common/stylesheet/mozilla/sizes.css

@@ -20 +20 @@
 H1 {
         font-family: Arial, Helvitica, sans-serif;
-        border-bottom: 1px solid #ccc;
         font-size:20px;
         margin:3px;
         padding-left:24px;
-        margin-bottom:8px;
+        margin-bottom:9px;
         font-weight:normal;
         background: url("image/h1graphic.png") 4px 4px no-repeat;;