From patchwork Sun Jul 24 23:03:14 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael-Doyle Hudson X-Patchwork-Id: 3061 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 7BE6B241E0 for ; Sun, 24 Jul 2011 23:03:19 +0000 (UTC) Received: from mail-qw0-f52.google.com (mail-qw0-f52.google.com [209.85.216.52]) by fiordland.canonical.com (Postfix) with ESMTP id 2787FA18565 for ; Sun, 24 Jul 2011 23:03:19 +0000 (UTC) Received: by qwb8 with SMTP id 8so2682690qwb.11 for ; Sun, 24 Jul 2011 16:03:18 -0700 (PDT) Received: by 10.229.68.200 with SMTP id w8mr3183448qci.114.1311548597174; Sun, 24 Jul 2011 16:03:17 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.229.217.78 with SMTP id hl14cs62257qcb; Sun, 24 Jul 2011 16:03:16 -0700 (PDT) Received: by 10.227.137.14 with SMTP id u14mr3222336wbt.31.1311548595360; Sun, 24 Jul 2011 16:03:15 -0700 (PDT) Received: from adelie.canonical.com (adelie.canonical.com [91.189.90.139]) by mx.google.com with ESMTP id m11si3424731wbh.51.2011.07.24.16.03.14; Sun, 24 Jul 2011 16:03:15 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.139 as permitted sender) client-ip=91.189.90.139; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.139 as permitted sender) smtp.mail=bounces@canonical.com Received: from loganberry.canonical.com ([91.189.90.37]) by adelie.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1Ql7ha-0008Do-Mh for ; Sun, 24 Jul 2011 23:03:14 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id A45572E84F6 for ; Sun, 24 Jul 2011 23:03:14 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: lava-scheduler X-Launchpad-Branch: ~linaro-validation/lava-scheduler/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 41 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-scheduler/trunk] Rev 41: a simple job view Message-Id: <20110724230314.29297.62447.launchpad@loganberry.canonical.com> Date: Sun, 24 Jul 2011 23:03:14 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="13483"; Instance="initZopeless config overlay" X-Launchpad-Hash: fe7d0b0cb822278d068742c28c193cb2f032c99d Merge authors: Michael Hudson-Doyle (mwhudson) ------------------------------------------------------------ revno: 41 [merge] committer: Michael-Doyle Hudson branch nick: trunk timestamp: Mon 2011-07-25 11:01:00 +1200 message: a simple job view added: lava_scheduler_app/templates/lava_scheduler_app/job.html modified: lava_scheduler_app/templates/lava_scheduler_app/alljobs.html lava_scheduler_app/templates/lava_scheduler_app/index.html lava_scheduler_app/urls.py lava_scheduler_app/views.py --- lp:lava-scheduler https://code.launchpad.net/~linaro-validation/lava-scheduler/trunk You are subscribed to branch lp:lava-scheduler. To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-scheduler/trunk/+edit-subscription === modified file 'lava_scheduler_app/templates/lava_scheduler_app/alljobs.html' --- lava_scheduler_app/templates/lava_scheduler_app/alljobs.html 2011-07-20 03:17:42 +0000 +++ lava_scheduler_app/templates/lava_scheduler_app/alljobs.html 2011-07-24 22:10:38 +0000 @@ -22,7 +22,7 @@ {% for job in jobs %} - {{ job.id }} + {{ job.id }} {{ job.get_status_display }} {{ job.target }} {{ job.submitter }} @@ -36,8 +36,11 @@ $(document).ready( function() { $("table.data").dataTable({ - "bJQueryUI": true - }) + "bJQueryUI": true, + "aoColumnDefs": [ + { "sType": "numeric", "aTargets": [ "id" ] } + ] + }); } ); === modified file 'lava_scheduler_app/templates/lava_scheduler_app/index.html' --- lava_scheduler_app/templates/lava_scheduler_app/index.html 2011-07-20 03:16:25 +0000 +++ lava_scheduler_app/templates/lava_scheduler_app/index.html 2011-07-24 21:58:58 +0000 @@ -27,7 +27,7 @@ - + @@ -37,7 +37,7 @@ {% for job in jobs %} - + @@ -53,8 +53,11 @@ $(document).ready( function() { $("table.data").dataTable({ - "bJQueryUI": true - }) + "bJQueryUI": true, + "aoColumnDefs": [ + { "sType": "numeric", "aTargets": [ "id" ] } + ] + }); } ); === added file 'lava_scheduler_app/templates/lava_scheduler_app/job.html' --- lava_scheduler_app/templates/lava_scheduler_app/job.html 1970-01-01 00:00:00 +0000 +++ lava_scheduler_app/templates/lava_scheduler_app/job.html 2011-07-24 22:53:00 +0000 @@ -0,0 +1,69 @@ +{% extends "lava_scheduler_app/_content.html" %} + +{% block extrahead %} +{{ block.super }} + +{% endblock %} + +{% block content %} +

Job {{ job.pk }}

+ +
+
+
Submitted by:
+
{{ job.submitter }}
+ +
Targeted to:
+
{{ job.target }}
+ +
Requested type:
+
{{ job.device_type }}
+
+ +
+
Status:
+
{{ job.get_status_display }}
+
+ +
+
Submitted at:
+
{{ job.submit_time }}
+ +
Started at:
+
{{ job.start_time|default:"not started" }}
+ +
Finished at:
+
{{ job.end_time|default:"not finished" }}
+
+
+
+ +
+ +
+ 
+{{ job.definition }}
+
+
+ +
+ + + +{% endblock %} === modified file 'lava_scheduler_app/urls.py' --- lava_scheduler_app/urls.py 2011-07-20 02:53:04 +0000 +++ lava_scheduler_app/urls.py 2011-07-21 03:53:15 +0000 @@ -4,4 +4,5 @@ 'lava_scheduler_app.views', url(r'^$', 'index'), url(r'^alljobs$', 'alljobs'), + url(r'^job/(?P[0-9]+)$', 'job'), ) === modified file 'lava_scheduler_app/views.py' --- lava_scheduler_app/views.py 2011-07-12 02:12:28 +0000 +++ lava_scheduler_app/views.py 2011-07-21 03:53:15 +0000 @@ -21,3 +21,12 @@ 'jobs': TestJob.objects.all(), }, RequestContext(request)) + + +def job(request, pk): + return render_to_response( + "lava_scheduler_app/job.html", + { + 'job': TestJob.objects.get(pk=pk), + }, + RequestContext(request))
IDID Status Target Submitter
{{ job.id }}{{ job.id }} {{ job.get_status_display }} {{ job.target }} {{ job.submitter }}