From 67689438db5a7b1f126c53e769edbfa7c5e7634b Mon Sep 17 00:00:00 2001 From: Marcin Haba Date: Sun, 13 Dec 2015 11:34:47 +0100 Subject: [PATCH] baculum: Add jobbytes and jobfiles columns in job list --- gui/baculum/protected/Class/Miscellaneous.php | 2 +- gui/baculum/protected/JavaScript/misc.js | 35 ++++++++++++++++++ .../protected/JavaScript/slide-window.js | 1 + gui/baculum/protected/Lang/en/messages.mo | Bin 26001 -> 26027 bytes gui/baculum/protected/Lang/en/messages.po | 3 ++ gui/baculum/protected/Lang/pl/messages.mo | Bin 28067 -> 28096 bytes gui/baculum/protected/Lang/pl/messages.po | 3 ++ gui/baculum/protected/Layouts/Main.tpl | 1 + gui/baculum/protected/Portlets/JobList.php | 7 ++++ gui/baculum/protected/Portlets/JobList.tpl | 8 +++- 10 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 gui/baculum/protected/JavaScript/misc.js diff --git a/gui/baculum/protected/Class/Miscellaneous.php b/gui/baculum/protected/Class/Miscellaneous.php index bb8a7170f6..58fd5d6a50 100644 --- a/gui/baculum/protected/Class/Miscellaneous.php +++ b/gui/baculum/protected/Class/Miscellaneous.php @@ -57,7 +57,7 @@ class Miscellaneous extends TModule { 'e' => array('value' => 'Non-fatal error', 'description' =>'Non-fatal error'), 'f' => array('value' => 'Fatal error', 'description' =>'Fatal error'), 'D' => array('value' => 'Verify Diff.', 'description' =>'Verify Differences'), - 'A' => array('value' => 'Canceled by user', 'description' =>'Canceled by the user'), + 'A' => array('value' => 'Canceled', 'description' =>'Canceled by the user'), 'I' => array('value' => 'Incomplete', 'description' =>'Incomplete Job'), 'F' => array('value' => 'Waiting on FD', 'description' =>'Waiting on the File daemon'), 'S' => array('value' => 'Waiting on SD', 'description' =>'Waiting on the Storage daemon'), diff --git a/gui/baculum/protected/JavaScript/misc.js b/gui/baculum/protected/JavaScript/misc.js new file mode 100644 index 0000000000..7cadf6faf7 --- /dev/null +++ b/gui/baculum/protected/JavaScript/misc.js @@ -0,0 +1,35 @@ +var Units = { + get_decimal_size: function(size) { + var size_unit = 'B'; + var units = ['K', 'M', 'G', 'T', 'P']; + var unit; + var dec_size = size.toString() + ((size > 0 ) ? size_unit : ''); + while(size > 1000) { + size /= 1000; + unit = units.shift(units); + } + if (unit) { + dec_size = size.toFixed(1) + unit + size_unit; + } + return dec_size; + } +} + +var Formatters = { + formatter: [ + {css_class: 'size', format_func: Units.get_decimal_size} + ], + set_formatters: function() { + var elements, formatter, txt; + for (var i = 0; i < this.formatter.length; i++) { + elements = document.getElementsByClassName(this.formatter[i].css_class); + formatter = this.formatter[i].format_func; + for (var i = 0; i < elements.length; i++) { + txt = elements[i].firstChild; + if (txt.nodeType === 3) { + txt.nodeValue = formatter(txt.nodeValue); + } + } + } + } +} diff --git a/gui/baculum/protected/JavaScript/slide-window.js b/gui/baculum/protected/JavaScript/slide-window.js index 5fe8041d3e..03ac2f7d0b 100644 --- a/gui/baculum/protected/JavaScript/slide-window.js +++ b/gui/baculum/protected/JavaScript/slide-window.js @@ -285,6 +285,7 @@ var SlideWindowClass = Class.create({ set_callback_parameter(tr); }.bind(this, tr)); }.bind(this)); + Formatters.set_formatters(); }, isConfigurationOpen: function() { diff --git a/gui/baculum/protected/Lang/en/messages.mo b/gui/baculum/protected/Lang/en/messages.mo index d36075ad158bded119dd0fa4be2eeb8a0f1b355f..6932c35a98845fbb382e407c6dabed0158993a9c 100644 GIT binary patch delta 6464 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 delta 6449 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 diff --git a/gui/baculum/protected/Lang/en/messages.po b/gui/baculum/protected/Lang/en/messages.po index 12f0a347f5..9ad4847bf2 100644 --- a/gui/baculum/protected/Lang/en/messages.po +++ b/gui/baculum/protected/Lang/en/messages.po @@ -1013,3 +1013,6 @@ msgstr "Add" msgid "Actions" msgstr "Actions" +msgid "Size" +msgstr "Size" + diff --git a/gui/baculum/protected/Lang/pl/messages.mo b/gui/baculum/protected/Lang/pl/messages.mo index 8d8211a1000066412d0404eff131330903b7c924..c80b8320a99a3260ed8066ca11bd3e0cabbd6a1a 100644 GIT binary patch delta 6463 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 Tg^s*?;f(1MXKgE+(9rIGKFQip delta 6423 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 /> /> /> + /> diff --git a/gui/baculum/protected/Portlets/JobList.php b/gui/baculum/protected/Portlets/JobList.php index 3e5e7994ac..93b85b1c58 100644 --- a/gui/baculum/protected/Portlets/JobList.php +++ b/gui/baculum/protected/Portlets/JobList.php @@ -137,5 +137,12 @@ class JobList extends Portlets implements ISlideWindow { } $this->CheckedValues->Value = ""; } + + public function formatJobName($name) { + if (strlen($name) > 25) { + $name = substr($name, 0, 10) . '...' . substr($name, -13); + } + return $name; + } } ?> diff --git a/gui/baculum/protected/Portlets/JobList.tpl b/gui/baculum/protected/Portlets/JobList.tpl index 9c181e4857..53c1fe5daa 100644 --- a/gui/baculum/protected/Portlets/JobList.tpl +++ b/gui/baculum/protected/Portlets/JobList.tpl @@ -35,7 +35,7 @@ /> -
<%=$this->getParent()->Data['name']%>
+
<%=$this->getPage()->JobWindow->formatJobName($this->getParent()->Data['name'])%>
 @@ -54,6 +54,12 @@
<%=isset($this->getPage()->JobWindow->jobStates[$this->getParent()->Data['jobstatus']]['value']) ? $this->getPage()->JobWindow->jobStates[$this->getParent()->Data['jobstatus']]['value'] : ''%>
+ + +
<%=$this->getParent()->Data['jobbytes']%>
+ + + <%=$this->getParent()->Data['endtime']%> -- 2.39.5