Owen Leonard
81c90ba3bf
This patch adds a new menu for vendor-related pages in which
vendor related "views" can be linked to: baskets, basket groups,
contracts, invoices, uncertain prices.
The acquisitions toolbar is pared down to vendor-related actions:
New basket, contract, or vendor; edit vendor, delete vendor,
receive shipment.
Other small improvements have been made to other pages: corrections
to breadcrumbs and title tags, adding useful links betweeen pages.
Vendor menu and toolbar are added to booksellers.pl
when there is only one "search result" (i.e. a vendor id is passed).
- Menu appears when booksellerid variable is present
- Redundant heading removed
- Additional variables added to enable proper display of the toolbar
- Revision corrects broken links pointed out by QA.
- Revision adds check of existing baskets and subscriptions as a
condition on display of the vendor delete button.
TODO: Add coverage of Basket groups page.
To test, navigate Acquisitions pages and test as many links and buttons
as you can, confirming that nothing is broken on vendor pages, invoice
pages, contract pages, uncertain price pages, etc.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
All tests pass - I like this very much!
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.
Tests done:
1) New toolbar - vendor search
- no results = button to create new vendor shows
- 1 result = additional new options show
- more than one result = button to create new vendor shows
2) Vendor views
- acq toolbar consistent with 1 result in vendor search
- new tabs on the left
- checked all links have the needed parameters and work correctly
3) New toolbar - different pages
- Toolbar is formatted consistently
- Delete vendor shows only up when it should - no baskets or
subscriptions
- Links work correctly
Works nicely, great groundwork for further improvements.
TODO Add new toolbar to (new) invoices page.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
201 lines
10 KiB
Text
201 lines
10 KiB
Text
[% INCLUDE 'doc-head-open.inc' %]
|
|
<title>Koha › Acquisitions › Contracts ›
|
|
[% IF ( add_form ) %]
|
|
[% IF ( contractnumber ) %]Modify contract '[% contractname %]'
|
|
[% ELSE %]New contract[% END %]
|
|
[% END %]
|
|
[% IF ( else ) %]Contracts of [% booksellername %][% END %]
|
|
[% IF ( add_validate ) %]Data recorded[% END %]
|
|
[% IF ( delete_confirm ) %]Confirm deletion of contract '[% contractnumber %]'[% END %]
|
|
[% IF ( delete_confirmed ) %]Contract deleted[% END %]</title>
|
|
[% INCLUDE 'doc-head-close.inc' %]
|
|
[% INCLUDE 'calendar.inc' %]
|
|
<script type="text/javascript" src="[% themelang %]/js/acq.js"></script>
|
|
<script type="text/javascript">
|
|
//<![CDATA[
|
|
// to check if the data are correctly entered.
|
|
function Check(ff) {
|
|
var ok=0;
|
|
var _alertString=_("Form not submitted because of the following problem(s)");
|
|
_alertString +="\n-------------------------------------------------------------------\n\n";
|
|
if (!(isNotNull(ff.contractname,0))){
|
|
ok=1;
|
|
_alertString += _("- Name missing") + "\n";
|
|
}
|
|
var startDate = Date_from_syspref($("#from").val());
|
|
var endDate = Date_from_syspref($("#to").val());
|
|
if (!parseInt(startDate.getTime())) {
|
|
ok=1;
|
|
_alertString += _("- Start date missing or invalid.") + "\n";
|
|
}
|
|
if (!parseInt(endDate.getTime())) {
|
|
ok=1;
|
|
_alertString += _("- End date missing or invalid.") + "\n";
|
|
}
|
|
|
|
if (startDate > endDate) {
|
|
ok=1;
|
|
_alertString += _("Wrong date! start date cannot be after end date.") + "\n";
|
|
}
|
|
if (endDate < (new Date)) {
|
|
ok=1;
|
|
_alertString += _("End date before today, Invalid end date!") + "\n";
|
|
}
|
|
if (ok) { // if there is a problem
|
|
alert(_alertString);
|
|
return false;
|
|
}
|
|
// if all is good
|
|
ff.submit();
|
|
}
|
|
//]]>
|
|
</script>
|
|
</head>
|
|
<body id="acq_aqcontract" class="acq">
|
|
[% INCLUDE 'header.inc' %]
|
|
[% INCLUDE 'contracts-admin-search.inc' %]
|
|
|
|
<div id="breadcrumbs">
|
|
<a href="/cgi-bin/koha/mainpage.pl">Home</a>
|
|
›
|
|
<a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
|
|
›
|
|
<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername %]</a>
|
|
›
|
|
[% IF ( add_form ) %]
|
|
<a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid %]">Contracts</a>
|
|
›
|
|
[% IF ( contractnumber ) %]Modify contract '[% contractname %]'
|
|
[% ELSE %]New contract
|
|
[% END %]
|
|
[% END %]
|
|
[% IF ( add_validate ) %]
|
|
<a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid %]">Contracts</a>
|
|
› Data recorded
|
|
[% END %]
|
|
[% IF ( delete_confirm ) %]
|
|
<a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid %]">Contracts</a>
|
|
› Confirm deletion of contract [% contractnumber %]
|
|
[% END %]
|
|
[% IF ( delete_confirmed ) %]
|
|
<a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid %]">Contracts</a> › Contract Deleted
|
|
[% END %]
|
|
[% IF ( else ) %]Contracts[% END %]
|
|
</div>
|
|
|
|
<div id="doc3" class="yui-t2">
|
|
|
|
<div id="bd">
|
|
<div id="yui-main">
|
|
<div class="yui-b">
|
|
|
|
[% INCLUDE 'acquisitions-toolbar.inc' %]
|
|
[% IF ( add_form ) %]
|
|
<form name="Aform" action="[% script_name %]" method="post">
|
|
<input type="hidden" name="op" value="add_validate" />
|
|
<input type="hidden" name="booksellerid" value="[% booksellerid %]" />
|
|
<input type="hidden" name="checked" value="0" />
|
|
[% IF ( contractnumber ) %]
|
|
<h1>Modify contract [% contractname %] for [% booksellername %]</h1>
|
|
[% ELSE %]
|
|
<h1>New contract for [% booksellername %]</h1>
|
|
[% END %]
|
|
<fieldset class="rows">
|
|
<ol>
|
|
[% IF ( contractnumber ) %]
|
|
<li><span class="label">Contract id </span>[% contractnumber %]
|
|
<input type="hidden" name="contractnumber" value="[% contractnumber %]" />
|
|
<input type="hidden" name="is_a_modif" value="1" />
|
|
</li>
|
|
[% END %]
|
|
<li><label for="contractname" class="required">Name *</label>
|
|
<input type="text" name="contractname" id="contractname" size="40" maxlength="80" value="[% contractname %]" />
|
|
</li>
|
|
<li><label for="contractdescription">Description</label>
|
|
<input type="text" name="contractdescription" id="contractdescription" size="40" maxlength="80" value="[% contractdescription %]" />
|
|
</li>
|
|
<li><label for="from" class="required">Start date *</label>
|
|
<input type="text" name="contractstartdate" id="from" value="[% contractstartdate %]" maxlength="10" size="10" class="datepickerfrom" />
|
|
<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
|
|
</li>
|
|
<li><label for="to" class="required">End date *</label>
|
|
<input type="text" name="contractenddate" id="to" value="[% contractenddate %]" maxlength="10" size="10" class="datepickerto" />
|
|
<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
|
|
</li>
|
|
</ol>
|
|
</fieldset>
|
|
<fieldset class="action">
|
|
<input type="button" value="Save" onclick="Check(this.form);" /> <a class="cancel" href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid %]&contractnumber=[% contractnumber %]">Cancel</a>
|
|
</fieldset>
|
|
</form>
|
|
[% END %]
|
|
[% IF ( add_validate ) %]
|
|
<h3>Data recorded</h3>
|
|
<form action="[% script_name %]" method="post">
|
|
<input type="submit" value="OK" />
|
|
</form>
|
|
[% END %]
|
|
[% IF ( delete_confirm ) %]
|
|
<form action="[% script_name %]" method="post">
|
|
<fieldset>
|
|
<legend>Confirm deletion of contract [% contractnumber %]</legend>
|
|
<table>
|
|
<tr><th scope="row">Contract number:</th><td>[% contractnumber %]</td></tr>
|
|
<tr><th scope="row">Contract name:</th><td>[% contractname %]</td></tr>
|
|
<tr><th scope="row">Contract description:</th><td>[% contractdescription %]</td></tr>
|
|
<tr><th scope="row">Contract start date:</th><td>[% contractstartdate %]</td></tr>
|
|
<tr><th scope="row">Contract end date:</th><td>[% contractenddate %]</td></tr>
|
|
<tr><th scope="row">Vendor:</th><td>[% booksellername %]</td></tr>
|
|
</table>
|
|
<fieldset class="action">
|
|
<input type="hidden" name="op" value="delete_confirmed" />
|
|
<input type="hidden" name="booksellerid" value="[% booksellerid %]" />
|
|
<input type="hidden" name="contractnumber" value="[% contractnumber %]" />
|
|
<input type="submit" value="Delete this Contract" />
|
|
<a class="cancel" href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid %]&contractnumber=[% contractnumber %]">Cancel</a>
|
|
</fieldset>
|
|
</fieldset>
|
|
</form>
|
|
[% END %]
|
|
[% IF ( delete_confirmed ) %]
|
|
<h3>Contract deleted</h3>
|
|
<form action="[% script_name %]" method="post">
|
|
<input type="hidden" name="booksellerid" value="[% booksellerid %]" />
|
|
<input type="submit" value="OK" />
|
|
</form>
|
|
[% END %]
|
|
[% IF ( else ) %]
|
|
<h2>Contract(s) of [% booksellername %]</h2>
|
|
[% IF ( loop ) %]
|
|
<table>
|
|
<tr>
|
|
<th scope="col">Name</th>
|
|
<th scope="col">Description</th>
|
|
<th scope="col">Start date</th>
|
|
<th scope="col">End date</th>
|
|
<th scope="col" colspan="2"> </th>
|
|
</tr>
|
|
[% FOREACH loo IN loop %]
|
|
[% IF ( loop.even ) %]<tr class="highlight">[% ELSE %]<tr>[% END %]
|
|
<td>
|
|
<a href="[% loo.script_name %]?op=add_form&booksellerid=[% loo.booksellerid %]&contractnumber=[% loo.contractnumber %]">[% loo.contractname %]</a>
|
|
</td>
|
|
<td>[% loo.contractdescription %]</td>
|
|
<td>[% loo.contractstartdate %]</td>
|
|
<td>[% loo.contractenddate %]</td>
|
|
<td><a href="[% loo.script_name %]?op=add_form&contractnumber=[% loo.contractnumber %]&booksellerid=[% loo.booksellerid %]">Edit</a></td>
|
|
<td><a href="[% loo.script_name %]?op=delete_confirm&contractnumber=[% loo.contractnumber %]&booksellerid=[% loo.booksellerid %]">Delete</a></td>
|
|
</tr>
|
|
[% END %]
|
|
</table>
|
|
[% ELSE %]
|
|
<div class="dialog message">There are no contracts with this vendor. <a href="/cgi-bin/koha/admin/aqcontract.pl?op=add_form&booksellerid=[% booksellerid %]">Add a contract</a>.</div>
|
|
[% END %]
|
|
[% END %]
|
|
</div>
|
|
</div>
|
|
<div class="yui-b">
|
|
[% INCLUDE 'vendor-menu.inc' %]
|
|
</div>
|
|
</div>
|
|
[% INCLUDE 'intranet-bottom.inc' %]
|