Changeset 660

Timestamp:

Dec 20, 2013, 11:26:04 AM (11 years ago)

Author:

maron

Message:

• Added: better filter for $

Location:

trunk

Files:

• Modules/Translation/TranslationList.php (modified) (3 diffs)
• includes/Version.php (modified) (1 diff)

trunk/Modules/Translation/TranslationList.php

@@ -23 +23 @@
                 $Filter['State'] = GetParameter('state', 0, true, true);
                 $Output .= '<td><select name="state">';
-                if($Filter['State'] == 0) $Selected = ' selected="selected"';
-                else $Selected = '';
-                $Output .= '<option value="0"'.$Selected.'>Všechny</option>';
-                if($Filter['State'] == 1) $Selected = ' selected="selected"';
-                else $Selected = '';
-                $Output .= '<option value="1"'.$Selected.'>Nepřeložené</option>';
-                if($Filter['State'] == 2) $Selected = ' selected="selected"';
-                else $Selected = '';
-                $Output .= '<option value="2"'.$Selected.'>Přeložené</option>';
-                if($Filter['State'] == 3) $Selected = ' selected="selected"';
-                else $Selected = '';
-                $Output .= '<option value="3"'.$Selected.'>Rozpracované</option>';
-                if($Filter['State'] == 4) $Selected = ' selected="selected"';
-                else $Selected = '';
-                $Output .= '<option value="4"'.$Selected.'>Anglické</option>';
-                if($Filter['State'] == 5) $Selected = ' selected="selected"';
-                else $Selected = '';
-                $Output .= '<option value="5"'.$Selected.'>Rozpracované-Nepřeložené</option>';
-                if($Filter['State'] == 6) $Selected = ' selected="selected"';
-                else $Selected = '';
-                $Output .= '<option value="6"'.$Selected.'>S chybějícím $N,$S..</option>';
+                $StateTypes = array('Všechny','Nepřeložené','Přeložené','Rozpracované','Anglické','Rozpracované-Nepřeložené','Chybějící $ ($N,$s..)','Chybějící $-Neopravený');
+                foreach ($StateTypes as $index=>$StateType) {
+                if($Filter['State'] == $index) $Selected = ' selected="selected"';
+                else $Selected = '';
+                  $Output .= '<option value="'.$index.'"'.$Selected.'>'.$StateType.'</option>';
+    }
                 $Output .= '</select></td>';
         
