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

(-)a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss (-6 lines)
Lines 1402-1413 div { Link Here
1402
    }
1402
    }
1403
}
1403
}
1404
1404
1405
#reserves,
1406
#checkouts {
1407
    border: 1px solid #B9D8D9;
1408
    padding: 1em;
1409
}
1410
1411
#sales {
1405
#sales {
1412
    display: none;
1406
    display: none;
1413
}
1407
}
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc (-1 / +1 lines)
Lines 9-15 Link Here
9
        [% END %]
9
        [% END %]
10
        [% IF CAN_user_updatecharges_remaining_permissions %]
10
        [% IF CAN_user_updatecharges_remaining_permissions %]
11
            <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]" class="btn btn-default btn-xs" >Make payment</a>
11
            <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]" class="btn btn-default btn-xs" >Make payment</a>
12
            <a href="/cgi-bin/koha/members/paycollect.pl?borrowernumber=[% patron.borrowernumber | uri %]" class="btn btn-default btn-xs" >Pay all charges</a></li>
12
            <a href="/cgi-bin/koha/members/paycollect.pl?borrowernumber=[% patron.borrowernumber | uri %]" class="btn btn-default btn-xs" >Pay all charges</a>
13
        [% END %]
13
        [% END %]
14
    </li>
14
    </li>
15
[% END %]
15
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc (-1 / +1 lines)
Lines 1-7 Link Here
1
[% USE raw %]
1
[% USE raw %]
2
[% USE Koha %]
2
[% USE Koha %]
3
[% PROCESS 'patron_restrictions.inc' %]
3
[% PROCESS 'patron_restrictions.inc' %]
4
<div id="reldebarments">
4
<div id="reldebarments" role="tabpanel" class="tab-pane">
5
    [% IF ( not debarments.defined || debarments.size < 1 ) %]
5
    [% IF ( not debarments.defined || debarments.size < 1 ) %]
6
        <p>Patron is currently unrestricted.</p>
6
        <p>Patron is currently unrestricted.</p>
7
    [% ELSE %]
7
    [% ELSE %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc (-1 / +1 lines)
Lines 1-7 Link Here
1
[% USE Koha %]
1
[% USE Koha %]
2
[% PROCESS 'modal-claims.inc' %]
2
[% PROCESS 'modal-claims.inc' %]
3
[% INCLUDE 'format_price.inc' %]
3
[% INCLUDE 'format_price.inc' %]
4
<div id="checkouts">
4
<div id="checkouts" role="tabpanel" class="tab-pane active">
5
    [% IF ( issuecount ) %]
5
    [% IF ( issuecount ) %]
6
        <div id="issues-table-loading-message">
6
        <div id="issues-table-loading-message">
7
            <p>
7
            <p>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-article-requests.inc (-1 / +1 lines)
Lines 1-6 Link Here
1
[% USE Context %]
1
[% USE Context %]
2
[% SET current_article_requests = Context.Scalar( Context.Scalar( patron, 'article_requests' ), 'filter_by_current' ) %]
2
[% SET current_article_requests = Context.Scalar( Context.Scalar( patron, 'article_requests' ), 'filter_by_current' ) %]
3
<div id="article-requests">
3
<div id="article-requests" role="tabpanel" class="tab-pane">
4
[% IF current_article_requests.count > 0 %]
4
[% IF current_article_requests.count > 0 %]
5
    <table id="article-requests-table" class="table table-bordered table-striped">
5
    <table id="article-requests-table" class="table table-bordered table-striped">
6
        <thead>
6
        <thead>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-return-claims.inc (-1 / +1 lines)
Lines 1-4 Link Here
1
<div id="return-claims">
1
<div id="return-claims" role="tabpanel" class="tab-pane">
2
    <p id="return-claims-controls">
2
    <p id="return-claims-controls">
3
        [% IF ( patron.return_claims.resolved.count > 0 || patron.return_claims.unresolved.count > 0 ) %]
3
        [% IF ( patron.return_claims.resolved.count > 0 || patron.return_claims.unresolved.count > 0 ) %]
4
            <a id="show_all_claims" class="ctrl_link" href="#">Show all [% patron.return_claims.count | html %] claim(s)</a>
4
            <a id="show_all_claims" class="ctrl_link" href="#">Show all [% patron.return_claims.count | html %] claim(s)</a>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/relatives-issues-table.inc (-1 / +1 lines)
Lines 1-6 Link Here
1
[% USE Koha %]
1
[% USE Koha %]
2
[% IF ( relatives_issues_count ) %]
2
[% IF ( relatives_issues_count ) %]
3
    <div id="relatives-issues">
3
    <div id="relatives-issues" role="tabpanel" class="tab-pane">
4
        <table id="relatives-issues-table" style="width: 100% !Important;">
4
        <table id="relatives-issues-table" style="width: 100% !Important;">
5
            <thead>
5
            <thead>
6
                <tr>
6
                <tr>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-105 / +106 lines)
Lines 814-851 Link Here
814
                </div> <!-- /.row -->
814
                </div> <!-- /.row -->
