Created attachment 60176 [details] [review] Add a field FR to the syspref AddressFormat Testplan 1 - Apply 2 - Check there is a field FR in the syspref AddressFormat
Created attachment 60214 [details] [review] Add a field FR to the syspref AddressFormat Testplan 1 - Apply 2 - Check there is a field FR in the syspref AddressFormat
Created attachment 60215 [details] [review] Add a field FR to the syspref AddressFormat Testplan 1 - Apply patch 2 - Check if there is a field FR in the syspref AddressFormat, enable it 3 - Create a new borrower and check the order of the fields for the address 4 - Check if it's address appears in a propper manner
Hi Babtiste, the patch adds a line ('LoadSearchHistoryToTheFirstLoggedUser',.... to installer/data/mysql/sysprefs.sql (Line 237) It seems to me that it is not related to this Bug?
Created attachment 60426 [details] [review] BUG 18110 : Removed a wrong syspref from code
On the patron's detail page, street number goes on a separate line, something like 11 rue de Bâle instead of 11 rue de Bâle I think the code should go inside the li element in member-display-address-style-fr.inc (maybe at other places as well?) You have something like: [% IF streetnumber %] [% streetnumber %][% END %] [%IF roadtype_desc %] [% roadtype_desc %][% END %] <li class="patronaddress1">[% address %] </li> I think it should be something like: <li class="patronaddress1"> [% IF streetnumber %] [% streetnumber %][% END %] [%IF roadtype_desc %] [% roadtype_desc %][% END %] [% address %] </li>
Hi, Are you sure you tested the newest version of the patch ? I remember I corrected at last a part of the problem Could you try again and send me the exact test plan you applied to get this bug ? I tried to make a new branch from master and apply the patch on a new branch : I can't reproduce it.
Created attachment 60657 [details] Screenshot with patch The streetnumber displays above the street (see screenshots at the left), I would expect them on the same line. 4554 Library Rd. instead of 4554 Library Rd. Editing the main address (Link below "Gender") displays some stray HTML (screenshots right).
Hi ! Did you reapply the patch ? I mean I can't reproduce your problem again, and I think I have corrected it, and by reapplying it on the master I can't reproduce it again.
Yes, I applied the patch. I think it is in member-display-address-style-fr.inc: The patch is as follows: (...) [% IF ( address ) %] [% SET roadtype_desc = '' %] [% IF streettype %] [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', streettype) %] [% END %] [% IF streetnumber %] [% streetnumber %][% END %] [%IF roadtype_desc %] [% roadtype_desc %][% END %] <li class="patronaddress1">[% address %] </li> [% END %] (...) If I change it to the following, the address displays OK: (...) [% IF ( address ) %] [% SET roadtype_desc = '' %] [% IF streettype %] [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', streettype) %] [% END %] <li class="patronaddress1"> [% IF streetnumber %] [% streetnumber %][% END %] [%IF roadtype_desc %] [% roadtype_desc %][% END %] [% address %] </li> [% END %] (...)
Additionally, member-main-address-style-fr.inc line 1 misses an opening < : fieldset class="rows" id="memberentry_mainaddress"> instead of: <fieldset class="rows" id="memberentry_mainaddress">
Created attachment 60689 [details] [review] Bug 16034 - DBRev 16.12.00.010 Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Created attachment 60690 [details] [review] BUG 18110 : Modified the adresses in order to fit the french standards
Created attachment 60694 [details] [review] BUG 18110 : Correct display and syspref AddFormat Add a field FR to the syspref AddressFormat Testplan 1 - Apply patch 2 - Check if there is a field FR in the syspref AddressFormat, enable it 3 - Create a new borrower and check the order of the fields for the address 4 - Check if it's address appears in a propper manner 27/02/17 : Fixed the display
Created attachment 60695 [details] [review] BUG 18110 : Correct display and syspref AddFormat Add a field FR to the syspref AddressFormat Testplan 1 - Apply patch 2 - Check if there is a field FR in the syspref AddressFormat, enable it 3 - Create a new borrower and check the order of the fields for the address 4 - Check if it's address appears in a propper manner 27/02/17 : Fixed the display
I'm really sorry, but there is still a problem with koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-fr.inc The streetnumber still does not display on the same line as the address. Your code reads (line 7 and following): <li> [% IF streetnumber %] [% streetnumber %][% END %] [%IF roadtype_desc %] [% roadtype_desc %][% END %] </li> <li class="patronaddress1">[% address %] </li> It should be: <li class="patronaddress1"> [% IF streetnumber %] [% streetnumber %][% END %] [%IF roadtype_desc %] [% roadtype_desc %][% END %] [% address %] </li>
Hi ! Do you think we should have everything printed on the same line ? I wasn't sure it would we best way to display the address, but is ok, I'll change it again ;)
Hi Baptiste, Yes, I think that number, street and address should display on the same line. See: https://fr.wikipedia.org/wiki/Adresse_postale#Recommandations_de_La_Poste (...) numéro dans la voie (éventuellement suivi d’un complément de numéro tel bis, ter, quater, etc.), immédiatement suivi du type de voie (rue, avenue, etc.) et du nom de celle-ci (...)
There is a problem when b.streettype is used, address 1 : 1 - is displayed on separate line at : http://pro.user05-koha.sandbox.biblibre.eu/cgi-bin/koha/circ/circulation.pl?borrowernumber=7020 http://pro.user05-koha.sandbox.biblibre.eu/cgi-bin/koha/members/moremember.pl?borrowernumber=7020 Furthermore, streettype is not displayed at all on some pages : For example : http://pro.user05-koha.sandbox.biblibre.eu/cgi-bin/koha/members/boraccount.pl?borrowernumber=7020 Other point : streetnumber nor streettype are not displayed here : http://pro.user05-koha.sandbox.biblibre.eu/cgi-bin/koha/members/member-password.pl?member=7020 but I guess these should be filled in another bugzilla ticket).
Created attachment 61610 [details] [review] BUG 18110: Corrected display address format - minor changes on address format - corrected member-password so that steetnumber is given to the template
I corrected the display of streetnumber in this ticket, I don't think it's necessary to open a new ticket just for one code line.
Hi Babtiste, Changes work fine, but please have a look at Alternate address as well, streetnumber is on a separate line and street type is after address. See: member-display-alt-address-style-fr.inc Marc
Sorry, I was wrong in my comment #16. I just found out that the addres line starts with an unwanted space character in member-display-address-style-fr.inc lines 8/9: [% IF streetnumber %] [% streetnumber %][% END %] [%IF roadtype_desc %] [% roadtype_desc %][% END %] The space characters after the IFs should move before the ENDs, otherwise the line will begin wit a blank. This is what I mean: [% IF streetnumber %][% streetnumber %] [% END %] [%IF roadtype_desc %][% roadtype_desc %] [% END %] BTW: Will be the same for member-display-alt-address-style-fr.inc
Sorry, one more unwanted space at the beginning of a line: [% IF ( city ) %]<li class="patroncity"> [%IF (zipcode ) %][% zipcode %] [% END %][% city %][% IF ( state ) ...should be: [% IF ( city ) %] <li class="patroncity">[%IF (zipcode ) %][% zipcode %] [% END %][% city %][% IF ( state ) Otherwise you get a space before the line with zipcode, city etc.
Created attachment 61639 [details] [review] BUG 18810: Removed unwanted spaces
(In reply to Marc Véron from comment #22) > Hi Babtiste, > > Changes work fine, but please have a look at Alternate address as well, > streetnumber is on a separate line and street type is after address. > > See: member-display-alt-address-style-fr.inc > > Marc Hi Babtiste, With Alternate address, I get: Alternate address 777 Royale rue 75002 Paris France I would expect 777 rue Royale
Created attachment 61650 [details] [review] BUG 18110 : Correct display and syspref AddFormat Add a field FR to the syspref AddressFormat Testplan 1 - Apply patch 2 - Check if there is a field FR in the syspref AddressFormat, enable it 3 - Create a new borrower and check the order of the fields for the address 4 - Check if it's address appears in a propper manner 27/02/17 : Fixed the display Signed-off-by: Aleisha Amohia <aleishaamohia@hotmail.com>
Created attachment 61651 [details] [review] BUG 18110: Corrected display address format - minor changes on address format - corrected member-password so that steetnumber is given to the template Signed-off-by: Aleisha Amohia <aleishaamohia@hotmail.com>
Created attachment 61652 [details] [review] BUG 18810: Removed unwanted spaces https://bugs.koha-community.org/show_bug.cgi?id=18110 Signed-off-by: Aleisha Amohia <aleishaamohia@hotmail.com>
Problem described in Comment #26 is not yet fixed. Followup patch follows
Created attachment 61656 [details] [review] Bug 18110: Folllowup to fix alternative address and add missing class This patch fixes the display of alternative address (streetnumber, streettype and address on same line, see comment #22, and it adds missing class patronaddress1 to main address display. To test: - Create / edit a customer to have streetnumber, streettype and address in both main address and alternate address - Switch syspref addressformat ot French style - Verify that both main address and alternate address display as expected on patron's detail page (street number, street type and address on same line)
Switching back to NSO for followup patch
Do not forget the update DB entry. And commit messages has to start with 'Bug xxxxx', not 'BUG xxxxx'
Created attachment 61796 [details] [review] Bug 18110: Update addressFormat in atomicupdate
Hi Babtiste - My followup patch would need a sign-off (See comment #32) - Atomic update produces an sql error, UPDATE sytax seems to be wrong. Did you test it? Marc
Created attachment 62651 [details] [review] Bug 18110: Folllowup to fix alternative address and add missing class This patch fixes the display of alternative address (streetnumber, streettype and address on same line, see comment #22, and it adds missing class patronaddress1 to main address display. To test: - Create / edit a customer to have streetnumber, streettype and address in both main address and alternate address - Switch syspref addressformat ot French style - Verify that both main address and alternate address display as expected on patron's detail page (street number, street type and address on same line) Works as expected. Signed-off-by: Baptiste Wojtkowski <baptiste.wojtkowski@biblibre.com>
Created attachment 62652 [details] [review] Bug 18110: Update addressFormat in atomicupdate
Sorry, syntax was wrong, I understood the error message as: your base is already full but everything is ok. I tested and signed off you patch, I just need the atomic update to be tested and signed off and I think we are done.
Created attachment 62664 [details] [review] Bug 18110: Update addressFormat in atomicupdate Signed-off-by: Marc Véron <veron@veron.ch>
Created attachment 62740 [details] [review] Bug 18110: Add a field FR to the syspref AddressFormat Add a field FR to the syspref AddressFormat Testplan 1 - Apply patch 2 - Check if there is a field FR in the syspref AddressFormat, enable it 3 - Create a new borrower and check the order of the fields for the address 4 - Check if it's address appears in a propper manner 27/02/17 : Fixed the display Signed-off-by: Aleisha Amohia <aleishaamohia@hotmail.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Created attachment 62741 [details] [review] Bug 18110: Corrected display address format - minor changes on address format - corrected member-password so that steetnumber is given to the template Signed-off-by: Aleisha Amohia <aleishaamohia@hotmail.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Created attachment 62742 [details] [review] Bug 18110: Removed unwanted spaces Signed-off-by: Aleisha Amohia <aleishaamohia@hotmail.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Created attachment 62743 [details] [review] Bug 18110: Folllowup to fix alternative address and add missing class This patch fixes the display of alternative address (streetnumber, streettype and address on same line, see comment #22, and it adds missing class patronaddress1 to main address display. To test: - Create / edit a customer to have streetnumber, streettype and address in both main address and alternate address - Switch syspref addressformat ot French style - Verify that both main address and alternate address display as expected on patron's detail page (street number, street type and address on same line) Signed-off-by: Baptiste Wojtkowski <baptiste.wojtkowski@biblibre.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Created attachment 62744 [details] [review] Bug 18110: Update addressFormat in atomicupdate Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Created attachment 62745 [details] [review] Bug 18110: Do not update value for existing installs Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Pushed to master for 17.05, thanks Baptiste, Marc, Jonathan!
This won't get ported back to 16.11.x as it is an enhancement.