@@ -158 +143 @@
                 if($Filter['Group'] != 0)
                 {
+                    $WithoutAlter =       ' AND NOT EXISTS(SELECT 1 FROM `'.$Table.'` AS `Sub` WHERE '.
+                                        '(`Sub`.`Language` <> '.$this->System->Config['OriginalLanguage'].')'.$LanguageFilter.
+                                        ' AND (`Sub`.`Entry` = `T`.`Entry`) AND (`Sub`.`ID` != `T`.`ID`) AND (`Sub`.`Complete` = 1) AND '.
+                                        '(`Sub`.`VersionStart` = `T`.`VersionStart`) AND (`Sub`.`VersionEnd` = `T`.`VersionEnd`))';
+                                foreach($TranslationTree[$Filter['Group']]['Items'] as $GroupItem)
+                                if($GroupItem['Visible'] == 1) {
+                                $ItemsVar[] =    'LENGTH(`T`.`'.$GroupItem['Column'].'`) - LENGTH( REPLACE( `T`.`'.$GroupItem['Column'].'`,  \'$\',  \'\' ) ) '.
+                           ' < ('.
+                                          'SELECT LENGTH(`Sub`.`'.$GroupItem['Column'].'`) - LENGTH( REPLACE( `Sub`.`'.$GroupItem['Column'].'`,  \'$\',  \'\' ) ) FROM `'.$Table.'` AS `Sub` WHERE '.
+                                                                        ' `Sub`.`Entry` = `T`.`Entry` AND `Sub`.`Language` = '.$this->System->Config['OriginalLanguage'].' AND '.
+                                                                        '`Sub`.`VersionStart` = `T`.`VersionStart` AND `Sub`.`VersionEnd` = `T`.`VersionEnd`'.
+                              ')';
+                      }
                         if($Filter['State'] == 0) $Filter['SQL'] .= $UserFilter.$VersionFilter.'';
                         else if($Filter['State'] == 1) $Filter['SQL'] .= $VersionFilter.' AND (`T`.`Language` = '.$this->System->Config['OriginalLanguage'].') '.
@@ -168 +166 @@
                         ') AND (`T`.`Complete` = 0)';
                         else if($Filter['State'] == 4) $Filter['SQL'] .= $VersionFilter.' AND (`T`.`Language` = '.$this->System->Config['OriginalLanguage'].')';
-                        else if($Filter['State'] == 5) $Filter['SQL'] .= $UserFilter.$VersionFilter.' AND (`T`.`Language` != '.$this->System->Config['OriginalLanguage'].
+                        else if($Filter['State'] == 5) $Filter['SQL'] .= $UserFilter.$VersionFilter.$WithoutAlter.
+      ' AND (`T`.`Language` != '.$this->System->Config['OriginalLanguage'].
                         ') AND (`T`.`Complete` = 0)'.
-      'AND NOT EXISTS(SELECT 1 FROM `'.$Table.'` AS `Sub` WHERE '.
-                                        '(`Sub`.`Language` <> '.$this->System->Config['OriginalLanguage'].')'.$LanguageFilter.
-                                        ' AND (`Sub`.`Entry` = `T`.`Entry`) AND (`Sub`.`Complete` = 1) AND '.
-                                        '(`Sub`.`VersionStart` = `T`.`VersionStart`) AND (`Sub`.`VersionEnd` = `T`.`VersionEnd`))';
-                        else if($Filter['State'] == 6) {
-                        
-                        if($Filter['Group'] != 0)
-                                foreach($TranslationTree[$Filter['Group']]['Items'] as $GroupItem)
-                                if($GroupItem['Visible'] == 1) {
-                                $Items[] = ''.  
-                           '`T`.`'.$GroupItem['Column'].'` NOT LIKE "%$%" '.
-                           ' AND EXISTS ('.
-                                          'SELECT 1 FROM `'.$Table.'` AS `Sub` WHERE `Sub`.`'.$GroupItem['Column'].'` LIKE "%$%"'.
-                                                                        ' AND `Sub`.`Entry` = `T`.`Entry` AND `Sub`.`Language` = '.$this->System->Config['OriginalLanguage'].' AND '.
-                                                                        '`Sub`.`VersionStart` = `T`.`VersionStart` AND `Sub`.`VersionEnd` = `T`.`VersionEnd`'.
-                                        ')'.
-                        '';
-                      }
+          '';
+                        else if($Filter['State'] == 6) {                        
         $Filter['SQL'] .= $UserFilter.$VersionFilter.' AND (`T`.`Complete` = 1) AND `T`.`Language` != '.$this->System->Config['OriginalLanguage'];
-
-        $Filter['SQL'] .= ' AND ('.implode(' OR ', $Items).') ';
-
-        
-       
-                    }
+        $Filter['SQL'] .= ' AND ('.implode(' OR ', $ItemsVar).') ';             
+                  }
+                        else if($Filter['State'] == 7) {                        
+        $Filter['SQL'] .= $UserFilter.$VersionFilter.' AND (`T`.`Complete` = 1) AND `T`.`Language` != '.$this->System->Config['OriginalLanguage'];
+        $Filter['SQL'] .= ' '. $WithoutAlter;
+        $Filter['SQL'] .= ' AND ('.implode(' OR ', $ItemsVar).') ';             
+                  }
                 }
         

trunk/includes/Version.php

@@ -6 +6 @@
 // and system will need database update. 
 
-$Revision = 659; // Subversion revision
+$Revision = 660; // Subversion revision
 $DatabaseRevision = 646; // Database structure revision 
-$ReleaseTime = '2013-12-19';
+$ReleaseTime = '2013-12-20';