X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=koha-tmpl%2Fintranet-tmpl%2Fprog%2Fen%2Fmodules%2Fadmin%2Faqbudgets.tt;h=82a66476cbbb44de1fb9a64a23693940839d2235;hb=b38187d8b004316b17d1e67753d638e96bb62bb8;hp=ca623f3f9c21079c01cee7419ba40e65aed26792;hpb=8ae5719d1681ffb5bf3dc803de5b80a39b6f3a68;p=koha.git

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
index ca623f3f9c..82a66476cb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
@@ -1,16 +1,79 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Administration &rsaquo; Funds[% IF ( add_form ) %] &rsaquo; [% IF ( budget_id ) %]Modify Fund[% IF ( budget_name ) %] '[% budget_name %]'[% END %][% ELSE %]Add Fund [% END %][% END %]</title>
+<title>Koha &rsaquo; Administration &rsaquo; Funds[% IF ( add_form ) %] &rsaquo; [% IF ( budget_id ) %]Modify fund[% IF ( budget_name ) %] '[% budget_name %]'[% END %][% ELSE %]Add fund [% END %][% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
+<script type="text/javascript">
+//<![CDATA[
+var MSG_BUDGET_PARENT_ALLOCATION = "- " + _("Fund amount exceeds parent allocation") + "\n";
+var MSG_BUDGET_PERIOD_ALLOCATION = "- " + _("Fund amount exceeds period allocation") + "\n";
+var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget") + "\n";
+//]]>
+</script>
+
 <script type="text/javascript" src="[% themelang %]/js/acq.js"></script>
 
 [% IF ( add_form ) %]
 <script type="text/javascript">
 //<![CDATA[
-//
-     var actTotal ="";
 
-    function ownerRemove(f) {
-        document.getElementById('budget_owner_name').innerHTML = '';
+    function userPopup() {
+        window.open("/cgi-bin/koha/admin/aqbudget_user_search.pl?type=user",
+            'PatronPopup',
+            'width=740,height=450,location=yes,toolbar=no,'
+            + 'scrollbars=yes,resize=yes'
+        );
+    }
+
+    function ownerPopup() {
+        window.open("/cgi-bin/koha/admin/aqbudget_user_search.pl?type=owner",
+            'PatronPopup',
+            'width=740,height=450,location=yes,toolbar=no,'
+            + 'scrollbars=yes,resize=yes'
+        );
+    }
+
+    function edit_owner(borrowernumber, surname, firstname) {
+        $('#budget_owner_name').empty();
+        $('#budget_owner_id').val('');
+        if (borrowernumber) {
+            var ownerlink = '<a href="/cgi-bin/koha/members/moremember.pl'
+                + '?borrowernumber=' + borrowernumber + '">'
+                + firstname + ' ' + surname + '</a>';
+            $('#budget_owner_name').html(ownerlink);
+            $('#budget_owner_id').val(borrowernumber);
+        }
+    }
+
+    function ownerRemove() {
+        edit_owner(0);
+    }
+
+    function add_user(borrowernumber, surname, firstname) {
+        var ids = $("#budget_users_id").val().split(':');
+        if(borrowernumber && ids.indexOf(borrowernumber) == -1) {
+            var li = '<li id="user_' + borrowernumber + '">'
+                + '<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber='
+                + borrowernumber + '">' + firstname + ' ' + surname
+                + '</a> [<a style="cursor:pointer"'
+                + 'onclick="del_user(' + borrowernumber +')">Remove</a>]</li>';
+            $(li).insertBefore("li#add_user_button");
+            ids.push(borrowernumber);
+            $("#budget_users_id").val(ids.join(':'));
+        } else {
+            return -1;
+        }
+        return 0;
+    }
+
+    function del_user(borrowernumber) {
+        var ids = $("#budget_users_id").val().split(':');
+        if (borrowernumber) {
+            var idx = ids.indexOf(borrowernumber+'');
+            if (idx != -1) {
+                ids.splice(idx, 1);
+                $("#budget_users_id").val(ids.join(':'));
+                $("li#user_" + borrowernumber).remove();
+            }
+        }
     }
 
     function Check(f) {
@@ -18,8 +81,6 @@
         var _alertString="";
         var alertString2;
 
-        // var actTotal ="";
-
         if (!(isNotNull(f.budget_code,1))) {
             _alertString += _("- Budget code cannot be blank") + "\n";
         }
@@ -83,10 +144,16 @@
 //]]>
 </script>
 [% ELSE %]
-<link href="[% themelang %]/lib/jquery/plugins/treetable/stylesheets/jquery.treeTable.css" rel="stylesheet" type="text/css" />
+    [% IF ( notree ) %]
+        <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
+        <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
+        [% INCLUDE 'datatables-strings.inc' %]
+        <script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
+    [% ELSE %]
+        <link href="[% themelang %]/lib/jquery/plugins/treetable/stylesheets/jquery.treeTable.css" rel="stylesheet" type="text/css" />
+        <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/treetable/jquery.treeTable.min.js"></script>
+    [% END %]
 
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/treetable/jquery.treeTable.min.js"></script>
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.qtip.js"></script>
 
 <script type="text/javascript">
@@ -121,18 +188,20 @@
             }
         });
         [% IF ( notree ) %]
