[title] Add "ERROR_CODE" in jobs page

diff --git a/dibs-web/app/controllers/jobs_controller.rb b/dibs-web/app/controllers/jobs_controller.rb
index 0524f58fc77905e93b3e15dbfd2991e85309cd2d..03dfdadc01a9ae55feec0cd5eb76fa2c5aff2875 100644 (file)
--- a/dibs-web/app/controllers/jobs_controller.rb
+++ b/dibs-web/app/controllers/jobs_controller.rb
@@ -140,6 +140,7 @@ class JobsController < ApplicationController
                                                                doc.UserName(job.user_name)
                                                                doc.StartTime(job.start_time)
                                                                doc.EndTime(job.end_time)
+                                                               doc.ErrorCode(job.error_code)
 
                                                                project_list = get_child_job_project_name(job.job_id)
                                                                doc.ProjectList(project_list)
@@ -231,6 +232,7 @@ class JobsController < ApplicationController
                                        doc.UserName(job.user_name)
                                        doc.StartTime(job.start_time)
                                        doc.EndTime(job.end_time)
+                                       doc.ErrorCode(job.error_code)
 
                                        project_list = get_child_job_project_name(job.job_id)
                                        doc.ProjectList(project_list)
@@ -307,6 +309,7 @@ class JobsController < ApplicationController
                                                doc.UserName(job.user_name)
                                                doc.StartTime(job.start_time)
                                                doc.EndTime(job.end_time)
+                                               doc.ErrorCode(job.error_code)
 
                                                project_list = get_child_job_project_name(job.job_id)
                                                doc.ProjectList(project_list)
@@ -388,6 +391,7 @@ class JobsController < ApplicationController
                                                doc.UserName(job.user_name)
                                                doc.StartTime(job.start_time)
                                                doc.EndTime(job.end_time)
+                                               doc.ErrorCode(job.error_code)
 
                                                project_list = get_child_job_project_name(job.job_id)
                                                doc.ProjectList(project_list)
@@ -402,6 +406,7 @@ class JobsController < ApplicationController
                                                                         , jobs.jtype AS job_type
                                                                         , jobs.status AS status
                                                                         , jobs.parent_job_id AS parent_job_id
+                                                                        , jobs.error_code AS error_code
                                                                         , DATE_FORMAT(jobs.start_time, '%Y-%m-%d %H:%i:%s') AS start_time
                                                                         , DATE_FORMAT(jobs.end_time, '%Y-%m-%d %H:%i:%s') AS end_time
                                                                         , CASE WHEN jobs.jtype like \"MULTI%\" THEN \"MULTI\"
@@ -442,6 +447,7 @@ class JobsController < ApplicationController
                                                                         , jobs.jtype AS job_type
                                                                         , jobs.status AS status
                                                                         , jobs.parent_job_id AS parent_job_id
+                                                                        , jobs.error_code AS error_code
                                                                         , DATE_FORMAT(jobs.start_time, '%Y-%m-%d %H:%i:%s') AS start_time
                                                                         , DATE_FORMAT(jobs.end_time, '%Y-%m-%d %H:%i:%s') AS end_time
                                                                     , projects.name AS project_name
@@ -513,6 +519,7 @@ class JobsController < ApplicationController
                                        doc.UserName(job.user_name)
                                        doc.StartTime(job.start_time)
                                        doc.EndTime(job.end_time)
+                                       doc.ErrorCode(job.error_code)
 
                                        project_list = get_child_job_project_name(job.job_id)
                                        doc.ProjectList(project_list)

diff --git a/dibs-web/app/models/job.rb b/dibs-web/app/models/job.rb
index 3c1599427d327dd525d9646490842c3262741881..c48ed96b0ed9e1b633022c9fd80ab931912687b3 100644 (file)
--- a/dibs-web/app/models/job.rb
+++ b/dibs-web/app/models/job.rb
@@ -1,3 +1,3 @@
 class Job < ActiveRecord::Base
-  attr_accessible :distribution_id, :id, :supported_os_id, :project_id, :status, :user_id, :remote_build_server_id, :parent_job_id, :source_id, :jtype, :start_time, :end_time
+  attr_accessible :distribution_id, :id, :supported_os_id, :project_id, :status, :user_id, :remote_build_server_id, :parent_job_id, :source_id, :jtype, :start_time, :end_time, :error_code
 end

diff --git a/dibs-web/public/javascripts/jobs.js b/dibs-web/public/javascripts/jobs.js
index c3005ab3a1c55c20fbe84328b36b455da2a5ff57..dd6ca35975f7007a71ecda768aa38fcf2692bb1e 100644 (file)
--- a/dibs-web/public/javascripts/jobs.js
+++ b/dibs-web/public/javascripts/jobs.js
@@ -426,6 +426,7 @@ function jobUpdateList(condition, param, distribution, selectedStatus) {
                        var job_id = $(this).find("Id").text();
                        var parent_job_id = $(this).find("ParentJobId").text();
                        var job_status = $(this).find("Status").text();
+                       var job_error_code = $(this).find("ErrorCode").text();
                        var start_time = $(this).find("StartTime").text();
                        var end_time = $(this).find("EndTime").text();
                        var font_color = "black";
@@ -433,6 +434,9 @@ function jobUpdateList(condition, param, distribution, selectedStatus) {
                        switch(job_status)
                        {
                                case "ERROR" :
+                                       if(job_error_code != "") {
+                                               job_status = job_error_code;
+                                       }
                                case "CANCELED" :
                                        font_color = "red";
                                        break;
@@ -601,6 +605,7 @@ function generateHtmlJobList(xml) {
        var jobAttribute = xml.find("JobAttribute").text();
        var os = xml.find("Os").text();
        var jobStatus = xml.find("Status").text();
+       var jobErrorCode = xml.find("ErrorCode").text();
        var userName = xml.find("UserName").text();
        var startTime = xml.find("StartTime").text();
        var endTime = xml.find("EndTime").text();
@@ -611,6 +616,11 @@ function generateHtmlJobList(xml) {
        switch(jobStatus)
        {
                case "ERROR" :
+                       if(jobErrorCode != "") {
+                               jobStatus = jobErrorCode;
+                       }
+                       console.log(id);
+                       console.log(jobErrorCode);
                case "CANCELED" :
                        font_color = "red";
                        break;