Changeset 1498:6d67bea812f3 for inc/admin/class.dc.filter.php

Timestamp:

08/20/13 16:32:39 (12 years ago)

Author:

Dsls

Branch:

twig

Message:

formfilters improvement, added applied filters features

File:

• inc/admin/class.dc.filter.php (modified) (7 diffs)

inc/admin/class.dc.filter.php

@@ -382 +382 @@
           $fcontext = new ArrayObject();
           $sfcontext = new ArrayObject();
+          $afcontext = new ArrayObject();
           foreach ($this->filters as $f) {
                if($f->isEnabled()) {
@@ -390 +391 @@
                $f->appendFilterContext($sfcontext);
           }
+          foreach ($this->filters as $f) {
+               if ($f->isApplied()) {
+                    $afcontext[] = $f->getAppliedFilterText();
+               }
+          }
           return array(
                'active_filters' => $fcontext,
                'static_filters' => $sfcontext,
+               'applied_filters' => $afcontext,
                'hide_filters'  => $this->hide_filterset,
                'prefix'        => $this->form_prefix);
@@ -635 +642 @@
 
      protected abstract function addValue($value=NULL);
-
+     protected abstract function getAppliedFilterText();
+     
     /**
      * add -- adds a value for the filter
@@ -832 +840 @@
           $params[$this->request_param]=$this->avalues['values'][0];
      }
+     
+     public function getAppliedFilterText() {
+          if ($this->isApplied()) {
+               return sprintf(__('%s contains : "%s"'),$this->desc,$this->avalues['values'][0]);
+          }
+     }
 }
 
@@ -860 +874 @@
      */
      public function init() {
+          echo $this->name.":".($this->multiple?"MULTIPLE":"SIMPLE");
           $this->field = new dcFieldCombo(
                $this->filter_id,
                NULL,
-               $this->combo);
+               $this->combo,array(
+                    'multiple' => $this->multiple));
           $this->filterset->addField($this->field);
      }
@@ -913 +929 @@
                $params[$attr]=$this->avalues['values'][0];
      }
-
+     public function getAppliedFilterText() {
+          if ($this->isApplied()) {
+               if (count($this->avalues['values'])) {
+                    return sprintf(__("%s is %s"),$this->desc,join(__(' OR '), $this->avalues['values']));
+               } else {
+                    return sprintf(__('%s is %s'),$this->desc,$this->avalues['values'][0]);
+               }
+          }
+     }
 }
 
@@ -1001 +1025 @@
           }
      }
+     public function getAppliedFilterText() {
+          if ($this->isApplied()) {
+               if ($this->avalues['verb'] == "is") {
+                    $txt = __("%s is %s");
+                    $or = __(' or ');
+               } else {
+                    $txt = __("%s is not %s");
+                    $or = __(' nor ');
+               }
+               $texts = array();
+               foreach ($this->avalues['values'] as $v) {
+                    $texts[] = $this->field->getTextForValue($v);
+               }
+               if (count($texts)>=1) {
+                    return sprintf($txt,$this->desc,join($or, $texts));
+               } else {
+                    return sprintf($txt,$this->desc,$texts);
+               }
+          }
+     }
 
 }