Attachment #16062 for bug #9744

View | Details | Raw Unified | Return to bug 9744
Collapse All | Expand All

Lines 102-109 foreach my $budget ( @{$budget_arr} ) { Link Here

(-)a/acqui/acqui-home.pl (-2 / +3 lines)
102		102
103	my $member = GetMember( borrowernumber => $budget->{budget_owner_id} );	103	my $member = GetMember( borrowernumber => $budget->{budget_owner_id} );
104	if ($member) {	104	if ($member) {
105	$budget->{budget_owner} =	105	$budget->{budget_owner_firstname} = $member->{'firstname'};
106	$member->{'firstname'} . ' ' . $member->{'surname'};	106	$budget->{budget_owner_surname} = $member->{'surname'};
		107	$budget->{budget_owner_borrowernumber} = $member->{'borrowernumber'};
107	}	108	}
108		109
109	if ( !defined $budget->{budget_amount} ) {	110	if ( !defined $budget->{budget_amount} ) {




dt_overwrite_html_sorting_localeCompare();

$(document).ready(function() {

    var inactive = $(".b_inactive,.bu_active");
    var active = $(".bu_inactive");
    inactive.hide();
    active.show();

    $('#showallbudgets').click(function() {
        if ( $('#showallbudgets:checked').val() !== undefined) {
            inactive.show();
            active.hide();
        }
        else {
            inactive.hide();
            active.show();
        }
	    $('#b_inactive').hide();
	    $('.bu_inactive').show();
	    $('.bu_active').hide();
	}
    });
    var srlt = $("#accounts").dataTable($.extend(true, {}, dataTablesDefaults, {
        "aoColumns": [

            null,
            null,
            null,
            null,
            null,
            { "sType": "num-html" },
            { "sType": "num-html" },
            null
        ],
        'bPaginate': false,
        'bFilter': false,
        'bInfo': false
    } ) );
});
//]]>

[% INCLUDE 'acquisitions-toolbar.inc' %]

<h1>Acquisitions</h1>
<div class="yui-g">
<div class="yui-u first">
<div id="acqui_acqui_home_order">

    [% UNLESS ( loop_budget ) %]
        [% IF ( CAN_user_acquisition_period_manage ) %]
        <div class="dialog alert">You must <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">define a budget</a> in Administration</div>
        [% ELSE %]
        <div class="dialog alert">Your administrator must define a budget in Administration</div>
        [% END %]
    [% END %]
<div class="yui-g">
<div class="yui-u first">
<div id="acqui_acqui_home_order">
    <fieldset>
        <legend>Manage orders</legend>
        <form name="findsupplier" action="/cgi-bin/koha/acqui/booksellers.pl" method="post">

        </form>
    </fieldset>
</div>

[% IF ( suggestion ) %][% IF ( suggestions_count ) %]
<div id="acqui_acqui_home_suggestions">
    <fieldset>
    <legend>Pending suggestions</legend>
        <p>[% suggestions_count %] suggestions waiting. <a href="/cgi-bin/koha/suggestion/suggestion.pl">Manage suggestions</a>.</p>
    </fieldset>
</div>[% END %][% END %]

</div>

[% IF ( suggestion && suggestions_count ) %]
<div class="yui-u">
    <div id="acqui_acqui_home_suggestions">
        <fieldset>
        <legend>Pending suggestions</legend>
            <p>[% suggestions_count %] suggestions waiting. <a href="/cgi-bin/koha/suggestion/suggestion.pl">Manage suggestions</a>.</p>
        </fieldset>
    </div>
</div>
[% END %]

</div>

[% IF ( loop_budget ) %]

            <h3>All available funds[% IF ( branchname ) %] for [% branchname %] library[% END %]</h3>




    <div id="BudgetsAndFunds">
    <p><label for="showallbudgets">Show active and inactive:</label> <input type="checkbox" id="showallbudgets" /></p>
    <table id="accounts">
        <thead>
        <tr>
            <th>Fund</th>
            <th>Fund name</th>
            <th class="b_inactive">Active</th>
            <th>Owner</th>
            <th>Library</th>
            <th>Amount</th>

        <tr>
            <th>Total</th>
            <th>&nbsp;</th>
            <th class="b_inactive">&nbsp;</th>
            <th>&nbsp;</th>
            <th>&nbsp;</th>
            <th class="data"><span class="bu_active">[% total %]</span><span class="bu_inactive" >[% total_active %]</span></th>
            <th class="data"><span class="bu_active">[% totordered %]</span><span class="bu_inactive" >[% totordered_active %]</span></th>
            <th class="data"><span class="bu_active">[% totspent %]</span><span class="bu_inactive" >[% totspent_active %]</span></th>
            <th class="data"><span class="bu_active">[% totavail %]</span><span class="bu_inactive" >[% totavail_active %]</span></th>
        </tr>
        </tfoot>
        <tbody>
        [% FOREACH loop_budge IN loop_budget %]
        [% IF ( loop_budge.budget_period_active ) %]
            <tr>
                <td>
                    [% IF ( CAN_user_acquisition_budget_manage ) %]
                        <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% loop_budge.budget_period_id %]">[% loop_budge.budget_code %]</a>
                    [% ELSE %]
                        [% loop_budge.budget_code %]
                    [% END %]
                </td>
                <td>[% loop_budge.budget_name %]</td>
                <td class="b_inactive">Active</td>
                <td>[% IF ( loop_budge.budget_owner_borrowernumber ) %]
                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loop_budge.budget_owner_borrowernumber %]">[% loop_budge.budget_owner_surname %], [% loop_budge.budget_owner_firstname %]</a>
                    [% ELSE %]
                        &nbsp;
                    [% END %]
                </td>
                <td>[% loop_budge.budget_branchname %]</td>
                <td class="data">[% loop_budge.budget_amount %]</td>
                <td class="data"><a href="ordered.pl?fund=[% loop_budge.budget_id %]&amp;fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_ordered %]</a></td>
                <td class="data"><a href="spent.pl?fund=[% loop_budge.budget_id %]&amp;fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_spent %]</a></td>
                <td class="data">[% loop_budge.budget_avail %]</td>
            </tr>
        [% ELSE %]
            <tr class="b_inactive">
                <td>
                    [% IF ( CAN_user_acquisition_budget_manage ) %]
                        <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% loop_budge.budget_period_id %]">[% loop_budge.budget_code %]</a>
                    [% ELSE %]
                        [% loop_budge.budget_code %]
                    [% END %]
                </td>
                <td>[% loop_budge.budget_name %]</td>
                <td class="b_inactive">Inactive</td>
                <td>[% IF ( loop_budge.budget_owner_borrowernumber ) %]
                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loop_budge.budget_owner_borrowernumber %]">[% loop_budge.budget_owner_surname %], [% loop_budge.budget_owner_firstname %]</a>
                    [% ELSE %]
                        &nbsp;
                    [% END %]
                </td>
                <td>[% loop_budge.budget_branchname %]</td>
                <td class="data">[% loop_budge.budget_amount %]</td>
                <td class="data"><a href="ordered.pl?fund=[% loop_budge.budget_id %]&amp;fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_ordered %]</a></td>
                <td class="data"><a href="spent.pl?fund=[% loop_budge.budget_id %]&amp;fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_spent %]</a></td>
                <td class="data">[% loop_budge.budget_avail %]</td>
            </tr>
        [% END %]
            [% IF ( loop.odd ) %]
                <tr class="b_inactive" style="display : none;">
            [% ELSE %]
                <tr class="highlight" id = "b_inactive" style="display : none;">
            [% END %]
            <td align="center" >[% loop_budge.budget_code %]</td>
                <td align="center">[% loop_budge.budget_owner %]</td>
                <td align="center">[% loop_budge.budget_branchname %]</td>
                <td align="right" >[% loop_budge.budget_amount %]</td>
                <td align="right" ><a href="ordered.pl?fund=[% loop_budge.budget_id %]&amp;fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_ordered %]</a></td>
                <td align="right" ><a href="spent.pl?fund=[% loop_budge.budget_id %]&amp;fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_spent %]</a></td>
                <td align="right" >[% loop_budge.budget_avail %]</td>
            [% END %]
        [% END %]
        </tbody>
    </table>
    </div>
    [% END %]
