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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tt (-1 / +11 lines)
Lines 13-19 Link Here
13
         */
13
         */
14
          function checkForm(form) {
14
          function checkForm(form) {
15
              if((form.checkbox[0].checked)){
15
              if((form.checkbox[0].checked)){
16
                  if ( (!form.date1.value) && (!form.borrower_dateexpiry.value) && (!form.borrower_categorycode.value) && (!form.patron_list_id.value)){
16
                  if ( (!form.date1.value) && (!form.borrower_dateexpiry.value) [% IF Koha.Preference('TrackLastPatronActivity') %]&& (!form.borrower_lastseen.value) [% END %]&& (!form.borrower_categorycode.value) && (!form.patron_list_id.value)){
17
                    alert(_("Please enter at least one criterion for deletion!"));
17
                    alert(_("Please enter at least one criterion for deletion!"));
18
                    return false;
18
                    return false;
19
                  }
19
                  }
Lines 107-112 Link Here
107
                    <input size="10" id="borrower_dateexpiry" name="borrower_dateexpiry" type="text" class="datepicker" />
107
                    <input size="10" id="borrower_dateexpiry" name="borrower_dateexpiry" type="text" class="datepicker" />
108
                    <span class="hint">[% INCLUDE 'date-format.inc' %]</span>
108
                    <span class="hint">[% INCLUDE 'date-format.inc' %]</span>
109
                </li>
109
                </li>
110
                [% IF Koha.Preference('TrackLastPatronActivity') %]
111
                    <li>
112
                        <label for="borrower_lastseen">who have not been connected since:</label>
113
                        <input size="10" id="borrower_lastseen" name="borrower_lastseen" type="text" class="datepicker" />
114
                        <span class="hint">[% INCLUDE 'date-format.inc' %]</span>
115
                    </li>
116
                [% END %]
110
                <li>
117
                <li>
111
                    <label for="borrower_categorycode">whose patron category is:</label>
118
                    <label for="borrower_categorycode">whose patron category is:</label>
112
                    <select id="borrower_categorycode" name="borrower_categorycode">
119
                    <select id="borrower_categorycode" name="borrower_categorycode">
Lines 191-196 Link Here
191
            <input type="hidden" name="not_borrowed_since" value="[% not_borrowed_since | $KohaDates %]" />
198
            <input type="hidden" name="not_borrowed_since" value="[% not_borrowed_since | $KohaDates %]" />
192
            <input type="hidden" name="last_issue_date" value="[% last_issue_date | $KohaDates %]" />
199
            <input type="hidden" name="last_issue_date" value="[% last_issue_date | $KohaDates %]" />
193
            <input type="hidden" name="borrower_dateexpiry" value="[% borrower_dateexpiry | $KohaDates %]" />
200
            <input type="hidden" name="borrower_dateexpiry" value="[% borrower_dateexpiry | $KohaDates %]" />
201
            [% IF Koha.Preference('TrackLastPatronActivity') %]
202
                <input type="hidden" name="borrower_lastseen" value="[% borrower_lastseen | $KohaDates %]" />
203
            [% END %]
194
            <input type="hidden" name="borrower_categorycode" value="[% borrower_categorycode %]" />
204
            <input type="hidden" name="borrower_categorycode" value="[% borrower_categorycode %]" />
195
            <input type="hidden" name="patron_list_id" value="[% patron_list_id %]" />
205
            <input type="hidden" name="patron_list_id" value="[% patron_list_id %]" />
196
            <input type="hidden" name="branch" value="[% current_branch %]" />
206
            <input type="hidden" name="branch" value="[% current_branch %]" />
(-)a/tools/cleanborrowers.pl (-2 / +13 lines)
Lines 64-69 my $borrower_dateexpiry = Link Here
64
  $params->{borrower_dateexpiry}
64
  $params->{borrower_dateexpiry}
65
  ? dt_from_string $params->{borrower_dateexpiry}
65
  ? dt_from_string $params->{borrower_dateexpiry}
66
  : undef;
66
  : undef;
67
my $borrower_lastseen =
68
  $params->{borrower_lastseen}
69
  ? dt_from_string $params->{borrower_lastseen}
70
  : undef;
67
my $patron_list_id = $params->{patron_list_id};
71
my $patron_list_id = $params->{patron_list_id};
68
72
69
my $borrower_categorycode = $params->{'borrower_categorycode'} || q{};
73
my $borrower_categorycode = $params->{'borrower_categorycode'} || q{};
Lines 92-97 if ( $step == 2 ) { Link Here
92
             _get_selection_params(
96
             _get_selection_params(
93
                  $not_borrowed_since,
97
                  $not_borrowed_since,
94
                  $borrower_dateexpiry,
98
                  $borrower_dateexpiry,
99
                  $borrower_lastseen,
95
                  $borrower_categorycode,
100
                  $borrower_categorycode,
96
                  $patron_list_id,
101
                  $patron_list_id,
97
                  $branch
102
                  $branch
Lines 128-133 elsif ( $step == 3 ) { Link Here
128
                _get_selection_params(
133
                _get_selection_params(
129
                    $not_borrowed_since,
134
                    $not_borrowed_since,
130
                    $borrower_dateexpiry,
135
                    $borrower_dateexpiry,
136
                    $borrower_lastseen,
131
                    $borrower_categorycode,
137
                    $borrower_categorycode,
132
                    $patron_list_id,
138
                    $patron_list_id,
133
                    $branch
139
                    $branch
Lines 179-184 $template->param( Link Here
179
    step                   => $step,
185
    step                   => $step,
180
    not_borrowed_since   => $not_borrowed_since,
186
    not_borrowed_since   => $not_borrowed_since,
181
    borrower_dateexpiry    => $borrower_dateexpiry,
187
    borrower_dateexpiry    => $borrower_dateexpiry,
188
    borrower_lastseen      => $borrower_lastseen,
182
    last_issue_date        => $last_issue_date,
189
    last_issue_date        => $last_issue_date,
183
    borrower_categorycodes => $patron_categories,
190
    borrower_categorycodes => $patron_categories,
184
    borrower_categorycode  => $borrower_categorycode,
191
    borrower_categorycode  => $borrower_categorycode,
Lines 197-203 sub _skip_borrowers_with_nonzero_balance { Link Here
197
}
204
}
198
205
199
sub _get_selection_params {
206
sub _get_selection_params {
200
    my ($not_borrowed_since, $borrower_dateexpiry,
207
    my ($not_borrowed_since, $borrower_dateexpiry, $borrower_lastseen,
201
        $borrower_categorycode, $patron_list_id, $branch) = @_;
208
        $borrower_categorycode, $patron_list_id, $branch) = @_;
202
209
203
    my $params = {};
210
    my $params = {};
Lines 211-216 sub _get_selection_params { Link Here
211
        dateformat => 'iso',
218
        dateformat => 'iso',
212
        dateonly   => 1
219
        dateonly   => 1
213
    }) if $borrower_dateexpiry;
220
    }) if $borrower_dateexpiry;
221
    $params->{last_seen} = output_pref({
222
        dt         => $borrower_lastseen,
223
        dateformat => 'iso',
224
        dateonly   => 1
225
    }) if $borrower_lastseen;
214
    $params->{category_code} = $borrower_categorycode if $borrower_categorycode;
226
    $params->{category_code} = $borrower_categorycode if $borrower_categorycode;
215
    $params->{patron_list_id} = $patron_list_id if $patron_list_id;
227
    $params->{patron_list_id} = $patron_list_id if $patron_list_id;
216
228
217
- 

Return to bug 16276