Changeset 732

Timestamp:

Jan 8, 2014, 3:03:03 PM (11 years ago)

Author:

maron

Message:

• Fixed: Column database change to double
• Added: smooth progress bar in export

Location:

trunk

Files:

• Modules/Export/Export.php (modified) (2 diffs)
• Modules/Export/ExportOutput.php (modified) (2 diffs)
• Modules/Export/ProcessTask.php (modified) (2 diffs)
• admin/UpdateTrace.php (modified) (2 diffs)
• includes/Version.php (modified) (1 diff)

trunk/Modules/Export/Export.php

@@ -301 +301 @@
   }  
 
-  function AddProgress($add = 2) {
+  function AddProgress($add = 1) {
 
     $DbResult = $this->System->Database->query('SELECT Progress FROM `ExportTask` WHERE `Export`='.$this->Id);
@@ -321 +321 @@
     while($Group = $DbResult->fetch_assoc())
     {
-      $this->AddProgress();
+      $this->AddProgress(2);
       $Output .= $Group['Name'].', ';
       if(file_exists($this->SourceDir.$this->ClientVersion['Version'].'/dbc/'.$Group['DBCFileName'].'.dbc')) 

trunk/Modules/Export/ExportOutput.php

@@ -219 +219 @@
     }
   } else {
-  
-
+    $Output .= ShowProgress($Export);
+
+  } 
+  return($Output);
+}
+
+function ShowProgress($Export) {
+    global $System;
+    $Output = '';
     $DbResult = $System->Database->query('SELECT Progress FROM `ExportTask` WHERE `Export`='.$Export->Id);
     $Task = $DbResult->fetch_assoc();
 
-        $Output .= '<script type="text/javascript" language="JavaScript" charset="utf-8">'.
-                                 'setTimeout("parent.location.href=\''.$System->Link('/export/?Action=View&Tab=7&Auto&ExportId='.$Export->Id).'\'", 5000)'.
-                                                 '</script>';
-    $Output .= ' <strong>Dokončeno procent: '.ProgressBar(300, $Task['Progress']).'</strong>';
+//      $Output .= '<script type="text/javascript" language="JavaScript" charset="utf-8">'.
+//                               'setTimeout("parent.location.href=\''.$System->Link('/export/?Action=View&Tab=7&Auto&ExportId='.$Export->Id).'\'", 5000)'.
+//                                               '</script>';                                       '.ProgressBar(300, $Task['Progress']).'
+        $Output .= '<script src="http://code.jquery.com/jquery-latest.js"></script>'.
+               '<script>'.
+                  '$(document).ready(function() {'.
+                  'var refreshId = setInterval(function() {'.
+                  '$("#progress").load("'.$System->Link('/Modules/Export/Progress.php?ExportId='.$Export->Id).'"); '.
+                  '}, 500);'.
+                  '});'.
+               '</script>';
+    $Output .= ' <strong>Dokončeno procent: <div id="progress">'.ProgressBar(300, $Task['Progress']).'</div></strong>';
+            //   $(\'#load_progress\').load(\''.'?Action=View&Tab=7&Auto&ExportId='.$Export->Id.'\');   
+              // Modules/Export/Progress.php?ExportId=37
     if ($Task['Progress'] == 0) $Output .= '<br/><br/><strong>Soubor čeká na zpracování ve frontě.</strong><br/>';
-  } 
-  return($Output);
-}
+    
+    return ($Output);
+}
+
 function OutputEXEToFile($ExportId)
 {
@@ -267 +285 @@
   } else {
     
-    $DbResult = $System->Database->query('SELECT Progress FROM `ExportTask` WHERE `Export`='.$Export->Id);
-    $Task = $DbResult->fetch_assoc();
-
-        $Output .= '<script type="text/javascript" language="JavaScript" charset="utf-8">'.
-                                 'setTimeout("parent.location.href=\''.$System->Link('/export/?Action=View&Tab=7&Auto&ExportId='.$Export->Id).'\'", 5000)'.
-                                                 '</script>';
-    $Output .= ' <strong>Dokončeno procent: '.ProgressBar(300, $Task['Progress']).'</strong>';
-    if ($Task['Progress'] == 0) $Output .= '<br/><br/><strong>Soubor čeká na zpracování ve frontě.</strong><br/>';
+    $Output .= ShowProgress($Export);
   }
   return($Output);

trunk/Modules/Export/ProcessTask.php

@@ -175 +175 @@
         
         //copy need files
-        SetProgress($Export,10);
+        SetProgress($Export,5);
         echo('Copy files...'."\n");
         rcopy('files/'.$Export->ClientVersion['Version'].'/patch-5.MPQ', $Export->TempDir.'patch-5.MPQ');
@@ -184 +184 @@
         rcopy('files/Fonts/', $Export->TempDir.'Fonts/');       
               
-        SetProgress($Export,15);
+        SetProgress($Export,10);
         echo('Export lua...'."\n");
         $Export->ExportToLua();
-        SetProgress($Export,20);
+        SetProgress($Export,15);
         echo('Export CzWoW...'."\n");
         $Export->MakeAddon();
-        SetProgress($Export,35);
+        SetProgress($Export,30);
         echo('Export dbc...'."\n");
         $Export->ExportToDBC();
       
         echo('Create readme...'."\n");
-        SetProgress($Export,65);
+        SetProgress($Export,60);
         $File = new FileStream();
         $File->CreateFile($Export->TempDir.'ReadMe.htm');

trunk/admin/UpdateTrace.php

@@ -2726 +2726 @@
 }
 
+function UpdateTo732($Manager)
+{
+        $Manager->Execute('ALTER TABLE  `ExportTask` CHANGE  `Progress`  `Progress` DOUBLE( 4, 2 ) NOT NULL ;');   
+}
+
+
 $Updates = array(
         498 => array('Revision' => 506, 'Function' => 'UpdateTo506'),
@@ -2749 +2755 @@
         716 => array('Revision' => 725 , 'Function' => 'UpdateTo725'),
         725 => array('Revision' => 731 , 'Function' => 'UpdateTo731'),
+        731 => array('Revision' => 732 , 'Function' => 'UpdateTo732'),
 );

trunk/includes/Version.php

@@ -6 +6 @@
 // and system will need database update. 
 
-$Revision = 731; // Subversion revision
-$DatabaseRevision = 731; // Database structure revision 
+$Revision = 732; // Subversion revision
+$DatabaseRevision = 732; // Database structure revision 
 $ReleaseTime = '2014-01-08';