X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=koha-tmpl%2Fintranet-tmpl%2Fprog%2Fen%2Fmodules%2Fadmin%2Fsmart-rules.tt;h=03a8bdcf7dd8a6b9d31783eeae83600b1574ef63;hb=5ee536c715f90262c344b2afc9a9456382c858b1;hp=99c03d344323e35690feecd17a5f99d083b09e7d;hpb=84020230ebee553bccf4bfd895719806a7d211f5;p=koha.git

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
index 99c03d3443..03a8bdcf7d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
@@ -1,130 +1,10 @@
 [% USE Branches %]
+[% SET footerjs = 1 %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Administration &rsaquo; Circulation and fine rules</title>
 [% INCLUDE 'doc-head-close.inc' %]
-[% INCLUDE 'calendar.inc' %]
-<script type="text/javascript">
-//<![CDATA[
-
-function clear_edit(){
-    var cancel = confirm(_("Are you sure you want to cancel your changes?"));
-    if ( !cancel ) return;
-    $('#default-circulation-rules td').removeClass('highlighted-row');
-    var edit_row = $("#edit_row");
-    $(edit_row).find("input").each(function(){
-        var type = $(this).attr("type");
-        if (type != "button" && type != "submit" ) {
-            $(this).val("");
-            $(this).prop('disabled', false);
-        }
-        if ( type == "checkbox" ) {
-            $(this).prop('checked', false);
-        }
-    });
-    $(edit_row).find("select").prop('disabled', false);
-    $(edit_row).find("select option:first").attr("selected", "selected");
-    $(edit_row).find("td:last input[name='clear']").remove();
-}
-
-var MSG_CONFIRM_DELETE = _("Are you sure you want to delete this rule? This cannot be undone.");
-
-
-$(document).ready(function() {
-    $(".delete").on("click",function(){
-        return confirmDelete(MSG_CONFIRM_DELETE);
-    });
-
-    $("#clone_rules").on("click",function(){
-        var library_dropdown = document.getElementById("branch");
-        var selected_library = library_dropdown.options[library_dropdown.selectedIndex].value;
-        var selected_library_text = $("#branch option:selected").text();
-        var to_library = $("#tobranch option:selected").text();
-        var MSG_CONFIRM_CLONE;
-        if (selected_library === "*") {
-            MSG_CONFIRM_CLONE = _("Are you sure you want to clone this standard rule to %s library? This will override the existing rules in this library.").format(to_library);
-            return confirmClone(MSG_CONFIRM_CLONE);
-        } else {
-            MSG_CONFIRM_CLONE = _("Are you sure you want to clone this circulation and fine rule from %s to %s library? This will override the existing rules in this library.").format(selected_library_text, to_library);
-            return confirmClone(MSG_CONFIRM_CLONE);
-        }
-    });
-
-        $('#cap_fine_to_replacement_price').on('change', function(){
-            $('#overduefinescap').prop('disabled', $(this).is(':checked') );
-        });
-        $('#selectlibrary').find("input:submit").hide();
-        $('#branch').change(function() {
-                $('#selectlibrary').submit();
-        });
-        $(".editrule").click(function(){
-            if ( $("#edit_row").find("input[type='text']").filter(function(){return this.value.length > 0 }).length > 0 ) {
-                var edit = confirm(_("Are you sure you want to edit another rule?"));
-                if (!edit) return false;
-            }
-            $('#default-circulation-rules td').removeClass('highlighted-row');
-            $(this).parent().parent().find("td").each(function (i) {
-                $(this).addClass('highlighted-row');
-                itm = $(this).text();
-                itm = itm.replace(/^\s*|\s*$/g,'');
-                var current_column = $("#edit_row td:eq("+i+")");
-                if ( i == 7 ) {
-                    // specific processing for the Hard due date column
-                    var select_value = $(this).find("input[type='hidden'][name='hardduedatecomparebackup']").val();
-                    var input_value = '';
-                    if (typeof select_value === 'undefined'){
-                        select_value = '-1';
-                    }else {
-                        input_value = itm.split(' ')[1];
-                    }
-                    $(current_column).find("input[type='text']").val(input_value);
-                    $(current_column).find("select").val(select_value);
-                } else if ( i == 13 ) {
-                    // specific processing for cap_fine_to_replacement_price
-                    var cap_fine_to_replacement_price = $(this).find("input[type='checkbox']");
-                    $('#cap_fine_to_replacement_price').prop('checked', cap_fine_to_replacement_price.is(':checked') );
-                    $('#overduefinescap').prop('disabled', cap_fine_to_replacement_price.is(':checked') );
-                } else {
-                    $(current_column).find("input[type='text']").val(itm);
-                    // select the corresponding option
-                    $(current_column).find("select option").each(function(){
-                        opt = $(this).text().toLowerCase();
-                        opt = opt.replace(/^\s*|\s*$/g,'');
-                        if ( opt == itm.toLowerCase() ) {
-                            $(this).attr('selected', 'selected');
-                        }
-                    });
-                    if ( i == 0 || i == 1 ) {
-                        // Disable the 2 first columns, we cannot update them.
-                        var val = $(current_column).find("select option:selected").val();
-                        var name = "categorycode";
-                        if ( i == 1 ) {
-                            name="itemtype";
-                        }
-                        // Remove potential previous input added
-                        $(current_column).find("input").remove();
-                        $(current_column).append("<input type='hidden' name='"+name+"' value='"+val+"' />");
-                    } else if ( i == 3 || i == 4 ) {
-                        // If the value is not an integer for "Current checkouts allowed" or "Current on-site checkouts allowed"
-                        // The value is "Unlimited" (or an equivalent translated string)
-                        // an it should be set to an empty string
-                        if( !((parseFloat(itm) == parseInt(itm)) && !isNaN(itm)) ) {
-                            $(current_column).find("input[type='text']").val("");
-                        }
-                    }
-                }
-            });
-            $("#default-circulation-rules tr:last td:eq(0) select").prop('disabled', true);
-            $("#default-circulation-rules tr:last td:eq(1) select").prop('disabled', true);
-            return false;
-        });
-        $(".clear_edit").on("click",function(e){
-            e.preventDefault();
-            clear_edit();
-        });
-});
-//]]>
-</script>
 </head>
+
 <body id="admin_smart-rules" class="admin">
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'prefs-admin-search.inc' %]
@@ -198,6 +78,7 @@ $(document).ready(function() {
                 <th>Cap fine at replacement price</th>
                 <th>Suspension in days (day)</th>
                 <th>Max. suspension duration (day)</th>
+                <th>Fine day charging interval</th>
                 <th>Renewals allowed (count)</th>
                 <th>Renewal period</th>
                 <th>No renewal before</th>
@@ -234,13 +115,13 @@ $(document).ready(function() {
                                                         </td>
 
 							<td>[% IF ( rule.unlimited_maxissueqty ) %]
-									Unlimited
+									<span>Unlimited</span>
 								[% ELSE %]
 									[% rule.maxissueqty %]
 								[% END %]
 							</td>
                             <td>[% IF rule.unlimited_maxonsiteissueqty %]
-                                    Unlimited
+                                    <span>Unlimited</span>
                                 [% ELSE %]
                                     [% rule.maxonsiteissueqty %]
                                 [% END %]
@@ -262,12 +143,18 @@ $(document).ready(function() {
                                   <input type="hidden" name="hardduedatecomparebackup" value="1" />
                                 [% END %]
                               [% ELSE %]
-                                None defined
+                                <span>None defined</span>
                               [% END %]
                             </td>
 							<td>[% rule.fine %]</td>
 							<td>[% rule.chargeperiod %]</td>
-                <td>[% IF rule.chargeperiod_charge_at %]Start of interval[% ELSE %]End of interval[% END %]</td>
+                            <td>
+                                [% IF rule.chargeperiod_charge_at %]
+                                    <span>Start of interval</span>
+                                [% ELSE %]
+                                    <span>End of interval</span>
+                                [% END %]
+                            </td>
 							<td>[% rule.firstremind %]</td>
                             <td>[% rule.overduefinescap FILTER format("%.2f") %]</td>
                             <td>
@@ -279,14 +166,15 @@ $(document).ready(function() {
                             </td>
 							<td>[% rule.finedays %]</td>
                             <td>[% rule.maxsuspensiondays %]</td>
+                            <td>[% rule.suspension_chargeperiod %]</td>
 							<td>[% rule.renewalsallowed %]</td>
                             <td>[% rule.renewalperiod %]</td>
                             <td>[% rule.norenewalbefore %]</td>
                             <td>
                                 [% IF ( rule.auto_renew ) %]
-                                Yes
+                                    <span>Yes</span>
                                 [% ELSE %]
-                                No
+                                    <span>No</span>
                                 [% END %]
                             </td>
                             <td>[% rule.no_auto_renewal_after %]</td>
@@ -295,22 +183,31 @@ $(document).ready(function() {
                                                         <td>[% rule.holds_per_record %]</td>
                                                         <td>
                                                             [% IF rule.onshelfholds == 1 %]
-                                                                Yes
+                                                                <span>Yes</span>
                                                             [% ELSIF rule.onshelfholds == 2 %]
-                                                                If all unavailable
+                                                                <span>If all unavailable</span>
                                                             [% ELSE %]
-                                                                If any unavailable
-                                                            [% END %]</td>
-                                                        <td>[% IF rule.opacitemholds == 'F'%]Force[% ELSIF rule.opacitemholds == 'Y'%]Allow[% ELSE %]Don't allow[% END %]</td>
+                                                                <span>If any unavailable</span>
+                                                            [% END %]
+                                                        </td>
+                                                        <td>
+                                                            [% IF rule.opacitemholds == 'F'%]
+                                                                <span>Force</span>
+                                                            [% ELSIF rule.opacitemholds == 'Y'%]
+                                                                <span>Allow</span>
+                                                            [% ELSE %]
+                                                                <span>Don't allow</span>
+                                                            [% END %]
+                                                        </td>
                                                         <td>
                                                             [% IF rule.article_requests == 'no' %]
-                                                                No
+                                                                <span>No</span>
                                                             [% ELSIF rule.article_requests == 'yes' %]
-                                                                Yes
+                                                                <span>Yes</span>
                                                             [% ELSIF rule.article_requests == 'bib_only' %]
-                                                                Record only
+                                                                <span>Record only</span>
                                                             [% ELSIF rule.article_requests == 'item_only' %]
-                                                                Item only
+                                                                <span>Item only</span>
                                                             [% END %]
                                                         </td>
 							<td>[% rule.rentaldiscount %]</td>
@@ -374,6 +271,7 @@ $(document).ready(function() {
                     <td><input type="checkbox" name="cap_fine_to_replacement_price" id="cap_fine_to_replacement_price" /></td>
                     <td><input type="text" name="finedays" id="fined" size="3" /> </td>
                     <td><input type="text" name="maxsuspensiondays" id="maxsuspensiondays" size="3" /> </td>
+                    <td><input type="text" name="suspension_chargeperiod" id="suspension_chargeperiod" size="3" /> </td>
                     <td><input type="text" name="renewalsallowed" id="renewalsallowed" size="2" /></td>
                     <td><input type="text" name="renewalperiod" id="renewalperiod" size="3" /></td>
                     <td><input type="text" name="norenewalbefore" id="norenewalbefore" size="3" /></td>
@@ -436,6 +334,7 @@ $(document).ready(function() {
                       <th>Overdue fines cap (amount)</th>
                       <th>Cap fine at replacement price</th>
                       <th>Suspension in days (day)</th>
+                      <th>Fine day charging interval</th>
                       <th>Max. suspension duration (day)</th>
                       <th>Renewals allowed (count)</th>
                       <th>Renewal period</th>
@@ -599,13 +498,13 @@ $(document).ready(function() {
                             [% END %]
                         </td>
                         <td>[% IF ( branch_cat_rule_loo.unlimited_maxissueqty ) %]
-                                Unlimited
+                                <span>Unlimited</span>
                             [% ELSE %]
                                 [% branch_cat_rule_loo.maxissueqty %]
                             [% END %]
                         </td>
                         <td>[% IF ( branch_cat_rule_loo.unlimited_maxonsiteissueqty ) %]
-                                Unlimited
+                                <span>Unlimited</span>
                             [% ELSE %]
                                 [% branch_cat_rule_loo.maxonsiteissueqty %]
                             [% END %]
@@ -755,29 +654,29 @@ $(document).ready(function() {
                             [% END %]
                         </td>
                         <td>[% IF ( branch_item_rule_loo.holdallowed_any ) %]
-                                From any library
+                                <span>From any library</span>
                             [% ELSIF ( branch_item_rule_loo.holdallowed_same ) %]
-                                From home library
+                                <span>From home library</span>
                             [% ELSE %]
-                                No holds allowed
+                                <span>No holds allowed</span>
                             [% END %]
                         </td>
                         <td>[% IF ( branch_item_rule_loo.hold_fulfillment_policy == 'any' ) %]
-                                any library
+                                <span>any library</span>
                             [% ELSIF ( branch_item_rule_loo.hold_fulfillment_policy == 'homebranch' ) %]
-                                item's home library
+                                <span>item's home library</span>
                             [% ELSIF ( branch_item_rule_loo.hold_fulfillment_policy == 'holdingbranch' ) %]
-                                item's holding library
+                                <span>item's holding library</span>
                             [% END %]
                         </td>
                         <td>[% IF ( branch_item_rule_loo.returnbranch == 'homebranch' ) %]
-                                Item returns home
+                                <span>Item returns home</span>
                             [% ELSIF ( branch_item_rule_loo.returnbranch == 'holdingbranch' ) %]
-                                Item returns to issuing branch
+                                <span>Item returns to issuing branch</span>
                             [% ELSIF ( branch_item_rule_loo.returnbranch == 'noreturn' ) %]
-                                Item floats
+                                <span>Item floats</span>
                             [% ELSE %]
-                                Error - unknown option
+                                <span>Error - unknown option</span>
                             [% END %]
                         </td>
                         <td class="actions">
@@ -834,4 +733,127 @@ $(document).ready(function() {
 [% INCLUDE 'admin-menu.inc' %]
 </div>
 </div>
+
+[% MACRO jsinclude BLOCK %]
+    <script type="text/javascript" src="[% interface %]/[% theme %]/js/admin-menu_[% KOHA_VERSION %].js"></script>
+    [% INCLUDE 'calendar.inc' %]
+    <script type="text/javascript">
+
+        function clear_edit(){
+            var cancel = confirm(_("Are you sure you want to cancel your changes?"));
+            if ( !cancel ) return;
+            $('#default-circulation-rules td').removeClass('highlighted-row');
+            var edit_row = $("#edit_row");
+            $(edit_row).find("input").each(function(){
+                var type = $(this).attr("type");
+                if (type != "button" && type != "submit" ) {
+                    $(this).val("");
+                    $(this).prop('disabled', false);
+                }
+                if ( type == "checkbox" ) {
+                    $(this).prop('checked', false);
+                }
+            });
+            $(edit_row).find("select").prop('disabled', false);
+            $(edit_row).find("select option:first").attr("selected", "selected");
+            $(edit_row).find("td:last input[name='clear']").remove();
+        }
+
+        var MSG_CONFIRM_DELETE = _("Are you sure you want to delete this rule? This cannot be undone.");
+
+        $(document).ready(function() {
+            $(".delete").on("click",function(){
+                return confirmDelete(MSG_CONFIRM_DELETE);
+            });
+
+            $("#clone_rules").on("click",function(){
+                var library_dropdown = document.getElementById("branch");
+                var selected_library = library_dropdown.options[library_dropdown.selectedIndex].value;
+                var selected_library_text = $("#branch option:selected").text();
+                var to_library = $("#tobranch option:selected").text();
+                var MSG_CONFIRM_CLONE;
+                if (selected_library === "*") {
+                    MSG_CONFIRM_CLONE = _("Are you sure you want to clone this standard rule to %s library? This will override the existing rules in this library.").format(to_library);
+                    return confirmClone(MSG_CONFIRM_CLONE);
+                } else {
+                    MSG_CONFIRM_CLONE = _("Are you sure you want to clone this circulation and fine rule from %s to %s library? This will override the existing rules in this library.").format(selected_library_text, to_library);
+                    return confirmClone(MSG_CONFIRM_CLONE);
+                }
+            });
+
+            $('#cap_fine_to_replacement_price').on('change', function(){
+                $('#overduefinescap').prop('disabled', $(this).is(':checked') );
+            });
+            $('#selectlibrary').find("input:submit").hide();
+            $('#branch').change(function() {
+                    $('#selectlibrary').submit();
+            });
+            $(".editrule").click(function(){
+                if ( $("#edit_row").find("input[type='text']").filter(function(){return this.value.length > 0 }).length > 0 ) {
+                    var edit = confirm(_("Are you sure you want to edit another rule?"));
+                    if (!edit) return false;
+                }
+                $('#default-circulation-rules td').removeClass('highlighted-row');
+                $(this).parent().parent().find("td").each(function (i) {
+                    $(this).addClass('highlighted-row');
+                    itm = $(this).text();
+                    itm = itm.replace(/^\s*|\s*$/g,'');
+                    var current_column = $("#edit_row td:eq("+i+")");
+                    if ( i == 7 ) {
+                        // specific processing for the Hard due date column
+                        var select_value = $(this).find("input[type='hidden'][name='hardduedatecomparebackup']").val();
+                        var input_value = '';
+                        if (typeof select_value === 'undefined'){
+                            select_value = '-1';
+                        }else {
+                            input_value = itm.split(' ')[1];
+                        }
+                        $(current_column).find("input[type='text']").val(input_value);
+                        $(current_column).find("select").val(select_value);
+                    } else if ( i == 13 ) {
+                        // specific processing for cap_fine_to_replacement_price
+                        var cap_fine_to_replacement_price = $(this).find("input[type='checkbox']");
+                        $('#cap_fine_to_replacement_price').prop('checked', cap_fine_to_replacement_price.is(':checked') );
+                        $('#overduefinescap').prop('disabled', cap_fine_to_replacement_price.is(':checked') );
+                    } else {
+                        $(current_column).find("input[type='text']").val(itm);
+                        // select the corresponding option
+                        $(current_column).find("select option").each(function(){
+                            opt = $(this).text().toLowerCase();
+                            opt = opt.replace(/^\s*|\s*$/g,'');
+                            if ( opt == itm.toLowerCase() ) {
+                                $(this).attr('selected', 'selected');
+                            }
+                        });
+                        if ( i == 0 || i == 1 ) {
+                            // Disable the 2 first columns, we cannot update them.
+                            var val = $(current_column).find("select option:selected").val();
+                            var name = "categorycode";
+                            if ( i == 1 ) {
+                                name="itemtype";
+                            }
+                            // Remove potential previous input added
+                            $(current_column).find("input").remove();
+                            $(current_column).append("<input type='hidden' name='"+name+"' value='"+val+"' />");
+                        } else if ( i == 3 || i == 4 ) {
+                            // If the value is not an integer for "Current checkouts allowed" or "Current on-site checkouts allowed"
+                            // The value is "Unlimited" (or an equivalent translated string)
+                            // an it should be set to an empty string
+                            if( !((parseFloat(itm) == parseInt(itm)) && !isNaN(itm)) ) {
+                                $(current_column).find("input[type='text']").val("");
+                            }
+                        }
+                    }
+                });
+                $("#default-circulation-rules tr:last td:eq(0) select").prop('disabled', true);
+                $("#default-circulation-rules tr:last td:eq(1) select").prop('disabled', true);
+                return false;
+            });
+            $(".clear_edit").on("click",function(e){
+                e.preventDefault();
+                clear_edit();
+            });
+        });
+    </script>
+[% END %]
 [% INCLUDE 'intranet-bottom.inc' %]