815
815
816
                <div id="patronlists" class="toptabs">
816
                <div id="patronlists" class="toptabs">
817
                    <ul>
817
                    <ul class="nav nav-tabs" role="tablist">
818
                        <li>
818
                        <li role="presentation" class="active">
819
                            <a href="#checkouts">Checkouts ([% issuecount || 0 | html %])</a>
819
                            <a href="#checkouts" aria-controls="checkouts" role="tab" data-toggle="tab">Checkouts ([% issuecount || 0 | html %])</a>
820
                        </li>
820
                        </li>
821
821
822
                        [% IF relatives_issues_count %]
822
                        [% IF relatives_issues_count %]
823
                            <li>
823
                            <li role="presentation">
824
                                <a id="relatives-issues-tab" href="#relatives-issues">Relatives' checkouts ([% relatives_issues_count | html %])</a>
824
                                <a id="relatives-issues-tab" href="#relatives-issues" aria-controls="relatives-issues" role="tab" data-toggle="tab">Relatives' checkouts ([% relatives_issues_count | html %])</a>
825
                            </li>
825
                            </li>
826
                        [% END %]
826
                        [% END %]
827
827
828
                        <li>
828
                        <li role="presentation">
829
                            <a href="#reserves" id="holds-tab">Holds ([% holds_count || 0 | html %])</a>
829
                            <a href="#reserves" id="holds-tab" aria-controls="reserves" role="tab" data-toggle="tab">Holds ([% holds_count || 0 | html %])</a>
830
                        </li>
830
                        </li>
831
831
832
                        [% IF Koha.Preference('UseRecalls') %]
832
                        [% IF Koha.Preference('UseRecalls') %]
833
                            <li>
833
                            <li role="presentation">
834
                                <a href="#recalls" id="recalls-tab">Recalls ([% recalls.count || 0 | html %])</a>
834
                                <a href="#recalls" id="recalls-tab" aria-controls="recalls" role="tab" data-toggle="tab">Recalls ([% recalls.count || 0 | html %])</a>
835
                            </li>
835
                            </li>
836
                        [% END %]
836
                        [% END %]
837
837
838
                        [% IF Koha.Preference('ArticleRequests') %]
838
                        [% IF Koha.Preference('ArticleRequests') %]
839
                            [% SET current_article_requests = Context.Scalar( Context.Scalar( patron, 'article_requests' ), 'filter_by_current' ) %]
839
                            [% SET current_article_requests = Context.Scalar( Context.Scalar( patron, 'article_requests' ), 'filter_by_current' ) %]
840
                            <li>
840
                            <li role="presentation">
841
                                <a href="#article-requests" id="article-requests-tab">Article requests ([% current_article_requests.count || 0 | html %])</a>
841
                                <a href="#article-requests" id="article-requests-tab" aria-controls="article-requests" role="tab" data-toggle="tab">Article requests ([% current_article_requests.count || 0 | html %])</a>
842
                            </li>
842
                            </li>
843
                        [% END %]
843
                        [% END %]
844
844
845
                        [% IF Koha.Preference('ClaimReturnedLostValue') || Koha.Preference('BundleLostValue') %]
845
                        [% IF Koha.Preference('ClaimReturnedLostValue') || Koha.Preference('BundleLostValue') %]
846
                            <li>
846
                            <li role="presentation">
847
                                [% IF ( patron.return_claims.count ) %]
847
                                [% IF ( patron.return_claims.count ) %]
848
                                    <a href="#return-claims" id="return-claims-tab">
848
                                    <a href="#return-claims" id="return-claims-tab" aria-controls="return-claims" role="tab" data-toggle="tab">
849
                                        Claims
849
                                        Claims
850
                                        ([% IF patron.return_claims.resolved.count == 0 %]
850
                                        ([% IF patron.return_claims.resolved.count == 0 %]
851
                                            <span title="Resolved claims" class="label label-default" id="return-claims-count-resolved">[% patron.return_claims.resolved.count | html %]</span>
851
                                            <span title="Resolved claims" class="label label-default" id="return-claims-count-resolved">[% patron.return_claims.resolved.count | html %]</span>
Lines 859-865 Link Here
859
                                        [% END %])
859
                                        [% END %])
860
                                    </a>
860
                                    </a>
861
                                [% ELSE %]
861
                                [% ELSE %]
862
                                    <a href="#return-claims" id="return-claims-tab">
862
                                    <a href="#return-claims" id="return-claims-tab" aria-controls="return-claims" role="tab" data-toggle="tab">
863
                                        Claims
863
                                        Claims
864
                                        (<span title="Resolved claims" class="label label-default" id="return-claims-count-resolved">0</span>
864
                                        (<span title="Resolved claims" class="label label-default" id="return-claims-count-resolved">0</span>
865
                                        <span title="Unresolved claims" class="label label-default" id="return-claims-count-unresolved">0</span>)
865
                                        <span title="Unresolved claims" class="label label-default" id="return-claims-count-unresolved">0</span>)
Lines 868-983 Link Here
868
                            </li>
868
                            </li>
869
                        [% END %]
