Attachment #24059 for bug #7180

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




    push @{$budget_loop}, {
        b_id  => $r->{budget_id},
        b_txt => $r->{budget_name},
        b_sort1_authcat => $r->{'sort1_authcat'},
        b_sort2_authcat => $r->{'sort2_authcat'},
        b_active => $r->{budget_period_active},
        b_sel => ( $r->{budget_id} == $budget_id ) ? 1 : 0,
    };


}

$template->param( sort1 => $data->{'sort1'} );
$template->param( sort2 => $data->{'sort2'} );
    if ( defined $budget->{'sort1_authcat'} ) {    # with custom  Asort* planning values
        $CGIsort1 = GetAuthvalueDropbox( $budget->{'sort1_authcat'}, $data->{'sort1'} );
    }
} elsif(@{$budgets}){
    $CGIsort1 = GetAuthvalueDropbox(  @$budgets[0]->{'sort1_authcat'}, '' );
}

# if CGIsort is successfully fetched, the use it
# else - failback to plain input-field
if ($CGIsort1) {
    $template->param( CGIsort1 => $CGIsort1 );
} else {
    $template->param( sort1 => $data->{'sort1'} );
}

my $CGIsort2;
if ($budget) {
    if ( defined $budget->{'sort2_authcat'} ) {
        $CGIsort2 = GetAuthvalueDropbox(  $budget->{'sort2_authcat'}, $data->{'sort2'} );
    }
} elsif(@{$budgets}) {
    $CGIsort2 = GetAuthvalueDropbox(  @$budgets[0]->{sort2_authcat}, '' );
}

if ($CGIsort2) {
    $template->param( CGIsort2 => $CGIsort2 );
} else {
    $template->param( sort2 => $data->{'sort2'} );
}

if (C4::Context->preference('AcqCreateItem') eq 'ordering' && !$ordernumber) {
    # Check if ACQ framework exists




                $('#budget_id .b_inactive').remove();
            }
        });

        $("#budget_id").change(function(){
            var destination_sort1 = $(this).parents('fieldset.rows').find('input[name="sort1"]');
            var sort1_authcat = $(this).find("option:selected").attr('data-sort1-authcat');
            var sort1 = $(destination_sort1).val() || "";
            if ( destination_sort1.length < 1 ) {
                destination_sort1 = $(this).parents('fieldset.rows').find('select[name="sort1"]');
            }
            var destination_sort2 = $(this).parents('fieldset.rows').find('input[name="sort2"]');
            var sort2_authcat = $(this).find("option:selected").attr('data-sort2-authcat');
            var sort2 = $(destination_sort2).val() || "";
            if ( destination_sort2.length < 1 ) {
                destination_sort2 = $(this).parents('fieldset.rows').find('select[name="sort2"]');
            }
            getAuthValueDropbox( 'sort1', sort1_authcat, destination_sort1, sort1 );
            getAuthValueDropbox( 'sort2', sort2_authcat, destination_sort2, sort2 );
        });
        $("#budget_id").change();
    });
//]]>
</script>

                    <input type="hidden" name="budget_id" id="budget_id" value="[% budget_id %]" />[% Budget_name %]
                [% ELSE %]
                <label class="required" for="budget_id">Fund: </label>
                <select id="budget_id" size="1" name="budget_id">
                        <option value="">Select a fund</option>
                [% FOREACH budget_loo IN budget_loop %]
                    [% IF ( budget_loo.b_sel ) %]
                        <option value="[% budget_loo.b_id %]" selected="selected" data-sort1-authcat="[% budget_loo.b_sort1_authcat %]" data-sort2-authcat="[% budget_loo.b_sort2_authcat %]">[% budget_loo.b_txt %]</option>
                    [% ELSE %]
                        [% IF ( budget_loo.b_active ) %]<option value="[% budget_loo.b_id %]" data-sort1-authcat="[% budget_loo.b_sort1_authcat %]" data-sort2-authcat="[% budget_loo.b_sort2_authcat %]">[% budget_loo.b_txt %]</option>
                        [% ELSE %]<option value="[% budget_loo.b_id %]" class="b_inactive" data-sort1-authcat="[% budget_loo.b_sort1_authcat %]" data-sort2-authcat="[% budget_loo.b_sort2_authcat %]">[% budget_loo.b_txt %] (inactive)</option>
                        [% END %]
                    [% END %]
                [% END %]

            </li>
            <li><div class="hint">The 2 following fields are available for your own usage. They can be useful for statistical purposes</div>
                <label for="sort1">Statistic 1: </label>
                <input id="sort1" type="text" id="sort1" size="20" name="sort1" value="[% sort1 %]" />
                [% IF CGIsort1 %]
                    <select id="sort1" size="1" name="sort1">
                    [% FOREACH sort_opt IN CGIsort1 %]
                       [% IF sort_opt.default %]
                          <option value="[% sort_opt.value %]" selected="selected">[% sort_opt.label %]</option>
                        [% ELSE %]
                          <option value="[% sort_opt.value %]">[% sort_opt.label %]</option>
                        [% END %]
                    [% END %]
                    </select>
                [% ELSE %]
                    <input type="text" id="sort1" size="20" name="sort1" value="[% sort1 %]" />
                [% END %]
                </span>
            </li>
            <li>
                <label for="sort2">Statistic 2: </label>
                <input id="sort2" type="text" id="sort2" size="20" name="sort2" value="[% sort2 %]" />
                [% IF CGIsort2 %]
                    <select id="sort2" size="1" name="sort2">
                    [% FOREACH sort_opt IN CGIsort2 %]
                       [% IF sort_opt.default %]
                          <option value="[% sort_opt.value %]" selected="selected">[% sort_opt.label %]</option>
                        [% ELSE %]
                          <option value="[% sort_opt.value %]">[% sort_opt.label %]</option>
                        [% END %]
                    [% END %]
                    </select>
                [% ELSE %]
                    <input type="text" id="sort2" size="20" name="sort2" value="[% sort2 %]" />
                [% END %]
                </span>
            </li>
        </ol>
    </fieldset>
