Changeset 485 for trunk/phpbms/modules/base/include/snapshot_include.php

Timestamp:

04/07/09 11:44:18 (3 years ago)

Author:

nate

Message:

• Merged Nathan branch back into trunk.

Files:

• trunk/phpbms/modules/base/include/snapshot_include.php (modified) (6 diffs)

trunk/phpbms/modules/base/include/snapshot_include.php

@@ -69 +69 @@
                 if($this->db->numRows($queryresult)){ ?>
 
-                <div class="box" id="systemMessageContainer">
+                <div id="systemMessageContainer">
                         <h2>System Messages</h2>
                         <?php while($therecord = $this->db->fetchArray($queryresult)) {
@@ -76 +76 @@
 
                         ?>
-                        <h3 class="systemMessageLinks"><?php echo htmlQuotes($therecord["subject"])?> <span>[ <?php echo htmlQuotes(formatFromSQLDateTime($therecord["creationdate"]))?> <?php echo htmlQuotes($therecord["createdby"])?>]</span></h3>
-                        <div class="systemMessages">
-                                <p><?php echo $therecord["content"]?></p>
-                        </div>
+                                <div class="systemMessageLinks">
+                                        <h3><?php echo htmlQuotes($therecord["subject"])?></h3>
+                                        <div>by <?php echo htmlQuotes($therecord["createdby"])?> on <?php echo htmlQuotes(formatFromSQLDateTime($therecord["creationdate"]))?></div>
+                                </div>
+                                <div class="systemMessages"><p><?php echo $therecord["content"]?></p></div>
                         <?php }//end while ?>
                 </div>
@@ -113 +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()
+                                                                )
+                                                        )
                                         )";
 
@@ -129 +138 @@
 
                                 $querystatement.="
-                                        assignedbyid = ".$this->userid."
+                                        (assignedbyid = ".$this->userid."
                                         AND (completed = 0
                                                 OR (completed = 1 AND completeddate >= CURDATE())
-                                        )";
+                                        ))";
 
                                 $title = "Delegations";
@@ -142 +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))
+                                                )
+                                        )
                                    )";
 
@@ -234 +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;