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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt (-84 / +12 lines)
Lines 81-91 function Check_page2(){ Link Here
81
        alert(_("You must choose a frequency"));
81
        alert(_("You must choose a frequency"));
82
        return false;
82
        return false;
83
    }
83
    }
84
    if($("#startdate").val().length == 0){
84
    if($("input[name='startdate']").val().length == 0){
85
        alert(_("You must choose a start date"));
85
        alert(_("You must choose a start date"));
86
        return false;
86
        return false;
87
    }
87
    }
88
    if($("#sublength").val().length == 0 && $("#enddate").val().length == 0){
88
    if($("#sublength").val().length == 0 && $("input[name='enddate']").val().length == 0){
89
        alert(_("You must choose a subscription length or an end date."));
89
        alert(_("You must choose a subscription length or an end date."));
90
        return false;
90
        return false;
91
    }
91
    }
Lines 286-292 function testPredictionPattern() { Link Here
286
        'firstacquidate': acquidate
286
        'firstacquidate': acquidate
287
    };
287
    };
288
    var ajaxParams = [
288
    var ajaxParams = [
289
        'enddate', 'subtype', 'sublength', 'frequency', 'numberingmethod',
289
        'to', 'subtype', 'sublength', 'frequency', 'numberingmethod',
290
        'lastvalue1', 'lastvalue2', 'lastvalue3', 'add1', 'add2', 'add3',
290
        'lastvalue1', 'lastvalue2', 'lastvalue3', 'add1', 'add2', 'add3',
291
        'every1', 'every2', 'every3', 'innerloop1', 'innerloop2', 'innerloop3',
291
        'every1', 'every2', 'every3', 'innerloop1', 'innerloop2', 'innerloop3',
292
        'setto1', 'setto2', 'setto3', 'numbering1', 'numbering2', 'numbering3',
292
        'setto1', 'setto2', 'setto3', 'numbering1', 'numbering2', 'numbering3',
Lines 370-376 function show_page_2() { Link Here
370
$(document).ready(function() {
370
$(document).ready(function() {
371
    $("select#frequency").change(function(){
371
    $("select#frequency").change(function(){
372
        patternneedtobetested = 1;
372
        patternneedtobetested = 1;
373
        $("#enddate").val('');
373
        $("input[name='enddate']").val('');
374
        frequencyload();
374
        frequencyload();
375
    });
375
    });
376
    $("select#numberpattern").change(function(){
376
    $("select#numberpattern").change(function(){
Lines 378-387 $(document).ready(function() { Link Here
378
        numberpatternload();
378
        numberpatternload();
379
    });
379
    });
380
    $("#subtype").change(function(){
380
    $("#subtype").change(function(){
381
        $("#enddate").val('');
381
        $("input[name='enddate']").val('');
382
    });
382
    });
383
    $("#sublength").change(function(){
383
    $("#sublength").change(function(){
384
        $("#enddate").val('');
384
        $("input[name='enddate']").val('');
385
    });
385
    });
386
    $("#lastvaluetemp1").keyup(function(){
386
    $("#lastvaluetemp1").keyup(function(){
387
        $("#lastvalue1").val($(this).val());
387
        $("#lastvalue1").val($(this).val());
Lines 616-666 $(document).ready(function() { Link Here
616
                                    <li>
616
                                    <li>
617
                                        <label for="firstacquidate">First issue publication date: (*)</label>
617
                                        <label for="firstacquidate">First issue publication date: (*)</label>
618
                                        [% UNLESS (more_than_one_serial) %]
618
                                        [% UNLESS (more_than_one_serial) %]
619
                                          <input type="text" name="firstacquidate" value="[% firstacquidate %]" size="13" maxlength="10" id="acqui_date" readonly="readonly" />
619
                                          <input type="text" size="10" id="acqui_date" name="firstacquidate" value="[% firstacquidate | $KohaDates %]" class="datepicker" readonly="readonly"/>
620
                                          <img src="[% themelang %]/lib/calendar/cal.gif" id="button2" style="cursor: pointer;" alt="Show Calendar" title="Show Calendar" />
621
                                          <!-- both scripts for calendar must follow the input field --> 
622
                                          <script type="text/javascript">
623
                                              Calendar.setup({
624
                                                  inputField:"acqui_date",
625
                                                  ifFormat       :   "[% DHTMLcalendar_dateformat %]",
626
                                                  button         :   "button2",
627
                                                  align          :   "Tl"
628
                                              });
629
                                          </script>
630
                                          <script type="text/javascript">
631
                                              Calendar.setup({
632
                                                  inputField     :   "acqui_date",
633
                                                  ifFormat       :   "[% DHTMLcalendar_dateformat %]",
634
                                                  button         :   "acqui_date",
635
                                                  align          :   "Tl"
636
                                              });
637
                                          </script>
638
                                        [% ELSE %]
620
                                        [% ELSE %]
639
                                          [% firstacquidate %]
621
                                          [% firstacquidate | $KohaDates %]
640
                                          <input type="hidden" id="acqui_date" name="firstacquidate" value="[% firstacquidate %]" />
622
                                          <input type="hidden" size="10" id="acqui_date" name="firstacquidate" value="[% firstacquidate | $KohaDates %]"/>
641
                                        [% END %]
623
                                        [% END %]
642
                                    </li>
624
                                    </li>
643
                                    [% IF (more_than_one_serial) %]
625
                                    [% IF (more_than_one_serial) %]
644
                                      <li>
626
                                      <li>
645
                                        <label for="nextacquidate">Next issue publication date:</label>
627
                                        <label for="nextacquidate">Next issue publication date:</label>
646
                                        <input type="text" id="nextacquidate" name="nextacquidate" size="13" readonly="readonly" value="[% nextacquidate | $KohaDates %]" />
628
                                        <input type="text" size="10" id="nextacquidate" name="nextacquidate" value="[% nextacquidate | $KohaDates %]" class="datepicker" readonly="readonly"/>
647
                                        <img src="[% themelang %]/lib/calendar/cal.gif" id="nextacquidatebutton" style="cursor: pointer;" alt="Show Calendar" title="Show Calendar" />
648
                                        <script type="text/javascript">
649
                                          Calendar.setup({
650
                                            inputField: "nextacquidate",
651
                                            ifFormat: "[% DHTMLcalendar_dateformat %]",
652
                                            button: "nextacquidatebutton",
653
                                            align: "Tl"
654
                                          });
655
                                        </script>
656
                                        <script type="text/javascript">
657
                                          Calendar.setup({
658
                                            inputField: "nextacquidate",
659
                                            ifFormat: "[% DHTMLcalendar_dateformat %]",
660
                                            button: "nextacquidate",
661
                                            align: "Tl"
662
                                          });
663
                                        </script>
664
                                      </li>
629
                                      </li>
665
                                    [% END %]
630
                                    [% END %]
666
                                    <li>
631
                                    <li>
Lines 688-735 $(document).ready(function() { Link Here
688
                                    </li>
653
                                    </li>
689
                                    <li>
654
                                    <li>
690
                                        <label for="startdate"> Subscription start date: (*)</label>
655
                                        <label for="startdate"> Subscription start date: (*)</label>
691
                                        <input type="text" name="startdate" value="[% startdate %]" size="13" maxlength="10" id="startdate" readonly="readonly" />
656
                                        <input type="text" size="10" id="from" name="startdate" value="[% startdate | $KohaDates %]" class="datepickerfrom" readonly="readonly"/>
692
                                        <img src="[% themelang %]/lib/calendar/cal.gif" id="button1" style="cursor: pointer;" alt="Show Calendar" title="Show Calendar" />
693
                                        <!-- both scripts for calendar must follow the input field --> 
694
                                        <script type="text/javascript">
695
                                            Calendar.setup({
696
                                                inputField   : "startdate",
697
                                                ifFormat     : "[% DHTMLcalendar_dateformat %]",
698
                                                button       : "button1",
699
                                                align        : "Tl"
700
                                            });
701
                                        </script>
702
                                        <script type="text/javascript">
703
                                            Calendar.setup({
704
                                                inputField   : "startdate",
705
                                                ifFormat     : "[% DHTMLcalendar_dateformat %]",
706
                                                button       : "startdate",
707
                                                align        : "Tl"
708
                                            });
709
                                        </script>
710
                                    </li>
657
                                    </li>
711
                                    <li>
658
                                    <li>
712
                                        <label for="enddate">Subscription end date:</label>
659
                                        <label for="enddate">Subscription end date:</label>
713
                                        <input type="text" name="enddate" value="[% enddate %]" size="13" maxlength="10" id="enddate" readonly="readonly" />
660
                                        <input type="text" size="10" id="to" name="enddate" value="[% enddate | $KohaDates %]" class="datepickerto" readonly="readonly"/>
714
                                        <a title="Clear" style="cursor:pointer" onclick="Clear('enddate');">&Chi;</a>
715
                                        <img src="[% themelang %]/lib/calendar/cal.gif" id="button3" style="cursor: pointer;" alt="Show Calendar" title="Show Calendar" />
716
                                        <!-- both scripts for calendar must follow the input field --> 
717
                                        <script type="text/javascript">
718
                                            Calendar.setup({
719
                                                inputField   : "enddate",
720
                                                ifFormat     : "[% DHTMLcalendar_dateformat %]",
721
                                                button       : "button3",
722
                                                align        : "Tl"
723
                                            });
724
                                        </script>
725
                                        <script type="text/javascript">
726
                                            Calendar.setup({
727
                                                inputField   : "enddate",
728
                                                ifFormat     : "[% DHTMLcalendar_dateformat %]",
729
                                                button       : "enddate",
730
                                                align        : "Tl"
731
                                            });
732
                                        </script>
733
                                    </li>
661
                                    </li>
734
                                    <li>
662
                                    <li>
735
                                        <label for="numberpattern"> Numbering pattern:</label>
663
                                        <label for="numberpattern"> Numbering pattern:</label>
(-)a/serials/subscription-add.pl (-2 / +1 lines)
Lines 81-87 if ($op eq 'modify' || $op eq 'dup' || $op eq 'modsubscription') { Link Here
81
         if ($subs->{$_} eq '0000-00-00') {
81
         if ($subs->{$_} eq '0000-00-00') {
82
            $subs->{$_} = ''
82
            $subs->{$_} = ''
83
    	} else {
83
    	} else {
84
            $subs->{$_} = format_date($subs->{$_});
84
            $subs->{$_} = $subs->{$_};
85
        }
85
        }
86
	  }
86
	  }
87
      if (!defined $subs->{letter}) {
87
      if (!defined $subs->{letter}) {
88
- 

Return to bug 7688