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

(-)a/Koha/DiscreteCalendar.pm (-20 / +29 lines)
Lines 136-142 sub get_dates_info { Link Here
136
        {
136
        {
137
            select  => [ 'date', { DATE => 'date' } ],
137
            select  => [ 'date', { DATE => 'date' } ],
138
            as      => [qw/ date date /],
138
            as      => [qw/ date date /],
139
            columns =>[ qw/ holiday_type open_hour close_hour note/]
139
            columns =>[ qw/ holiday_type open_hour close_hour note description/]
140
        },
140
        },
141
    );
141
    );
142
142
Lines 149-155 sub get_dates_info { Link Here
149
            holiday_type => $date->holiday_type() ,
149
            holiday_type => $date->holiday_type() ,
150
            open_hour    => $date->open_hour(),
150
            open_hour    => $date->open_hour(),
151
            close_hour   => $date->close_hour(),
151
            close_hour   => $date->close_hour(),
152
            note         => $date->note()
152
            note         => $date->note(),
153
            description  => $date->description(),
153
        };
154
        };
154
    }
155
    }
155
156
Lines 255-261 sub get_date_info { Link Here
255
            select  => [ 'date', { DATE => 'date' } ],
256
            select  => [ 'date', { DATE => 'date' } ],
256
            as      => [qw/ date date /],
257
            as      => [qw/ date date /],
257
            where   => \['DATE(?) = date', $date_string ],
258
            where   => \['DATE(?) = date', $date_string ],
258
            columns =>[ qw/ branchcode holiday_type open_hour close_hour note/]
259
            columns =>[ qw/ branchcode holiday_type open_hour close_hour note description/]
259
        },
260
        },
260
    );
261
    );
261
    my $dateDTO;
262
    my $dateDTO;
Lines 266-272 sub get_date_info { Link Here
266
            holiday_type => $date->holiday_type() ,
267
            holiday_type => $date->holiday_type() ,
267
            open_hour    => $date->open_hour(),
268
            open_hour    => $date->open_hour(),
268
            close_hour   => $date->close_hour(),
269
            close_hour   => $date->close_hour(),
269
            note         => $date->note()
270
            note         => $date->note(),
271
            description  => $date->description(),
270
        };
272
        };
271
    }
273
    }
272
274
Lines 346-353 sub get_unique_holidays { Link Here
346
            holiday_type => $HOLIDAYS->{EXCEPTION}
348
            holiday_type => $HOLIDAYS->{EXCEPTION}
347
        },
349
        },
348
        {
350
        {
349
            select => [{ DATE => 'date' }, 'note' ],
351
            select => [{ DATE => 'date' }, 'note', 'description' ],
350
            as     => [qw/ date note/],
352
            as     => [qw/ date note description/],
351
            where  => ($exclude_past ? \[' date >= CURRENT_DATE()'] : {} ),
353
            where  => ($exclude_past ? \[' date >= CURRENT_DATE()'] : {} ),
352
        }
354
        }
353
    );
355
    );
Lines 357-363 sub get_unique_holidays { Link Here
357
        push @unique_holidays, {
359
        push @unique_holidays, {
358
            date       => $date->date(),
360
            date       => $date->date(),
359
            outputdate => $outputdate,
361
            outputdate => $outputdate,
360
            note       => $date->note()
362
            note       => $date->note(),
363
            description => $date->description(),
361
        }
364
        }
362
    }
365
    }
363
366
Lines 385-392 sub get_float_holidays { Link Here
385
            holiday_type => $HOLIDAYS->{FLOAT}
388
            holiday_type => $HOLIDAYS->{FLOAT}
386
        },
389
        },
387
        {
390
        {
388
            select => [{ DATE => 'date' }, 'note' ],
391
            select => [{ DATE => 'date' }, 'note', 'description' ],
389
            as     => [qw/ date note/],
392
            as     => [qw/ date note description/],
390
            where  => ($exclude_past ? \[' date >= CURRENT_DATE()'] : {} ),
393
            where  => ($exclude_past ? \[' date >= CURRENT_DATE()'] : {} ),
391
        }
394
        }
392
    );
395
    );
Lines 396-402 sub get_float_holidays { Link Here
396
        push @float_holidays, {
399
        push @float_holidays, {
397
            date        => $date->date(),
400
            date        => $date->date(),
398
            outputdate  => $outputdate,
401
            outputdate  => $outputdate,
399
            note        => $date->note()
402
            note        => $date->note(),
403
            description => $date->description(),
400
        }
404
        }
401
    }
