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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt (-121 / +112 lines)
Lines 598-688 Link Here
598
                            ILL request log
598
                            ILL request log
599
                        </a>
599
                        </a>
600
                    </div>
600
                    </div>
601
                    <div class="ill-view-panel panel panel-default">
601
                    <div class="page-section">
602
                        <div class="panel-heading">
602
                        <h3>Request details</h3>
603
                            <h3>Request details</h3>
603
                        <h4>Details from library</h4>
604
                        </div>
604
                        <div class="rows">
605
                        <div class="panel-body">
605
                            <ol>
606
                            <h4>Details from library</h4>
606
                                <li class="orderid">
607
                            <div class="rows">
607
                                    <span class="label orderid">Order ID:</span>
608
                                <ol>
608
                                    [% IF request.orderid %][% request.orderid | html %][% ELSE %]<span>N/A</span>[% END %]
609
                                    <li class="orderid">
609
                                </li>
610
                                        <span class="label orderid">Order ID:</span>
610
                                <li class="borrowernumber">
611
                                        [% IF request.orderid %][% request.orderid | html %][% ELSE %]<span>N/A</span>[% END %]
611
                                    <span class="label borrowernumber">Patron:</span>
612
                                    </li>
612
                                    [% borrowerlink = "/cgi-bin/koha/members/moremember.pl" _ "?borrowernumber=" _ request.patron.borrowernumber %]
613
                                    <li class="borrowernumber">
613
                                    <a href="[% borrowerlink | url %]" title="View borrower details">
614
                                        <span class="label borrowernumber">Patron:</span>
614
                                    [% request.patron.firstname _ " " _ request.patron.surname _ " [" _ request.patron.cardnumber _ "]" | html %]
615
                                        [% borrowerlink = "/cgi-bin/koha/members/moremember.pl" _ "?borrowernumber=" _ request.patron.borrowernumber %]
615
                                    </a>
616
                                        <a href="[% borrowerlink | url %]" title="View borrower details">
616
                                </li>
617
                                        [% request.patron.firstname _ " " _ request.patron.surname _ " [" _ request.patron.cardnumber _ "]" | html %]
618
                                        </a>
619
                                    </li>
620
617
621
                                    <li class="biblio_id">
618
                                <li class="biblio_id">
622
                                        <span class="label biblio_id">Bibliographic record ID:</span>
619
                                    <span class="label biblio_id">Bibliographic record ID:</span>
623
                                        [% IF request.biblio_id %]
620
                                    [% IF request.biblio_id %]
624
                                            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% request.biblio_id | uri %]">[% request.biblio_id | html %]</a>
621
                                        <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% request.biblio_id | uri %]">[% request.biblio_id | html %]</a>
625
                                        [% ELSE %]
622
                                    [% ELSE %]
626
                                            <span>N/A</span>
623
                                        <span>N/A</span>
627
                                        [% END %]
624
                                    [% END %]
628
                                    </li>
625
                                </li>
629
                                    <li class="branchcode">
626
                                <li class="branchcode">
630
                                        <span class="label branchcode">Library:</span>
627
                                    <span class="label branchcode">Library:</span>
631
                                        [% Branches.GetName(request.branchcode) | html %]
628
                                    [% Branches.GetName(request.branchcode) | html %]
632
                                    </li>
629
                                </li>
633
                                    <li class="status">
630
                                <li class="status">
634
                                        <span class="label status">Status:</span>
631
                                    <span class="label status">Status:</span>
635
                                        [% IF request.statusalias %]
632
                                    [% IF request.statusalias %]
636
                                            [% request.statusalias.lib | html %]
633
                                        [% request.statusalias.lib | html %]
637
                                        [% ELSE %]
634
                                    [% ELSE %]
638
                                            [% request.capabilities.$req_status.name | html%]
635
                                        [% request.capabilities.$req_status.name | html%]
639
                                            [% IF request.requested_partners.length > 0 %]
636
                                        [% IF request.requested_partners.length > 0 %]
640
                                                ([% request.requested_partners | html %])
637
                                            ([% request.requested_partners | html %])
641
                                            [% END %]
642
                                        [% END %]
638
                                        [% END %]
643
                                    </li>
644
                                    <li class="updated">
645
                                        <span class="label updated">Last updated:</span>
646
                                        [% request.updated | $KohaDates  with_hours => 1 %]
647
                                    </li>
648
                                    <li class="medium">
649
                                        <span class="label medium">Request type:</span>
