Attachment #38211 for bug #14008

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




        }
    });
[% END %]
  // redefine the datepicker's default because reports require ISO
  // http://jqueryui.com/demos/datepicker/#option-dateFormat
  $( ".datepicker" ).datepicker( "option", "dateFormat", "yy-mm-dd" );

[% IF (create || editsql || save) %]
    $("#select_group").change(function() {

  <fieldset class="brief">
  <h3>Filter</h3>
  <ol>
    <li><label for="filter_date">Date:</label> <input type="text" id="filter_date" name="filter_date" size="10" value="[% filters.date %]" class="datepicker" />
    <div class="hint">[% INCLUDE 'date-format.inc' %]</div>

    </li>
    <li><label for="filter_author">Author:</label> <input type="text" id="filter_author" name="filter_author" value="[% filters.author %]" /></li>
    <li><label for="filter_keyword">Keyword:</label> <input type="text" id="filter_keyword" name="filter_keyword" value="[% filters.keyword %]" /></li>
  </ol>
  </fieldset>
  <fieldset class="action"><input type="submit" value="Apply filter" /></fieldset>

Lines 107-112 elsif ( $phase eq 'Build new' ) { Link Here

(-)a/reports/guided_reports.pl (-1 / +1 lines)
107	'savedreports' => get_saved_reports($filter),	107	'savedreports' => get_saved_reports($filter),
108	'usecache' => $usecache,	108	'usecache' => $usecache,
109	'groups_with_subgroups'=> groups_with_subgroups($group, $subgroup),	109	'groups_with_subgroups'=> groups_with_subgroups($group, $subgroup),
		110	filters => $filter,
110	);	111	);
111	}	112	}
112		113
113	-

Return to bug 14008

Lines 167-175 $(document).ready(function(){ Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt (-6 / +3 lines)
167	}	167	}
168	});	168	});
169	[% END %]	169	[% END %]
170	// redefine the datepicker's default because reports require ISO
171	// http://jqueryui.com/demos/datepicker/#option-dateFormat
172	$( ".datepicker" ).datepicker( "option", "dateFormat", "yy-mm-dd" );
173		170
174	[% IF (create \|\| editsql \|\| save) %]	171	[% IF (create \|\| editsql \|\| save) %]
175	$("#select_group").change(function() {	172	$("#select_group").change(function() {
Lines 1025-1036 Sub report:<select name="subreport"> Link Here
1025	<fieldset class="brief">	1022	<fieldset class="brief">
1026	<h3>Filter</h3>	1023	<h3>Filter</h3>
1027	<ol>	1024	<ol>
1028	<li><label for="filter_date">Date:</label> <input type="text" id="filter_date" name="filter_date" size="10" value="[% filter_date %]" class="datepicker" />	1025	<li><label for="filter_date">Date:</label> <input type="text" id="filter_date" name="filter_date" size="10" value="[% filters.date %]" class="datepicker" />
1029	<div class="hint">[% INCLUDE 'date-format.inc' %]</div>	1026	<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
1030		1027
1031	</li>	1028	</li>
1032	<li><label for="filter_author">Author:</label> <input type="text" id="filter_author" name="filter_author" value="[% filter_author %]" /></li>	1029	<li><label for="filter_author">Author:</label> <input type="text" id="filter_author" name="filter_author" value="[% filters.author %]" /></li>
1033	<li><label for="filter_keyword">Keyword:</label> <input type="text" id="filter_keyword" name="filter_keyword" value="[% filter_keyword %]" /></li>	1030	<li><label for="filter_keyword">Keyword:</label> <input type="text" id="filter_keyword" name="filter_keyword" value="[% filters.keyword %]" /></li>
1034	</ol>	1031	</ol>
1035	</fieldset>	1032	</fieldset>
1036	<fieldset class="action"><input type="submit" value="Apply filter" /></fieldset>	1033	<fieldset class="action"><input type="submit" value="Apply filter" /></fieldset>