405
    }
402
406
Lines 424-431 sub get_need_validation_holidays { Link Here
424
            holiday_type => $HOLIDAYS->{NEED_VALIDATION}
428
            holiday_type => $HOLIDAYS->{NEED_VALIDATION}
425
        },
429
        },
426
        {
430
        {
427
            select => [{ DATE => 'date' }, 'note' ],
431
            select => [{ DATE => 'date' }, 'note', 'description' ],
428
            as     => [qw/ date note/],
432
            as     => [qw/ date note description/],
429
            where  => ($exclude_past ? \[' date >= CURRENT_DATE()'] : {} ),
433
            where  => ($exclude_past ? \[' date >= CURRENT_DATE()'] : {} ),
430
        }
434
        }
431
    );
435
    );
Lines 435-441 sub get_need_validation_holidays { Link Here
435
        push @need_validation_holidays, {
439
        push @need_validation_holidays, {
436
            date        => $date->date(),
440
            date        => $date->date(),
437
            outputdate  => $outputdate,
441
            outputdate  => $outputdate,
438
            note        => $date->note()
442
            note        => $date->note(),
443
            description => $date->description(),
439
        }
444
        }
440
    }
445
    }
441
446
Lines 464-471 sub get_repeatable_holidays { Link Here
464
469
465
        },
470
        },
466
        {
471
        {
467
            select => \[ 'distinct DAY(date), MONTH(date), note'],
472
            select => \[ 'distinct DAY(date), MONTH(date), note, description'],
468
            as     => [qw/ day month note/],
473
            as     => [qw/ day month note description/],
469
            where  => ($exclude_past ? \[' date >= CURRENT_DATE()'] : {} ),
474
            where  => ($exclude_past ? \[' date >= CURRENT_DATE()'] : {} ),
470
        }
475
        }
471
    );
476
    );
Lines 474-480 sub get_repeatable_holidays { Link Here
474
        push @repeatable_holidays, {
479
        push @repeatable_holidays, {
475
            day => $date->get_column('day'),
480
            day => $date->get_column('day'),
476
            month => $date->get_column('month'),
481
            month => $date->get_column('month'),
477
            note => $date->note()
482
            note => $date->note(),
483
            description => $date->description(),
478
        };
484
        };
479
    }
485
    }
480
486
Lines 502-509 sub get_week_days_holidays { Link Here
502
            branchcode   => $branchcode,
508
            branchcode   => $branchcode,
503
        },
509
        },
504
        {
510
        {
505
            select   => \[ 'distinct DAYOFWEEK(date), note'],
511
            select   => \[ 'distinct DAYOFWEEK(date), note, description'],
506
            as       => [qw/ weekday note /],
512
            as       => [qw/ weekday note description /],
507
            where    => ($exclude_past ? \[' date >= CURRENT_DATE()'] : {} ),
513
            where    => ($exclude_past ? \[' date >= CURRENT_DATE()'] : {} ),
508
        }
514
        }
509
    );
515
    );
