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