</div>

</div>
</div>
</div>
<div class="yui-b">
[% INCLUDE 'acquisitions-menu.inc' %]
</div>
- 

Return to bug 9744

Lines 11-29 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt (-65 / +90 lines)
11	dt_overwrite_html_sorting_localeCompare();	11	dt_overwrite_html_sorting_localeCompare();
12		12
13	$(document).ready(function() {	13	$(document).ready(function() {
		14
		15	var inactive = $(".b_inactive,.bu_active");
		16	var active = $(".bu_inactive");
		17	inactive.hide();
		18	active.show();
		19
14	$('#showallbudgets').click(function() {	20	$('#showallbudgets').click(function() {
15	if ( $('#showallbudgets:checked').val() !== undefined) {	21	if ( $('#showallbudgets:checked').val() !== undefined) {
16	$('.b_inactive').show();	22	inactive.show();
17	$('#b_inactive').show();	23	active.hide();
18	$('.bu_active').show();	24	}
19	$('.bu_inactive').hide();	25	else {
20	}	26	inactive.hide();
21	else {	27	active.show();
22	$('.b_inactive').hide();	28	}
23	$('#b_inactive').hide();
24	$('.bu_inactive').show();
25	$('.bu_active').hide();
26	}
27	});	29	});
28	var srlt = $("#accounts").dataTable($.extend(true, {}, dataTablesDefaults, {	30	var srlt = $("#accounts").dataTable($.extend(true, {}, dataTablesDefaults, {
29	"aoColumns": [	31	"aoColumns": [
Lines 31-43 $(document).ready(function() { Link Here
31	null,	33	null,
32	null,	34	null,
33	null,	35	null,
		36	null,
		37	null,
34	{ "sType": "num-html" },	38	{ "sType": "num-html" },
35	{ "sType": "num-html" },	39	{ "sType": "num-html" },
36	null,	40	null
37	],	41	],
38	'bPaginate': false,	42	'bPaginate': false,
39	'bFilter': false,	43	'bFilter': false,
40	'bInfo': false,	44	'bInfo': false
41	} ) );	45	} ) );
42	});	46	});
43	//]]>	47	//]]>
Lines 59-76 $(document).ready(function() { Link Here
59	[% INCLUDE 'acquisitions-toolbar.inc' %]	63	[% INCLUDE 'acquisitions-toolbar.inc' %]
60		64
61	<h1>Acquisitions</h1>	65	<h1>Acquisitions</h1>
62	<div class="yui-g">
63	<div class="yui-u first">
64	<div id="acqui_acqui_home_order">
65
66	[% UNLESS ( loop_budget ) %]	66	[% UNLESS ( loop_budget ) %]
67	[% IF ( CAN_user_parameters ) %]	67	[% IF ( CAN_user_acquisition_period_manage ) %]
68	<div class="dialog alert">You must <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">define a budget</a> in Administration</div>	68	<div class="dialog alert">You must <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">define a budget</a> in Administration</div>
69	[% ELSE %]	69	[% ELSE %]
70	<div class="dialog alert">Your administrator must define a budget in Administration</div>	70	<div class="dialog alert">Your administrator must define a budget in Administration</div>
71	[% END %]	71	[% END %]
72	[% END %]	72	[% END %]
73		73	<div class="yui-g">
		74	<div class="yui-u first">
		75	<div id="acqui_acqui_home_order">
74	<fieldset>	76	<fieldset>
75	<legend>Manage orders</legend>	77	<legend>Manage orders</legend>
76	<form name="findsupplier" action="/cgi-bin/koha/acqui/booksellers.pl" method="post">	78	<form name="findsupplier" action="/cgi-bin/koha/acqui/booksellers.pl" method="post">
Lines 80-99 $(document).ready(function() { Link Here
80	</form>	82	</form>
81	</fieldset>	83	</fieldset>
82	</div>	84	</div>
83
84	[% IF ( suggestion ) %][% IF ( suggestions_count ) %]
85	<div id="acqui_acqui_home_suggestions">
86	<fieldset>
87	<legend>Pending suggestions</legend>
88	<p>[% suggestions_count %] suggestions waiting. <a href="/cgi-bin/koha/suggestion/suggestion.pl">Manage suggestions</a>.</p>
89	</fieldset>
90	</div>[% END %][% END %]
91
92	</div>	85	</div>
93		86
		87	[% IF ( suggestion && suggestions_count ) %]
94	<div class="yui-u">	88	<div class="yui-u">
		89	<div id="acqui_acqui_home_suggestions">
		90	<fieldset>
		91	<legend>Pending suggestions</legend>
		92	<p>[% suggestions_count %] suggestions waiting. <a href="/cgi-bin/koha/suggestion/suggestion.pl">Manage suggestions</a>.</p>
		93	</fieldset>
		94	</div>
		95	</div>
		96	[% END %]
		97
		98	</div>
95		99
96	[% IF ( loop_budget ) %]	100	[% IF ( loop_budget ) %]
97		101
98	<h3>All available funds[% IF ( branchname ) %] for [% branchname %] library[% END %]</h3>	102	<h3>All available funds[% IF ( branchname ) %] for [% branchname %] library[% END %]</h3>
99		103
Lines 103-112 $(document).ready(function() { Link Here
103		107
104		108
105	<div id="BudgetsAndFunds">	109	<div id="BudgetsAndFunds">
		110	<p><label for="showallbudgets">Show active and inactive:</label> <input type="checkbox" id="showallbudgets" /></p>
106	<table id="accounts">	111	<table id="accounts">
107	<thead>	112	<thead>
108	<tr>	113	<tr>
109	<th>Fund</th>	114	<th>Fund</th>
		115	<th>Fund name</th>
		116	<th class="b_inactive">Active</th>
110	<th>Owner</th>	117	<th>Owner</th>
111	<th>Library</th>	118	<th>Library</th>
112	<th>Amount</th>	119	<th>Amount</th>
Lines 119-171 $(document).ready(function() { Link Here
119	<tr>	126	<tr>
120	<th>Total</th>	127	<th>Total</th>
121	<th> </th>	128	<th> </th>
		129	<th class="b_inactive"> </th>
122	<th> </th>	130	<th> </th>
123	<th align="right" ><span class="bu_active" style="display : none;">[% total %]</span><span class="bu_inactive" >[% total_active %]</span></th>	131	<th> </th>
124	<th align="right" ><span class="bu_active" style="display : none;">[% totordered %]</span><span class="bu_inactive" >[% totordered_active %]</span></th>	132	<th class="data"><span class="bu_active">[% total %]</span><span class="bu_inactive" >[% total_active %]</span></th>
125	<th align="right" ><span class="bu_active" style="display : none;">[% totspent %]</span><span class="bu_inactive" >[% totspent_active %]</span></th>	133	<th class="data"><span class="bu_active">[% totordered %]</span><span class="bu_inactive" >[% totordered_active %]</span></th>
126	<th align="right" ><span class="bu_active" style="display : none;">[% totavail %]</span><span class="bu_inactive" >[% totavail_active %]</span></th>	134	<th class="data"><span class="bu_active">[% totspent %]</span><span class="bu_inactive" >[% totspent_active %]</span></th>
		135	<th class="data"><span class="bu_active">[% totavail %]</span><span class="bu_inactive" >[% totavail_active %]</span></th>
127	</tr>	136	</tr>
128	</tfoot>	137	</tfoot>
129	<tbody>	138	<tbody>
130	[% FOREACH loop_budge IN loop_budget %]	139	[% FOREACH loop_budge IN loop_budget %]
131	[% IF ( loop_budge.budget_period_active ) %]	140	[% IF ( loop_budge.budget_period_active ) %]
132	[% IF ( loop.odd ) %]	141	<tr>
133	<tr>	142	<td>
134	[% ELSE %]	143	[% IF ( CAN_user_acquisition_budget_manage ) %]
135	<tr class="highlight">	144	<a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% loop_budge.budget_period_id %]">[% loop_budge.budget_code %]</a>
136	[% END %]	145	[% ELSE %]
137	<td align="center">[% loop_budge.budget_code %]</td>	146	[% loop_budge.budget_code %]
138	<td align="center">[% loop_budge.budget_owner %]</td>	147	[% END %]
139	<td align="center">[% loop_budge.budget_branchname %]</td>	148	</td>
140	<td align="right" >[% loop_budge.budget_amount %]</td>	149	<td>[% loop_budge.budget_name %]</td>
141	<td align="right" ><a href="ordered.pl?fund=[% loop_budge.budget_id %]&fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_ordered %]</a></td>	150	<td class="b_inactive">Active</td>
142	<td align="right" ><a href="spent.pl?fund=[% loop_budge.budget_id %]&fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_spent %]</a></td>	151	<td>[% IF ( loop_budge.budget_owner_borrowernumber ) %]
143	<td align="right" >[% loop_budge.budget_avail %]</td>	152	<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loop_budge.budget_owner_borrowernumber %]">[% loop_budge.budget_owner_surname %], [% loop_budge.budget_owner_firstname %]</a>
		153	[% ELSE %]
		154
		155	[% END %]
		156	</td>
		157	<td>[% loop_budge.budget_branchname %]</td>
		158	<td class="data">[% loop_budge.budget_amount %]</td>
		159	<td class="data"><a href="ordered.pl?fund=[% loop_budge.budget_id %]&fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_ordered %]</a></td>
		160	<td class="data"><a href="spent.pl?fund=[% loop_budge.budget_id %]&fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_spent %]</a></td>
		161	<td class="data">[% loop_budge.budget_avail %]</td>
		162	</tr>
		163	[% ELSE %]
		164	<tr class="b_inactive">
		165	<td>
		166	[% IF ( CAN_user_acquisition_budget_manage ) %]
		167	<a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% loop_budge.budget_period_id %]">[% loop_budge.budget_code %]</a>
		168	[% ELSE %]
		169	[% loop_budge.budget_code %]
		170	[% END %]
		171	</td>
		172	<td>[% loop_budge.budget_name %]</td>
		173	<td class="b_inactive">Inactive</td>
		174	<td>[% IF ( loop_budge.budget_owner_borrowernumber ) %]
		175	<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loop_budge.budget_owner_borrowernumber %]">[% loop_budge.budget_owner_surname %], [% loop_budge.budget_owner_firstname %]</a>
		176	[% ELSE %]
		177
		178	[% END %]
		179	</td>
		180	<td>[% loop_budge.budget_branchname %]</td>
		181	<td class="data">[% loop_budge.budget_amount %]</td>
		182	<td class="data"><a href="ordered.pl?fund=[% loop_budge.budget_id %]&fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_ordered %]</a></td>
		183	<td class="data"><a href="spent.pl?fund=[% loop_budge.budget_id %]&fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_spent %]</a></td>
		184	<td class="data">[% loop_budge.budget_avail %]</td>
144	</tr>	185	</tr>
145	[% ELSE %]	186	[% END %]
146	[% IF ( loop.odd ) %]
147	<tr class="b_inactive" style="display : none;">
148	[% ELSE %]
149	<tr class="highlight" id = "b_inactive" style="display : none;">
150	[% END %]
151	<td align="center" >[% loop_budge.budget_code %]</td>
152	<td align="center">[% loop_budge.budget_owner %]</td>
153	<td align="center">[% loop_budge.budget_branchname %]</td>
154	<td align="right" >[% loop_budge.budget_amount %]</td>
155	<td align="right" ><a href="ordered.pl?fund=[% loop_budge.budget_id %]&fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_ordered %]</a></td>
156	<td align="right" ><a href="spent.pl?fund=[% loop_budge.budget_id %]&fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_spent %]</a></td>
157	<td align="right" >[% loop_budge.budget_avail %]</td>
158	[% END %]
159	[% END %]	187	[% END %]
160	</tbody>	188	</tbody>
161	</table>	189	</table>
162	</div><span class="label">Show all : </span><input type="checkbox" id="showallbudgets" />	190	</div>
163	[% END %]	191	[% END %]
164	</div>
165		192
166	</div>	193	</div>
167	</div>	194	</div>
168	</div>
169	<div class="yui-b">	195	<div class="yui-b">
170	[% INCLUDE 'acquisitions-menu.inc' %]	196	[% INCLUDE 'acquisitions-menu.inc' %]
171	</div>	197	</div>
172	-