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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt (-22 / +14 lines)
Lines 189-216 Link Here
189
	</select></li>
189
	</select></li>
190
[% END %]
190
[% END %]
191
[% IF ( column.date ) %]
191
[% IF ( column.date ) %]
192
	<li><span class="label">Choose: </span><table>
192
    <li class="radio">
193
	<tr valign="top">
193
        <label for="all_dates">All dates</label>
194
	<td><input type="radio" name="[% column.name %]_all" value="all" />All dates</td>
194
        <input type="radio" id="all_dates" name="[% column.name %]_date_type_value" value="all" checked="checked" />
195
	<td>OR</td>
195
        <label for="date_range">Date range</label>
196
	<td><input type="radio" name="dates" value="range" />Date range<br />
196
        <input type="radio" id="date_range" name="[% column.name %]_date_type_value" value="range" />
197
	<table>
197
    </li>
198
	<tr>
198
    <li class="radio">
199
	<td>Start of date range</td>
199
        Start of date range
200
    <td><input type="text" size="10" id="from" name="[% column.name %]_start_value" value="" class="datepickerfrom" />
200
        <input type="text" size="10" id="from" name="[% column.name %]_start_value" value="" class="datepickerfrom" />
201
	<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
201
        <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
202
	</td>
202
        End of date range
203
	</tr>
203
        <input type="text" size="10" id="to" name="[% column.name %]_end_value" value="" class="datepickerto" />
204
	<tr>
204
        <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
205
	<td>End of date range</td>
205
    </li>
206
	<td>
207
    <input type="text" size="10" id="to" name="[% column.name %]_end_value" value="" class="datepickerto" />
208
	<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
209
	</td>
210
	</tr>
211
	</table></td>
212
	</tr>
213
</table></li>
214
[% END %]
206
[% END %]
215
[% IF ( column.text ) %]
207
[% IF ( column.text ) %]
216
	<li><label for="[% column.name %]_value">Search string matches: </label> <input type="text" size="13" name="[% column.name %]_value" /></li>
208
	<li><label for="[% column.name %]_value">Search string matches: </label> <input type="text" size="13" name="[% column.name %]_value" /></li>
(-)a/reports/dictionary.pl (-25 / +27 lines)
Lines 147-177 elsif ( $phase eq 'New Term step 5' ) { Link Here
147
147
148
            $query_criteria .= " AND $crit='$value'";
148
            $query_criteria .= " AND $crit='$value'";
149
        }
149
        }
150
        $value = $input->param( $crit . "_start_value" );
151
150
152
        if ($value) {
151
        if ( my $date_type_value = $input->param( $crit . "_date_type_value" ) ) {
153
            my %tmp_hash;
152
            if ( $date_type_value eq 'range' ) {
154
            $tmp_hash{'name'}  = "$crit Start";
153
                if ( $value = $input->param( $crit . "_start_value" ) ) {
155
            $tmp_hash{'value'} = $value;
154
                    my %tmp_hash;
156
            push @criteria_loop, \%tmp_hash;
155
                    $tmp_hash{'name'}  = "$crit Start";
157
            my $value_dt = eval { dt_from_string( $value ) };
156
                    $tmp_hash{'value'} = $value;
158
            $value = output_pref( { dt => $value_dt, dateonly => 1, dateformat => 'iso' } )
157
                    push @criteria_loop, \%tmp_hash;
159
                if ( $value_dt );
158
                    my $value_dt = eval { dt_from_string( $value ) };
160
159
                    $value = output_pref( { dt => $value_dt, dateonly => 1, dateformat => 'iso' } )
161
            $query_criteria .= " AND $crit >= '$value'";
160
                        if ( $value_dt );
162
        }
161
163
162
                    $query_criteria .= " AND $crit >= '$value'";
164
        $value = $input->param( $crit . "_end_value" );
163
                }
165
        if ($value) {
164
166
            my %tmp_hash;
165
                if ( $value = $input->param( $crit . "_end_value" ) ) {
167
            $tmp_hash{'name'}  = "$crit End";
166
                    my %tmp_hash;
168
            $tmp_hash{'value'} = $value;
167
                    $tmp_hash{'name'}  = "$crit End";
169
            push @criteria_loop, \%tmp_hash;
168
                    $tmp_hash{'value'} = $value;
170
            my $value_dt = eval { dt_from_string( $value ) };
169
                    push @criteria_loop, \%tmp_hash;
171
            $value = output_pref( { dt => $value_dt, dateonly => 1, dateformat => 'iso' } )
170
                    my $value_dt = eval { dt_from_string( $value ) };
172
                if ( $value_dt );
171
                    $value = output_pref( { dt => $value_dt, dateonly => 1, dateformat => 'iso' } )
173
172
                        if ( $value_dt );
174
            $query_criteria .= " AND $crit <= '$value'";
173
174
                    $query_criteria .= " AND $crit <= '$value'";
175
                }
176
            }
177
            # else we want all dates
175
        }
178
        }
176
    }
179
    }
177
    $template->param(
180
    $template->param(
178
- 

Return to bug 2669