- 

Return to bug 7180

Lines 262-267 foreach my $r (@{$budgets}) { Link Here

(-)a/acqui/neworderempty.pl (-31 / +4 lines)
262	push @{$budget_loop}, {	262	push @{$budget_loop}, {
263	b_id => $r->{budget_id},	263	b_id => $r->{budget_id},
264	b_txt => $r->{budget_name},	264	b_txt => $r->{budget_name},
		265	b_sort1_authcat => $r->{'sort1_authcat'},
		266	b_sort2_authcat => $r->{'sort2_authcat'},
265	b_active => $r->{budget_period_active},	267	b_active => $r->{budget_period_active},
266	b_sel => ( $r->{budget_id} == $budget_id ) ? 1 : 0,	268	b_sel => ( $r->{budget_id} == $budget_id ) ? 1 : 0,
267	};	269	};
Lines 276-312 if ($close) { Link Here
276		278
277	}	279	}
278		280
279	my $CGIsort1;	281	$template->param( sort1 => $data->{'sort1'} );
280	if ($budget) { # its a mod ..	282	$template->param( sort2 => $data->{'sort2'} );
281	if ( defined $budget->{'sort1_authcat'} ) { # with custom Asort* planning values
282	$CGIsort1 = GetAuthvalueDropbox( $budget->{'sort1_authcat'}, $data->{'sort1'} );
283	}
284	} elsif(@{$budgets}){
285	$CGIsort1 = GetAuthvalueDropbox( @$budgets[0]->{'sort1_authcat'}, '' );
286	}
287
288	# if CGIsort is successfully fetched, the use it
289	# else - failback to plain input-field
290	if ($CGIsort1) {
291	$template->param( CGIsort1 => $CGIsort1 );
292	} else {
293	$template->param( sort1 => $data->{'sort1'} );
294	}
295
296	my $CGIsort2;
297	if ($budget) {
298	if ( defined $budget->{'sort2_authcat'} ) {
299	$CGIsort2 = GetAuthvalueDropbox( $budget->{'sort2_authcat'}, $data->{'sort2'} );
300	}
301	} elsif(@{$budgets}) {
302	$CGIsort2 = GetAuthvalueDropbox( @$budgets[0]->{sort2_authcat}, '' );
303	}
304
305	if ($CGIsort2) {
306	$template->param( CGIsort2 => $CGIsort2 );
307	} else {
308	$template->param( sort2 => $data->{'sort2'} );
309	}
310		283
311	if (C4::Context->preference('AcqCreateItem') eq 'ordering' && !$ordernumber) {	284	if (C4::Context->preference('AcqCreateItem') eq 'ordering' && !$ordernumber) {
312	# Check if ACQ framework exists	285	# Check if ACQ framework exists

Lines 141-146 $(document).ready(function() Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt (-36 / +24 lines)
141	$('#budget_id .b_inactive').remove();	141	$('#budget_id .b_inactive').remove();
142	}	142	}
143	});	143	});
		144
		145	$("#budget_id").change(function(){
		146	var destination_sort1 = $(this).parents('fieldset.rows').find('input[name="sort1"]');
		147	var sort1_authcat = $(this).find("option:selected").attr('data-sort1-authcat');
		148	var sort1 = $(destination_sort1).val() \|\| "";
		149	if ( destination_sort1.length < 1 ) {
		150	destination_sort1 = $(this).parents('fieldset.rows').find('select[name="sort1"]');
		151	}
		152	var destination_sort2 = $(this).parents('fieldset.rows').find('input[name="sort2"]');
		153	var sort2_authcat = $(this).find("option:selected").attr('data-sort2-authcat');
		154	var sort2 = $(destination_sort2).val() \|\| "";
		155	if ( destination_sort2.length < 1 ) {
		156	destination_sort2 = $(this).parents('fieldset.rows').find('select[name="sort2"]');
		157	}
		158	getAuthValueDropbox( 'sort1', sort1_authcat, destination_sort1, sort1 );
		159	getAuthValueDropbox( 'sort2', sort2_authcat, destination_sort2, sort2 );
		160	});
		161	$("#budget_id").change();
