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

diff --git a/client/Maestro/Resources/configuration-ingest.json b/client/Maestro/Resources/configuration-ingest.json
index dd21b53e03538eb80273b8e40524b264f0322b75..a8be4c5c58734fa97d384024b88fa33097454a12 100644 (file)
--- a/client/Maestro/Resources/configuration-ingest.json
+++ b/client/Maestro/Resources/configuration-ingest.json
@@ -54,7 +54,7 @@
       "killDateDays": 7,\r
       "useMetadata": false,\r
       "remote": {\r
-        "address": "file://10.10.1.100/BRAAVOS/ARCHIVE",\r
+        "address": "file://10.10.1.100/BRAAVOS/OCTOPUS",\r
         "userName": "mediacube",\r
         "password": "Broadca5T"\r
       }\r

diff --git a/client/Maestro/Targets/UNCTargetProcessor.cs b/client/Maestro/Targets/UNCTargetProcessor.cs
index 3518df12ba985670620158da293928541d01974a..9a1a305186abb8841d52ff66077d03239604c1fe 100644 (file)
--- a/client/Maestro/Targets/UNCTargetProcessor.cs
+++ b/client/Maestro/Targets/UNCTargetProcessor.cs
@@ -158,7 +158,8 @@ namespace Maestro.Targets {
         }\r
 \r
         private CopyProgressResult CopyProgressHandler(long total, long transferred, long streamSize, long StreamByteTrans, uint dwStreamNumber, CopyProgressCallbackReason reason, IntPtr hSourceFile, IntPtr hDestinationFile, IntPtr lpData) {\r
-            Progress = (int)((double)total / transferred * 100);\r
+            if (transferred > 0)    \r
+                Progress = (int)((double) transferred * 100 / total );\r
             return CopyProgressResult.PROGRESS_CONTINUE;\r
         }\r
 \r

diff --git a/server/user.jobengine.osgi.server/pages/joblist.zul b/server/user.jobengine.osgi.server/pages/joblist.zul
index 5bc1481ac545fb4b4a868c4c257318adfa0e89f3..5349123cff469748dd11c2d10adc9bde3f7f712a 100644 (file)
--- 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" \r
                                        onSelect="@command('selectJob')" style="border: none; background: #e3e3e3 !important;" oddRowSclass="listbox-odd-style" sclass="listbox-normal-style" >\r
                                       <listhead>\r
-                                       <listheader label="Id" width="70px" sort="auto(id)" align="left"/>\r
-                                       <listheader label="Name" width="auto(progress)" sort="auto(name)" align="left"/>\r
-                                       <listheader label="Priority" width="70px" sort="auto(priority)" align="left"/>\r
-                                       <listheader label="Status" width="120px" sort="auto(status)" align="left"/>\r
-                                       <listheader label="Progress" sort="120px" align="left"/>\r
+                                       <listheader label="Id" hflex="min" align="left"/>\r
+                                       <listheader label="Name" hflex="min" align="left"/>\r
+                                       <listheader label="Priority" hflex="min" sort="auto(priority)" align="left"/>\r
+                                       <listheader label="Status" hflex="min" sort="auto(status)" align="left"/>\r
+                                       <listheader label="Progress" width="200px" align="left"/>\r
+                                       <listheader label="Message" align="left"/>\r
                                       </listhead>\r
                                       \r
                                       <template name="model">\r
@@ -52,6 +53,7 @@
                                                        <listcell>\r
                                                                <progressmeter ca:data-animationspeed="-1" value="@load(each.progress)" width="100%" />\r
                                                        </listcell>\r
+                                                       <listcell label="@load(each.description)"/>\r
                                           </listitem>\r
                                       </template>\r
                                </listbox>\r

diff --git a/server/user.jobengine.osgi.server/pages/search_items.zul b/server/user.jobengine.osgi.server/pages/search_items.zul
index fdd004cf28c4f9562d7cda17a876da690d9b0a73..63dd7158aa28c24f37cedf70938e83ee518d6a62 100644 (file)
--- a/server/user.jobengine.osgi.server/pages/search_items.zul
+++ b/server/user.jobengine.osgi.server/pages/search_items.zul
@@ -23,8 +23,8 @@
 \r
                                        <groupbox vflex="true" closable="false">\r
                                                <caption sclass="boldfont" label="Gyűjtők" />\r