869
                        [% END %]
870
870
871
                        <li>
871
                        <li role="presentation">
872
                            <a id="debarments-tab-link" href="#reldebarments">Restrictions ([% debarments.size || 0 | html %])</a>
872
                            <a id="debarments-tab-link" href="#reldebarments" aria-controls="reldebarments" role="tab" data-toggle="tab">Restrictions ([% debarments.size || 0 | html %])</a>
873
                        </li>
873
                        </li>
874
874
875
                        [% SET enrollments = patron.get_club_enrollments %]
875
                        [% SET enrollments = patron.get_club_enrollments %]
876
                        [% SET enrollable  = patron.get_enrollable_clubs(0) %] <!-- 0 => not OPAC -->
876
                        [% SET enrollable  = patron.get_enrollable_clubs(0) %] <!-- 0 => not OPAC -->
877
                        [% IF CAN_user_clubs && ( enrollable.count || enrollments.count ) %]
877
                        [% IF CAN_user_clubs && ( enrollable.count || enrollments.count ) %]
878
                            <li>
878
                            <li role="presentation">
879
                                <a id="clubs-tab-link" href="#clubs-tab">
879
                                <a id="clubs-tab-link" href="#clubs-tab" aria-controls="clubs-tab" role="tab" data-toggle="tab">
880
                                    Clubs ([% enrollments.count | html %]/[% enrollable.count | html %])
880
                                    Clubs ([% enrollments.count | html %]/[% enrollable.count | html %])
881
                                </a>
881
                                </a>
882
                            </li>
882
                            </li>
883
                        [% END %]
883
                        [% END %]
884
                    </ul>
884
                    </ul>
885
885
886
                    <!-- SUMMARY : TODAY & PREVIOUS ISSUES -->
886
                    <div class="tab-content">
887
                        <!-- SUMMARY : TODAY & PREVIOUS ISSUES -->
887
888
888
                    [% INCLUDE "checkouts-table.inc" %]
889
                        [% INCLUDE "checkouts-table.inc" %]
889
890
890
                    [% INCLUDE "relatives-issues-table.inc" %]
891
                        [% INCLUDE "relatives-issues-table.inc" %]
891
892
892
                    [% IF CAN_user_clubs && ( enrollable.count || enrollments.count ) %]
893
                        [% IF CAN_user_clubs && ( enrollable.count || enrollments.count ) %]
893
                        <div id="clubs-tab">
894
                            <div id="clubs-tab" role="tabpanel" class="tab-pane">
894
                            Loading...
895
                                Loading...
895
                        </div> <!-- /#clubs-tab -->
896
                            </div> <!-- /#clubs-tab -->
896
                    [% END %]
897
                        [% END %]
897
898
898
                    [% INCLUDE borrower_debarments.inc %]
899
                        [% INCLUDE borrower_debarments.inc %]
899
900
900
                    <div id="reserves">
901
                        <div id="reserves" role="tabpanel" class="tab-pane">
901
                        [% IF ( holds_count ) %]
902
                            [% IF ( holds_count ) %]
902
                            <form action="/cgi-bin/koha/reserve/modrequest.pl" method="post">
903
                                <form action="/cgi-bin/koha/reserve/modrequest.pl" method="post">
903
                                <input type="hidden" name="from" value="circ" />
904
                                    <input type="hidden" name="from" value="circ" />
904
                                <table id="holds-table" style="width: 100% !Important;">
905
                                    <table id="holds-table" style="width: 100% !Important;">
905
                                    <thead>
906
                                        <thead>
906
                                        <tr>
907
                                            <tr>
907
                                            <th>Hold date</th>
908
                                                <th>Hold date</th>
908
                                            <th>Title</th>
909
                                                <th>Title</th>
909
                                            <th>Call number</th>
910
                                                <th>Call number</th>
910
                                            <th>Item type</th>
911
                                                <th>Item type</th>
911
                                            <th>Barcode</th>
912
                                                <th>Barcode</th>
912
                                            <th>Pickup at</th>
913
                                                <th>Pickup at</th>
913
                                            <th>Expiration</th>
914
                                                <th>Expiration</th>
914
                                            <th>Priority</th>
915
                                                <th>Priority</th>
915
                                            <th>Cancel?</th>
916
                                                <th>Cancel?</th>
916
                                            <th>Suspend?</th>
917
                                                <th>Suspend?</th>
917
                                            <th>Status</th>
918
                                                <th>Status</th>
918
                                        </tr>
919
                                            </tr>
919
                                    </thead>
920
                                        </thead>
920
                                </table>
921
                                    </table>
921
922
922
                                <fieldset class="action">
923
                                    <fieldset class="action">
923
                                    <input type="submit" class="cancel" name="submit" value="Cancel marked holds" />
924
                                        <input type="submit" class="cancel" name="submit" value="Cancel marked holds" />
924
925
925
                                    [% SET hold_cancellation = AuthorisedValues.GetAuthValueDropbox('HOLD_CANCELLATION') %]
926
                                        [% SET hold_cancellation = AuthorisedValues.GetAuthValueDropbox('HOLD_CANCELLATION') %]