144	});	162	});
145	//]]>	163	//]]>
146	</script>	164	</script>
Lines 414-427 $(document).ready(function() Link Here
414	<input type="hidden" name="budget_id" id="budget_id" value="[% budget_id %]" />[% Budget_name %]	432	<input type="hidden" name="budget_id" id="budget_id" value="[% budget_id %]" />[% Budget_name %]
415	[% ELSE %]	433	[% ELSE %]
416	<label class="required" for="budget_id">Fund: </label>	434	<label class="required" for="budget_id">Fund: </label>
417	<select id="budget_id" onchange="fetchSortDropbox(this.form)" size="1" name="budget_id">	435	<select id="budget_id" size="1" name="budget_id">
418	<option value="">Select a fund</option>	436	<option value="">Select a fund</option>
419	[% FOREACH budget_loo IN budget_loop %]	437	[% FOREACH budget_loo IN budget_loop %]
420	[% IF ( budget_loo.b_sel ) %]	438	[% IF ( budget_loo.b_sel ) %]
421	<option value="[% budget_loo.b_id %]" selected="selected">[% budget_loo.b_txt %]</option>	439	<option value="[% budget_loo.b_id %]" selected="selected" data-sort1-authcat="[% budget_loo.b_sort1_authcat %]" data-sort2-authcat="[% budget_loo.b_sort2_authcat %]">[% budget_loo.b_txt %]</option>
422	[% ELSE %]	440	[% ELSE %]
423	[% IF ( budget_loo.b_active ) %]<option value="[% budget_loo.b_id %]">[% budget_loo.b_txt %]</option>	441	[% IF ( budget_loo.b_active ) %]<option value="[% budget_loo.b_id %]" data-sort1-authcat="[% budget_loo.b_sort1_authcat %]" data-sort2-authcat="[% budget_loo.b_sort2_authcat %]">[% budget_loo.b_txt %]</option>
424	[% ELSE %]<option value="[% budget_loo.b_id %]" class="b_inactive">[% budget_loo.b_txt %] (inactive)</option>	442	[% ELSE %]<option value="[% budget_loo.b_id %]" class="b_inactive" data-sort1-authcat="[% budget_loo.b_sort1_authcat %]" data-sort2-authcat="[% budget_loo.b_sort2_authcat %]">[% budget_loo.b_txt %] (inactive)</option>
425	[% END %]	443	[% END %]
426	[% END %]	444	[% END %]
427	[% END %]	445	[% END %]
Lines 540-578 $(document).ready(function() Link Here
540	</li>	558	</li>
541	<li><div class="hint">The 2 following fields are available for your own usage. They can be useful for statistical purposes</div>	559	<li><div class="hint">The 2 following fields are available for your own usage. They can be useful for statistical purposes</div>
542	<label for="sort1">Statistic 1: </label>	560	<label for="sort1">Statistic 1: </label>
543	<span id="sort1_zone">	561	<input id="sort1" type="text" id="sort1" size="20" name="sort1" value="[% sort1 %]" />
544	[% IF CGIsort1 %]
545	<select id="sort1" size="1" name="sort1">
546	[% FOREACH sort_opt IN CGIsort1 %]
547	[% IF sort_opt.default %]
548	<option value="[% sort_opt.value %]" selected="selected">[% sort_opt.label %]</option>
549	[% ELSE %]
550	<option value="[% sort_opt.value %]">[% sort_opt.label %]</option>
551	[% END %]
552	[% END %]
553	</select>
554	[% ELSE %]
555	<input type="text" id="sort1" size="20" name="sort1" value="[% sort1 %]" />
556	[% END %]
557	</span>
558	</li>
559	<li>	562	<li>
560	<label for="sort2">Statistic 2: </label>	563	<label for="sort2">Statistic 2: </label>
561	<span id="sort2_zone">	564	<input id="sort2" type="text" id="sort2" size="20" name="sort2" value="[% sort2 %]" />
562	[% IF CGIsort2 %]
563	<select id="sort2" size="1" name="sort2">
564	[% FOREACH sort_opt IN CGIsort2 %]
565	[% IF sort_opt.default %]
566	<option value="[% sort_opt.value %]" selected="selected">[% sort_opt.label %]</option>
567	[% ELSE %]
568	<option value="[% sort_opt.value %]">[% sort_opt.label %]</option>
569	[% END %]
570	[% END %]
571	</select>
572	[% ELSE %]
573	<input type="text" id="sort2" size="20" name="sort2" value="[% sort2 %]" />
574	[% END %]
575	</span>
576	</li>	565	</li>
577	</ol>	566	</ol>
578	</fieldset>	567	</fieldset>
579	-