Attachment 20588 Details for Bug 10430 – [PASSED QA] Bug 10430 - status filter not working in serial claims when translated

[patch] [PASSED QA] Bug 10430 - status filter not working in serial claims when translated

PASSED-QA-Bug-10430---status-filter-not-working-in.patch (text/plain), 4.44 KB, created by Katrin Fischer on 2013-08-25 16:16:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2013-08-25 16:16:35 UTC

Size: 4.44 KB

patch

obsolete

>From cc28d3cc6b5a0bdfe24bb6a35a0919595f593657 Mon Sep 17 00:00:00 2001
>From: Fridolyn SOMERS <fridolyn.somers@biblibre.com>
>Date: Fri, 7 Jun 2013 12:14:02 +0200
>Subject: [PATCH] [PASSED QA] Bug 10430 - status filter not working in serial
> claims when translated
>
>With a translated intranet (ie fr-FR) the status filter does not work for "Late" status.
>It is because status in combobox filter is translated "Retard" and status in table is translated "En retard".
>
>This patch changed javascript filter to work on a status code instead of status name.
>The new classes may be used to change CSS depending on status.
>
>Test plan :
>- Use a translated intranet (ie fr-FR)
>- Go to serials claim of a vendor with issues of multiple status
>- Check that status filter does its work
>
>Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
>Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
>Patch passes all tests and QA script.
>The status filter should probably be changed to only
>allow filtering on status that can appear on the page.
>---
> .../prog/en/modules/serials/claims.tt | 50 +++++++++++---------
> 1 file changed, 27 insertions(+), 23 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt
>index 7528e9a..01af0e2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt
>@@ -68,16 +68,20 @@
> 	 }
> 	}
> 
>-	// Filter by status
>-	function filterByStatus() {
>-	 selectedStatus = $("#statusfilter").val();
>-	 if (selectedStatus == "all") {
>-		clearFilters();
>-	 } else {
>-		$("table#claimst tbody tr").hide();
>-		$("table#claimst tbody tr:contains(" + selectedStatus + ")").show();
>-	 }
>-	}
>+ // Filter by status
>+ function filterByStatus() {
>+ selectedStatus = $("#statusfilter").val();
>+ if (selectedStatus == "all") {
>+ clearFilters();
>+ } else {
>+ $("table#claimst tbody tr").hide();
>+ $("table#claimst tbody tr").each( function() {
>+ if ( $(this).find("span.status-" + selectedStatus).size() > 0 ) {
>+ $(this).show();
>+ }
>+ });
>+ }
>+ }
> 
> 	// Filter by branch
> 	function filterByBranch() {
>@@ -201,13 +205,13 @@
> 	<li>
> 	 <label for="statusfilter">Status : </label>
> 	 <select id="statusfilter" onchange="filterByStatus();">
>-		<option value="all" selected="selected">(All)</option>
>-		<option>Expected</option>
>-		<option>Arrived</option>
>-		<option>Late</option>
>-		<option>Missing</option>
>-		<option>Claimed</option>
>- <option>Stopped</option>
>+ <option value="all" selected="selected">(All)</option>
>+ <option value="expected">Expected</option>
>+ <option value="arrived">Arrived</option>
>+ <option value="late">Late</option>
>+ <option value="missing">Missing</option>
>+ <option value="claimed">Claimed</option>
>+ <option value="stopped">Stopped</option>
> 	 </select>
> 	</li>
> 	
>@@ -281,12 +285,12 @@
> [% missingissue.serialseq %]
> </td>
> <td>
>- [% IF ( missingissue.status1 ) %]Expected[% END %]
>- [% IF ( missingissue.status2 ) %]Arrived[% END %]
>- [% IF ( missingissue.status3 ) %]Late[% END %]
>- [% IF ( missingissue.status4 ) %]Missing[% END %]
>- [% IF ( missingissue.status7 ) %]Claimed[% END %]
>- [% IF ( missingissue.status8 ) %]Stopped[% END %]
>+ [% IF ( missingissue.status1 ) %]Expected[% END %]
>+ [% IF ( missingissue.status2 ) %]Arrived[% END %]
>+ [% IF ( missingissue.status3 ) %]Late[% END %]
>+ [% IF ( missingissue.status4 ) %]Missing[% END %]
>+ [% IF ( missingissue.status7 ) %]Claimed[% END %]
>+ [% IF ( missingissue.status8 ) %]Stopped[% END %]
> </td>
> <td class="planneddate">
> [% missingissue.planneddate %]
>-- 
>1.7.9.5

Actions: View | Diff | Splinter Review

Attachments on bug 10430: 18748 | 20197 | 20588 | 20704