From 409ac379f471e1ba16bc3ad2dcefdac16f141c5e Mon Sep 17 00:00:00 2001 From: Alex Buckley Date: Sun, 29 Jan 2017 11:33:35 +0000 Subject: [PATCH] Bug 18002 - Added in modal box and message (outside of modal box) for when users first visit Acquisitions. These messages are in place of the unclear yellow warning messages. Test plan: 1. Drop and recreate your database 2. Go through the web installer without installing any optional data values 3. Visit Acquisitions you should see two large yellow warning message boxes telling you to specify a currency and a budget 4. Apply this patch 5. Refresh the Acquisitions page. Instead of the two yellow warning messages you will see a message sentence telling you to create a currency (providing you with a link). As well as a modal box fading in specifying (with links) the steps you need to do to set up Acquisitions, in the following order: create budget, fund, vendor and basket --- .../prog/en/includes/budgets-active-currency.inc | 8 +++--- .../prog/en/modules/acqui/acqui-home.tt | 33 +++++++++++++++++++++- 2 files changed, 36 insertions(+), 5 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-active-currency.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-active-currency.inc index 1862059..005d58e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-active-currency.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-active-currency.inc @@ -3,12 +3,12 @@

Currency = [% currency %]

[% END %] [% ELSE %] -
-

No active currency is defined

[% IF CAN_user_parameters_parameters_remaining_permissions %] -

Please specify an active currency.

+

You have no currencies defined in your database

+ Enter a currency [% ELSE %]

Your administrator must specify an active currency.

[% END %] -
+
+

Now you can follow the below steps to set up acquisitions.


[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt index f64a60b..57cda13 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt @@ -15,6 +15,18 @@ dt_overwrite_html_sorting_localeCompare(); $(document).ready(function() { + //Store element references for the modal box in variables + var modal = document.getElementById('acquisitionsModal'); + var span = document.getElementsByClassName("close")[0]; + + //If no budget has been created fade in the acquisitions modal informational box + if ( showModal == 1) { + $('#acquisitionsModal').fadeIn(1000); + } + if ( hideModal == 1) { + $('#acquisitionsModal').hide(); + } + var oTable = $("#accounts").dataTable($.extend(true, {}, dataTablesDefaults, { "fnDrawCallback": function ( oSettings ) { if ( oSettings.aiDisplay.length == 0 ) @@ -103,11 +115,30 @@ $(document).ready(function() { [% INCLUDE 'budgets-active-currency.inc' hide = 'yes' %] [% UNLESS ( loop_budget ) %] [% IF ( CAN_user_acquisition_period_manage ) %] -
You must define a budget in Administration
+ + [% ELSE %]
Your administrator must define a budget in Administration
[% END %] [% END %] + +
-- 2.1.4