-        $("#budgeth").tablesorter({
-            widgets : ['zebra'],
-            sortList: [[0,0]],
-            headers: { 7: { sorter: false }}
-        });
+            $("#budgeth").dataTable($.extend(true, {}, dataTablesDefaults, {
+                "aoColumnDefs": [
+                    { "aTargets": [ -1 ], "bSortable": false, "bSearchable": false },
+                ],
+                "aLengthMenu": [[10, 20, 50, 100, -1], [10, 20, 50, 100, "All"]],
+                "iDisplayLength": 20,
+                "sPaginationType": "four_button"
+            }));
         [% ELSE %]
         $("#budgeth").treeTable();
         [% END %]
 
         $("#filterbutton").click(function() {
             $("#fundfilters").slideToggle(0);
-            $("#content").css({ marginLeft:  $("#content").css("marginLeft") == "4em"?"15em":"4em"});
         });
     });
 //]]>
@@ -140,7 +209,7 @@
 [% END %]
 
 </head>
-<body>
+<body id="admin_aqbudgets" class="admin">
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'budgets-admin-search.inc' %]
 
@@ -154,13 +223,23 @@
 <div id="yui-main">
 <div class="yui-b" id="content">
 
+
 [% UNLESS ( delete_confirm ) %][% INCLUDE 'budgets-admin-toolbar.inc' %][% END %]
+
+[% IF (error_not_authorised_to_modify) %]
+    <div class="error">
+        <p>You are not authorized to modify this fund</p>
+    </div>
+[% END %]
+
 [% IF ( else ) %]
 
 <h1>Funds for '[% budget_period_description %]'</h1>
 
 [% INCLUDE 'budgets-active-currency.inc' %]
 
+[% IF ( budget ) %]
+
 <table id="budgeth">
     <thead>
         <tr>
@@ -188,7 +267,6 @@
     </tr>
     </tfoot>
     <tbody>
-    [% IF ( budget ) %]
         [% FOREACH budge IN budget %]
     [% IF ( budge.toggle ) %]
     <tr id="node-[% budge.budget_id %]" class="highlight[% IF ( budge.budget_parent_id ) %] child-of-node-[% budge.budget_parent_id %][% END %] tooltiped">
@@ -225,28 +303,29 @@
             </ul>
         [% END %]</td>
     [% IF ( budge.budget_lock ) %]
-        <td> <span style="color: gray;" > Edit Delete </span> </td>
+        <td> <span style="color: gray;"> Edit Delete </span> </td>
     [% ELSE %]
         <td>
             <a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&amp;budget_id=[% budge.budget_id %]&amp;budget_period_id=[% budge.budget_period_id %]" >Edit</a>
             <a href="/cgi-bin/koha/admin/aqbudgets.pl?op=delete_confirm&amp;budget_id=[% budge.budget_id %]&amp;budget_period_id=[% budge.budget_period_id %]">Delete</a>
