From 2481f29a0f558f2d1b0140b9ab34615d96a4f222 Mon Sep 17 00:00:00 2001 From: "jose.lausuch" Date: Thu, 1 Sep 2016 10:44:01 +0200 Subject: Remove first prototype of the Pharos Dashboard The Dashboard implementation from Max is im progress and more advanced than the initial one. It doesn't make sense to maintain both of them. Change-Id: Iabea63a7e5b6e8d64cb72b8de2264c5c4484eae8 Signed-off-by: jose.lausuch --- infra-dashboard/pages/ci_pods.php | 91 ---------- infra-dashboard/pages/dev_pods.php | 342 ------------------------------------- infra-dashboard/pages/slaves.php | 58 ------- 3 files changed, 491 deletions(-) delete mode 100644 infra-dashboard/pages/ci_pods.php delete mode 100644 infra-dashboard/pages/dev_pods.php delete mode 100644 infra-dashboard/pages/slaves.php (limited to 'infra-dashboard/pages') diff --git a/infra-dashboard/pages/ci_pods.php b/infra-dashboard/pages/ci_pods.php deleted file mode 100644 index 5f51530..0000000 --- a/infra-dashboard/pages/ci_pods.php +++ /dev/null @@ -1,91 +0,0 @@ - - -'; - echo ""; - echo ""; - echo "Name"; - echo "Slave Name"; - echo "Status"; - echo "Installer"; - echo "Scenario"; - echo "Branch"; - echo "Job"; - echo ""; - echo ""; - echo ""; - - while ($row = mysql_fetch_array($result)) { - $slave = $row{'slavename'}; - if (! isCiPod($slave)) continue; - - $slave_url = getSlaveUrl($slave); - $status = getSlaveStatus($slave); - - $job_name = ""; - $job_installer = ""; - $job_branch = ""; - $job_url = ""; - $job_scenario = ""; - $job_type = ""; - - if ($status == 'online'){ - $job_params = getJJob($slave); - $job_name = $job_params['name']; - $job_installer = $job_params['installer']; - $job_branch = $job_params['branch']; - $job_url = $job_params['url']."lastBuild/consoleFull"; - $job_scenario = $job_params['scenario']; - $job_type = $job_params['type']; - } - - echo ""; - echo "".$row{'name'}.""; - echo "".$slave.""; - if ($status == "online") $color = "#BEFAAA"; - else $color = "#FAAAAB"; - echo "".$status.""; - if ($job_type == "0") $class = "blink_me"; - else $class=""; - echo "".$job_installer.""; - echo "".$job_scenario.""; - echo "".$job_branch.""; - $green = '#33cc00'; - $grey = '#646F73'; - $red = '#FF5555'; - $orange = '#EDD62B'; - if ($job_type == "0") { // job running - echo "".$job_name.""; - } - else if ($job_type == "1") {// last job successful - echo "".$job_name.""; - } - else if ($job_type == "2") {// last job failed - echo "".$job_name.""; - } - else if ($job_type == "3") {// last job is unstable - echo "".$job_name.""; - } - else { - echo "".$job_name.""; - } - echo ""; - } - echo ''; - echo ''; - - -?> diff --git a/infra-dashboard/pages/dev_pods.php b/infra-dashboard/pages/dev_pods.php deleted file mode 100644 index 144504b..0000000 --- a/infra-dashboard/pages/dev_pods.php +++ /dev/null @@ -1,342 +0,0 @@ - - - - - - - - b.starttime AND now() <= b.endtime ON r.resource_id = p.resource_id;"; - $result = mysql_query($q); - - //SELECT r.name as resname,r.slavename, r.link, r.resource_id,u.user_id,u.name as username,u.email,b.starttime,b.endtime,b.purpose from resource r LEFT JOIN pod p LEFT JOIN booking b INNER JOIN user u ON u.user_id = b.user_id ON b.resource_id = p.resource_id AND now() > b.starttime AND now() <= b.endtime ON r.resource_id = p.resource_id WHERE type_id=2; - closeDB(); - - echo ''; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - - while ($row = mysql_fetch_array($result)) { - $slave = $row{'slavename'}; - if (! isDevPod($slave)) continue; - - $slave_url = getSlaveUrl($slave); - $status = getSlaveStatus($slave); - echo ""; - echo ""; - echo ""; - if ($row{'username'} != "") $booker = $row{'username'}; - else $booker="-"; - echo ""; - - if ($row{'endtime'} != "") { - $until = strtotime($row{'endtime'}); - echo ""; - //$until = $row{'endtime'}; - } else { - $until="-"; - echo ""; - } - if ($row{'purpose'} != "") $purpose = $row{'purpose'}; - else $purpose="-"; - echo ""; - $active = 'true'; - if ($status == "online") $color = "#BEFAAA"; - else $color = "#FAAAAB"; - echo ""; - - echo ""; - echo ""; - } - echo ''; - echo '
NameSlave NameBooked byBooked untilPurposeStatus
".$row{'resname'}."".$slave."".$booker."".date('d/M/Y', $until)."".$until."".$purpose."".$status."
'; -?> - - -
-
-
- -
-
- - -
- - - - - - - - - - - - - - - - - -
Booked by:

Start:

End:

Purpose:

- - - - - - - - - - - - - diff --git a/infra-dashboard/pages/slaves.php b/infra-dashboard/pages/slaves.php deleted file mode 100644 index 25fafd2..0000000 --- a/infra-dashboard/pages/slaves.php +++ /dev/null @@ -1,58 +0,0 @@ - - -xpath('computer'); - - echo '
'; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - foreach ($array as &$value) { - - $slave = $value->displayName; - $idle = $value->idle; - $slave_url = getSlaveUrl($slave); - $status = getSlaveStatus($slave); - - if ($status == "online" and $idle == "true") { - $status = "online / idle"; - $color = "#C8D6C3"; - } - else if ($status == "online") $color = "#BEFAAA"; - else $color = "#FAAAAB"; - - $job_name = ""; - $job_url = ""; - $job_scenario = ""; - - - if ($status == 'online') { - $job_params = getJJob($slave); - $job_name = $job_params['name']; - $job_url = $job_params['url']; - $job_scenario = $job_params['scenario']; - } - - echo ""; - echo ""; - - echo ""; - echo ""; - - echo ""; - } - echo ''; - echo '
Slave nameStatusCurrent build
".$slave."".$status."".$job_name."
'; -?> -- cgit 1.2.3-korg