Changeset 191

Timestamp:

02/22/07 10:44:47

Author:

brieb

Message:

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

Files:

• trunk/phpbms/common/javascript/common.js (modified) (1 diff)
• trunk/phpbms/common/javascript/datepicker.js (modified) (1 diff)
• trunk/phpbms/common/javascript/fields.js (modified) (1 diff)
• trunk/phpbms/common/javascript/timepicker.js (modified) (1 diff)
• trunk/phpbms/common/stylesheet/mozilla/base.css (modified) (1 diff)
• trunk/phpbms/common/stylesheet/mozilla/boxes.css (modified) (3 diffs)
• trunk/phpbms/common/stylesheet/mozilla/sizes.css (modified) (1 diff)
• trunk/phpbms/datepicker.php (modified) (1 diff)
• trunk/phpbms/fpdf/FAQ.htm (deleted)
• trunk/phpbms/include/common_functions.php (modified) (4 diffs)
• trunk/phpbms/include/createmodifiedby.php (modified) (2 diffs)
• trunk/phpbms/include/fields.php (modified) (2 diffs)
• trunk/phpbms/include/jstransport.php (modified) (1 diff)
• trunk/phpbms/install/createtables.sql (modified) (2 diffs)
• trunk/phpbms/install/settings.sql (modified) (1 diff)
• trunk/phpbms/install/updatev0.7.sql (modified) (1 diff)
• trunk/phpbms/modules/base/adminsettings.php (modified) (2 diffs)
• trunk/phpbms/modules/base/files_addedit.php (modified) (1 diff)
• trunk/phpbms/modules/base/include/notes_addedit_include.php (modified) (10 diffs)
• trunk/phpbms/modules/base/include/snapshot_include.php (modified) (5 diffs)
• trunk/phpbms/modules/base/include/users_addedit_include.php (modified) (1 diff)
• trunk/phpbms/modules/base/notes_addedit.php (modified) (1 diff)
• trunk/phpbms/modules/base/notes_ajax.php (modified) (1 diff)
• trunk/phpbms/modules/base/report/notes_summary.php (modified) (3 diffs)
• trunk/phpbms/modules/base/snapshot_ajax.php (modified) (5 diffs)
• trunk/phpbms/modules/base/users_addedit.php (modified) (1 diff)
• trunk/phpbms/modules/bms/clients_addedit.php (modified) (1 diff)
• trunk/phpbms/modules/bms/clients_email_process.php (modified) (1 diff)
• trunk/phpbms/modules/bms/clients_purchasehistory.php (modified) (5 diffs)
• trunk/phpbms/modules/bms/include/clientemailprojects_edit_include.php (modified) (1 diff)
• trunk/phpbms/modules/bms/include/clients_addedit_include.php (modified) (3 diffs)
• trunk/phpbms/modules/bms/include/invoices_addedit_include.php (modified) (10 diffs)
• trunk/phpbms/modules/bms/install/createtables.sql (modified) (2 diffs)
• trunk/phpbms/modules/bms/install/install.php (modified) (1 diff)
• trunk/phpbms/modules/bms/install/invoicestatuses.sql (added)
• trunk/phpbms/modules/bms/install/updatev0.70.sql (modified) (1 diff)
• trunk/phpbms/modules/bms/invoices_statushistory.php (modified) (2 diffs)
• trunk/phpbms/modules/bms/products_saleshistory.php (modified) (4 diffs)
• trunk/phpbms/modules/bms/quickview_ajax.php (modified) (1 diff)
• trunk/phpbms/modules/bms/report/clients_notesummary.php (modified) (3 diffs)
• trunk/phpbms/modules/bms/report/clients_purchasehistory.php (modified) (3 diffs)
• trunk/phpbms/modules/bms/report/invoices_pdfinvoice.php (modified) (2 diffs)
• trunk/phpbms/modules/bms/report/invoices_pdfpackinglist.php (modified) (2 diffs)
• trunk/phpbms/modules/bms/report/invoices_pdfquote.php (modified) (2 diffs)
• trunk/phpbms/modules/bms/report/invoices_pdfworkorder.php (modified) (2 diffs)
• trunk/phpbms/modules/bms/report/invoices_totals.php (modified) (3 diffs)
• trunk/phpbms/modules/bms/report/lineitems_totals.php (modified) (3 diffs)
• trunk/phpbms/modules/bms/report/products_saleshistory.php (modified) (4 diffs)

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){
-
-
-
-
-
-
+
-}

