Changeset 695

Timestamp:

Jan 3, 2014, 11:09:37 AM (11 years ago)

Author:

maron

Message:

• Added: selection groupitems in export

Location:

trunk

Files:

• Modules/Export/CreateAddon.php (modified) (2 diffs)
• Modules/Export/Export.php (modified) (3 diffs)
• Modules/Export/Page.php (modified) (4 diffs)
• admin/UpdateTrace.php (modified) (2 diffs)
• includes/Version.php (modified) (1 diff)

trunk/Modules/Export/CreateAddon.php

@@ -133 +133 @@
         $Buffer = 'CZWOW_'.$Column['AddonFileName'].'_count='.$FileIndex.';CZWOW_'.$Column['AddonFileName'].'_'.$FileIndex.'={';
     
-        $DbResult2 = $this->Database->query($this->BuildQuery($Group,'',$ExportVersion));
+        $DbResult2 = $this->Database->query($this->BuildQuery($Group,$ExportVersion));
         
         while($Line = $DbResult2->fetch_assoc()) 
@@ -197 +197 @@
       $CanGenerated = '';
     
-    $DbResult = $this->Database->query($this->BuildQuery($Group,'',$CanGenerated));
+    $DbResult = $this->Database->query($this->BuildQuery($Group,$CanGenerated));
     while($Line = $DbResult->fetch_array()) 
     {

trunk/Modules/Export/Export.php

@@ -72 +72 @@
   }
   
-  function BuildQuery($Group, $Columns = '', $Version = '')
+  function BuildQuery($Group, $Version = '')
   {
     global $TranslationTree;
@@ -80 +80 @@
     else
       $ExportVersion = $this->ClientVersion['BuildNumber'];
-    
-    $Query = 'SELECT * FROM (SELECT `T`.*, '.$Columns.'`User`.`Name` AS `UserName` FROM `'.$Group['TablePrefix'].'` AS `T`'.
+
+          $DbResultItem = $this->System->Database->query('SELECT * FROM `ExportGroupItem` WHERE `Export`='.$this->Id);
+                while($GroupItem = $DbResultItem->fetch_assoc())
+                {
+                  $GroupItems[$GroupItem['GroupItem']] = 1;
+    }
+    // Build selected columns
+    $Columns = '';
+    foreach($TranslationTree[$Group['Id']]['Items'] as $Column) {
+      if (!isset($GroupItems[$Column['Id']])) $Columns .= ' `T`.`'.$Column['Column'].'` AS `'.$Column['Column'].'`, ';
+    }
+  //  $Columns = substr($Columns, 0, -2);
+
+    
+    $Query = 'SELECT * FROM (SELECT '.$Columns.' T.`ID`,T.`Language`,T.`User`,T.`Entry`,T.`VersionEnd`,T.`VersionStart`, `User`.`Name` AS `UserName` FROM `'.$Group['TablePrefix'].'` AS `T`'.
     ' JOIN `ExportUser` ON (`ExportUser`.`User`=`T`.`User`) AND (`ExportUser`.`Export`='.$this->Id.') '.
     ' JOIN `User` ON `User`.`ID`=`T`.`User`'.
@@ -90 +103 @@
     // Build columns for english texts
     $OriginalColumns = '';
-    foreach($TranslationTree[$Group['Id']]['Items'] as $Column)
+    foreach($TranslationTree[$Group['Id']]['Items'] as $Column) {
       $OriginalColumns .= ' `T3`.`'.$Column['Column'].'` AS `En'.$Column['Column'].'`, ';
+      if (isset($GroupItems[$Column['Id']])) 
+        $OriginalColumns .= ' `T3`.`'.$Column['Column'].'` AS `'.$Column['Column'].'`, ';
+    }
     $OriginalColumns = substr($OriginalColumns, 0, -2);
     

trunk/Modules/Export/Page.php

@@ -430 +430 @@
                                 $Output .= ShowMessage('Výběr uložen.');
                         }
+          //items
+      foreach($TranslationTree as $Group) 
+                {
+                //  echo $Group['Id'].' ';
+        foreach($TranslationTree[$Group['Id']]['Items'] as $Column) {
+          if(array_key_exists('item'.$Column['Id'], $_POST)) $Selected = true;
+          else $Selected = false;
+          //we will save only forbitten collums and need to be visible
+          $Selected = !$Selected;
+          if (!$Column['Visible']) $Selected = false;  
+
+                                                $Condition = ' WHERE `Export`='.$_GET['ExportId'].' AND `GroupItem`='.$Column['Id'];
+                                                $DbResult = $this->System->Database->query('SELECT * FROM `ExportGroupItem` '.$Condition);
+                                                if($DbResult->num_rows > 0)
+                                                {
+                                                        if(!$Selected) $this->System->Database->query('DELETE FROM `ExportGroupItem` '.$Condition);
+                                                } else
+                                                {
+                                                        if($Selected) $this->System->Database->query('INSERT INTO `ExportGroupItem` (`Export`, `GroupItem`) VALUES ('.$_GET['ExportId'].', '.$Column['Id'].')');
+                                                }
+
+        }
+      }
                 }
         
