Subversion Repositories VORC

Rev

Rev 222 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 222 Rev 230
Line 100... Line 100...
100
#      return "$colName like \"%$filter%\"";
100
#      return "$colName like \"%$filter%\"";
101
#    }
101
#    }
102
    return "department like '%$filter-2%' or department like '%$filter-3%' or department like '%$filter-4%'";
102
    return "department like '%$filter-2%' or department like '%$filter-3%' or department like '%$filter-4%'";
103
  } else {
103
  } else {
104
    my @options = ();
104
    my @options = ();
105
    my $tmpFormValue = param ("filter-".$colName);
105
    my $tmpFormValue = getFilterValue ($colName);
Line 106... Line 106...
106
    
106
    
107
    push @options, "-blank-" unless $LVL < 4;
107
    push @options, "-blank-" unless $LVL < 4;
Line 108... Line 108...
108
    push @options, ($LVL < 4 and $ORCUSER->{department}->{VCI} < 2) ? grep { $ORCUSER->{department}->{$_} >= 2 } sort keys %{$ORCUSER->{department}} : sort keys %{$DepartmentNames};
108
    push @options, ($LVL < 4 and $ORCUSER->{department}->{VCI} < 2) ? grep { $ORCUSER->{department}->{$_} >= 2 } sort keys %{$ORCUSER->{department}} : sort keys %{$DepartmentNames};
Line 126... Line 126...
126
  if ($filter ne "")  {
126
  if ($filter ne "")  {
127
    $filtered_by_access = $filter;
127
    $filtered_by_access = $filter;
128
    return $filter eq "-1" ? "$colName = $filter" : "($colName = $filter or department like '%$filter%')";
128
    return $filter eq "-1" ? "$colName = $filter" : "($colName = $filter or department like '%$filter%')";
129
  } else {
129
  } else {
130
    my @options = (-1, 0, 1, 2, 3, 4, 5);
130
    my @options = (-1, 0, 1, 2, 3, 4, 5);
131
    my $tmpFormValue = param ("filter-".$colName);
131
    my $tmpFormValue = getFilterValue ($colName);
Line 132... Line 132...
132
    
132
    
133
    @options = map { $tmpFormValue eq $_ ?
133
    @options = map { $tmpFormValue eq $_ ?
134
                       ( $h->option ({ selected=>[], value=>$_ }, $ROLE->{$_}) ) :
134
                       ( $h->option ({ selected=>[], value=>$_ }, $ROLE->{$_}) ) :
Line 147... Line 147...
147
  
147
  
148
  if ($filter)  {
148
  if ($filter)  {
149
    return $filter =~ /^R-/ ? "$colName = '$filter'" : $filter eq "pass" ? "isnull($colName) = 0" : "isnull($colName) = 1";
149
    return $filter =~ /^R-/ ? "$colName = '$filter'" : $filter eq "pass" ? "isnull($colName) = 0" : "isnull($colName) = 1";
150
  } else {
150
  } else {
151
    my @options = ("", "pass", "no pass");
151
    my @options = ("", "pass", "no pass");
Line 152... Line 152...
152
    my $tmpFormValue = param ("filter-".$colName);
152
    my $tmpFormValue = getFilterValue ($colName);
153
    
153
    
154
    @options = map { $tmpFormValue eq $_ ?
154
    @options = map { $tmpFormValue eq $_ ?
Line 166... Line 166...
166
  
166
  
167
  if ($filter ne "")  {
167
  if ($filter ne "")  {
168
    return join " and ", "department like '%EMT%'", $filter eq "True" ? "$colName = 1" : "$colName = 0";
168
    return join " and ", "department like '%EMT%'", $filter eq "True" ? "$colName = 1" : "$colName = 0";
169
  } else {
169
  } else {
170
    my @options = ("", "True", "False");
170
    my @options = ("", "True", "False");
Line 171... Line 171...
171
    my $tmpFormValue = param ("filter-".$colName);
171
    my $tmpFormValue = getFilterValue ($colName);
172
    
172
    
173
    @options = map { $tmpFormValue eq $_ ?
173
    @options = map { $tmpFormValue eq $_ ?