From: Vásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Date: Mon, 8 Oct 2018 14:42:09 +0000 (+0000)
Subject: git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube... 
X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=a7417d8467fac3e483ac7c992155b2ca2b1c7c9b;p=mediacube.git

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

diff --git a/client/Maestro/MaestroForm.Designer.cs b/client/Maestro/MaestroForm.Designer.cs
index b620c7a3..52bd64c4 100644
--- 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);
             this.metadataInfoBindingSource = new System.Windows.Forms.BindingSource(this.components);
             this.columnInputName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Progress = new Maestro.Commons.DataGridViewProgressColumn();
             this.columnLabel = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.columnID = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.columnStatus = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -734,6 +735,7 @@ namespace Maestro {
             this.dgJobs.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.columnInputName,
             this.columnLabel,
+            this.Progress,
             this.columnID,
             this.columnStatus,
             this.columnStarted,
@@ -867,6 +869,14 @@ namespace Maestro {
             this.columnLabel.Name = "columnLabel";
             this.columnLabel.Width = 63;
             // 
+            // Progress
+            // 
+            this.Progress.DataPropertyName = "Progress";
+            this.Progress.Frozen = true;
+            this.Progress.HeaderText = "";
+            this.Progress.MinimumWidth = 100;
+            this.Progress.Name = "Progress";
+            // 
             // columnID
             // 
             this.columnID.DataPropertyName = "ID";
@@ -1051,6 +1061,7 @@ namespace Maestro {
         private DataGridViewTextBoxColumn columnOutput;
         private DataGridViewTextBoxColumn columnKillDate;
         private DataGridViewTextBoxColumn columnMessage;
+        private Commons.DataGridViewProgressColumn Progress;
     }
 }
 
diff --git a/client/Maestro/Sources/FileSourceItem.cs b/client/Maestro/Sources/FileSourceItem.cs
index 94ac7fbe..5657f65b 100644
--- a/client/Maestro/Sources/FileSourceItem.cs
+++ b/client/Maestro/Sources/FileSourceItem.cs
@@ -69,7 +69,11 @@ namespace Maestro.Sources {
 
         public string FormattedSize {
             get {
-                return (FileInfo == null) ? String.Empty : GetSizeString(FileInfo.Length);
+                long length = 0;
+                try {
+                    length = FileInfo.Length;
+                } catch { }
+                return (FileInfo == null) ? String.Empty : GetSizeString(length);
             }
         }
 
diff --git a/client/MaestroShared/Targets/UNCTargetProcessor.cs b/client/MaestroShared/Targets/UNCTargetProcessor.cs
index d82893d5..fd0a4953 100644
--- a/client/MaestroShared/Targets/UNCTargetProcessor.cs
+++ b/client/MaestroShared/Targets/UNCTargetProcessor.cs
@@ -91,7 +91,7 @@ namespace MaestroShared.Targets {
                     ValidateTransfer();
                     //logger.Info("Spend (s):" + (DateTime.Now - started).TotalSeconds);
                     Status = READY;
-                    Message = SUCCESS + " " + SUCCESS + " " + SUCCESS + " " + SUCCESS + " " + SUCCESS;
+                    Message = SUCCESS;
                 }
                 if (Parameters.TargetConfig.DeleteAfterCopy)
                     DeleteAfterCopy();
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 0b9e38dc..b1178747 100644
--- 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
-footer=2016 © Copyright User Rendszerház Kft.
+version=2.4.2
+footer=2016-2018 © Copyright User Rendszerház Kft.
 
 login_info=Információ
 login_dialogtitle=Bejelentkezés
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 ee5fc66b..eff08056 100644
--- 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
 	public void afterCompose(@ContextParam(ContextType.VIEW) Component view) {
 		Selectors.wireComponents(view, this, false);
-		//		Calendar calendar = CalendarUtils.createZeroCalendar();
-		//		calendar.add(Calendar.DAY_OF_YEAR, -1);
-		//		setSelectedDate(calendar.getTime());
-		setSelectedDate(new Date());
+		Calendar calendar = CalendarUtils.createZeroCalendar();
+		calendar.add(Calendar.DAY_OF_YEAR, -1);
+		setSelectedDate(calendar.getTime());
+		//setSelectedDate(new Date());
 	}
 
 	private void clearChart(Charts charts) {