Changeset 1761

Timestamp:

05/06/16 08:57:49 (8 years ago)

Author:

nanardon

Message:

Add trickery to make stat working

Location:

trunk

Files:

• LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Json/EmploymentByPeriod.pm (modified) (1 diff)
• LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/objects.pm (modified) (2 diffs)

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Json/EmploymentByPeriod.pm

@@ -34 +34 @@
 
     my @filteredObj = $base->search_objects(
-        'employment', sprintf('firstday<=%s', $end->ymd('-')), sprintf('lastday>=%s', $start->ymd('-'))
+        'employment', sprintf('firstday<=%s', $end->ymd('-')), sprintf('lastday>=%s', $start->ymd('-')), 'lastday=NULL'
     );
     my %atstart = map { $_ => 1 } $base->search_objects(

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/objects.pm

@@ -742 +742 @@
         # attr=foo => no extra white space !
         # \W is false, it is possible to have two char
-        my ($attr, $mode, $val) = $item =~ /^(\w+)(?:(\W+)(.+))?$/ or next;
+        my ($attr, $mode, $val) = $item =~ /^(\w+)(?:([^\w*]+)(.+))?$/ or next;
         if (!$mode) {
             $mode = '~';
@@ -776 +776 @@
                 $base->db->quote_identifier($attribute->iname),
                 ($mode eq '~' ? '::text' : ''),
-                $val eq '*'
+                $mode eq '=' && $val eq '*'
                     ? 'is not NULL'
+                    : $mode eq '=' && $val eq 'NULL'
+                    ? 'is NULL'
                     : $mode eq '~'
                         ? 'ILIKE ?'
                         : "$mode ?"
             );
-            push(@{$attrbind{$attr}}, $mode eq '~' ? '%' . $val . '%' : $val) unless($val eq '*');
+            push(@{$attrbind{$attr}}, $mode eq '~' ? '%' . $val . '%' : $val) unless($mode eq '=' && ($val eq '*' || $val eq 'NULL'));
         } else {
             $sql = sprintf(