650
                                        [% type = request.get_type %]
651
                                        [% IF type %][% type | html %][% ELSE %]<span>N/A</span>[% END %]
652
                                    </li>
653
                                    <li class="cost">
654
                                        <span class="label cost">Cost:</span>
655
                                        [% IF request.cost %][% request.cost | $Price %][% ELSE %]<span>N/A</span>[% END %]
656
                                    </li>
657
                                    <li class="price_paid">
658
                                        <span class="label price_paid">Price paid:</span>
659
                                        [% IF request.price_paid %][% request.price_paid | $Price %][% ELSE %]<span>N/A</span>[% END %]
660
                                    </li>
661
                                    <li class="req_id">
662
                                        <span class="label req_id">Request number:</span>
663
                                        [% request.id_prefix _ request.illrequest_id | html %]
664
                                    </li>
665
                                    <li class="notesstaff">
666
                                        <span class="label notes_staff">Staff notes:</span>
667
                                        <p>[% request.notesstaff | html %]</p>
668
                                    </li>
669
                                    <li class="notesopac">
670
                                        <span class="label notes_opac">Notes:</span>
671
                                        <p>[% request.notesopac | html %]</p>
672
                                    </li>
673
                                </ol>
674
                            </div>
675
                            <div class="rows">
676
                                <h4>Details from supplier ([% request.backend | html %])</h4>
677
                                <ol>
678
                                    [% FOREACH meta IN request.metadata %]
679
                                        <li class="requestmeta-[% meta.key.replace('\s','_') | html %]">
680
                                            <span class="label">[% meta.key | html %]:</span>
681
                                            [% meta.value | html %]
682
                                        </li>
683
                                    [% END %]
639
                                    [% END %]
684
                                </ol>
640
                                </li>
685
                            </div>
641
                                <li class="updated">
642
                                    <span class="label updated">Last updated:</span>
643
                                    [% request.updated | $KohaDates  with_hours => 1 %]
644
                                </li>
645
                                <li class="medium">
646
                                    <span class="label medium">Request type:</span>
647
                                    [% type = request.get_type %]
648
                                    [% IF type %][% type | html %][% ELSE %]<span>N/A</span>[% END %]
649
                                </li>
650
                                <li class="cost">
651
                                    <span class="label cost">Cost:</span>
652
                                    [% IF request.cost %][% request.cost | $Price %][% ELSE %]<span>N/A</span>[% END %]
653
                                </li>
654
                                <li class="price_paid">
655
                                    <span class="label price_paid">Price paid:</span>
656
                                    [% IF request.price_paid %][% request.price_paid | $Price %][% ELSE %]<span>N/A</span>[% END %]
657
                                </li>
658
                                <li class="req_id">
659
                                    <span class="label req_id">Request number:</span>
660
                                    [% request.id_prefix _ request.illrequest_id | html %]
661
                                </li>
662
                                <li class="notesstaff">
663
                                    <span class="label notes_staff">Staff notes:</span>
664
                                    <p>[% request.notesstaff | html %]</p>
665
                                </li>
666
                                <li class="notesopac">
667
                                    <span class="label notes_opac">Notes:</span>
668
                                    <p>[% request.notesopac | html %]</p>
669
                                </li>
670
                            </ol>
671
                        </div>
672
                        <div class="rows">
673
                            <h4>Details from supplier ([% request.backend | html %])</h4>
674
                            <ol>
675
                                [% FOREACH meta IN request.metadata %]
676
                                    <li class="requestmeta-[% meta.key.replace('\s','_') | html %]">
677
                                        <span class="label">[% meta.key | html %]:</span>
678
                                        [% meta.value | html %]
679
                                    </li>
680
                                [% END %]
681
                            </ol>
686
                        </div>
682
                        </div>
687
                    </div>
683
                    </div>
688
684
Lines 734-778 Link Here
734
                        </div>
730
                        </div>
735
                    </div>
731
                    </div>
736
732
737
                    <div class="ill-view-panel panel panel-default">
733
                    <div class="page-section">
738
                        <div class="panel-heading">
734
                        <h3>[% request.illcomments.count | html %] comments</h3>
739
                            <h3>[% request.illcomments.count | html %] comments</h3>
735
                        [% IF request.illcomments.count && request.illcomments.count > 0 %]
740
                        </div>
736
                            [% FOREACH comment IN request.illcomments %]
741
                        <div class="panel-body">
737
                                <div class="rows comment_[% comment.patron.categorycode | html %]">