Lines 511-517 sub get_week_days_holidays { Link Here
511
    while (my $date = $rs->next()) {
517
    while (my $date = $rs->next()) {
512
        push @week_days, {
518
        push @week_days, {
513
            weekday => ($date->get_column('weekday') -1),
519
            weekday => ($date->get_column('weekday') -1),
514
            note    => $date->note()
520
            note    => $date->note(),
521
            description => $date->description(),
515
        };
522
        };
516
    }
523
    }
517
524
Lines 547-552 sub edit_holiday { Link Here
547
    my ($params) = @_;
554
    my ($params) = @_;
548
555
549
    my $title        = $params->{title};
556
    my $title        = $params->{title};
557
    my $description  = $params->{description};
550
    my $weekday      = $params->{weekday} || '';
558
    my $weekday      = $params->{weekday} || '';
551
    my $holiday_type = $params->{holiday_type};
559
    my $holiday_type = $params->{holiday_type};
552
560
Lines 577-582 sub edit_holiday { Link Here
577
    my %updateValues = (
585
    my %updateValues = (
578
        is_opened    => 0,
586
        is_opened    => 0,
579
        note         => $title,
587
        note         => $title,
588
        description  => $description,
580
        holiday_type => $holiday_type,
589
        holiday_type => $holiday_type,
581
    );
590
    );
582
    $updateValues{open_hour} = $open_hour if $open_hour ne '';
591
    $updateValues{open_hour} = $open_hour if $open_hour ne '';
Lines 938-944 sub copy_holiday { Link Here
938
                    {
947
                    {
939
                        select  => [{ DAYOFWEEK => 'date' }],
948
                        select  => [{ DAYOFWEEK => 'date' }],
940
                        as      => [qw/ weekday /],
949
                        as      => [qw/ weekday /],
941
                        columns =>[ qw/ holiday_type note open_hour close_hour note/]
950
                        columns =>[ qw/ holiday_type note open_hour close_hour note description/]
942
                    }
951
                    }
943
                );
952
                );
944
                my $copyDate = $fromDate->next();
953
                my $copyDate = $fromDate->next();
(-)a/Koha/Schema/Result/DiscreteCalendar.pm (-2 / +10 lines)
Lines 55-60 __PACKAGE__->table("discrete_calendar"); Link Here
55
  is_nullable: 1
55
  is_nullable: 1
56
  size: 30
56
  size: 30
57
57
58
=head2 description
59
60
  data_type: 'mediumtext'
61
  default_value: ''''
62
  is_nullable: 1
63
58
=head2 open_hour
64
=head2 open_hour
59
65
60
  data_type: 'time'
66
  data_type: 'time'
Lines 82-87 __PACKAGE__->add_columns( Link Here
82
  { data_type => "varchar", default_value => "", is_nullable => 1, size => 1 },
88
  { data_type => "varchar", default_value => "", is_nullable => 1, size => 1 },
83
  "note",
89
  "note",
84
  { data_type => "varchar", default_value => "", is_nullable => 1, size => 30 },
90
  { data_type => "varchar", default_value => "", is_nullable => 1, size => 30 },
91
  "description",
92
  { data_type => "mediumtext", default_value => "''", is_nullable => 1 },
85
  "open_hour",
93
  "open_hour",
86
  { data_type => "time", is_nullable => 0 },
94
  { data_type => "time", is_nullable => 0 },
87
  "close_hour",
95
  "close_hour",
Lines 103-110 __PACKAGE__->add_columns( Link Here
103
__PACKAGE__->set_primary_key("branchcode", "date");
111
__PACKAGE__->set_primary_key("branchcode", "date");
104
112
105
113
106
# Created by DBIx::Class::Schema::Loader v0.07045 @ 2017-04-19 10:07:41
114
# Created by DBIx::Class::Schema::Loader v0.07049 @ 2022-10-20 11:37:37
107
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:wtctW8ZzCkyCZFZmmavFEw
115
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:/w9T8ShNcZsKRpeGaePHoA
108
116
109
117
110
# You can replace this text with custom code or comments, and it will be preserved on regeneration
118
# You can replace this text with custom code or comments, and it will be preserved on regeneration
(-)a/installer/data/mysql/atomicupdate/bug_17015_part1_create_discrete_calendar.perl (+1 lines)
Lines 8-13 if( CheckVersion( $DBversion ) ) { Link Here
8
                `is_opened` tinyint(1) DEFAULT 1,
8
                `is_opened` tinyint(1) DEFAULT 1,
9
                `holiday_type` varchar(1) DEFAULT '',
9
                `holiday_type` varchar(1) DEFAULT '',
10
                `note` varchar(30) DEFAULT '',
10
                `note` varchar(30) DEFAULT '',
11
                `description` mediumtext DEFAULT '',
11
                `open_hour` time NOT NULL,
12
                `open_hour` time NOT NULL,
12
                `close_hour` time NOT NULL,
13
                `close_hour` time NOT NULL,
13
                PRIMARY KEY (`branchcode`,`date`)
14
                PRIMARY KEY (`branchcode`,`date`)
(-)a/installer/data/mysql/atomicupdate/bug_17015_part4_add_description.perl (+8 lines)
Line 0 Link Here
1
$DBversion = 'XXX';
2
if( CheckVersion( $DBversion ) ) {
3
    if ( !column_exists( 'discrete_calendar', 'description' ) ) {
4
        $dbh->do( "ALTER TABLE `discrete_calendar` ADD COLUMN `description` mediumtext default '' AFTER `note`;" );
5
    }
6
7
    NewVersion( $DBversion, 17015, "New koha calendar Part 4 - Add description field");
8
}
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/discrete_calendar.tt (-3 / +20 lines)
Lines 116-121 Link Here
116
                                            <label for="title">Title: </label>
116
                                            <label for="title">Title: </label>
117
                                            <input type="text" name="Title" id="title" size="35" />
117
                                            <input type="text" name="Title" id="title" size="35" />
118
                                        </li>
118
                                        </li>
119
                                        <li>
120
                                            <label for="description">Description: </label>
121
                                            <textarea id="description" name="description" rows="2" cols="40"></textarea>
122
                                        </li>
119
                                        <li id="holidayType">
123
                                        <li id="holidayType">
120
                                            <label for="holidayType">Date type</label>
124
                                            <label for="holidayType">Date type</label>
121
                                            <select name ='holidayType'>
125
                                            <select name ='holidayType'>
Lines 191-196 Link Here
191
                            <ul>
195
                            <ul>
192
                                <li>Search in the calendar the day you want to set as holiday.</li>
196
                                <li>Search in the calendar the day you want to set as holiday.</li>
193
                                <li>Click the date to add or edit a holiday.</li>
197
                                <li>Click the date to add or edit a holiday.</li>
198
                                <li>Enter a title and description for the holiday.</li>
194
                                <li>Specify how the holiday should repeat.</li>
199
                                <li>Specify how the holiday should repeat.</li>
195
                                <li>Click Save to finish.</li>
200
                                <li>Click Save to finish.</li>
196
                                <li>PS:
201
                                <li>PS:
Lines 219-224 Link Here
219
                                    <tr>
224
                                    <tr>
220
                                        <th class="validation">Date</th>
225
                                        <th class="validation">Date</th>
221
                                        <th class="validation">Title</th>
226
                                        <th class="validation">Title</th>
227
                                        <th class="validation">Description</th>
222
                                    </tr>
228
                                    </tr>
223
                                </thead>
229
                                </thead>
224
                                <tbody>
230
                                <tbody>
Lines 226-231 Link Here
226
                                    <tr>
232
                                    <tr>
227
                                        <td><a href="#main" onclick="go_to_date('[% need_validation_holiday.date | html %]')"><span title="[% need_validation_holiday.DATE_SORT | html %]">[% need_validation_holiday.outputdate | html %]</span></a></td>
233
                                        <td><a href="#main" onclick="go_to_date('[% need_validation_holiday.date | html %]')"><span title="[% need_validation_holiday.DATE_SORT | html %]">[% need_validation_holiday.outputdate | html %]</span></a></td>
228
                                        <td>[% need_validation_holiday.note | html %]</td>
234
                                        <td>[% need_validation_holiday.note | html %]</td>
235
                                        <td>[% need_validation_holiday.description.replace('\\\r\\\n', '<br />') | html %]</td>
229
                                    </tr>
236
                                    </tr>
230
                                    [% END %]
237
                                    [% END %]
231
                                </tbody>
238
                                </tbody>
Lines 239-244 Link Here
239
                                    <tr>
246
                                    <tr>
240
                                        <th class="repeatableweekly">Day of week</th>
247
                                        <th class="repeatableweekly">Day of week</th>
241
                                        <th class="repeatableweekly">Title</th>
248
                                        <th class="repeatableweekly">Title</th>
249
                                        <th class="repeatableweekly">Description</th>
242
                                    </tr>
250
                                    </tr>
243
                                </thead>
251
                                </thead>
244
                                <tbody>
252
                                <tbody>
Lines 246-251 Link Here
246
                                    <tr>
254
                                    <tr>
247
                                        <td>[% WEEK_DAYS_LOO.weekday | html %]</td>
255
                                        <td>[% WEEK_DAYS_LOO.weekday | html %]</td>
248
                                        <td>[% WEEK_DAYS_LOO.note | html %]</td>
256
                                        <td>[% WEEK_DAYS_LOO.note | html %]</td>
257
                                        <td>[% WEEK_DAYS_LOO.description.replace('\\\r\\\n', '<br />') | html %]</td>
249
                                    </tr>
258
                                    </tr>
250
                                    [% END %]
259
                                    [% END %]
251
                                </tbody>
260
                                </tbody>
Lines 263-268 Link Here
263
                                        <th class="repeatableyearly">Month/day</th>
272
                                        <th class="repeatableyearly">Month/day</th>
264
                                        [% END %]
273
                                        [% END %]
265
                                        <th class="repeatableyearly">Title</th>
274
                                        <th class="repeatableyearly">Title</th>
275
                                        <th class="repeatableyearly">Description</th>
266
                                    </tr>
276
                                    </tr>
267
                                </thead>
277
                                </thead>
268
                                <tbody>
278
                                <tbody>
Lines 274-279 Link Here
274
                                        <td><span title="[% DAY_MONTH_HOLIDAYS_LOO.DATE_SORT | html %]">[% DAY_MONTH_HOLIDAYS_LOO.month | html %]/[% DAY_MONTH_HOLIDAYS_LOO.day | html %]</span></td>
284
                                        <td><span title="[% DAY_MONTH_HOLIDAYS_LOO.DATE_SORT | html %]">[% DAY_MONTH_HOLIDAYS_LOO.month | html %]/[% DAY_MONTH_HOLIDAYS_LOO.day | html %]</span></td>
275
                                        [% END %]
285
                                        [% END %]
276
                                        <td>[% DAY_MONTH_HOLIDAYS_LOO.note | html %]</td>
286
                                        <td>[% DAY_MONTH_HOLIDAYS_LOO.note | html %]</td>
287
                                        <td>[% DAY_MONTH_HOLIDAYS_LOO.description.replace('\\\r\\\n', '<br />') | html %]</td>
277
                                    </tr>
288
                                    </tr>
278
                                    [% END %]
289
                                    [% END %]
279
                                </tbody>
290
                                </tbody>
Lines 287-292 Link Here
287
                                    <tr>
298
                                    <tr>
288
                                        <th class="holiday">Date</th>
299
                                        <th class="holiday">Date</th>
289
                                        <th class="holiday">Title</th>
300
                                        <th class="holiday">Title</th>
301
                                        <th class="holiday">Description</th>
290
                                    </tr>
302
                                    </tr>
291
                                </thead>
303
                                </thead>
292
                                <tbody>
304
                                <tbody>
Lines 294-299 Link Here
294
                                    <tr>
306
                                    <tr>
295
                                        <td><a href="#main" onclick="go_to_date('[% HOLIDAYS_LOO.date | html %]')"><span title="[% HOLIDAYS_LOO.DATE_SORT | html %]">[% HOLIDAYS_LOO.outputdate | html %]</span></a></td>
307
                                        <td><a href="#main" onclick="go_to_date('[% HOLIDAYS_LOO.date | html %]')"><span title="[% HOLIDAYS_LOO.DATE_SORT | html %]">[% HOLIDAYS_LOO.outputdate | html %]</span></a></td>
296
                                        <td>[% HOLIDAYS_LOO.note | html %]</td>
308
                                        <td>[% HOLIDAYS_LOO.note | html %]</td>
309
                                        <td>[% HOLIDAYS_LOO.description.replace('\\\r\\\n', '<br />') | html %]</td>
297
                                    </tr>
310
                                    </tr>
298
                                    [% END %]
311
                                    [% END %]
299
                                </tbody>
312
                                </tbody>
Lines 307-312 Link Here
307
                                    <tr>
320
                                    <tr>
308
                                        <th class="float">Date</th>
321
                                        <th class="float">Date</th>
309
                                        <th class="float">Title</th>
322
                                        <th class="float">Title</th>
323
                                        <th class="float">Description</th>
310
                                    </tr>
324
                                    </tr>
311
                                </thead>
325
                                </thead>
312
                                <tbody>
326
                                <tbody>
Lines 314-319 Link Here
314
                                    <tr>
328
                                    <tr>
315
                                        <td><a href="#main" onclick="go_to_date('[% float_holiday.date | html %]')"><span title="[% float_holiday.DATE_SORT | html %]">[% float_holiday.outputdate | html %]</span></a></td>
329
                                        <td><a href="#main" onclick="go_to_date('[% float_holiday.date | html %]')"><span title="[% float_holiday.DATE_SORT | html %]">[% float_holiday.outputdate | html %]</span></a></td>
316
                                        <td>[% float_holiday.note | html %]</td>
330
                                        <td>[% float_holiday.note | html %]</td>
331
                                        <td>[% float_holiday.description.replace('\\\r\\\n', '<br />') | html %]</td>
317
                                    </tr>
332
                                    </tr>
318
                                    [% END %]
333
                                    [% END %]
319
                                </tbody>
334
                                </tbody>
Lines 345-350 Link Here
345
        [% FOREACH date IN datesInfos %]
360
        [% FOREACH date IN datesInfos %]
346
            datesInfos["[% date.date | html %]"] = {
361
            datesInfos["[% date.date | html %]"] = {
347
                title : "[% date.note | html %]",
362
                title : "[% date.note | html %]",
363
                description : "[% date.description | html %]",
348
                outputdate : "[% date.outputdate | html %]",
364
                outputdate : "[% date.outputdate | html %]",
349
                holiday_type:"[% date.holiday_type | html %]",
365
                holiday_type:"[% date.holiday_type | html %]",
350
                open_hour: "[% date.open_hour | html %]",
366
                open_hour: "[% date.open_hour | html %]",
Lines 355-361 Link Here
355
        /*
371
        /*
356
         * Displays the details of the selected date on a side panel
372
         * Displays the details of the selected date on a side panel
357
         */
373
         */
358
        function showHoliday (date_obj, dateString, dayName, day, month, year, weekDay, title, holidayType) {
374
        function showHoliday (date_obj, dateString, dayName, day, month, year, weekDay, title, description, holidayType) {
359
            $("#newHoliday").slideDown("fast");
375
            $("#newHoliday").slideDown("fast");
360
            $("#copyHoliday").slideUp("fast");
376
            $("#copyHoliday").slideUp("fast");
361
            $('#newDaynameOutput').html(dayName);
377
            $('#newDaynameOutput').html(dayName);
Lines 371-376 Link Here
371
            $(".newHoliday, #Weekday").val(weekDay);
387
            $(".newHoliday, #Weekday").val(weekDay);
372
388
373
            $('.newHoliday #title').val(title);
389
            $('.newHoliday #title').val(title);
390
            $('.newHoliday #description').val(description);
374
            $('#HolidayType').val(holidayType);
391
            $('#HolidayType').val(holidayType);
375
            $('#days_of_week option[value="'+ (weekDay + 1) +'"]').attr('selected', true);
392
            $('#days_of_week option[value="'+ (weekDay + 1) +'"]').attr('selected', true);
376
            $('#openHour').val(datesInfos[dateString].open_hour);
393
            $('#openHour').val(datesInfos[dateString].open_hour);
Lines 530-536 Link Here
530
            var date_obj = date.date_obj;
547
            var date_obj = date.date_obj;
531
548
532
            document.querySelector("#calendar-anchor")._flatpickr.setDate(date_obj);
549
            document.querySelector("#calendar-anchor")._flatpickr.setDate(date_obj);
533
            showHoliday(date_obj, dateString, dayName, day, month, year, weekDay, datesInfos[dateString].title, datesInfos[dateString].holiday_type);
550
            showHoliday(date_obj, dateString, dayName, day, month, year, weekDay, datesInfos[dateString].title, datesInfos[dateString].description, datesInfos[dateString].holiday_type);
534
        }
551
        }
535
552
536
        /*
553
        /*
Lines 629-635 Link Here
629
646
630
                        // set value of form hidden field
647
                        // set value of form hidden field
631
                        $('#from_date').val(dateStr);
648
                        $('#from_date').val(dateStr);
632
                        showHoliday(date.date_obj, dateString, dayName, date.day, date.month, date.year, weekDay, datesInfos[dateString].title, datesInfos[dateString].holiday_type);
649
                        showHoliday(date.date_obj, dateString, dayName, date.day, date.month, date.year, weekDay, datesInfos[dateString].title, datesInfos[dateString].description, datesInfos[dateString].holiday_type);
633
                    [% END %]
650
                    [% END %]
634
                }
651
                }
635
            });
652
            });
(-)a/tools/discrete_calendar.pl (-1 / +2 lines)
Lines 50-55 my $holiday_type = $input->param('holidayType'); Link Here
50
my $allbranches = $input->param('allBranches');
50
my $allbranches = $input->param('allBranches');
51
51
52
my $title = $input->param('Title');
52
my $title = $input->param('Title');
53
my $description = $input->param('description');
53
54
54
my $action = $input->param('action') || '';
55
my $action = $input->param('action') || '';
55
56
Lines 109-114 if ($action eq 'copyBranch') { Link Here
109
110
110
        $calendar->edit_holiday({
111
        $calendar->edit_holiday({
111
            title        => $title,
112
            title        => $title,
113
            description  => $description,
112
            weekday      => $weekday,
114
            weekday      => $weekday,
113
            holiday_type => $holiday_type,
115
            holiday_type => $holiday_type,
114
            open_hour    => $openHour,
116
            open_hour    => $openHour,
115
- 

Return to bug 17015