926
                                    [% IF hold_cancellation.count %]
927
                                        [% IF hold_cancellation.count %]
927
                                        <select name="cancellation-reason">
928
                                            <select name="cancellation-reason">
928
                                            <option value="">No reason given</option>
929
                                                <option value="">No reason given</option>
929
                                            [% FOREACH reason IN hold_cancellation %]
930
                                                [% FOREACH reason IN hold_cancellation %]
930
                                                <option value="[% reason.authorised_value | html %]">[% reason.lib | html %]</option>
931
                                                    <option value="[% reason.authorised_value | html %]">[% reason.lib | html %]</option>
931
                                            [% END %]
932
                                                [% END %]
932
                                        </select>
933
                                            </select>
933
                                    [% END %]
934
                                        [% END %]
934
                                </fieldset>
935
                                    </fieldset>
935
                            </form>
936
                                </form>
936
937
937
                            [% IF Koha.Preference('SuspendHoldsIntranet') %]
938
                                [% IF Koha.Preference('SuspendHoldsIntranet') %]
938
                                <fieldset class="action">
939
                                    <fieldset class="action">
939
                                    <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
940
                                        <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
940
                                        <input type="hidden" name="from" value="circ" />
941
                                            <input type="hidden" name="from" value="circ" />
941
                                        <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
942
                                            <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
942
                                        <input type="submit" value="Suspend all holds" />
943
                                            <input type="submit" value="Suspend all holds" />
943
944
944
                                        [% IF Koha.Preference('AutoResumeSuspendedHolds') %]
945
                                            [% IF Koha.Preference('AutoResumeSuspendedHolds') %]
945
                                        <label for="suspend_until">until</label>
946
                                            <label for="suspend_until">until</label>
946
                                        <input type="text" size="10" id="suspend_until" name="suspend_until" class="flatpickr" data-flatpickr-futuredate="true" />
947
                                            <input type="text" size="10" id="suspend_until" name="suspend_until" class="flatpickr" data-flatpickr-futuredate="true" />
947
                                        <span class="hint">Specify date on which to resume [% INCLUDE 'date-format.inc' %]: </span>
948
                                            <span class="hint">Specify date on which to resume [% INCLUDE 'date-format.inc' %]: </span>
948
                                         [% END %]
949
                                            [% END %]
949
                                    </form>
950
                                        </form>
950
                                </fieldset>
951
                                    </fieldset>
951
952
952
                                <fieldset class="action">
953
                                    <fieldset class="action">
953
                                    <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
954
                                        <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
954
                                        <input type="hidden" name="from" value="circ" />
955
                                            <input type="hidden" name="from" value="circ" />
955
                                        <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
956
                                            <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
956
                                        <input type="hidden" name="suspend" value="0" />
957
                                            <input type="hidden" name="suspend" value="0" />
957
                                        <input type="submit" value="Resume all suspended holds" />
958
                                            <input type="submit" value="Resume all suspended holds" />
958
                                    </form>
959
                                        </form>
959
                                </fieldset>
960
                                    </fieldset>