-                                               <listbox id="itemResults" sizedByContent="false" span="true" model="@load(svm.searchResult)" multiple="false" autopaging="true" mold="paging" vflex="true"\r
-                                                       selectedItem="@bind(svm.selectedItem)" style="border: none; background: #e3e3e3 !important;" oddRowSclass="listbox-odd-style"\r
+                                               <listbox id="itemResults" sizedByContent="false" span="true" model="@load(svm.searchResult)" multiple="false" autopaging="true"\r
+                                                       mold="paging" vflex="true" selectedItem="@bind(svm.selectedItem)" style="border: none; background: #e3e3e3 !important;" oddRowSclass="listbox-odd-style"\r
                                                        sclass="listbox-normal-style">\r
                                                        <listhead sizable="true">\r
                                                                <listheader label="ID" hflex="1" align="left" />\r
@@ -42,9 +42,9 @@
                                        <groupbox vflex="true" closable="false">\r
                                                <caption sclass="boldfont" label="Anyagok" />\r
 \r
-                                               <listbox id="mediaList" sizedByContent="false" span="true" onSelect="@command('onSelectMedia', media=event.reference.value)" model="@load(svm.selectedItem.medias)"\r
-                                                       multiple="false" vflex="true" selectedItem="@bind(svm.selectedMedia)" style="border: none; background: #e3e3e3 !important;"\r
-                                                       oddRowSclass="listbox-odd-style" sclass="listbox-normal-style" >\r
+                                               <listbox id="mediaList" sizedByContent="false" span="true" onSelect="@command('onSelectMedia', media=event.reference.value)"\r
+                                                       model="@load(svm.selectedItem.medias)" multiple="false" vflex="true" selectedItem="@bind(svm.selectedMedia)"\r
+                                                       style="border: none; background: #e3e3e3 !important;" oddRowSclass="listbox-odd-style" sclass="listbox-normal-style">\r
                                                        <listhead sizable="true">\r
                                                                <listheader label="ID" hflex="1" align="left" />\r
                                                                <listheader label="Cím" hflex="6" align="left" />\r
@@ -64,90 +64,63 @@
                        <center border="none">\r
 \r
                                <borderlayout height="100%" width="100%" visible="@load(svm.hasLowresMediaFile)">\r
-                               \r
+\r
                                        <north border="none" size="60%" splittable="true" minsize="250" collapsible="true">\r
                                                <div align="center" height="100%" width="100%">\r
-<!--                                           <label value="@bind(svm.selectedMedia.description)" /> -->\r
                                                        <iframe id="mediaPlayer" height="100%" width="100%" autohide="false" src="@load(svm.lowresMediaFilePath)"></iframe>\r
                                                </div>\r
                                        </north>\r
-                                       <center border="none" >\r
-                                               \r
-                                               <groupbox closable="false" mold="3d" width="100%" height="100%">\r
-                                                       <caption label="@load(svm.selectedItem.title)" />\r
-                                                       <button label="Visszatöltés" onClick="@command('downloadMedia')" autodisable="self"\r
-                                                       disabled="@load(not svm.hasTSMMediaFile)" sclass="buttonboldfont" />\r
-                                                       <div width="100%" height="100%" style="border:1px solid black;overflow:auto;">\r
-                                                       \r
-                                                               <div if="${svm.selectedItem.description ne null}">\r
-                                                                       <label style="font-size:8pt" value="Anyag leírása" />\r
-                                                                       <div><label value="@load(svm.selectedItem.description)" /></div>\r
-                                                               </div>\r
-                                                               <space bar="false" />\r
+                                       <center border="none">\r
 \r
