Changeset 8182 for trunk/MagicSoft

Timestamp:

10/31/06 18:22:33 (18 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• datacenter/db/builddatasets.php (added)
• datacenter/db/include.php (modified) (11 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2006/10/31 Daniela Dorner
+
+   * datacenter/db/menu.php
+     - added PrintStarRangeMenu (inputs to query range for the 
+       timestamp when Star has been done)
+     - changed PrintFailedMenu (ReturnCode and FailedCode were labeled
+       wrongly)
+
+   * datacenter/db/magicdefs.php
+     - added fRunTimeLimit 
+     - shortened alias of fSkyBrightnessMed
+
+   * datacenter/db/builddatasets.php
+     - added (website to build datasets)
+
+   * datacenter/db/include.php
+     - exchanged \" by ' 
+     - added function CheckBox2 for $_POST
+     - added argument $form to function PrintMagicTable ($form 
+       indicates if a second <form> and the according checkboxes and 
+       inputs for $_POST are needed)
+     - added checkboxes in function PrintMagicTable for 2 additional 
+       columns needed in builddatasets.php 
+
+   * datacenter/db/culminating.php, datacenter/db/datacheck.php,
+     datacenter/db/datasetinfo.php, datacenter/db/datasetinfo-aio.php,
+     datacenter/db/dbstatus.php, datacenter/db/findoffdata.php, 
+     datacenter/db/index.php, datacenter/db/opticaldata.php, 
+     datacenter/db/printtable.php, datacenter/db/querycal.php, 
+     datacenter/db/querymc.php, datacenter/db/queryrbk.php, 
+     datacenter/db/queryseq.php, datacenter/db/querystar.php,
+     datacenter/db/runinfo-aio.php, datacenter/db/runinfo.php, 
+     datacenter/db/sequinfo-aio.php, datacenter/db/sequinfo.php, 
+     datacenter/db/sources.php, datacenter/db/statusrps.php, 
+     datacenter/db/statussps.php, datacenter/db/statussbs.php:
+     - changed call of function PrintMagicTable according to changes
+       in include.php
+
+
 
  2006/10/31 Thomas Bretz

trunk/MagicSoft/Mars/datacenter/db/include.php

@@ -24 +24 @@
         $checked = "";
 
-    printf("    <input type=\"checkbox\" name=\"%s\" value=\"On\" %s>%s\n", $name, $checked, $text);
+    printf("    <input type='checkbox' name='%s' value='On' %s>%s\n", $name, $checked, $text);
     printf("<BR>");
 
-    printf(" <select name=\"%s\">\n", $var);
+    printf(" <select name='%s'>\n", $var);
 
     $status = array
@@ -40 +40 @@
     {
         if ($stat==$i)
-            printf("<option value=\"%d\" selected>%s</option>\n", $i, $status[$i]);
+            printf("<option value='%d' selected>%s</option>\n", $i, $status[$i]);
         else
-            printf("<option value=\"%d\">%s</option>\n", $i, $status[$i]);
+            printf("<option value='%d'>%s</option>\n", $i, $status[$i]);
     }
 
@@ -78 +78 @@
         $checked = "";
 
-    printf("    <input type=\"checkbox\" name=\"%s\" value=\"On\" %s>%s\n", $name, $checked, $text);
+    printf("    <input type='checkbox' name='%s' value='On' %s>%s\n", $name, $checked, $text);
     printf("<BR>");
 
-    printf(" <select name=\"%s\">\n", $var);
+    printf(" <select name='%s'>\n", $var);
 
     $status = array
@@ -98 +98 @@
     {
         if ($stat==$i)
-            printf("<option value=\"%d\" selected>%s</option>\n", $i, $status[$i]);
+            printf("<option value='%d' selected>%s</option>\n", $i, $status[$i]);
         else
-            printf("<option value=\"%d\">%s</option>\n", $i, $status[$i]);
+            printf("<option value='%d'>%s</option>\n", $i, $status[$i]);
     }
 
@@ -144 +144 @@
         $checked = "";
 
-    printf("    <input type=\"checkbox\" name=\"%s\" value=\"On\" %s><A HREF=\"printtable.php?fTable=%s\">%s</A>\n", $name, $checked, $table, $descr);
+    printf("    <input type='checkbox' name='%s' value='On' %s><A HREF='printtable.php?fTable=%s'>%s</A>\n", $name, $checked, $table, $descr);
 
     printf("   <BR>\n");
 
-    printf("   <select name=\"%s\" size=\"1\" class=\"Width\">\n", $index);
+    printf("   <select name='%s' size='1' class='Width'>\n", $index);
 
     if (empty($_GET[$index]) || $_GET[$index]==0)
-        printf("    <option value=\"0\" selected>--- ALL ---</option>\n");
-    else
-        printf("    <option value=\"0\">--- ALL ---</option>\n");
+        printf("    <option value='0' selected>--- ALL ---</option>\n");
+    else
+        printf("    <option value='0'>--- ALL ---</option>\n");
 
     if (!empty($_GET[$index]) && $_GET[$index]==-1)
-        printf("    <option value=\"-1\" selected>--- GROUP BY ---</option>\n");
-    else
-        printf("    <option value=\"-1\">--- GROUP BY ---</option>\n");
+        printf("    <option value='-1' selected>--- GROUP BY ---</option>\n");
+    else
+        printf("    <option value='-1'>--- GROUP BY ---</option>\n");
 
     while ($row = mysql_fetch_row($result))
     {
         if (!empty($_GET[$index]) && $_GET[$index]==$row[0])
-            printf("    <option value=\"%s\" selected>%s</option>\n", $row[0], $row[1]);
+            printf("    <option value='%s' selected>%s</option>\n", $row[0], $row[1]);
         else
-            printf("    <option value=\"%s\">%s</option>\n", $row[0], $row[1]);
+            printf("    <option value='%s'>%s</option>\n", $row[0], $row[1]);
     }
     printf("   </select>\n");
@@ -258 +258 @@
         $checked = "";
 
-    printf("    <td><input type=\"checkbox\" name=\"%s\" value=\"On\" %s>%s</td>\n", $value, $checked, $text);
+    printf("    <td><input type='checkbox' name='%s' value='On' %s>%s</td>\n", $value, $checked, $text);
+}
+
+function Checkbox2($val, $set, $text)
+{
+    $value=$val.$set;
+    switch ($set)
+    {
+    case  "ON":
+        if (!isset($_POST["submit"]) && ereg(" ".$val." ", $_GET["Set"]))
+            $_POST[$value]="On";
+        break;
+    case "Off":
+        if (!isset($_POST["submit"]) && ereg(" ".$val." ", $_GET["Set2"]))
+            $_POST[$value]="On";
+        break;
+    }
+
+    if ($_POST[$value]=="On")
+        $checked = "checked";
+    else
+        $checked = "";
+
+    printf("    <td><input type='checkbox' name='%s' value='On' %s>%s</td>\n", $value, $checked, $text);
 }
 
@@ -400 +423 @@
 }
 