960
                            [% END # /IF SuspendHoldsIntranet %]
961
                                [% END # /IF SuspendHoldsIntranet %]
961
962
962
                        [% ELSE # IF holds_count %]
963
                            [% ELSE # IF holds_count %]
963
                            <p>Patron has nothing on hold.</p>
964
                                <p>Patron has nothing on hold.</p>
964
                        [% END # /IF holds_count %]
965
                            [% END # /IF holds_count %]
965
                    </div> <!-- /#reserves -->
966
                        </div> <!-- /#reserves -->
966
967
                    [% IF Koha.Preference('UseRecalls') %]
968
                        <div id="recalls">
969
                            [% INCLUDE 'recalls.inc' %]
970
                        </div>
971
                    [% END %]
972
967
973
                    [% IF Koha.Preference('ClaimReturnedLostValue') || Koha.Preference('BundleLostValue') %]
968
                        [% IF Koha.Preference('UseRecalls') %]
974
                        [% INCLUDE 'patron-return-claims.inc' %]
969
                            <div id="recalls" role="tabpanel" class="tab-pane">
975
                    [% END %]
970
                                [% INCLUDE 'recalls.inc' %]
971
                            </div>
972
                        [% END %]
976
973
977
                    [% IF Koha.Preference('ArticleRequests') %]
974
                        [% IF Koha.Preference('ClaimReturnedLostValue') || Koha.Preference('BundleLostValue') %]
978
                        [% INCLUDE 'patron-article-requests.inc' %]
975
                            [% INCLUDE 'patron-return-claims.inc' %]
979
                    [% END %]
976
                        [% END %]
980
977
978
                        [% IF Koha.Preference('ArticleRequests') %]
979
                            [% INCLUDE 'patron-article-requests.inc' %]
980
                        [% END %]
981
                    </div> <!-- /.tab-content -->
981
                </div> <!-- /#patronlists -->
982
                </div> <!-- /#patronlists -->
982
                [% ELSIF borrowernumber # IF patron %]
983
                [% ELSIF borrowernumber # IF patron %]
983
                    <div class="dialog message">Patron not found. <a href="/cgi-bin/koha/members/members-home.pl">Return to search</a></div>
984
                    <div class="dialog message">Patron not found. <a href="/cgi-bin/koha/members/members-home.pl">Return to search</a></div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-124 / +118 lines)
Lines 643-685 Link Here
643
                    </div> <!-- /div.row -->
643
                    </div> <!-- /div.row -->
644
644
645
                    <div id="finesholdsissues" class="toptabs">
645
                    <div id="finesholdsissues" class="toptabs">
646
                        <ul>
646
                        <ul class="nav nav-tabs" role="tablist">
647
                            <li>
647
                            <li role="presentation" class="active">
648
                                <a href="#checkouts">Checkouts ([% issuecount || 0 | html %])</a>
648
                                <a href="#checkouts" aria-controls="checkouts" role="tab" data-toggle="tab">Checkouts ([% issuecount || 0 | html %])</a>
649
                            </li>
649
                            </li>
650
                            [% IF relatives_issues_count %]
650
                            [% IF relatives_issues_count %]
651
                                <li>
651
                                <li role="presentation">
652
                                    <a href="#relatives-issues" id="relatives-issues-tab">Relatives' checkouts ([% relatives_issues_count | html %])</a>
652
                                    <a href="#relatives-issues" id="relatives-issues-tab" aria-controls="relatives-issues" role="tab" data-toggle="tab">Relatives' checkouts ([% relatives_issues_count | html %])</a>
653
                                </li>
653
                                </li>
654
                            [% END %]
654
                            [% END %]
655
                            [% IF ( fines ) %]
655
                            [% IF ( fines ) %]
656
                                <li id="finestab">
656
                                <li role="presentation" id="finestab">
657
                                    <a href="#finesandcharges">Charges ([% fines | $Price %])</a>
657
                                    <a href="#finesandcharges" aria-controls="finesandcharges" role="tab" data-toggle="tab">Charges ([% fines | $Price %])</a>
658
                                </li>
658
                                </li>
659
                            [% END %]
659
                            [% END %]
660
                            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
660
                            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
661
                                <li>
661
                                <li role="presentation">
662
                                        <a href="#reserves" id="holds-tab">Holds ([% holds_count || 0 | html %])</a>
662
                                        <a href="#reserves" id="holds-tab" aria-controls="reserves" role="tab" data-toggle="tab">Holds ([% holds_count || 0 | html %])</a>
663
                                </li>
663
                                </li>
664
                            [% END %]
664
                            [% END %]
665
665
666
                            [% IF Koha.Preference('UseRecalls') %]
666
                            [% IF Koha.Preference('UseRecalls') %]
667
                                <li>
667
                                <li role="presentation">
668
                                    <a href="#recalls" id="recalls-tab">Recalls ([% recalls.count || 0 | html %])</a>
668
                                    <a href="#recalls" id="recalls-tab" aria-controls="recalls" role="tab" data-toggle="tab">Recalls ([% recalls.count || 0 | html %])</a>
669
                                </li>
669
                                </li>
670
                            [% END %]
670
                            [% END %]
671
671
672
                            [% IF Koha.Preference('ArticleRequests') %]
672
                            [% IF Koha.Preference('ArticleRequests') %]
673
                                [% SET article_requests = Context.Scalar( Context.Scalar( patron, 'article_requests' ), 'filter_by_current') %]
673
                                [% SET article_requests = Context.Scalar( Context.Scalar( patron, 'article_requests' ), 'filter_by_current') %]
674
                                <li>
674
                                <li role="presentation">
675
                                    <a href="#article-requests" id="article-requests-tab">Article requests ([% article_requests.count || 0 | html %])</a>
675
                                    <a href="#article-requests" id="article-requests-tab" aria-controls="article-requests" role="tab" data-toggle="tab">Article requests ([% article_requests.count || 0 | html %])</a>
676
                                </li>
676
                                </li>
677
                            [% END %]
677
                            [% END %]
678
678
679
                            [% IF Koha.Preference('ClaimReturnedLostValue') || Koha.Preference('BundleLostValue') %]
679
                            [% IF Koha.Preference('ClaimReturnedLostValue') || Koha.Preference('BundleLostValue') %]
680
                                <li>
680
                                <li role="presentation">
681
                                    [% IF ( patron.return_claims.count ) %]
681
                                    [% IF ( patron.return_claims.count ) %]
682
                                        <a href="#return-claims" id="return-claims-tab">
682
                                        <a href="#return-claims" id="return-claims-tab" aria-controls="return-claims" role="tab" data-toggle="tab">
683
                                            Claims
683
                                            Claims
684
                                            ([% IF patron.return_claims.resolved.count == 0 %]
684
                                            ([% IF patron.return_claims.resolved.count == 0 %]
685
                                                <span title="Resolved claims" class="label label-default" id="return-claims-count-resolved">[% patron.return_claims.resolved.count | html %]</span>
685
                                                <span title="Resolved claims" class="label label-default" id="return-claims-count-resolved">[% patron.return_claims.resolved.count | html %]</span>
Lines 693-699 Link Here
693
                                            [% END %])
693
                                            [% END %])
694
                                        </a>
694
                                        </a>
695
                                    [% ELSE %]
695
                                    [% ELSE %]
696
                                        <a href="#return-claims" id="return-claims-tab">
696
                                        <a href="#return-claims" id="return-claims-tab" aria-controls="return-claims" role="tab" data-toggle="tab">
697
                                            Claims
697
                                            Claims
698
                                            (<span title="Resolved claims" class="label label-default" id="return-claims-count-resolved">0</span>
698
                                            (<span title="Resolved claims" class="label label-default" id="return-claims-count-resolved">0</span>
699
                                            <span title="Unresolved claims" class="label label-default" id="return-claims-count-unresolved">0</span>)
699
                                            <span title="Unresolved claims" class="label label-default" id="return-claims-count-unresolved">0</span>)
Lines 702-828 Link Here
702
                                </li>
702
                                </li>
703
                            [% END %]
703
                            [% END %]
704
704
705
                            <li>
705
                            <li role="presentation">
706
                                <a id="debarments-tab-link" href="#reldebarments">Restrictions ([% debarments.size || 0 | html %])</a>
706
                                <a id="debarments-tab-link" href="#reldebarments" aria-controls="reldebarments" role="tab" data-toggle="tab">Restrictions ([% debarments.size || 0 | html %])</a>
707
                            </li>
707
                            </li>
708
708
709
                            [% SET enrollments = patron.get_club_enrollments %]
709
                            [% SET enrollments = patron.get_club_enrollments %]
710
                            [% SET enrollable  = patron.get_enrollable_clubs(0) %] <!-- 0 => not OPAC -->
710
                            [% SET enrollable  = patron.get_enrollable_clubs(0) %] <!-- 0 => not OPAC -->
711
                            [% IF CAN_user_clubs && ( enrollable.count || enrollments.count ) %]
711
                            [% IF CAN_user_clubs && ( enrollable.count || enrollments.count ) %]
712
                                <li>
712
                                <li role="presentation">
713
                                    <a id="clubs-tab-link" href="#clubs-tab">
713
                                    <a id="clubs-tab-link" href="#clubs-tab" aria-controls="checkouts" role="tab" data-toggle="tab">
714
                                        Clubs ([% enrollments.count | html %]/[% enrollable.count | html %])
714
                                        Clubs ([% enrollments.count | html %]/[% enrollable.count | html %])
715
                                    </a>
715
                                    </a>
716
                                </li>
716
                                </li>
717
                            [% END %]
717
                            [% END %]
718
                        </ul>
718
                        </ul>
719
719
720
                        [% INCLUDE "checkouts-table.inc" %]
720
                        <div class="tab-content">
721
                            [% INCLUDE "checkouts-table.inc" %]
721
722
722
                        [% INCLUDE "relatives-issues-table.inc" %]
723
                            [% INCLUDE "relatives-issues-table.inc" %]
723
724
724
                        [% IF ( fines ) %]
725
                            [% IF ( fines ) %]
725
                            <div id="finesandcharges">
726
                                <div id="finesandcharges" role="tabpanel" class="tab-pane">
726
                                [% IF ( fines ) %]
727
                                    [% IF ( fines ) %]
727
                                    <p>Total due: [% fines | $Price %]</p>
728
                                        <p>Total due: [% fines | $Price %]</p>
728
                                [% ELSE %]
729
                                    [% ELSE %]
729
                                    <p>No outstanding charges</p>
730
                                        <p>No outstanding charges</p>
730
                                [% END %]
731
                                    [% END %]
731
                            </div>
732
                                </div>
732
                        [% END %]
733
                            [% END %]
733
734
734
                        [% IF CAN_user_clubs && ( enrollments.count || enrollable.count ) %]
735
                            [% IF CAN_user_clubs && ( enrollments.count || enrollable.count ) %]
735
                            <div id="clubs-tab">
736
                                <div id="clubs-tab" role="tabpanel" class="tab-pane">
736
                                Loading...
737
                                    Loading...
737
                            </div>
738
                                </div>
738
                        [% END %]
739
                            [% END %]
739
740
740
                        [% INCLUDE borrower_debarments.inc %]
741
                            [% INCLUDE borrower_debarments.inc %]
741
742
                        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
743
                            <div id="reserves">
744
                                [% IF ( holds_count ) %]
745
                                    <form action="/cgi-bin/koha/reserve/modrequest.pl" method="post">
746
                                        <input type="hidden" name="from" value="circ" />
747
                                        <table id="holds-table" style="width: 100% !Important;">
748
                                            <thead>
749
                                                <tr>
750
                                                    <th>Hold date</th>
751
                                                    <th>Title</th>
752
                                                    <th>Call number</th>
753
                                                    <th>Item type</th>
754
                                                    <th>Barcode</th>
755
                                                    <th>Pickup at</th>
756
                                                    <th>Expiration</th>
757
                                                    <th>Priority</th>
758
                                                    <th>Delete?</th>
759
                                                    <th>Suspend?</th>
760
                                                    <th>Status</th>
761
                                                </tr>
762
                                            </thead>
763
                                        </table>
764
765
                                        <fieldset class="action">
766
                                            <input type="submit" class="cancel" name="submit" value="Cancel marked holds" />
767
768
                                            [% SET hold_cancellation = AuthorisedValues.GetAuthValueDropbox('HOLD_CANCELLATION') %]
769
                                            [% IF hold_cancellation.count %]
770
                                                <label for="cancellation-reason">Cancellation reason:</label>
771
                                                <select name="cancellation-reason">
772
                                                    <option value="">No reason given</option>
773
                                                    [% FOREACH reason IN hold_cancellation %]
774
                                                        <option value="[% reason.authorised_value | html %]">[% reason.lib | html %]</option>
775
                                                    [% END %]
776
                                                </select>
777
                                            [% END %]
778
                                        </fieldset>
779
                                    </form>
780
742
781
                                    [% IF Koha.Preference('SuspendHoldsIntranet') %]
743
                            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
782
                                        <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
744
                                <div id="reserves" role="tabpanel" class="tab-pane">
783
                                            <fieldset class="action">
745
                                    [% IF ( holds_count ) %]
784
                                                <input type="hidden" name="from" value="borrower" />
746
                                        <form action="/cgi-bin/koha/reserve/modrequest.pl" method="post">
785
                                                <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
747
                                            <input type="hidden" name="from" value="circ" />
786
                                                <input type="submit" value="Suspend all holds" />
748
                                            <table id="holds-table" style="width: 100% !Important;">
787
749
                                                <thead>
788
                                                [% IF Koha.Preference('AutoResumeSuspendedHolds') %]
750
                                                    <tr>
789
                                                    <label for="suspend_until">until</label>
751
                                                        <th>Hold date</th>
790
                                                    <input type="text" size="10" id="suspend_until" name="suspend_until" class="flatpickr" data-flatpickr-futuredate="true"/>
752
                                                        <th>Title</th>
791
                                                    <span class="hint">Specify date on which to resume [% INCLUDE 'date-format.inc' %]: </span>
753
                                                        <th>Call number</th>
792
                                                [% END %]
754
                                                        <th>Item type</th>
793
                                            </fieldset>
755
                                                        <th>Barcode</th>
794
                                        </form>
756
                                                        <th>Pickup at</th>
757
                                                        <th>Expiration</th>
758
                                                        <th>Priority</th>
759
                                                        <th>Delete?</th>
760
                                                        <th>Suspend?</th>
761
                                                        <th>Status</th>
762
                                                    </tr>
763
                                                </thead>
764
                                            </table>
795
765
796
                                        <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
797
                                            <fieldset class="action">
766
                                            <fieldset class="action">
798
                                                <input type="hidden" name="from" value="borrower" />
767
                                                <input type="submit" class="cancel" name="submit" value="Cancel marked holds" />
799
                                                <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
768
800
                                                <input type="hidden" name="suspend" value="0" />
769
                                                [% SET hold_cancellation = AuthorisedValues.GetAuthValueDropbox('HOLD_CANCELLATION') %]
801
                                                <input type="submit" value="Resume all suspended holds" />
770
                                                [% IF hold_cancellation.count %]
771
                                                    <label for="cancellation-reason">Cancellation reason:</label>
772
                                                    <select name="cancellation-reason">
773
                                                        <option value="">No reason given</option>
774
                                                        [% FOREACH reason IN hold_cancellation %]
775
                                                            <option value="[% reason.authorised_value | html %]">[% reason.lib | html %]</option>
776
                                                        [% END %]
777
                                                    </select>
778
                                                [% END %]
802
                                            </fieldset>
779
                                            </fieldset>
803
                                        </form>
780
                                        </form>
804
                                    [% END # IF SuspendHoldsIntranet %]
805
781
806
                                [% ELSE %]
782
                                        [% IF Koha.Preference('SuspendHoldsIntranet') %]
807
                                    <p>Patron has nothing on hold.</p>
783
                                            <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
808
                                [% END %]
784
                                                <fieldset class="action">
809
                            </div> [% # /div#reserves %]
785
                                                    <input type="hidden" name="from" value="borrower" />
810
                        [% END %]
786
                                                    <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
787
                                                    <input type="submit" value="Suspend all holds" />
788
789
                                                    [% IF Koha.Preference('AutoResumeSuspendedHolds') %]
790
                                                        <label for="suspend_until">until</label>
791
                                                        <input type="text" size="10" id="suspend_until" name="suspend_until" class="flatpickr" data-flatpickr-futuredate="true"/>
792
                                                        <span class="hint">Specify date on which to resume [% INCLUDE 'date-format.inc' %]: </span>
793
                                                    [% END %]
794
                                                </fieldset>
795
                                            </form>
796
797
                                            <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
798
                                                <fieldset class="action">
799
                                                    <input type="hidden" name="from" value="borrower" />
800
                                                    <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
801
                                                    <input type="hidden" name="suspend" value="0" />
802
                                                    <input type="submit" value="Resume all suspended holds" />
803
                                                </fieldset>
804
                                            </form>
805
                                        [% END # IF SuspendHoldsIntranet %]
811
806
812
                        [% IF Koha.Preference('UseRecalls') %]
807
                                    [% ELSE %]
813
                            <div id="recalls">
808
                                        <p>Patron has nothing on hold.</p>
814
                                [% INCLUDE 'recalls.inc' %]
809
                                    [% END %]
815
                            </div>
810
                                </div> [% # /div#reserves %]
816
                        [% END %]
811
                            [% END %]
817
812
818
                        [% IF Koha.Preference('ClaimReturnedLostValue') %]
813
                            [% IF Koha.Preference('UseRecalls') %]
819
                            [% INCLUDE 'patron-return-claims.inc' %]
814
                                <div id="recalls" role="tabpanel" class="tab-pane">
820
                        [% END %]
815
                                    [% INCLUDE 'recalls.inc' %]
816
                                </div>
817
                            [% END %]
821
818
822
                        [% IF Koha.Preference('ArticleRequests') %]
819
                            [% IF Koha.Preference('ClaimReturnedLostValue') %]
823
                            [% INCLUDE 'patron-article-requests.inc' %]
820
                                [% INCLUDE 'patron-return-claims.inc' %]
824
                        [% END %]
821
                            [% END %]
825
822
823
                            [% IF Koha.Preference('ArticleRequests') %]
824
                                [% INCLUDE 'patron-article-requests.inc' %]
825
                            [% END %]
826
                        </div> <!-- /.tab-content -->
826
                    </div> <!-- /div#finesholdsissues -->
827
                    </div> <!-- /div#finesholdsissues -->
827
                </main>
828
                </main>
828
            </div> <!-- /.col-sm-10.col-sm-push-2 -->
829
            </div> <!-- /.col-sm-10.col-sm-push-2 -->
Lines 891-909 Link Here
891
                });
892
                });
892
            }
893
            }
893
894
894
            $('#finesholdsissues').tabs({
895
            $("#finesholdsissues a[data-toggle='tab']").on("shown.bs.tab", function(e){
895
                // Correct table sizing for tables hidden in tabs
896
                var oTable = $('div.dataTables_wrapper > table', $(e.target.hash) ).dataTable();
896
                // http://www.datatables.net/examples/api/tabs_and_scrolling.html
897
                if ( oTable.length > 0 ) {
897
                "show": function(event, ui) {
898
                    oTable.fnAdjustColumnSizing();
898
                    var oTable = $('div.dataTables_wrapper>table', ui.panel).dataTable();
899
                    if ( oTable.length > 0 ) {
900
                        oTable.fnAdjustColumnSizing();
901
                    }
902
                },
903
                "activate": function( event, ui ) {
904
                    $("a", ui.newTab ).click();
905
                }
899
                }
906
            } );
900
            });
907
901
908
            $("#view_restrictions").on("click",function(){
902
            $("#view_restrictions").on("click",function(){
909
                $('#debarments-tab-link').click();
903
                $('#debarments-tab-link').click();
(-)a/koha-tmpl/intranet-tmpl/prog/js/holds.js (-1 / +1 lines)
Lines 120-126 $(document).ready(function() { Link Here
120
    $("#holds-tab").on( "click", function(){ load_holds_table() } );
120
    $("#holds-tab").on( "click", function(){ load_holds_table() } );
121
121
122
    // If the holds tab is preselected on load, we need to load the table
122
    // If the holds tab is preselected on load, we need to load the table
123
    if ( $("#holds-tab").parent().hasClass('ui-state-active') ) { load_holds_table() }
123
    if ( $("#holds-tab").parent().hasClass('active') ) { load_holds_table() }
124
124
125
    function load_holds_table() {
125
    function load_holds_table() {
126
        var holds = new Array();
126
        var holds = new Array();
(-)a/koha-tmpl/intranet-tmpl/prog/js/pages/circulation.js (-5 / +8 lines)
Lines 8-17 $(document).ready(function() { Link Here
8
        return false;
8
        return false;
9
    });
9
    });
10
10
11
    $('#patronlists').tabs({
11
    $("#patronlists a[data-toggle='tab']").on("shown.bs.tab", function(e){
12
        activate: function( event, ui ) {
12
        $(this).click();
13
            $("a", ui.newTab ).click();
14
        }
15
    });
13
    });
16
14
17
    $("#borrower_messages .cancel").on("click",function(){
15
    $("#borrower_messages .cancel").on("click",function(){
Lines 91-96 $(document).ready(function() { Link Here
91
        $("#" + fieldID).val("");
89
        $("#" + fieldID).val("");
92
    });
90
    });
93
91
92
    /* Preselect Bootstrap tab based on location hash */
93
    var hash = window.location.hash.substring(1);
94
    if( hash ){
95
        var activeTab = $('a[href="#' + hash + '"]');
96
        activeTab && activeTab.tab('show');
97
    }
94
98
95
});
99
});
96
100
97
- 

Return to bug 30487