-                                                               <div if="${svm.selectedItem.description eq null}">\r
-                                                                       <label style="font-size:8pt; font-weight:bold;" value="Anyag leírása" />\r
-                                                                       <div><label value="fake description" /></div>\r
-                                                               </div>\r
-                                                               <space bar="false" />\r
-                                                               <div if="${svm.selectedItem.description eq null}">\r
-                                                                       <label style="font-size:8pt; font-weight:bold;" value="Anyag leírása" />\r
-                                                                       <div><label value="fake description" /></div>\r
-                                                               </div>\r
-                                                               <space bar="false" />\r
-                                                               <div if="${svm.selectedItem.description eq null}">\r
-                                                                       <label style="font-size:8pt; font-weight:bold;" value="Anyag leírása" />\r
-                                                                       <div><label value="fake description" /></div>\r
-                                                               </div>\r
-                                                               <space bar="false" />\r
-                                                               <div if="${svm.selectedItem.description eq null}">\r
-                                                                       <label style="font-size:8pt; font-weight:bold;" value="Anyag leírása" />\r
-                                                                       <div><label value="fake description" /></div>\r
-                                                               </div>\r
-                                                               <space bar="false" />\r
-                                                               <div if="${svm.selectedItem.description eq null}">\r
-                                                                       <label style="font-size:8pt; font-weight:bold;" value="Anyag leírása" />\r
-                                                                       <div><label value="fake description" /></div>\r
-                                                               </div>\r
-                                                               <space bar="false" />\r
-                                                               <div if="${svm.selectedItem.description eq null}">\r
-                                                                       <label style="font-size:8pt; font-weight:bold;" value="Anyag leírása" />\r
-                                                                       <div><label value="fake description" /></div>\r
-                                                               </div>\r
-                                                               <space bar="false" />\r
-                                                               <div if="${svm.selectedItem.description eq null}">\r
-                                                                       <label style="font-size:8pt; font-weight:bold;" value="Anyag leírása" />\r
-                                                                       <div><label value="fake description" /></div>\r
-                                                               </div>\r
-                                                               <space bar="false" />\r
-                                                               <div if="${svm.selectedItem.description eq null}">\r
-                                                                       <label style="font-size:8pt; font-weight:bold;" value="Anyag leírása" />\r
-                                                                       <div><label value="fake description" /></div>\r
-                                                               </div>\r
-                                                               <space bar="false" />\r
-                                                               <div if="${svm.selectedItem.description eq null}">\r
-                                                                       <label style="font-size:8pt; font-weight:bold;" value="Anyag leírása" />\r
-                                                                       <div><label value="fake description" /></div>\r
-                                                               </div>\r
-                                                               <space bar="false" />\r
-                                                               <div if="${svm.selectedItem.description eq null}">\r
-                                                                       <label style="font-size:8pt; font-weight:bold;" value="Anyag leírása" />\r
-                                                                       <div><label value="fake description" /></div>\r
-                                                               </div>\r
-                                                               <space bar="false" />\r
-                                                               <div if="${svm.selectedItem.description eq null}">\r
-                                                                       <label style="font-size:8pt; font-weight:bold;" value="Anyag leírása" />\r
-                                                                       <div><label value="fake description" /></div>\r
-                                                               </div>\r
-                                                               <space bar="false" />\r
-                                                               <div if="${svm.selectedItem.description eq null}">\r
-                                                                       <label style="font-size:8pt; font-weight:bold;" value="Anyag leírása" />\r
-                                                                       <div><label value="fake description" /></div>\r
-                                                               </div>\r
+                                               <groupbox closable="false" mold="3d" width="100%" height="100%">\r
+                                                       <caption>\r
+                                                               <button label="Visszatöltés" onClick="@command('downloadMedia')" autodisable="self" disabled="@load(not svm.hasTSMMediaFile)"\r
+                                                                       sclass="buttonboldfont" />\r
+                                                       </caption>\r
+                                                       <div width="100%" height="100%" style="margin: 4px; overflow:auto;">\r
+                                                               <div>\r
+                                                                       <label style="font-size:8pt; color: gray" value="Anyag azonosító" />\r
+                                                                       <div style="margin: 4px">\r
+                                                                               <label value="@load(svm.selectedItem.houseId)" />\r
+                                                                       </div>\r
+                                                                       <space bar="false" />\r
+                                                               </div>\r
+                                                               <div>\r
+                                                                       <label style="font-size:8pt; color: gray" value="Anyag címe" />\r
+                                                                       <div style="margin: 4px">\r
+                                                                               <label value="@load(svm.selectedItem.title)" />\r
+                                                                       </div>\r
+                                                                       <space bar="false" />\r
+                                                               </div>\r
+                                                               <div>\r
+                                                                       <label style="font-size:8pt; color: gray" value="Anyag leírása" />\r
+                                                                       <div style="margin: 4px">\r
+                                                                               <label value="@load(svm.selectedItem.description)" />\r
+                                                                       </div>\r
+                                                                       <space bar="false" />\r
+                                                               </div>\r
+                                                               <div>\r
+                                                                       <label style="font-size:8pt; color: gray" value="Média azonosító" />\r
+                                                                       <div style="margin: 4px">\r
+                                                                               <label value="@load(svm.selectedMedia.houseId)" />\r
+                                                                       </div>\r
+                                                                       <space bar="false" />\r
+                                                               </div>\r
+                                                               <div>\r
+                                                                       <label style="font-size:8pt; color: gray" value="Média címe" />\r
+                                                                       <div style="margin: 4px">\r
+                                                                               <label value="@load(svm.selectedMedia.title)" />\r
+                                                                       </div>\r
+                                                                       <space bar="false" />\r
+                                                               </div>\r
+                                                               <div>\r
+                                                                       <label style="font-size:8pt; color: gray" value="Média leírása" />\r
+                                                                       <div style="margin: 4px">\r
+                                                                               <label value="@load(svm.selectedMedia.title)" />\r
+                                                                       </div>\r
                                                                </div>\r
-                                                       </groupbox>\r
-                                               \r
-                                                                                               \r
+                                                       </div>\r
+                                               </groupbox>\r
                                        </center>\r
                                </borderlayout>\r
 \r