-function PrintMagicTable($result0, $alias, $rightalign, $limitsmean, $limitsmin, $limitsmax, $_GET)
+function PrintMagicTable($result0, $alias, $rightalign, $limitsmean, $limitsmin, $limitsmax, $form, $_GET)
 {
     $col   = FALSE;
@@ -418 +441 @@
 
     printf("\n<center>\n");
+    if ($form)
+        printf("<form method='POST'>");
     if (empty($_GET["fPrintTable"]))
         printf("<p>%s<P>\n", $menu);
-    printf("<table BORDER=\"0\">\n");
+    printf("<table BORDER='0'>\n");
     while ($row0 = mysql_fetch_assoc($result0))
     {
@@ -427 +452 @@
             printf(" <tr BGCOLOR='#C0C0C0'>\n");
             $first = FALSE;
+            if ($form)
+                printf("<td>ON</td><td>Off</td>");
             foreach ($row0 as $key => $element)
             {
@@ -455 +482 @@
         $col = !$col;
 
+        if ($form)
+        {
+//            printf("<td>%s</td>",$row0["Sequ"]."ON");
+//            printf("<td>%s</td>",$row0["Sequ"]."Off");
+            CheckBox2($row0["Sequ"], "ON","");
+            CheckBox2($row0["Sequ"], "Off","");
+        }
         foreach ($row0 as $key => $element)
         {
             if (empty($rightalign[$key]))
-                printf("  <td align=\"left\">");
+                printf("  <td align='left'>");
             else
-                printf("  <td align=\"right\">");
+                printf("  <td align='right'>");
 
             //determine color of text in cell
@@ -551 +585 @@
         printf("%s\n", $menu);
     printf("<P>\n");
-    printf("</center>\n");
-    printf("</td>\n");
-    printf("</tr>\n");
+
+    if (!$form)
+    {
+        printf("</center>\n");
+        printf("</td>\n");
+        printf("</tr>\n");
+    }
 }