Attachment 60677 Details for Bug 18002 – Bug 18002 - Added add fund form to the onboardinginclude.inc file to be displayed after users have created a budget in the add budget form also in the onboardinginclude.inc

[patch] Bug 18002 - Added add fund form to the onboardinginclude.inc file to be displayed after users have created a budget in the add budget form also in the onboardinginclude.inc

Bug-18002---Added-add-fund-form-to-the-onboardingi.patch (text/plain), 10.68 KB, created by Alex Buckley on 2017-02-26 07:42:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Buckley

Created: 2017-02-26 07:42:00 UTC

Size: 10.68 KB

patch

obsolete

>From 3d5cbfd95f00b2a316ede61714dd9af38ecfbd31 Mon Sep 17 00:00:00 2001
>From: Alex Buckley <alexbuckley@catalyst.net.nz>
>Date: Fri, 17 Feb 2017 01:55:00 +0000
>Subject: [PATCH] Bug 18002 - Added add fund form to the onboardinginclude.inc
> file to be displayed after users have created a budget in the add budget form
> also in the onboardinginclude.inc
>
>---
> admin/aqbudgetperiods.pl                           |   6 +-
> .../prog/en/includes/onboardinginclude.inc         | 128 +++++++++++++--------
> .../prog/en/modules/acqui/acqui-home.tt            |   7 ++
> .../prog/en/modules/admin/aqbudgetperiods.tt       |   2 +-
> 4 files changed, 95 insertions(+), 48 deletions(-)
>
>diff --git a/admin/aqbudgetperiods.pl b/admin/aqbudgetperiods.pl
>index 7ce5783..8258578 100755
>--- a/admin/aqbudgetperiods.pl
>+++ b/admin/aqbudgetperiods.pl
>@@ -113,14 +113,16 @@ if ( $op eq 'add_form' ) {
> elsif ( $op eq 'add_validate' ) {
> ## add or modify a budget period (confirmation)
> 
>-    ## update budget period data
>+## update budget period data
> 	if ( $budget_period_id ne '' ) {
> 		$$budget_period_hashref{$_}||=0 for qw(budget_period_active budget_period_locked);
> 		my $status=ModBudgetPeriod($budget_period_hashref);
> 	} 
> 	else {    # ELSE ITS AN ADD
> 		my $budget_period_id=AddBudgetPeriod($budget_period_hashref);
>-	}
>+    print $input->redirect("/cgi-bin/koha/acqui/acqui-home.pl?step=2");
>+    exit;
>+}
> 	$op='else';
> }
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude.inc
>index b26f070..f64848c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/onboardinginclude.inc
>@@ -1,7 +1,3 @@
>-[% USE Koha %]
>-[% USE KohaDates %]
>-[% USE Branches %]
>-
> <style type="text/css">
>  #onboardingModal{
>      z-index:1;
>@@ -14,58 +10,100 @@
>      top:auto;
>      right:auto;
>      bottom:auto;
>-            border-radius:25px;
>+     border-radius:25px;
> }
> </style>
> 
>-[% step = 1 %]
>-
>-<div id="onboardingModal">
>-     <span class="close">&times;</span><br><br>
>-[% IF  displayonboardscreen == "acquisitions" %]
>-     <h2> Create a budget</h2>
>-     <form action="/cgi-bin/koha/admin/aqbudgetperiods.pl" name="f" method="post">
>-        <fieldset class="rows">
>+    <div id="onboardingModal">
>+         <span class="close">&times;</span><br><br>
>+    [% IF  displayonboardscreen == "acquisitions" %]
>+        [% IF step == 2 %]
>+        <form action="/cgi-bin/koha/admin/aqbudgets.pl" id="edit_fund" name="Aform" method="post">
>+            <fieldset class="rows">
>+            <legend>[% IF ( budget_id ) %]Modify[% ELSE %]Add[% END %] Fund
>+                [% IF ( budget_period_description ) %]
>+                    [% budget_name %] for Budget '[% budget_period_description %]'
>+                [% END %]
>+            </legend>
>             <input type="hidden" name="op" value="add_validate" />
>-            <input type="hidden" name="budget_period_id" value="[% budget_period_id %]" />
>+            <input type="hidden" name="checked" value="0" />
>             <ol>
>-                <li>
>-                    <label class="required" for="from">Start date: </label>
>-                    <input type="text" size="10" id="from" name="budget_period_startdate" value="[% budget_period_startdate | $KohaDates %]" class="datepickerfrom" />
>-                    <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
>+            [% IF ( budget_parent_id ) %]
>+                 <li>
>+                    <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="to">End date: </label>
>-                    <input type="text" size="10" id="to" name="budget_period_enddate" value="[% budget_period_enddate | $KohaDates %]" class="datepickerto" />
>-                    <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
>-                </li>
>+            <li>
>+                <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_period_description">Description: </label>
>-                    <input type="text" id="budget_period_description" name="budget_period_description"
>-                    size="48" maxlength="80" value="[% budget_period_description %]" />
>-                </li>
>+            <li>
>+                <label class="required" for="budget_name">Fund name: </label>
>+                <input type="text" name="budget_name" id="budget_name" value="[% budget_name %]" size="60" />
>+            </li>
> 
>-                <li>
>-                    <label for="budget_period_total">Total amount: </label>
>-                    <input type="text" id="budget_period_total" name="budget_period_total"
>-                    size="10" maxlength="80" value="[% budget_period_total | $Price on_editing => 1 %]" />
>-                </li>
>+            <li>
>+                <label style="white-space: nowrap;" for="budget_amount" class="required">Amount: </label>
>+                <input type="text" name="budget_amount" id="budget_amount" value="[% budget_amount | $Price on_editing => 1 %]" size="8" />
>+            </li>
> 
>-                <li>
>-                    <label for="budget_period_active">Make budget active: </label>
>-                    [% IF ( budget_period_active ) %]<input type="checkbox" checked="checked" id="budget_period_active" name="budget_period_a    ctive" value="1" />[% ELSE %]  <input type="checkbox" id="budget_period_active" name="budget_period_active" value="1"/> [% END %]
>-                </li>
>-            </ol>
>-        </fielset>
>+            <fieldset class="action">
>+                <input type="submit" value="Submit" /> <a class="cancel" href="/cgi-bin/koha/admin/aqbudgets.pl">Cancel</a>
>+                <input type="hidden" name="budget_period_id" value="[% budget_period_id %]" />
>+            </fieldset>
>+        </form>
>+
>+    [% ELSE %]
>+        <h2> Create a budget</h2>
>+        <form action="/cgi-bin/koha/admin/aqbudgetperiods.pl" name="f" method="post">
>+            <fieldset class="rows">
>+                <input type="hidden" name="op" value="add_validate" />
>+                <input type="hidden" name="budget_period_id" value="[% budget_period_id %]" />
>+                <ol>
>+                    <li>
>+                        <label class="required" for="from">Start date: </label>
>+                        <input type="text" size="10" id="from" name="budget_period_startdate" value="[% budget_period_startdate | $KohaDates %]" class="datepickerfrom" />
>+                        <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
>+                    </li>
>+
>+                    <li>
>+                        <label class="required" for="to">End date: </label>
>+                        <input type="text" size="10" id="to" name="budget_period_enddate" value="[% budget_period_enddate | $KohaDates %]" class="datepickerto" />
>+                        <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
>+                    </li>
>+
>+                    <li>
>+                        <label class="required" for="budget_period_description">Description: </label>
>+                        <input type="text" id="budget_period_description" name="budget_period_description" size="48" maxlength="80" value="[% budget_period_description %]" />
>+                    </li>
>+
>+                    <li>
>+                        <label for="budget_period_total">Total amount: </label>
>+                        <input type="text" id="budget_period_total" name="budget_period_total" size="10" maxlength="80" value="[% budget_period_total | $Price on_editing => 1 %]" />
>+                    </li>
>+
>+                    <li>
>+                        <label for="budget_period_active">Make budget active: </label>
>+                        [% IF ( budget_period_active ) %]<input type="checkbox" checked="checked" id="budget_period_active" name="budget_period_active" value="1" />[% ELSE %]  <input type="checkbox" id="budget_period_active" name="budget_period_active" value="1"/> [% END %]
>+                    </li>
>+                </ol>
>+            </fieldset>
>+
>+            <fieldset class="action">
>+                <a href = "/cgi-bin/koha/acqui/acqui-home.pl?step=2">
>+                <input type="submit" class="action" value="Submit" />
>+                </a>
>+                <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl" class="cancel">Cancel</a>
>+            </fieldset>
>+        </form>
>+    </div>
>+    [% END %]
> 
>-        <fieldset class="action">
>-            <input type="button" value="Save" onclick="Check(this.form)" />
>-            <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl" class="cancel">Cancel</a>
>-        </fielset>
>-    </form>
>-</div>
> [% ELSIF displayonboardscreen == "label" %]
> 
> 
>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 0bc0982..5240eee 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
>@@ -1,5 +1,9 @@
> [% USE Price %]
> [% USE Branches %]
>+[% USE Koha %]
>+[% USE KohaDates %]
>+[% USE Branches %]
>+
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Koha &rsaquo; Acquisitions</title>
> [% INCLUDE 'doc-head-close.inc' %]
>@@ -9,6 +13,9 @@
> <link href="[% interface %]/lib/jquery/plugins/treetable/stylesheets/jquery.treetable.css" rel="stylesheet" type="text/css" />
> <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/treetable/jquery.treetable.js"></script>
> 
>+[% INCLUDE 'calendar.inc' %]
>+<script type="text/javascript" src="[% interface %]/[% theme %]/js/acq.js"></script>
>+
> <script type="text/javascript">
> //<![CDATA[
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
>index a74329c..97ab4ea 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
>@@ -334,7 +334,7 @@
>     <li>
>     <label class="required" for="from">Start date: </label>
>     <input type="text" size="10" id="from" name="budget_period_startdate" value="[% budget_period_startdate | $KohaDates %]" class="datepickerfrom" />
>-				<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
>+				
>     </li>
>     <li>
> 
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 18002: 59910 | 59911 | 59992 | 60676 | 60677 | 60678 | 60679 | 60680 | 60681 | 60682 | 60683 | 60684 | 60685 | 60686 | 60687 | 60688 | 61987 | 61988 | 63150 | 63151 | 63380 | 63456 | 64732 | 64746 | 64765 | 64947 | 66301 | 67649 | 67650 | 67651 | 68108 | 68109 | 68110