From b6442abf65901b562375a0b628a06fe1539346b4 Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?=
 <daniel.vasary@userrendszerhaz.hu>
Date: Thu, 12 Oct 2017 10:35:10 +0000
Subject: [PATCH] git-tfs-id:
 [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C30602

---
 .../Resources/configuration-ingest.json       |   2 +-
 client/Maestro/Targets/UNCTargetProcessor.cs  |   3 +-
 .../pages/joblist.zul                         |  12 +-
 .../pages/search_items.zul                    | 137 +++++++-----------
 4 files changed, 65 insertions(+), 89 deletions(-)

diff --git a/client/Maestro/Resources/configuration-ingest.json b/client/Maestro/Resources/configuration-ingest.json
index dd21b53e..a8be4c5c 100644
--- a/client/Maestro/Resources/configuration-ingest.json
+++ b/client/Maestro/Resources/configuration-ingest.json
@@ -54,7 +54,7 @@
       "killDateDays": 7,
       "useMetadata": false,
       "remote": {
-        "address": "file://10.10.1.100/BRAAVOS/ARCHIVE",
+        "address": "file://10.10.1.100/BRAAVOS/OCTOPUS",
         "userName": "mediacube",
         "password": "Broadca5T"
       }
diff --git a/client/Maestro/Targets/UNCTargetProcessor.cs b/client/Maestro/Targets/UNCTargetProcessor.cs
index 3518df12..9a1a3051 100644
--- a/client/Maestro/Targets/UNCTargetProcessor.cs
+++ b/client/Maestro/Targets/UNCTargetProcessor.cs
@@ -158,7 +158,8 @@ namespace Maestro.Targets {
         }
 
         private CopyProgressResult CopyProgressHandler(long total, long transferred, long streamSize, long StreamByteTrans, uint dwStreamNumber, CopyProgressCallbackReason reason, IntPtr hSourceFile, IntPtr hDestinationFile, IntPtr lpData) {
-            Progress = (int)((double)total / transferred * 100);
+            if (transferred > 0)    
+                Progress = (int)((double) transferred * 100 / total );
             return CopyProgressResult.PROGRESS_CONTINUE;
         }
 
diff --git a/server/user.jobengine.osgi.server/pages/joblist.zul b/server/user.jobengine.osgi.server/pages/joblist.zul
index 5bc1481a..5349123c 100644
--- a/server/user.jobengine.osgi.server/pages/joblist.zul
+++ b/server/user.jobengine.osgi.server/pages/joblist.zul
@@ -36,11 +36,12 @@
 				<listbox id="lbJobList" model="@load(jlm.jobList)" multiple="true" autopaging="true" mold="default" vflex="true" checkmark="true" 
 					onSelect="@command('selectJob')" style="border: none; background: #e3e3e3 !important;" oddRowSclass="listbox-odd-style" sclass="listbox-normal-style" >
 				       <listhead>
-				       	<listheader label="Id" width="70px" sort="auto(id)" align="left"/>
-				       	<listheader label="Name" width="auto(progress)" sort="auto(name)" align="left"/>
-				       	<listheader label="Priority" width="70px" sort="auto(priority)" align="left"/>
-				       	<listheader label="Status" width="120px" sort="auto(status)" align="left"/>
-				       	<listheader label="Progress" sort="120px" align="left"/>
+				       	<listheader label="Id" hflex="min" align="left"/>
+				       	<listheader label="Name" hflex="min" align="left"/>
+				       	<listheader label="Priority" hflex="min" sort="auto(priority)" align="left"/>
+				       	<listheader label="Status" hflex="min" sort="auto(status)" align="left"/>
+				       	<listheader label="Progress" width="200px" align="left"/>
+				       	<listheader label="Message" align="left"/>
 				       </listhead>
 				       
 				       <template name="model">
@@ -52,6 +53,7 @@
 				           		<listcell>
 				           			<progressmeter ca:data-animationspeed="-1" value="@load(each.progress)" width="100%" />
 				           		</listcell>
+				           		<listcell label="@load(each.description)"/>
 				           </listitem>
 				       </template>
 				</listbox>
diff --git a/server/user.jobengine.osgi.server/pages/search_items.zul b/server/user.jobengine.osgi.server/pages/search_items.zul
index fdd004cf..63dd7158 100644
--- a/server/user.jobengine.osgi.server/pages/search_items.zul
+++ b/server/user.jobengine.osgi.server/pages/search_items.zul
@@ -23,8 +23,8 @@
 
 					<groupbox vflex="true" closable="false">
 						<caption sclass="boldfont" label="Gyűjtők" />
-						<listbox id="itemResults" sizedByContent="false" span="true" model="@load(svm.searchResult)" multiple="false" autopaging="true" mold="paging" vflex="true"
-							selectedItem="@bind(svm.selectedItem)" style="border: none; background: #e3e3e3 !important;" oddRowSclass="listbox-odd-style"
+						<listbox id="itemResults" sizedByContent="false" span="true" model="@load(svm.searchResult)" multiple="false" autopaging="true"
+							mold="paging" vflex="true" selectedItem="@bind(svm.selectedItem)" style="border: none; background: #e3e3e3 !important;" oddRowSclass="listbox-odd-style"
 							sclass="listbox-normal-style">
 							<listhead sizable="true">
 								<listheader label="ID" hflex="1" align="left" />
@@ -42,9 +42,9 @@
 					<groupbox vflex="true" closable="false">
 						<caption sclass="boldfont" label="Anyagok" />
 
-						<listbox id="mediaList" sizedByContent="false" span="true" onSelect="@command('onSelectMedia', media=event.reference.value)" model="@load(svm.selectedItem.medias)"
-							multiple="false" vflex="true" selectedItem="@bind(svm.selectedMedia)" style="border: none; background: #e3e3e3 !important;"
-							oddRowSclass="listbox-odd-style" sclass="listbox-normal-style" >
+						<listbox id="mediaList" sizedByContent="false" span="true" onSelect="@command('onSelectMedia', media=event.reference.value)"
+							model="@load(svm.selectedItem.medias)" multiple="false" vflex="true" selectedItem="@bind(svm.selectedMedia)"
+							style="border: none; background: #e3e3e3 !important;" oddRowSclass="listbox-odd-style" sclass="listbox-normal-style">
 							<listhead sizable="true">
 								<listheader label="ID" hflex="1" align="left" />
 								<listheader label="Cím" hflex="6" align="left" />
@@ -64,90 +64,63 @@
 			<center border="none">
 
 				<borderlayout height="100%" width="100%" visible="@load(svm.hasLowresMediaFile)">
-				
+
 					<north border="none" size="60%" splittable="true" minsize="250" collapsible="true">
 						<div align="center" height="100%" width="100%">
-<!-- 						<label value="@bind(svm.selectedMedia.description)" /> -->
 							<iframe id="mediaPlayer" height="100%" width="100%" autohide="false" src="@load(svm.lowresMediaFilePath)"></iframe>
 						</div>
 					</north>
-					<center border="none" >
-						
-						<groupbox closable="false" mold="3d" width="100%" height="100%">
-							<caption label="@load(svm.selectedItem.title)" />
-							<button label="Visszatöltés" onClick="@command('downloadMedia')" autodisable="self"
-							disabled="@load(not svm.hasTSMMediaFile)" sclass="buttonboldfont" />
-							<div width="100%" height="100%" style="border:1px solid black;overflow:auto;">
-							
-							        <div if="${svm.selectedItem.description ne null}">
-							        	<label style="font-size:8pt" value="Anyag leírása" />
-							        	<div><label value="@load(svm.selectedItem.description)" /></div>
-							        </div>
-							        <space bar="false" />
+					<center border="none">
 
-							        <div if="${svm.selectedItem.description eq null}">
-							        	<label style="font-size:8pt; font-weight:bold;" value="Anyag leírása" />
-							        	<div><label value="fake description" /></div>
-							        </div>
-							        <space bar="false" />
-							        <div if="${svm.selectedItem.description eq null}">
-							        	<label style="font-size:8pt; font-weight:bold;" value="Anyag leírása" />
-							        	<div><label value="fake description" /></div>
-							        </div>
-							        <space bar="false" />
-							        <div if="${svm.selectedItem.description eq null}">
-							        	<label style="font-size:8pt; font-weight:bold;" value="Anyag leírása" />
-							        	<div><label value="fake description" /></div>
-							        </div>
-							        <space bar="false" />
-							        <div if="${svm.selectedItem.description eq null}">
-							        	<label style="font-size:8pt; font-weight:bold;" value="Anyag leírása" />
-							        	<div><label value="fake description" /></div>
-							        </div>
-							        <space bar="false" />
-							        <div if="${svm.selectedItem.description eq null}">
-							        	<label style="font-size:8pt; font-weight:bold;" value="Anyag leírása" />
-							        	<div><label value="fake description" /></div>
-							        </div>
-							        <space bar="false" />
-							        <div if="${svm.selectedItem.description eq null}">
-							        	<label style="font-size:8pt; font-weight:bold;" value="Anyag leírása" />
-							        	<div><label value="fake description" /></div>
-							        </div>
-							        <space bar="false" />
-							        <div if="${svm.selectedItem.description eq null}">
-							        	<label style="font-size:8pt; font-weight:bold;" value="Anyag leírása" />
-							        	<div><label value="fake description" /></div>
-							        </div>
-							        <space bar="false" />
-							        <div if="${svm.selectedItem.description eq null}">
-							        	<label style="font-size:8pt; font-weight:bold;" value="Anyag leírása" />
-							        	<div><label value="fake description" /></div>
-							        </div>
-							        <space bar="false" />
-							        <div if="${svm.selectedItem.description eq null}">
-							        	<label style="font-size:8pt; font-weight:bold;" value="Anyag leírása" />
-							        	<div><label value="fake description" /></div>
-							        </div>
-							        <space bar="false" />
-							        <div if="${svm.selectedItem.description eq null}">
-							        	<label style="font-size:8pt; font-weight:bold;" value="Anyag leírása" />
-							        	<div><label value="fake description" /></div>
-							        </div>
-							        <space bar="false" />
-							        <div if="${svm.selectedItem.description eq null}">
-							        	<label style="font-size:8pt; font-weight:bold;" value="Anyag leírása" />
-							        	<div><label value="fake description" /></div>
-							        </div>
-							        <space bar="false" />
-							        <div if="${svm.selectedItem.description eq null}">
-							        	<label style="font-size:8pt; font-weight:bold;" value="Anyag leírása" />
-							        	<div><label value="fake description" /></div>
-							        </div>
+						<groupbox closable="false" mold="3d" width="100%" height="100%">
+							<caption>
+								<button label="Visszatöltés" onClick="@command('downloadMedia')" autodisable="self" disabled="@load(not svm.hasTSMMediaFile)"
+									sclass="buttonboldfont" />
+							</caption>
+							<div width="100%" height="100%" style="margin: 4px; overflow:auto;">
+								<div>
+									<label style="font-size:8pt; color: gray" value="Anyag azonosító" />
+									<div style="margin: 4px">
+										<label value="@load(svm.selectedItem.houseId)" />
+									</div>
+									<space bar="false" />
+								</div>
+								<div>
+									<label style="font-size:8pt; color: gray" value="Anyag címe" />
+									<div style="margin: 4px">
+										<label value="@load(svm.selectedItem.title)" />
+									</div>
+									<space bar="false" />
+								</div>
+								<div>
+									<label style="font-size:8pt; color: gray" value="Anyag leírása" />
+									<div style="margin: 4px">
+										<label value="@load(svm.selectedItem.description)" />
+									</div>
+									<space bar="false" />
+								</div>
+								<div>
+									<label style="font-size:8pt; color: gray" value="Média azonosító" />
+									<div style="margin: 4px">
+										<label value="@load(svm.selectedMedia.houseId)" />
+									</div>
+									<space bar="false" />
+								</div>
+								<div>
+									<label style="font-size:8pt; color: gray" value="Média címe" />
+									<div style="margin: 4px">
+										<label value="@load(svm.selectedMedia.title)" />
+									</div>
+									<space bar="false" />
+								</div>
+								<div>
+									<label style="font-size:8pt; color: gray" value="Média leírása" />
+									<div style="margin: 4px">
+										<label value="@load(svm.selectedMedia.title)" />
+									</div>
 								</div>
-							</groupbox>
-						
-												
+							</div>
+						</groupbox>
 					</center>
 				</borderlayout>
 
-- 
2.54.0