trunk/phpbms/common/javascript/fields.js

@@ -148 +148 @@
-//validate a time (12 hour)
-function validateTime(strValue){
-
-
-
-
-
+
-}
-
-// validate dates
-function validateDate(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";
-        
-
-
-
-
-
-
+
+
+
+
-        if(timeField.onchange) timeField.onchange();
-}
-function tpClickMinute(thetd){
-thetd.innerHTML
+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;
+
+
+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;
-ABB1B
+CAD1D
-        border-style:solid;
-        -moz-border-radius:0;
@@ -21 +21 @@
-
-FIELDSET,.box{
-74879C
+ACB7C4
-        border-width:1px;
-        border-style:solid;
@@ -30 +30 @@
-.box{
-        background-color:#EFF9F9;
-999999
+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;
-8
+9
-        font-weight:normal;
-        background: url("image/h1graphic.png") 4px 4px no-repeat;;

trunk/phpbms/datepicker.php

@@ -47 +47 @@
-                $todayArray=getdate($today);
-                if($selectedDate!="0000-00-00"){
-dateFromSQLDate($selectedDate
+stringToDate($selectedDate,"SQL"
-                        $tempDate=getdate($selDate);
-                        $displayLongDate=$tempDate["month"]." ".$tempDate["mday"].", ".$tempDate["year"];

trunk/phpbms/include/common_functions.php

@@ -130 +130 @@
-}
-
-
+
+
-// It will add the quotes for you.
-//=====================================================================
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                else
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        if($datetime=="")
-                return mktime();
@@ -198 +276 @@
-        eregi('(....)(..)(..)(..)(..)(..)',$datetime,$matches);
-        array_shift ($matches); 
-
-
+
-                $$var = (int) array_shift($matches);
-        }
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-function addSlashesToArray($thearray){
-        if(get_magic_quotes_runtime() || get_magic_quotes_gpc())
@@ -282 +387 @@
-}
-
-function dateFormat($thedate){
-        if($thedate) {
-                $phpdate=dateFromSQLDate($thedate);
-                return strftime("%m/%d/%Y",$phpdate);
-        } else return "";
-}
-
-function timeFormat($thetime){
-        if($thetime) {
-                $phptime=timeFromSQLTime($thetime);
-                return strftime(HOUR_FORMAT.":%M %p",$phptime);
-        } else return "";
-}
-
-function formatDateTime($thedatetime,$secs=false){
-        $temparray=explode(" ",$thedatetime);
-        $thereturn="";
-        if (isset($temparray[0])){
-                if($temparray[0]){
-                        $phpdate=dateFromSQLDate($temparray[0]);
-                        $thereturn.=strftime("%m/%d/%Y",$phpdate);
-                }
-        }
-        if (isset($temparray[1])){
-                $phptime=timeFromSQLTime($temparray[1]);                
-                if($secs)
-                        $thereturn.=" ".strftime(HOUR_FORMAT.":%M:%S %p",$phptime);
-                else
-                        $thereturn.=" ".strftime(HOUR_FORMAT.":%M %p",$phptime);
-        }
-        return $thereturn;
-}
-
-
-function formatTimestamp($timestamp){
-        if($timestamp){
-                $phptimestamp=dateFromSQLTimestamp($timestamp);
-                return strftime("%m/%d/%Y ".HOUR_FORMAT.":%M:%S %p",$phptimestamp);
-        }
-}
-
-function formatVariable($value,$format){
@@ -332 +397 @@
-                break;
-                case "date":
-dateFormat
+formatFromSQLDate
-                break;
-                case "time":
-timeFormat
+formatFromSQLTime
-                break;
-                case "datetime":
-DateT
+FromSQLDatet
-                break;
-                case "filelink":

trunk/phpbms/include/createmodifiedby.php

@@ -5 +5 @@
-                created by<br />                
-                <div><input name="createdbydisplay" type="text" value="<?php echo $createdby?>" size="20" maxlength="164" readonly="true" class="uneditable fieldCreateModify" tabindex="0" /></div>
-DateT
+FromSQLDatet
-        </div>
-        <div class="small">
@@ -11 +11 @@
-                modified by<br/>
-                <div><input name="modifiedbydisplay" type="text" value="<?php echo $modifiedby?>" size="20" maxlength="164" readonly="true" class="uneditable fieldCreateModify" tabindex="0" /></div>
-DateT
+FromSQLDatet
-        </div>  
-</div>

trunk/phpbms/include/fields.php

@@ -278 +278 @@
-        /*
-           name =                       Name of the field
-
-
-
-
-
-
+
+
+
+
+
+
+
-        ?> <input id="<?php echo $name?>" name="<?php echo $name?>" type="text" value="<?php echo $value?>" <?php
-        if ($attributes) 
@@ -298 +299 @@
-        /*
-           name =                       Name of the field
-
-
-
-
-
-
+
+
+
+
+
+
+
-        ?> <input id="<?php echo $name?>" name="<?php echo $name?>" type="text" value="<?php echo $value?>" <?php
-        if ($attributes) foreach($attributes as $attribute => $tvalue) echo " ".$attribute."=\"".$tvalue."\"";                          

trunk/phpbms/include/jstransport.php

@@ -16 +16 @@
-        } echo "\n\n";  
-        
+        //date formating
+        ?>DATE_FORMAT="<?php echo $_SESSION["date_format"]?>";<?php
+        echo "\n\n";
+        
+        //time formating
+        ?>TIME_FORMAT="<?php echo $_SESSION["time_format"]?>";<?php
+        echo "\n\n";
+        
-        if(isset($_SESSION["include_js"])){
-                echo $_SESSION["include_js"];

trunk/phpbms/install/createtables.sql

@@ -115 +115 @@
-
-CREATE TABLE `tabledefs` (
-
+ auto_increment
-  `displayname` varchar(64) default NULL,
-  `type` varchar(16) NOT NULL default 'table',
@@ -263 +263 @@
-  PRIMARY KEY(`id`)
-) TYPE = MYISAM;
+
+CREATE TABLE `scheduler` (
+  `id` INTEGER UNSIGNED NOT NULL AUTO_INCREMENT,
+  `name` VARCHAR(45),
+  `job` VARCHAR(128),
+  `crontab` VARCHAR(64),
+  `lastrun` DATETIME,
+  `startdatetime` DATETIME,
+  `enddatetime` DATETIME,
+  `description` TEXT,
+  `inactive` TINYINT UNSIGNED NOT NULL DEFAULT 0,
+  `createdby` INTEGER UNSIGNED,
+  `creationdate` DATETIME,
+  `modifiedby` INTEGER UNSIGNED,
+  `modifieddate` TIMESTAMP,
+  PRIMARY KEY(`id`)
+)
+ENGINE = MYISAM;

trunk/phpbms/install/settings.sql

@@ -9 +9 @@
-INSERT INTO `settings` (`name`, `value`) VALUES ('stylesheet','mozilla');
-INSERT INTO `settings` (`name`, `value`) VALUES ('phone_format','US - Loose');
+INSERT INTO `settings` (`name`, `value`) VALUES ('date_format','English, US');
+INSERT INTO `settings` (`name`, `value`) VALUES ('time_format','12 Hour');