From: DeAndre Carroll <[EMAIL PROTECTED]>
Changed date popups in scheduler.tmpl to a date picker element
Made corresponding changes to scheduler.pl
---
.../prog/en/modules/tools/scheduler.tmpl | 69 +++-----------
tools/scheduler.pl | 102 +++++++++++---------
2 files changed, 71 insertions(+), 100 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tmpl
index f09a02e..e4b0bfa 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tmpl
@@ -1,6 +1,7 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
<title>Koha › Tools › Task Scheduler</title>
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="calendar.inc" -->
</head>
<body>
<!-- TMPL_INCLUDE NAME="header.inc" -->
@@ -29,62 +30,18 @@
<!-- TMPL_VAR NAME="time" --></li>
<li><label for="starttime">Time:</label>
<input type="text" name="starttime" id="starttime" value="" maxlength="5"
size="5" /></li>
-<li><label for="startday">Date: </label>
-<select name="startday" id="startday">
-<option value="01">1</option>
-<option value="02">2</option>
-<option value="03">3</option>
-<option value="04">4</option>
-<option value="05">5</option>
-<option value="06">6</option>
-<option value="07">7</option>
-<option value="08">8</option>
-<option value="09">9</option>
-<option value="10">10</option>
-<option value="11">11</option>
-<option value="12">12</option>
-<option value="13">13</option>
-<option value="14">14</option>
-<option value="15">15</option>
-<option value="16">16</option>
-<option value="17">17</option>
-<option value="18">18</option>
-<option value="19">19</option>
-<option value="20">20</option>
-<option value="21">21</option>
-<option value="22">22</option>
-<option value="23">23</option>
-<option value="24">24</option>
-<option value="25">25</option>
-<option value="26">26</option>
-<option value="27">27</option>
-<option value="28">28</option>
-<option value="29">29</option>
-<option value="30">30</option>
-<option value="31">31</option>
-
-</select>
-
-<select name="startmonth">
-<option value="01">Jan</option>
-<option value="02">Feb</option>
-<option value="03">Mar</option>
-<option value="04">Apr</option>
-<option value="05">May</option>
-<option value="06">Jun</option>
-<option value="07">Jul</option>
-<option value="08">Aug</option>
-<option value="09">Sep</option>
-<option value="10">Oct</option>
-<option value="11">Nov</option>
-<option value="12">Dec</option>
-</select>
-
-<select name="startyear">
-<option value="2007">2007</option>
-<option value="2008">2008</option>
-
-</select>
+<li><label for="startdate">Date: </label> <input type="text" size="10"
id="startdate" name="startdate" value="" />
+<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" border="0"
alt="Show Calendar" id="openCalendarStartdate" style="cursor: pointer;" />
+
+<script type="text/javascript">
+//<![CDATA[
+ Calendar.setup({
+ inputField : "startdate",
+ ifFormat : "<!-- TMPL_VAR
NAME="DHTMLcalendar_dateformat" -->",
+ button : "openCalendarStartdate"
+ });
+//]]>
+</script>
</li>
<li><label for="report">Report:</label>
diff --git a/tools/scheduler.pl b/tools/scheduler.pl
index 674a405..ad2f5a3 100755
--- a/tools/scheduler.pl
+++ b/tools/scheduler.pl
@@ -24,73 +24,87 @@ use C4::Reports;
use C4::Auth;
use CGI;
use C4::Output;
+use C4::Dates;
+
+use vars qw($debug);
+
+BEGIN {
+ $debug = $ENV{DEBUG} || 0;
+}
my $input = new CGI;
-my $base = C4::Context->config('intranetdir');
+my $base = C4::Context->config('intranetdir');
my $CONFIG_NAME = $ENV{'KOHA_CONF'};
my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
- {
- template_name => "tools/scheduler.tmpl",
- query => $input,
- type => "intranet",
- authnotrequired => 0,
- flagsrequired => { tools => 'schedule_tasks' },
- debug => 1,
- }
- );
+ {
+ template_name => "tools/scheduler.tmpl",
+ query => $input,
+ type => "intranet",
+ authnotrequired => 0,
+ flagsrequired => { tools => 'schedule_tasks' },
+ debug => 1,
+ }
+);
-my $mode=$input->param('mode');
-my $id = $input->param('id');
+my $mode = $input->param('mode');
+my $id = $input->param('id');
-if ($mode eq 'job_add') {
- my $startday = $input->param('startday');
- my $startmonth = $input->param('startmonth');
- my $startyear = $input->param('startyear');
- my $starttime = $input->param('starttime');
- my $recurring = $input->param('recurring');
- $starttime =~ s/\://g;
- my $start = $startyear . $startmonth . $startday . $starttime;
- my $report=$input->param('report');
- my $format=$input->param('format');
- my $email=$input->param('email');
- my $command = "EXPORT KOHA_CONF=\"$CONFIG_NAME\";
".$base."/tools/runreport.pl $report $format $email";
- if ($recurring){
- my $frequency = $input->param('frequency');
- add_cron_job($start,$command);
- }
- else {
- unless (add_at_job($start,$command)) {
- $template->param(job_add_failed => 1);
+if ( $mode eq 'job_add' ) {
+ my $startdate =
+ join( '', ( split m|/|, $input->param('startdate') )[ 2, 0, 1 ] );
+ my $starttime = $input->param('starttime');
+ my $recurring = $input->param('recurring');
+ $starttime =~ s/\://g;
+ my $start = $startdate . $starttime;
+ my $report = $input->param('report');
+ my $format = $input->param('format');
+ my $email = $input->param('email');
+ my $command =
+ "EXPORT KOHA_CONF=\"$CONFIG_NAME\"; " . $base
+ . "/tools/runreport.pl $report $format $email";
+
+ if ($recurring) {
+ my $frequency = $input->param('frequency');
+ add_cron_job( $start, $command );
+ }
+ else {
+ unless ( add_at_job( $start, $command ) ) {
+ $template->param( job_add_failed => 1 );
}
- }
+ }
}
-if ($mode eq 'job_change'){
- my $jobid = $input->param('jobid');
- if ($input->param('delete')){
- remove_at_job($jobid);
- }
+if ( $mode eq 'job_change' ) {
+ my $jobid = $input->param('jobid');
+ if ( $input->param('delete') ) {
+ remove_at_job($jobid);
+ }
}
my $jobs = get_jobs();
my @jobloop;
- foreach my $job (values %$jobs) {
- push @jobloop,$job;
+foreach my $job ( values %$jobs ) {
+ push @jobloop, $job;
}
[EMAIL PROTECTED] = sort {$a->{TIME} cmp $b->{TIME}} @jobloop;
[EMAIL PROTECTED] = sort { $a->{TIME} cmp $b->{TIME} } @jobloop;
my $reports = get_saved_reports();
-if (defined $id) {
+if ( defined $id ) {
foreach my $report (@$reports) {
$report->{'selected'} = 1 if $report->{'id'} eq $id;
}
}
-$template->param( 'savedreports' => $reports );
-$template->param(JOBS => [EMAIL PROTECTED]);
+$template->param( 'savedreports' => $reports );
+$template->param( JOBS => [EMAIL PROTECTED] );
my $time = localtime(time);
-$template->param('time' => $time);
+$template->param( 'time' => $time );
+$template->param(
+ DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
+ dateformat => C4::Dates->new()->format(),
+ debug => $debug,
+);
output_html_with_http_headers $input, $cookie, $template->output;
--
1.5.5.GIT
_______________________________________________
Koha-patches mailing list
[email protected]
http://lists.koha.org/mailman/listinfo/koha-patches
