Changeset 484 for branches/nathan

Timestamp:

04/07/09 11:10:54 (3 years ago)

Author:

brieb

Message:

• Fixed problem with endless loop on workload
• Fixed problem with assigned notes not falling off after being marked completed.
• Added 2nd System message detailing how to remove system messages or new installs.

Location:

branches/nathan

Files:

• install/notes.sql (modified) (1 diff)
• modules/base/include/snapshot_include.php (modified) (4 diffs)

branches/nathan/install/notes.sql

@@ -1 +1 @@
 INSERT INTO `notes` (`assignedtoid`, `attachedid`, `attachedtabledefid`, `content`, `assignedtodate`, `subject`, `type`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`, `importance`, `parentid`, `startdate`, `enddate`, `completed`, `private`, `status`, `completeddate`, `location`, `category`, `assignedtotime`, `starttime`, `endtime`, `assignedbyid`, `repeating`, `repeattype`, `repeatuntil`, `repeatevery`, `repeattimes`, `repeateachlist`, `repeatontheday`, `repeatontheweek`, `firstrepeat`, `lastrepeat`, `timesrepeated`, `repeatname`) VALUES (NULL,NULL,NULL,'For more help using this software use the following links:\r\n\r\nhttp://www.phpbms.org - community site and wiki.\r\n\r\nhttp://www.phpbms.org/forum -user support forum.\r\n\r\nhttp://www.kreotek.com - paid support and customization.',NULL,'Welcome to phpBMS','SM',1,NOW(),1,NOW(),0,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,'Daily',NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL);
+INSERT INTO `notes` (`assignedtoid`, `attachedid`, `attachedtabledefid`, `content`, `assignedtodate`, `subject`, `type`, `createdby`, `creationdate`, `modifiedby`, `modifieddate`, `importance`, `parentid`, `startdate`, `enddate`, `completed`, `private`, `status`, `completeddate`, `location`, `category`, `assignedtotime`, `starttime`, `endtime`, `assignedbyid`, `repeating`, `repeattype`, `repeatuntil`, `repeatevery`, `repeattimes`, `repeateachlist`, `repeatontheday`, `repeatontheweek`, `firstrepeat`, `lastrepeat`, `timesrepeated`, `repeatname`) VALUES (NULL, NULL, NULL, '1) From the menu, navigate to Tools->Notes.\r\n2) From the find drop down, choose \'System Messages\' and then click the search button.\r\n3) Select the record(s) you want to delete and then click the delete (-) button.', NULL, 'How To Delete System Messages', 'SM', 1, NOW(), 1, NOW(), '0', NULL, NULL, NULL, '0', '0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '0', '0', 'Daily', NULL, '1', NULL, NULL, NULL, NULL, NULL, NULL, '0', NULL);

branches/nathan/modules/base/include/snapshot_include.php

@@ -114 +114 @@
 
                                 $querystatement.="
-                                        assignedtoid = ".$this->userid."
-                                         OR (
-                                                type = 'TS'
-                                                AND (assignedtoid = 0 OR assignedtoid IS NULL)
-                                                AND createdby = ".$this->userid."
-                                        ) AND (completed = 0
-                                                OR (completed = 1 AND completeddate >= CURDATE())
+                                        ((
+                                                assignedtoid = ".$this->userid."
+                                                OR      (
+                                                        type = 'TS'
+                                                        AND (assignedtoid = 0 OR assignedtoid IS NULL)
+                                                        AND createdby = ".$this->userid."
+                                                        )
+                                        )
+                                                AND     (
+                                                        completed = 0
+                                                        OR      (
+                                                                completed = 1
+                                                                AND completeddate >= CURDATE()
+                                                                )
+                                                        )
                                         )";
 
@@ -130 +138 @@
 
                                 $querystatement.="
-                                        assignedbyid = ".$this->userid."
+                                        (assignedbyid = ".$this->userid."
                                         AND (completed = 0
                                                 OR (completed = 1 AND completeddate >= CURDATE())
-                                        )";
+                                        ))";
 
                                 $title = "Delegations";
@@ -143 +151 @@
 
                 $querystatement.="AND (
-                                        (startdate IS NULL AND enddate IS NULL AND assignedtodate IS NULL) OR
-                                        (startdate IS NOT NULL AND startdate <= DATE_ADD(CURDATE(),INTERVAL 30 DAY)) OR
-                                        (enddate IS NOT NULL AND enddate <= DATE_ADD(CURDATE(),INTERVAL 30 DAY)) OR
-                                        (assignedtodate IS NOT NULL AND assignedtodate <= DATE_ADD(CURDATE(),INTERVAL 30 DAY))
+                                        (startdate IS NULL AND enddate IS NULL AND assignedtodate IS NULL)
+
+                                        OR (
+                                                (startdate IS NOT NULL AND startdate <= DATE_ADD(CURDATE(),INTERVAL 30 DAY))
+                                                AND (
+                                                        (enddate IS NOT NULL AND enddate <= DATE_ADD(CURDATE(),INTERVAL 30 DAY))
+                                                        OR (assignedtodate IS NOT NULL AND assignedtodate <= DATE_ADD(CURDATE(),INTERVAL 30 DAY))
+                                                )
+                                        )
                                    )";
 
@@ -235 +248 @@
                                                                 case "Now":
                                                                         $section["title"] = "Soon";
-                                                                        $section["date"] = mktime(0,0,0,date("m"),date("d")+7,date("Y"));;
+                                                                        $section["date"] = mktime(0,0,0,date("m"),date("d")+7,date("Y"));
                                                                         break;
 
                                                                 case "Soon":
                                                                         $section["title"] = "Later";
-                                                                        $section["date"] = mktime(0,0,0,date("m"),date("d")+31,date("Y"));;
+//                                                                      $section["date"] = mktime(0,0,0,date("m"),date("d")+31,date("Y"));
+                                                                        $section["date"] = mktime(0,0,0,date("m"),date("d"),2038);
                                                                         break;