[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha koha-tmpl/intranet-tmpl/prog/en/tools/clea... [rel_3_0]
|
From: |
Antoine Farnault |
|
Subject: |
[Koha-cvs] koha koha-tmpl/intranet-tmpl/prog/en/tools/clea... [rel_3_0] |
|
Date: |
Mon, 27 Nov 2006 14:53:55 +0000 |
CVSROOT: /sources/koha
Module name: koha
Branch: rel_3_0
Changes by: Antoine Farnault <toins> 06/11/27 14:53:55
Modified files:
koha-tmpl/intranet-tmpl/prog/en/tools: cleanborrowers.tmpl
tools : cleanborrowers.pl
Log message:
some little change.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/tools/cleanborrowers.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/tools/cleanborrowers.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.3&r2=1.1.2.4
Patches:
Index: koha-tmpl/intranet-tmpl/prog/en/tools/cleanborrowers.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/tools/Attic/cleanborrowers.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- koha-tmpl/intranet-tmpl/prog/en/tools/cleanborrowers.tmpl 17 Nov 2006
15:55:16 -0000 1.1.2.2
+++ koha-tmpl/intranet-tmpl/prog/en/tools/cleanborrowers.tmpl 27 Nov 2006
14:53:55 -0000 1.1.2.3
@@ -7,8 +7,8 @@
<script type="text/javascript" src="<!-- TMPL_VAR name="themelang"
-->/includes/calendar/calendar.js"></script>
<script type="text/javascript" src="<!-- TMPL_VAR name="themelang"
-->/includes/calendar/calendar-en.js"></script>
<script type="text/javascript" src="<!-- TMPL_VAR name="themelang"
-->/includes/calendar/calendar-setup.js"></script>
-
<!-- End of additions -->
+
<!-- TMPL_INCLUDE NAME="menus.inc" -->
<!-- TMPL_INCLUDE NAME="menu-tools.inc" -->
@@ -23,13 +23,11 @@
<input id="checkborrower" type="checkbox" name="checkbox"
value="borrower" checked="true" />
<label for="checkborrower">Delete borrower who has not borrowed
since:</label>
<input size="10" id="date1" name="filterdate1" value="<!-- TMPL_VAR
NAME="filterdate1"-->" type="text" />
- <img src="<!-- TMPL_VAR Name="themelang"
-->/includes/calendar/cal.gif" id="openCalendarTo" valign="top" border="0"
hspace="0" vspace="0" />
<script type="text/javascript">
Calendar.setup(
{
- inputField : "to",
+ inputField : "date1",
ifFormat : "%Y-%m-%d",
- button : "openCalendarTo",
}
);
</script>
@@ -38,13 +36,11 @@
<input id="checkissue" type="checkbox" name="checkbox" value="issue"
checked="true" />
<label for="checkissue">Anonymize issue history older than</label>
<input size="10" id="date2" name="filterdate2" value="<!-- TMPL_VAR
NAME="filterdate2"-->" type="text" />
- <img src="<!-- TMPL_VAR Name="themelang"
-->/includes/calendar/cal.gif" id="openCalendarTo" valign="top" border="0"
hspace="0" vspace="0" />
<script type="text/javascript">
Calendar.setup(
{
- inputField : "to",
+ inputField : "date2",
ifFormat : "%Y-%m-%d",
- button : "openCalendarTo",
}
);
</script>
@@ -65,10 +61,12 @@
<fieldset>
<legend>Warnings</legend>
<b>
- <!-- TMPL_IF NAME="totalToDelete" --><!-- TMPL_VAR
NAME="totalToDelete" --> borrowers will be deleted.<!-- /TMPL_IF -->
- <!-- TMPL_IF NAME="totalToAnonymize" --><!-- TMPL_VAR
NAME="totalToAnonymize" --> issue history will be anonymized.<!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="totalToDelete" --><!-- TMPL_VAR
NAME="totalToDelete" --> <!-- TMPL_ELSE -->0 <!-- /TMPL_IF --> borrowers will
be deleted.
+ <br />
+ <!-- TMPL_IF NAME="totalToAnonymize" --><!-- TMPL_VAR
NAME="totalToAnonymize" --> <!-- TMPL_ELSE -->0 <!-- /TMPL_IF --> issue history
will be anonymized.
+ <br />
</b>
- <br /><br />
+ <br />
<form name="f2" action="/cgi-bin/koha/tools/cleanborrowers.pl"
method="POST" onsubmit="return checkForm2(this);">
<!-- TMPL_IF NAME="totalToDelete" -->
What do you want to do for deleted members ?<br />
@@ -82,10 +80,11 @@
<!-- /TMPL_IF -->
<!--TMPL_IF NAME="totalToAnonymize"-->
<br />
- Are you sure you want to anonymize history for <!-- TMPL_VAR
NAME="totalToAnonymize"--> borrowers ?
+ Are you sure you want to anonymize issue history for <!--
TMPL_VAR NAME="totalToAnonymize"--> borrowers ?
<input type="hidden" name="do_anonym" value="<!-- TMPL_VAR
NAME="totalToAnonymize" -->" />
<!-- /TMPL_IF -->
- <br />
+ <br /><br />
+ <a href="JavaScript:back();" title="go back">Cancel</a>
<input type="submit" value=" OK " style="float:right;"/>
<input type="hidden" name="step3" value="1" />
@@ -110,7 +109,7 @@
<!-- /TMPL_IF -->
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="do_anonym" -->
- <!-- TMPL_VAR NAME="TotalAno" --> issue's history has been
anonimized.
+ All user which issue's history older than <!-- TMPL_VAR
NAME="filterdate1" --> has been anonimized.
<!-- /TMPL_IF -->
</b>
</div>
Index: tools/cleanborrowers.pl
===================================================================
RCS file: /sources/koha/koha/tools/Attic/cleanborrowers.pl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- tools/cleanborrowers.pl 17 Nov 2006 15:55:16 -0000 1.1.2.3
+++ tools/cleanborrowers.pl 27 Nov 2006 14:53:55 -0000 1.1.2.4
@@ -17,7 +17,7 @@
#
# Written by Antoine Farnault address@hidden on Nov. 2006.
-# $Id: cleanborrowers.pl,v 1.1.2.3 2006/11/17 15:55:16 toins Exp $
+# $Id: cleanborrowers.pl,v 1.1.2.4 2006/11/27 14:53:55 toins Exp $
=head1 cleanborrowers.pl
@@ -66,22 +66,25 @@
);
if ( $params->{'step2'} ) {
+ $filterdate1 = $params->{'filterdate1'};
+ $filterdate2 = $params->{'filterdate2'};
my $checkbox = $params->{'checkbox'};
+ my $totalDel;
+ if ($checkbox eq "borrower") {
+ $filterdate1 = $params->{'filterdate1'};
+ my $membersToDelete =
GetBorrowersWhoHaveNotBorrowedSince($filterdate1);
+ $totalDel = scalar @$membersToDelete;
+ }
+
my $totalAno;
if ($checkbox eq "issue") {
- $filterdate1 = $params->{'filterdate1'};
+ $filterdate2 = $params->{'filterdate2'};
my $membersToAnonymize =
- GetBorrowersWithIssuesHistoryOlderThan($filterdate1);
+ GetBorrowersWithIssuesHistoryOlderThan($filterdate2);
$totalAno = scalar @$membersToAnonymize;
}
- my $totalDel;
- if ($checkbox eq "borrower") {
- $filterdate2 = $params->{'filterdate2'};
- my $membersToDelete =
GetBorrowersWhoHaveNotBorrowedSince($filterdate2);
- $totalDel = scalar @$membersToDelete;
- }
$template->param(
step2 => 1,
totalToDelete => $totalDel,
@@ -103,8 +106,9 @@
my ( $totalDel, $totalAno, $radio ) = ( 0, 0, 0 );
+ # delete members
if ($do_delete) {
- my $membersToDelete =
GetBorrowersWhoHaveNotBorrowedSince($filterdate2);
+ my $membersToDelete =
GetBorrowersWhoHaveNotBorrowedSince($filterdate1);
$totalDel = scalar(@$membersToDelete);
$radio = $params->{'radio'};
if ( $radio eq 'trash' ) {
@@ -127,17 +131,10 @@
# Anonymising all members
if ($do_anonym) {
- my $membersToAnonymize =
- GetBorrowersWithIssuesHistoryOlderThan($filterdate1);
- $totalAno = scalar @$membersToAnonymize;
- my $i;
- for ( $i = 0 ; $i < $totalAno ; $i++ ) {
- AnonymiseIssueHistory(
$membersToAnonymize->[$i]->{'borrowernumber'},
- $filterdate1 );
- }
+ $totalAno = AnonymiseIssueHistory($filterdate2);
$template->param(
+ filterdate1 => $filterdate2,
do_anonym => '1',
- TotalAno => $totalAno,
);
}