@@ -439 +462 @@
         
                 $TableColumns = array(
+                                array('Name' => '', 'Title' => 'Výběr'),
                                 array('Name' => 'Name', 'Title' => 'Jméno'),
-                                array('Name' => 'MangosTable', 'Title' => 'Tabulka MaNGOSu'),
-                                array('Name' => 'DBCFileName', 'Title' => 'DBC soubor'),
-                                array('Name' => 'LuaFileName', 'Title' => 'Lua soubor'),
-                                array('Name' => '', 'Title' => 'Výběr'),
+                                array('Name' => 'MangosTable', 'Title' => 'Mangos/DBC/Lua'),
+                //              array('Name' => 'DBCFileName', 'Title' => 'DBC soubor'),
+                //              array('Name' => 'LuaFileName', 'Title' => 'Lua soubor'),
+                                array('Name' => '', 'Title' => 'Položky překladu'),
                 );
                 $Order = GetOrderTableHeader($TableColumns, 'Name');
@@ -460 +484 @@
                 '<table class="BaseTable">'.
                 $Order['Output'];
+
+          $DbResultItem = $this->System->Database->query('SELECT * FROM `ExportGroupItem` WHERE `Export`='.$_GET['ExportId']);
+                while($GroupItem = $DbResultItem->fetch_assoc())
+                {
+                  $GroupItems[$GroupItem['GroupItem']] = 1;
+    }
         
                 $Query = 'SELECT * FROM ('.$Query.') AS TX '.$Order['SQL'].$PageList['SQLLimit'];
@@ -465 +495 @@
                 while($Group = $DbResult->fetch_assoc())
                 {
+      $Columns = '';
+      foreach($TranslationTree[$Group['Id']]['Items'] as $Column) {
+        if ($Column['Visible'])  $Columns .= CheckBox('item'.$Column['Id'], !isset($GroupItems[$Column['Id']]), '', 'CheckBox', !$Editable).' '.$Column['Name'].' <br />';
+      }
                         $Checked = $Group['ExportGroupId'] != '';
                         $Selection = CheckBox('sel'.$Group['Id'], $Checked, '', 'CheckBox', !$Editable);
                         $Output .= '<tr>'.
-                                        '<td>'.$Group['Name'].'</td>'.
-                                        '<td>'.$Group['MangosTable'].'</td>'.
-                                        '<td>'.$Group['DBCFileName'].'</td>'.
-                                        '<td>'.$Group['LuaFileName'].'</td>'.
-                                        '<td>'.$Selection.'<input type="hidden" name="seq'.$Group['Id'].'"/></td></tr>';
+                                        '<td>'.$Selection.'<input type="hidden" name="seq'.$Group['Id'].'"/></td>'.
+                                        '<td>'.$Group['Name'].'</td><td>';
+                                        if ($Group['MangosTable'] <> '')
+                                          $Output .= $Group['MangosTable'].'.sql ';
+                                        if ($Group['LuaFileName'] <> '')
+                                          $Output .= $Group['LuaFileName'].'.lua ';
+                                        if ($Group['DBCFileName'] <> '')
+                                          $Output .= $Group['DBCFileName'].'.dbc ';
+      
+      $Output .=                '</td><td>';
+      $Output .=        $Columns.       '</td>';
+      $Output .=     '</tr>';
                 }
                 $Output .= '</table>'.

trunk/admin/UpdateTrace.php

@@ -2684 +2684 @@
 }
 
+function UpdateTo695($Manager)
+{
+        $Manager->Execute('CREATE TABLE IF NOT EXISTS `ExportGroupItem` (`Id` int(11) NOT NULL AUTO_INCREMENT,'.
+  '`Export` int(11) NOT NULL,`GroupItem` int(11) NOT NULL, PRIMARY KEY (`Id`), KEY `Export` (`Export`),'.
+  ' KEY `GroupItem` (`GroupItem`)) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;');   
+        $Manager->Execute('ALTER TABLE `ExportGroupItem`'.
+  'ADD CONSTRAINT `ExportGroupItem_ibfk_1` FOREIGN KEY (`Export`) REFERENCES `Export` (`Id`),'.
+  'ADD CONSTRAINT `ExportGroupItem_ibfk_2` FOREIGN KEY (`GroupItem`) REFERENCES `GroupItem` (`Id`);');   
+}
 
 $Updates = array(
@@ -2703 +2712 @@
         646 => array('Revision' => 666 , 'Function' => 'UpdateTo666'),
         666 => array('Revision' => 678 , 'Function' => 'UpdateTo678'),
+        678 => array('Revision' => 695 , 'Function' => 'UpdateTo695'),
 );

trunk/includes/Version.php

@@ -6 +6 @@
 // and system will need database update. 
 
-$Revision = 694; // Subversion revision
-$DatabaseRevision = 678; // Database structure revision 
+$Revision = 695; // Subversion revision
+$DatabaseRevision = 695; // Database structure revision 
 $ReleaseTime = '2014-01-02';