View | Details | Raw Unified | Return to bug 4811
Collapse All | Expand All

(-)a/C4/Search.pm (-1 / +1 lines)
Lines 2541-2547 sub GetDistinctValues { Link Here
2541
        my $dbh = C4::Context->dbh;
2541
        my $dbh = C4::Context->dbh;
2542
        warn "select DISTINCT($column) as value, count(*) as cnt from $table group by lib order by $column " if $DEBUG;
2542
        warn "select DISTINCT($column) as value, count(*) as cnt from $table group by lib order by $column " if $DEBUG;
2543
        my $sth = $dbh->prepare(
2543
        my $sth = $dbh->prepare(
2544
            "select DISTINCT($column) as value, count(*) as cnt from $table " . ( $string ? " where $column like \"$string%\"" : "" ) . "group by value order by $column " );
2544
            "select DISTINCT($column) as value, count(*) as cnt from $table " . ( $string ? " where $column like \"$string%\" and $column is not null " : " where $column is not null " ) . "group by value order by $column " );
2545
        $sth->execute;
2545
        $sth->execute;
2546
        my $elements = $sth->fetchall_arrayref( {} );
2546
        my $elements = $sth->fetchall_arrayref( {} );
2547
        return $elements;
2547
        return $elements;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl (-2 / +2 lines)
Lines 305-315 h4.collapse a { font-size : 80%; text-decoration: none; } fieldset.brief ol { di Link Here
305
                                                                     </select></li>
305
                                                                     </select></li>
306
                    <li><label for="suggesteddate"> Suggested on:</label><!--TMPL_VAR Name="suggesteddate"--></li>
306
                    <li><label for="suggesteddate"> Suggested on:</label><!--TMPL_VAR Name="suggesteddate"--></li>
307
                    <li><label for="suggestionmanagedby"> Managed by:</label><select id="suggestionmanagedby" name="suggestionmanagedby"><option value="">Any</option>
307
                    <li><label for="suggestionmanagedby"> Managed by:</label><select id="suggestionmanagedby" name="suggestionmanagedby"><option value="">Any</option>
308
<!-- TMPL_LOOP name="suggestionmanagedby_loop" --><!-- TMPL_IF NAME="selected" --><option value="<!-- TMPL_VAR name="code" -->" selected="selected"><!-- TMPL_VAR name="desc" --></option><!-- TMPL_ELSE --><option value="<!-- TMPL_VAR name="code" -->"><!-- TMPL_VAR name="desc" --></option><!-- /TMPL_IF --><!-- /TMPL_LOOP -->
308
<!-- TMPL_LOOP name="managedby_loop" --><!-- TMPL_IF NAME="selected" --><option value="<!-- TMPL_VAR name="code" -->" selected="selected"><!-- TMPL_VAR name="desc" --></option><!-- TMPL_ELSE --><option value="<!-- TMPL_VAR name="code" -->"><!-- TMPL_VAR name="desc" --></option><!-- /TMPL_IF --><!-- /TMPL_LOOP -->
309
                                                                     </select></li>
309
                                                                     </select></li>
310
                    <li><label for="manageddate"> Management date:</label><!--TMPL_VAR Name="manageddate"--></li>
310
                    <li><label for="manageddate"> Management date:</label><!--TMPL_VAR Name="manageddate"--></li>
311
                    <li><label for="suggestionacceptedby"> Accepted by:</label><select id="suggestionacceptedby" name="suggestionacceptedby"><option value="">Any</option>
311
                    <li><label for="suggestionacceptedby"> Accepted by:</label><select id="suggestionacceptedby" name="suggestionacceptedby"><option value="">Any</option>
312
<!-- TMPL_LOOP name="suggestionacceptedby_loop" --><!-- TMPL_IF NAME="selected" --> <option value="<!-- TMPL_VAR name="code" -->" selected="selected"><!-- TMPL_VAR name="desc" --></option><!-- TMPL_ELSE --><option value="<!-- TMPL_VAR name="code" -->"><!-- TMPL_VAR name="desc" --></option><!-- /TMPL_IF --><!-- /TMPL_LOOP -->
312
<!-- TMPL_LOOP name="acceptedby_loop" --><!-- TMPL_IF NAME="selected" --> <option value="<!-- TMPL_VAR name="code" -->" selected="selected"><!-- TMPL_VAR name="desc" --></option><!-- TMPL_ELSE --><option value="<!-- TMPL_VAR name="code" -->"><!-- TMPL_VAR name="desc" --></option><!-- /TMPL_IF --><!-- /TMPL_LOOP -->
313
		                                      </select></li>
313
		                                      </select></li>
314
                    <li><label for="accepteddate"> Accepted on:</label><!--TMPL_VAR Name="accepteddate"--></li><li><input type="submit" value="Go" /></li></ol>
314
                    <li><label for="accepteddate"> Accepted on:</label><!--TMPL_VAR Name="accepteddate"--></li><li><input type="submit" value="Go" /></li></ol>
315
                </fieldset>
315
                </fieldset>
(-)a/suggestion/suggestion.pl (-4 / +3 lines)
Lines 57-63 sub GetCriteriumDesc { Link Here
57
    return ( $criteriumvalue eq 'ASKED' ? "Pending" : ucfirst( lc($criteriumvalue) ) ) if ( $displayby =~ /status/i );
57
    return ( $criteriumvalue eq 'ASKED' ? "Pending" : ucfirst( lc($criteriumvalue) ) ) if ( $displayby =~ /status/i );
58
    return ( GetBranchName($criteriumvalue) )  if ( $displayby =~ /branchcode/ );
58
    return ( GetBranchName($criteriumvalue) )  if ( $displayby =~ /branchcode/ );
59
    return ( GetSupportName($criteriumvalue) ) if ( $displayby =~ /itemtype/ );
59
    return ( GetSupportName($criteriumvalue) ) if ( $displayby =~ /itemtype/ );
60
    if ( $displayby =~ /managedby/ || $displayby =~ /acceptedby/ ) {
60
    if ( $displayby =~ /managedby/ || $displayby =~ /acceptedby/ || $displayby =~ /suggestedby/) {
61
        my $borr = C4::Members::GetMember( borrowernumber => $criteriumvalue );
61
        my $borr = C4::Members::GetMember( borrowernumber => $criteriumvalue );
62
        return "" unless $borr;
62
        return "" unless $borr;
63
63
Lines 125-132 if ( $op =~ /save/i ) { Link Here
125
} elsif ( $op eq "change" ) {
125
} elsif ( $op eq "change" ) {
126
    if ( $$suggestion_ref{"STATUS"} ) {
126
    if ( $$suggestion_ref{"STATUS"} ) {
127
        if ( my $tmpstatus = lc( $$suggestion_ref{"STATUS"} ) =~ /ACCEPTED|REJECTED/i ) {
127
        if ( my $tmpstatus = lc( $$suggestion_ref{"STATUS"} ) =~ /ACCEPTED|REJECTED/i ) {
128
            $$suggestion_ref{ "$tmpstatus" . "date" } = C4::Dates->today;
128
            $$suggestion_ref{ lc( $$suggestion_ref{"STATUS"}) . "date" } = C4::Dates->today;
129
            $$suggestion_ref{ "$tmpstatus" . "by" }   = C4::Context->userenv->{number};
129
            $$suggestion_ref{ lc( $$suggestion_ref{"STATUS"}) . "by" }   = C4::Context->userenv->{number};
130
        }
130
        }
131
        $$suggestion_ref{"manageddate"} = C4::Dates->today;
131
        $$suggestion_ref{"manageddate"} = C4::Dates->today;
132
        $$suggestion_ref{"managedby"}   = C4::Context->userenv->{number};
132
        $$suggestion_ref{"managedby"}   = C4::Context->userenv->{number};
133
- 

Return to bug 4811