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

(-)a/C4/Reports/Guided.pm (-7 / +11 lines)
Lines 607-619 sub format_results { Link Here
607
}	
607
}	
608
608
609
sub delete_report {
609
sub delete_report {
610
    my ($id)  = @_;
610
    my ($ids) = @_;
611
    my $dbh   = C4::Context->dbh();
611
    if ($ids) {
612
    my $query = "DELETE FROM saved_sql WHERE id = ?";
612
        my $dbh = C4::Context->dbh;
613
    my $sth   = $dbh->prepare($query);
613
        my $sth = $dbh->prepare("DELETE FROM saved_sql WHERE id IN ($ids)");
614
    $sth->execute($id);
614
        $sth->execute();
615
}	
615
        $sth->finish;
616
616
        return 1;
617
    } else {
618
        return 0;
619
    }
620
}
617
621
618
my $SAVED_REPORTS_BASE_QRY = <<EOQ;
622
my $SAVED_REPORTS_BASE_QRY = <<EOQ;
619
SELECT s.*, r.report, r.date_run, $AREA_NAME_SQL_SNIPPET, av_g.lib AS groupname, av_sg.lib AS subgroupname,
623
SELECT s.*, r.report, r.date_run, $AREA_NAME_SQL_SNIPPET, av_g.lib AS groupname, av_sg.lib AS subgroupname,
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt (-2 / +17 lines)
Lines 65-70 $(document).ready(function(){ Link Here
65
    widgets : ['zebra'],
65
    widgets : ['zebra'],
66
    sortList: [[1,0]],
66
    sortList: [[1,0]],
67
    headers: {
67
    headers: {
68
        0: { sorter: false},
68
        10: { sorter: false},
69
        10: { sorter: false},
69
        11: { sorter: false},
70
        11: { sorter: false},
70
        12: { sorter: false},
71
        12: { sorter: false},
Lines 78-83 $(document).ready(function(){ Link Here
78
  // redefine the datepicker's default because reports require ISO
79
  // redefine the datepicker's default because reports require ISO
79
  // http://jqueryui.com/demos/datepicker/#option-dateFormat
80
  // http://jqueryui.com/demos/datepicker/#option-dateFormat
80
  $( ".datepicker" ).datepicker( "option", "dateFormat", "yy-mm-dd" );
81
  $( ".datepicker" ).datepicker( "option", "dateFormat", "yy-mm-dd" );
82
    $("#reports_form").submit(function(){
83
        var checkedItems = $("input[name=ids]:checked");
84
        if ($(checkedItems).size() == 0) {
85
            alert(_("You must select one or more reports to delete"));
86
            return false;
87
        }
88
        return confirm(_('Are you sure you want to delete the selected reports?'));
89
    });
81
});
90
});
82
//]]>
91
//]]>
83
</script>
92
</script>
Lines 151-160 canned reports and writing custom SQL reports.</p> Link Here
151
[% INCLUDE 'table-pager.inc' perpage='20' %]
160
[% INCLUDE 'table-pager.inc' perpage='20' %]
152
</div>
161
</div>
153
162
163
<form action="/cgi-bin/koha/reports/guided_reports.pl" id="reports_form" method="post">
164
<input type="hidden" name="phase" value="Delete Multiple" />
154
<table id="table_reports" class="tablesorter">
165
<table id="table_reports" class="tablesorter">
155
<thead>
166
<thead>
156
 <tr>
167
 <tr>
157
  <th>ID</th>
168
  <th>&nbsp;</th>
158
  <th>Report name</th>
169
  <th>Report name</th>
159
  <th>Type</th>
170
  <th>Type</th>
160
  <th>Area</th>
171
  <th>Area</th>
Lines 174-180 canned reports and writing custom SQL reports.</p> Link Here
174
<tbody>
185
<tbody>
175
[% FOREACH savedreport IN savedreports %]
186
[% FOREACH savedreport IN savedreports %]
176
[% UNLESS ( loop.odd ) %]<tr class="odd">[% ELSE %]<tr>[% END %]
187
[% UNLESS ( loop.odd ) %]<tr class="odd">[% ELSE %]<tr>[% END %]
177
<td>[% savedreport.id %]</td>
188
<td><input type="checkbox" name="ids" value="[% savedreport.id %]" /></td>
178
<td>[% savedreport.report_name %]</td>
189
<td>[% savedreport.report_name %]</td>
179
<td>[% savedreport.type %]</td>
190
<td>[% savedreport.type %]</td>
180
<td>[% savedreport.areaname %]</td>
191
<td>[% savedreport.areaname %]</td>
Lines 206-211 canned reports and writing custom SQL reports.</p> Link Here
206
[% END %]
217
[% END %]
207
</tbody>
218
</tbody>
208
</table>
219
</table>
220
<fieldset class="action">
221
    <input type="submit" value="Delete selected" />
222
</fieldset>
223
</form>
209
[% ELSE %]<div class="dialog message">
224
[% ELSE %]<div class="dialog message">
210
    [% IF (filter_set) %]
225
    [% IF (filter_set) %]
211
    <h4>No saved reports match your criteria. </h4>
226
    <h4>No saved reports match your criteria. </h4>
(-)a/reports/guided_reports.pl (-3 / +10 lines)
Lines 109-119 elsif ( $phase eq 'Build new' ) { Link Here
109
    );
109
    );
110
}
110
}
111
111
112
elsif ( $phase eq 'Delete Multiple') {
113
114
    my @ids = $input->param('ids');
115
    delete_report( join ",", @ids );
116
    print $input->redirect("/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved");
117
    exit;
118
}
119
112
elsif ( $phase eq 'Delete Saved') {
120
elsif ( $phase eq 'Delete Saved') {
113
	
121
	
114
	# delete a report from the saved reports list
122
	# delete a report from the saved reports list
115
	my $id = $input->param('reports');
123
    my $ids = $input->param('reports');
116
	delete_report($id);
124
    delete_report($ids);
117
    print $input->redirect("/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved");
125
    print $input->redirect("/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved");
118
	exit;
126
	exit;
119
}		
127
}		
120
- 

Return to bug 3134