-            <a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&amp;budget_parent_id=[% budge.budget_id %]&amp;budget_period_id=[% budge.budget_period_id %]">Add Child Fund</a>
+            <a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&amp;budget_parent_id=[% budge.budget_id %]&amp;budget_period_id=[% budge.budget_period_id %]">Add child fund</a>
         </td>
     [% END %]
     </tr>
-        [% END %]
-    [% ELSE %]
-        <tr><td colspan="12">No fund found</td></tr>
     [% END %]
     </tbody>
 </table>
 
+[% ELSE %]
+    No fund found
+[% END %]
+
 [% IF ( pagination_bar ) %]<div class="pages">[% pagination_bar %]</div>[% END %]
 [% END %] <!-- else -->
 
 <!-- ********************************************************************************************** -->
 <!-- create add/mod entry form -->
-[% IF ( add_form ) %]
+[% IF ( add_form && !error_not_authorised_to_modify ) %]
 <form action="/cgi-bin/koha/admin/aqbudgets.pl" name="Aform" method="post">
     <fieldset class="rows">
     <legend>[% IF ( budget_id ) %]Modify[% ELSE %]Add[% END %] Fund
@@ -260,19 +339,19 @@
     <ol>
     [% IF ( budget_parent_id ) %]
     <li>
-        <span class="label">Fund Parent: </span>
+        <span class="label">Fund parent: </span>
         [% budget_parent_name %]
         [% budget_parent_id %] - [% budget_parent_name %]
         <input type="hidden" name="budget_parent_id" value="[% budget_parent_id %]" />
     </li>
     [% END %]
     <li>
-    <label class="required"  for="budget_code">Fund Code: </label>
+    <label class="required"  for="budget_code">Fund code: </label>
     <input type="text" name="budget_code" id="budget_code" value="[% budget_code %]" size="30" />
     </li>
 
     <li>
-    <label class="required" for="budget_name">Fund Name: </label>
+    <label class="required" for="budget_name">Fund name: </label>
     <input type="text" name="budget_name" id="budget_name" value="[% budget_name %]" size="60" />
     </li>
 
@@ -281,27 +360,50 @@
     <input type="text" name="budget_amount" id="budget_amount" value="[% budget_amount %]" size="8" />
     </li>
 
-    <li>
+    <li style="display:none;">
     <label for="budget_encumb">Encumbrance: </label>
     <input type="text" name="budget_encumb" id="budget_encumb" value="[% budget_encumb %]" size="8" />
     </li>
 
-    <li>
+    <li style="display:none;">
     <label for="budget_expend">Expenditure: </label>
-    <input type="text" name="budget_expend" id="budget_expend" value="[% budget_expend %]" size="8" /><input type="hidden" name="budget_owner_id" id="budget_owner_id" value="[% budget_owner_id %]" />
+    <input type="text" name="budget_expend" id="budget_expend" value="[% budget_expend %]" size="8" />
     </li>
 
     <li>
-    <span class="label">Owner: </span>
-    <span  id="budget_owner_name">
-    <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% budget_owner_id %]">[% budget_owner_name %]</a>
-    </span>
-
-    <!-- FIXME: hardcoded button positions :/ -->
-    <input style="" type="button" id="edit_owner" value="Edit owner" onclick="ownerPopup(); return false;" />
-    <input style=""  type="button" id="remove_owner" value="Remove owner" onclick="ownerRemove(this.form); return false;" />
+        <span class="label">Owner: </span>
+        <span  id="budget_owner_name">
+        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% budget_owner_id %]">
+            [% budget_owner_name %]
+        </a>
+        </span>
+        <input type="hidden" name="budget_owner_id" id="budget_owner_id"
+            value="[% budget_owner_id %]" />
+
+        <!-- FIXME: hardcoded button positions :/ -->
+        <input type="button" id="edit_owner" value="Edit owner"
+            onclick="ownerPopup(); return false;" />
+        <input type="button" id="remove_owner" value="Remove owner"
+            onclick="ownerRemove(); return false;" />
     </li>
 
