Index: trunk/ippMonitor/raw/dataquality.php =================================================================== --- trunk/ippMonitor/raw/dataquality.php (revision 42795) +++ trunk/ippMonitor/raw/dataquality.php (revision 42972) @@ -15,5 +15,5 @@ else {$myMenu = "ipp.czar.dat";} -menu($myMenu, 'Czartool on '.$lastUpdateTime, 'ipp.css', $ID['link'], $ID['proj']); +menu($myMenu, 'Czartool on', ' ipp.css', $ID['link'], $ID['proj']); $pass = $ID['pass']; @@ -22,5 +22,7 @@ // Fetch data based on range selection -$range = isset($_GET['range']) ? $_GET['range'] : 'yday'; +$range = isset($_GET['range']) ? $_GET['range'] : 'week'; + +require_once 'functions.php'; echo ""; @@ -28,495 +30,49 @@ echo " "; echo ""; echo "
"; echo "

Data Quality Report

"; -echo "
"; -echo ' Last night (default) | '; -echo ' Today (MJD '.getMJD().') | '; -echo ' Past 7 days | '; -echo ' Past 30 days | '; -echo ' Past 365 days | '; -echo ' All '; + +# +# project selector +echo '
'; +# Project selector with highlight +$projects = ["gpc1" => "GPC1", "gpc2" => "GPC2"]; +foreach ($projects as $key => $label) { + if ($proj == $key) { + echo "$label | "; + } else { + echo '' . $label . ' | '; + } +} +echo "
"; + +# range links with highlighting +$ranges = [ + "today" => "Today", + "yesterday" => "Yesterday", + "week" => "Week", + "month" => "Month", + "year" => "Year", + "all" => "All" +]; + +foreach ($ranges as $key => $label) { + if ($range == $key) { + echo "$label | "; + } else { + echo '' . $label . ' | '; + } +} + echo "
"; -echo getDataQuality($projectdb, $range); + +echo "
"; +echo " Current MJD: " . getMJD(); +echo "
"; + +echo getDataQuality($projectdb, $range, $proj); menu_end(); -///////////////////////////////////////////////////////////////////////////// -// // -// Functions // -// // -///////////////////////////////////////////////////////////////////////////// - -########################################################################### -# -# Get data quality -# -########################################################################### -function getDataQuality($db, $range = 'yday') { - // Start timer - $start = microtime(true); - - $mjdDay = getMJD(); - $mjdDay_yearback = $mjdDay - 366; - $mjdDay_monthback = $mjdDay - 32; - $min_exp_id = 0; - - // Determine the reference exp_name based on the selected range - switch ($range) { - case 'year': - $expname = "o" . $mjdDay_yearback . "%"; - break; - case 'month': - $expname = "o" . $mjdDay_monthback . "%"; - break; - case 'week': - $expname = "o" . ($mjdDay - 7) . "%"; - break; - case 'day': - $expname = "o" . $mjdDay . "%"; - break; - default: - $expname = "o" . ($mjdDay - 1) . "%"; // Default: last night - break; - } - - // Query to get the minimum exp_id - $expIdQuery = "SELECT MIN(exp_id) AS min_exp_id FROM rawExp WHERE rawExp.exp_name LIKE '$expname'"; - $result = $db->query($expIdQuery); - - if (DB::isError($result)) { - die("Database error: " . $result->getMessage()); - } - - $row = $result->fetchRow(DB_FETCHMODE_ASSOC); - - if (!empty($row['min_exp_id'])) { - $min_exp_id = $row['min_exp_id']; - // echo "Minimum exp_id: " . $min_exp_id; - } else { - echo "No results found."; - } - - //echo "

"; - - // Determine the date constraint based on the range - switch ($range) { - case 'year': - $dateConstraint = "dateobs >= NOW() - INTERVAL 365 DAY AND rawExp.exp_id >= $min_exp_id"; - break; - case 'month': - $dateConstraint = "dateobs >= NOW() - INTERVAL 30 DAY AND rawExp.exp_id >= $min_exp_id"; - break; - case 'week': - $expnames = array(); - for ($i = 0; $i < 7; $i++) { - $expnames[] = "rawExp.exp_name LIKE 'o" . ($mjdDay - $i) . "%'"; - } - $dateConstraint = "(" . implode(" OR ", $expnames) . ") AND rawExp.exp_id >= $min_exp_id"; - break; - case 'yday': - $dateConstraint = "rawExp.exp_name LIKE 'o" . ($mjdDay - 1) . "%' AND rawExp.exp_id >= $min_exp_id"; - break; - case 'day': - $dateConstraint = "rawExp.exp_name LIKE 'o$mjdDay%' AND rawExp.exp_id >= $min_exp_id"; - break; - case 'all': - $dateConstraint = "rawExp.exp_id >= 0"; - break; - default: // Default to last night - $dateConstraint = "rawExp.exp_name LIKE 'o" . ($mjdDay - 1) . "%' AND rawExp.exp_id >= $min_exp_id"; - break; - } - - // Updated SQL query - $sql = "select * from (SELECT SUBTIME(dateobs, '10:00:00') AS time, - round(( 367*YEAR(dateobs)- FLOOR((7 * (YEAR(dateobs) + FLOOR((MONTH(dateobs) + 9) / 12))) / 4) + FLOOR(275 * MONTH(dateobs) / 9) - + DAY(dateobs) + 1721013.5 + (HOUR(dateobs) / 24.0) + (MINUTE(dateobs) / 1440.0) + (SECOND(dateobs) / 86400.0) - 2400000.5), 5) AS MJD, - filter, comment, ra*180/pi() as RA, decl*180/pi() as DECL, exp_name, alt, az, fwhm_major, fwhm_minor, zpt_obs, zpt_stdev, rawExp.exp_id, camRun.label - FROM rawExp - JOIN chipRun USING (exp_id) - JOIN camRun USING (chip_id) - JOIN camProcessedExp USING (cam_id) - WHERE $dateConstraint - AND exp_type = 'OBJECT' - AND camRun.state LIKE 'full' - AND camProcessedExp.fault = 0 - AND camProcessedExp.zpt_obs != 0 ORDER BY RAND() limit 5000) as sub order by time;"; - - $DQarray = array(); - $qry = $db->query($sql); - if (dberror($qry)) { - echo "Error with $sql
\n"; - return; - } - // echo "$sql

\n"; - - while ($qry->fetchInto($row)) { - $DQarray[] = $row; - } - - // Ensure $DQarray is not empty - if (empty($DQarray)) { - echo "
No data for MJD: $mjdDay
"; - return; // Stop execution if no data to encode - } - - // Convert data array to JSON for easier handling in JavaScript - $dataJson = json_encode($DQarray); - - if ($dataJson === false) { - echo "Error encoding JSON: " . json_last_error_msg(); // Display any JSON encoding errors - return; // Stop execution if JSON encoding fails - } - - echo ""; // Log JSON output to console for debugging -echo << - - - - - -
-
-
-
- -
-
-
-
- -
-
-
-
- -HTML; - // End timer - $total_time = round(microtime(true) - $start, 3); - echo "
loading plot in $total_time seconds
"; - -} - - - ?>