Attachment 43220 Details for Bug 14924 – Bug 14924 - Remove C4::Dates from members/memberentry.pl

[patch] Bug 14924 - Remove C4::Dates from members/memberentry.pl

Bug-14924---Remove-C4Dates-from-membersmemberentry.patch (text/plain), 4.63 KB, created by Jonathan Druart on 2015-10-08 08:32:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2015-10-08 08:32:43 UTC

Size: 4.63 KB

patch

obsolete

>From 5cb993c706aca7d03fd829e32a68a3a85210fdca Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Marc=20V=C3=A9ron?= <veron@veron.ch>
>Date: Tue, 29 Sep 2015 17:32:56 +0200
>Subject: [PATCH] Bug 14924 - Remove C4::Dates from members/memberentry.pl
>
>This patch removes C4::Dates from members/memberentry.pl
>
>To test:
>- Apply patch
>- Add and edit patrons with and without birthdate as
>  mandatory field (syspref BorrowerMandatoryField)
>- Verify that dates (birtdate, registration, expiration)
>  display and are stored correctly
>
>Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
>Works as advertised. Tested with syspref BorrowerMandatoryField and
>table borrowers.dateofbirth
>
>Bug 14924 - (follow-up) Add date validation using eval
>
>This patch adds a date validation (see comment #3).
>
>To test:
>
>- Apply patch
>- Create a new user or edit an existing user
>- Try valid dates for date of birth
>- Try invalid dates as 0000-00-00 or 32/01/1970. You can can
>  copy/paste such strings to the date field, ignore the warning
>  message and submit. Verify that after submit you get a message
>  "Date of birth is invalid"
>- Try the same with enrollement /expiry dates
>
>Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
>Works as advertised. Tested with invalid dates.
>
>Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Amended patch: I have splitted them to make them much more readable
>(some lines were removed then added).
>---
> members/memberentry.pl | 26 ++++++++++++--------------
> 1 file changed, 12 insertions(+), 14 deletions(-)
>
>diff --git a/members/memberentry.pl b/members/memberentry.pl
>index bc5efda..ba705a5 100755
>--- a/members/memberentry.pl
>+++ b/members/memberentry.pl
>@@ -35,7 +35,6 @@ use C4::Members;
> use C4::Members::Attributes;
> use C4::Members::AttributeTypes;
> use C4::Koha;
>-use C4::Dates qw/format_date format_date_in_iso/;
> use C4::Log;
> use C4::Letters;
> use C4::Branch; # GetBranches
>@@ -167,19 +166,16 @@ if ( $op eq 'insert' || $op eq 'modify' || $op eq 'save' || $op eq 'duplicate' )
>         }
>     }
> 
>-    my $dateobject = C4::Dates->new();
>-    my $syspref = $dateobject->regexp();		# same syspref format for all 3 dates
>-    my $iso     = $dateobject->regexp('iso');	#
>     foreach (qw(dateenrolled dateexpiry dateofbirth)) {
>         next unless exists $newdata{$_};
>         my $userdate = $newdata{$_} or next;
>-        if ($userdate =~ /$syspref/) {
>-            $newdata{$_} = format_date_in_iso($userdate);	# if they match syspref format, then convert to ISO
>-        } elsif ($userdate =~ /$iso/) {
>-            warn "Date $_ ($userdate) is already in ISO format";
>+
>+        my $formatteddate = eval { output_pref({ dt => dt_from_string( $userdate ), dateformat => 'iso', dateonly => 1 } ); };
>+        if ( $formatteddate ) {
>+            $newdata{$_} = $formatteddate;
>         } else {
>             ($userdate eq '0000-00-00') and warn "Data error: $_ is '0000-00-00'";
>-            $template->param( "ERROR_$_" => 1 );	# else ERROR!
>+            $template->param( "ERROR_$_" => 1 );
>             push(@errors,"ERROR_$_");
>         }
>     }
>@@ -360,7 +356,7 @@ if ($op eq 'save' || $op eq 'insert'){
> 
> if ( ($op eq 'modify' || $op eq 'insert' || $op eq 'save'|| $op eq 'duplicate') and ($step == 0 or $step == 3 )){
>     unless ($newdata{'dateexpiry'}){
>-        my $arg2 = $newdata{'dateenrolled'} || C4::Dates->today('iso');
>+        my $arg2 = $newdata{'dateenrolled'} || output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 });
>         $newdata{'dateexpiry'} = GetExpiryDate($newdata{'categorycode'},$arg2);
>     }
> }
>@@ -643,10 +639,10 @@ if ($nok) {
>   #Formatting data for display    
>   
> if (!defined($data{'dateenrolled'}) or $data{'dateenrolled'} eq ''){
>-  $data{'dateenrolled'}=C4::Dates->today('iso');
>+  $data{'dateenrolled'} = output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 });
> }
> if ( $op eq 'duplicate' ) {
>-    $data{'dateenrolled'} = C4::Dates->today('iso');
>+    $data{'dateenrolled'} = output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 });
>     $data{'dateexpiry'} = GetExpiryDate( $data{'categorycode'}, $data{'dateenrolled'} );
> }
> if (C4::Context->preference('uppercasesurnames')) {
>@@ -655,8 +651,10 @@ if (C4::Context->preference('uppercasesurnames')) {
> }
> 
> foreach (qw(dateenrolled dateexpiry dateofbirth)) {
>-	$data{$_} = format_date($data{$_});	# back to syspref for display
>-	$template->param( $_ => $data{$_});
>+    if ( $data{$_} ) {
>+       $data{$_} = eval { output_pref({ dt => dt_from_string( $data{$_} ), dateonly => 1 } ); };  # back to syspref for display
>+    }
>+    $template->param( $_ => $data{$_});
> }
> 
> if (C4::Context->preference('ExtendedPatronAttributes')) {
>-- 
>2.1.0

Actions: View | Diff | Splinter Review

Attachments on bug 14924: 42953 | 42964 | 43028 | 43065 | 43217 | 43220