git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...

diff --git a/client/Maestro/MaestroForm.Designer.cs b/client/Maestro/MaestroForm.Designer.cs
index b620c7a358562294b4f0f074d846df4cae071cc3..52bd64c4b6e7294e57fad0757eb5bcb7896177bd 100644 (file)
--- a/client/Maestro/MaestroForm.Designer.cs
+++ b/client/Maestro/MaestroForm.Designer.cs
@@ -86,6 +86,7 @@ namespace Maestro {
             this.systemMessageBindingSource = new System.Windows.Forms.BindingSource(this.components);\r
             this.metadataInfoBindingSource = new System.Windows.Forms.BindingSource(this.components);\r
             this.columnInputName = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
+            this.Progress = new Maestro.Commons.DataGridViewProgressColumn();\r
             this.columnLabel = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
             this.columnID = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
             this.columnStatus = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
@@ -734,6 +735,7 @@ namespace Maestro {
             this.dgJobs.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {\r
             this.columnInputName,\r
             this.columnLabel,\r
+            this.Progress,\r
             this.columnID,\r
             this.columnStatus,\r
             this.columnStarted,\r
@@ -867,6 +869,14 @@ namespace Maestro {
             this.columnLabel.Name = "columnLabel";\r
             this.columnLabel.Width = 63;\r
             // \r
+            // Progress\r
+            // \r
+            this.Progress.DataPropertyName = "Progress";\r
+            this.Progress.Frozen = true;\r
+            this.Progress.HeaderText = "";\r
+            this.Progress.MinimumWidth = 100;\r
+            this.Progress.Name = "Progress";\r
+            // \r
             // columnID\r
             // \r
             this.columnID.DataPropertyName = "ID";\r
@@ -1051,6 +1061,7 @@ namespace Maestro {
         private DataGridViewTextBoxColumn columnOutput;\r
         private DataGridViewTextBoxColumn columnKillDate;\r
         private DataGridViewTextBoxColumn columnMessage;\r
+        private Commons.DataGridViewProgressColumn Progress;\r
     }\r
 }\r
 \r

diff --git a/client/Maestro/Sources/FileSourceItem.cs b/client/Maestro/Sources/FileSourceItem.cs
index 94ac7fbef4f1210e4a4c65125cd388f7abaab105..5657f65b54809ad3df7769a898ed500baf1b7375 100644 (file)
--- a/client/Maestro/Sources/FileSourceItem.cs
+++ b/client/Maestro/Sources/FileSourceItem.cs
@@ -69,7 +69,11 @@ namespace Maestro.Sources {
 \r
         public string FormattedSize {\r
             get {\r
-                return (FileInfo == null) ? String.Empty : GetSizeString(FileInfo.Length);\r
+                long length = 0;\r
+                try {\r
+                    length = FileInfo.Length;\r
+                } catch { }\r
+                return (FileInfo == null) ? String.Empty : GetSizeString(length);\r
             }\r
         }\r
 \r

diff --git a/client/MaestroShared/Targets/UNCTargetProcessor.cs b/client/MaestroShared/Targets/UNCTargetProcessor.cs
index d82893d566943635e18d2b711d9aecd29a8d4305..fd0a49533592f62e77ec4f6e7d5235b193bd553f 100644 (file)
--- a/client/MaestroShared/Targets/UNCTargetProcessor.cs
+++ b/client/MaestroShared/Targets/UNCTargetProcessor.cs
@@ -91,7 +91,7 @@ namespace MaestroShared.Targets {
                     ValidateTransfer();\r
                     //logger.Info("Spend (s):" + (DateTime.Now - started).TotalSeconds);\r
                     Status = READY;\r
-                    Message = SUCCESS + " " + SUCCESS + " " + SUCCESS + " " + SUCCESS + " " + SUCCESS;\r
+                    Message = SUCCESS;\r
                 }\r
                 if (Parameters.TargetConfig.DeleteAfterCopy)\r
                     DeleteAfterCopy();\r

diff --git a/server/user.jobengine.osgi.server/resources/i3-label_hu.properties b/server/user.jobengine.osgi.server/resources/i3-label_hu.properties
index 0b9e38dcb6dfe96431171e5a5ffc3fe183eed687..b11787472322bdf19392a87211c4465c538b0256 100644 (file)
--- a/server/user.jobengine.osgi.server/resources/i3-label_hu.properties
+++ b/server/user.jobengine.osgi.server/resources/i3-label_hu.properties
@@ -1,5 +1,5 @@
-version=2.4.1\r
-footer=2016 © Copyright User Rendszerház Kft.\r
+version=2.4.2\r
+footer=2016-2018 © Copyright User Rendszerház Kft.\r
 \r
 login_info=Információ\r
 login_dialogtitle=Bejelentkezés\r

diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/NewsHistoryModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/NewsHistoryModel.java
index ee5fc66bf281f2bc0db60b77a1efd9b8a0b6975c..eff080562154dd56155093d3ee82db8c842b7b30 100644 (file)
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/NewsHistoryModel.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/NewsHistoryModel.java
@@ -57,10 +57,10 @@ public class NewsHistoryModel {
        @AfterCompose\r
        public void afterCompose(@ContextParam(ContextType.VIEW) Component view) {\r
                Selectors.wireComponents(view, this, false);\r
-               //              Calendar calendar = CalendarUtils.createZeroCalendar();\r
-               //              calendar.add(Calendar.DAY_OF_YEAR, -1);\r
-               //              setSelectedDate(calendar.getTime());\r
-               setSelectedDate(new Date());\r
+               Calendar calendar = CalendarUtils.createZeroCalendar();\r
+               calendar.add(Calendar.DAY_OF_YEAR, -1);\r
+               setSelectedDate(calendar.getTime());\r
+               //setSelectedDate(new Date());\r
        }\r
 \r
        private void clearChart(Charts charts) {\r