+    <li>
+        <span class="label">Users:</span>
+        <ul style="float:left;" id="budget_users">
+            [% FOREACH user IN budget_users %]
+                <li id="user_[% user.borrowernumber %]">
+                    <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% user.borrowernumber %]">
+                        [% user.firstname %] [% user.surname %]
+                    </a>
+                    [<a style="cursor:pointer"
+                    onclick="del_user([% user.borrowernumber %])">Remove</a>]
+                </li>
+            [% END %]
+            <li id="add_user_button">
+                <input type="button" onclick="userPopup()" value="Add users" />
+            </li>
+        </ul>
+        <input type="hidden" name="budget_users_ids" id="budget_users_id" value="[% budget_users_ids %]" />
     <li>
     <label for="budget_branchcode">Library: </label>
     <select name="budget_branchcode" id="budget_branchcode">
@@ -315,10 +417,37 @@
     <li>
     <label for="budget_permission">Restrict access to: </label>
     <select name="budget_permission" id="budget_permission">
-    [% IF ( budget_perm_0 ) %]<option value="0" selected="selected">None</option>[% ELSE %]<option value="0">None</option>[% END %]
-    [% IF ( budget_perm_1 ) %]<option value="1" selected="selected">Owner</option>[% ELSE %]<option value="1">Owner</option>[% END %]
-    [% IF ( budget_perm_2 ) %]<option value="2" selected="selected">Library</option>[% ELSE %]<option value="2">Library</option>[% END %]
-    </option>
+        [% IF ( budget_perm_0 ) %]
+            <option value="0" selected="selected">
+        [% ELSE %]
+            <option value="0">
+        [% END %]
+            None
+        </option>
+
+        [% IF ( budget_perm_1 ) %]
+            <option value="1" selected="selected">
+        [% ELSE %]
+            <option value="1">
+        [% END %]
+            Owner
+        </option>
+
+        [% IF ( budget_perm_3) %]
+            <option value="3" selected="selected">
+        [% ELSE %]
+            <option value="3">
+        [% END %]
+            Owner and users
+        </option>
+
+        [% IF ( budget_perm_2 ) %]
+            <option value="2" selected="selected">
+        [% ELSE %]
+            <option value="2">
+        [% END %]
+            Owner, users and library
+        </option>
     </select>
     </li>
 
@@ -377,10 +506,10 @@
 [% END %] <!-- add_form -->
 
 [% IF ( delete_confirm ) %]
-<div class="dialog alert"> <h3>Delete Fund [% budget_name %]?</h3>
+<div class="dialog alert"> <h3>Delete fund [% budget_name %]?</h3>
 <table>
     <tr>
-    <th scope="row">Fund Amount:</th>
+    <th scope="row">Fund amount:</th>
     <td>[% budget_amount %]</td>
     </tr>
 </table>
@@ -389,11 +518,11 @@
     <input type="hidden" name="op" value="delete_confirmed" />
     <input type="hidden" name="budget_id" value="[% budget_id %]" />
     <input type="hidden" name="budget_period_id" value="[% budget_period_id %]" />
-    <input type="submit" value="Delete this budget" class="approve" />
+    <input type="submit" value="Delete" class="approve" />
 </form>
 
 <form action="[% action %]" method="get">
-    <input type="submit" class="deny" value="No, Do Not Delete" />
+    <input type="submit" class="deny" value="Cancel" />
 </form>
 </div>
 [% END %]
@@ -419,7 +548,7 @@
         </li>
         <li class="radio">
 
-        <label for="show_mine">Show my<br /> funds only</label>
+        <label for="show_mine">Show my funds only</label>
             [% IF ( show_mine ) %]
                 <input type="checkbox" id="show_mine"  name="show_mine" value="1" checked="checked" />
             [% ELSE %]