742
                            [% IF request.illcomments.count && request.illcomments.count > 0 %]
738
                                <h5>Comment by:
743
                                [% FOREACH comment IN request.illcomments %]
739
                                <a href="[% borrowerlink | url %]" title="View borrower details">
744
                                    <div class="rows comment_[% comment.patron.categorycode | html %]">
740
                                [% comment.patron.firstname _ " " _ comment.patron.surname _ " [" _ comment.patron.cardnumber _ "]" | html %]</a>
745
                                    <h5>Comment by:
741
                                [% comment.timestamp | $KohaDates with_hours => 1 %]</h5>
746
                                    <a href="[% borrowerlink | url %]" title="View borrower details">
742
                                <p>[% comment.comment | html %]</p>
747
                                    [% comment.patron.firstname _ " " _ comment.patron.surname _ " [" _ comment.patron.cardnumber _ "]" | html %]</a>
743
                                </div>
748
                                    [% comment.timestamp | $KohaDates with_hours => 1 %]</h5>
749
                                    <p>[% comment.comment | html %]</p>
750
                                    </div>
751
                                [% END %]
752
                            [% END %]
744
                            [% END %]
753
                                <div class="rows">
745
                        [% END %]
754
                                    <h3><a id="toggle_addcomment" href="#">Add comment</a></h3>
746
                            <div class="rows">
755
                                    <div id="addcomment" class="content_hidden">
747
                                <h3><a id="toggle_addcomment" href="#">Add comment</a></h3>
756
                                        <form class="validated" method="post" action="/cgi-bin/koha/ill/ill-requests.pl">
748
                                <div id="addcomment" class="content_hidden">
757
                                            <input type="hidden" value="save_comment" name="method">
749
                                    <form class="validated" method="post" action="/cgi-bin/koha/ill/ill-requests.pl">
758
                                            <input type="hidden" value="[% csrf_token | html %]" name="csrf_token">
750
                                        <input type="hidden" value="save_comment" name="method">
759
                                            <input type="hidden" value="[% request.illrequest_id | html %]" name="illrequest_id">
751
                                        <input type="hidden" value="[% csrf_token | html %]" name="csrf_token">
760
                                            <fieldset class="rows">
752
                                        <input type="hidden" value="[% request.illrequest_id | html %]" name="illrequest_id">
761
                                                <ol>
753
                                        <fieldset class="rows">
762
                                                    <li>
754
                                            <ol>
763
                                                        <label class="required" for="comment">Comment: </label>
755
                                                <li>
764
                                                        <textarea class="required" required="required" cols="80" rows="10" id="comment" name="comment"></textarea>
756
                                                    <label class="required" for="comment">Comment: </label>
765
                                                        <span class="required">Required</span>
757
                                                    <textarea class="required" required="required" cols="80" rows="10" id="comment" name="comment"></textarea>
766
                                                    </li>
758
                                                    <span class="required">Required</span>
767
                                                </ol>
759
                                                </li>
768
                                            </fieldset>
760
                                            </ol>
769
                                            <fieldset class="action">
761
                                        </fieldset>
770
                                                <input type="submit" class="btn btn-primary" value="Submit" />
762
                                        <fieldset class="action">
771
                                            </fieldset>
763
                                            <input type="submit" class="btn btn-primary" value="Submit" />
772
                                        </form>
764
                                        </fieldset>
773
                                    </div>
765
                                    </form>
774
                                </div>
766
                                </div>
775
                        </div>
767
                            </div>
776
                    </div>
768
                    </div>
777
769
778
                [% ELSIF query_type == 'illlist' %]
770
                [% ELSIF query_type == 'illlist' %]
Lines 785-791 Link Here
785
                [% ELSIF query_type == 'availability' %]
777
                [% ELSIF query_type == 'availability' %]
786
                    <!-- availability -->
778
                    <!-- availability -->
787
                    <h1>Availability</h1>
779
                    <h1>Availability</h1>
788
                    <div id="results">
780
                    <div id="results" class="page-section">
789
                        <h3>Displaying availability results</h3>
781
                        <h3>Displaying availability results</h3>
790
                        <form method="POST" action="/cgi-bin/koha/ill/ill-requests.pl">
782
                        <form method="POST" action="/cgi-bin/koha/ill/ill-requests.pl">
791
                            [% FOREACH key IN whole.keys %]
783
                            [% FOREACH key IN whole.keys %]
792
- 

Return to bug 33762