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

(-)a/admin/columns_settings.yml (+27 lines)
Lines 101-106 modules: Link Here
101
          cannot_be_toggled: 1
101
          cannot_be_toggled: 1
102
          cannot_be_modified: 1
102
          cannot_be_modified: 1
103
103
104
    suggestions:
105
      suggestions:
106
        -
107
          columnname: selections
108
          cannot_be_toggled: 1
109
          cannot_be_modified: 1
110
        -
111
          columnname: suggestion
112
        -
113
          columnname: suggested_by
114
        -
115
          columnname: suggested_on
116
        -
117
          columnname: managed_by
118
        -
119
          columnname: managed_on
120
        -
121
          columnname: library
122
        -
123
          columnname: library_fund
124
        -
125
          columnname: suggestion_status
126
        -
127
          columnname: actions
128
          cannot_be_toggled: 1
129
          cannot_be_modified: 1
130
104
  admin:
131
  admin:
105
    currency:
132
    currency:
106
      currencies-table:
133
      currencies-table:
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt (-20 / +23 lines)
Lines 4-9 Link Here
4
[% USE AuthorisedValues %]
4
[% USE AuthorisedValues %]
5
[% USE KohaDates %]
5
[% USE KohaDates %]
6
[% USE Price %]
6
[% USE Price %]
7
[% USE ColumnsSettings %]
7
[% SET footerjs = 1 %]
8
[% SET footerjs = 1 %]
8
[% INCLUDE 'doc-head-open.inc' %]
9
[% INCLUDE 'doc-head-open.inc' %]
9
<title>Koha &rsaquo; Acquisitions  &rsaquo;
10
<title>Koha &rsaquo; Acquisitions  &rsaquo;
Lines 501-507 Link Here
501
    <table id="[% suggestion.suggestiontype | html %]t" class="sorted">
502
    <table id="[% suggestion.suggestiontype | html %]t" class="sorted">
502
        <thead>
503
        <thead>
503
            <tr>
504
            <tr>
504
                <th class="NoSort">&nbsp;</th>
505
                <th class="NoSort noExport">&nbsp;</th>
505
                <th class="anti-the">Suggestion</th>
506
                <th class="anti-the">Suggestion</th>
506
                <th>Suggested by</th>
507
                <th>Suggested by</th>
507
                <th>Suggested on</th>
508
                <th>Suggested on</th>
Lines 510-516 Link Here
510
                <th>Library</th>
511
                <th>Library</th>
511
                <th>Fund</th>
512
                <th>Fund</th>
512
                <th>Status</th>
513
                <th>Status</th>
513
                <th class="NoSort">&nbsp;</th>
514
                <th class="NoSort noExport">&nbsp;</th>
514
            </tr>
515
            </tr>
515
    </thead>
516
    </thead>
516
        <tbody>
517
        <tbody>
Lines 810-816 Link Here
810
[% MACRO jsinclude BLOCK %]
811
[% MACRO jsinclude BLOCK %]
811
    [% INCLUDE 'calendar.inc' %]
812
    [% INCLUDE 'calendar.inc' %]
812
    [% IF ( op == 'show' || op_else ) %]
813
    [% IF ( op == 'show' || op_else ) %]
813
        <script type="text/javascript">
814
        <script>
814
            $(document).ready(function(){
815
            $(document).ready(function(){
815
                $(".deletesuggestion").on("click",function(){
816
                $(".deletesuggestion").on("click",function(){
816
                    return confirm(_("Are you sure you want to delete this suggestion?"));
817
                    return confirm(_("Are you sure you want to delete this suggestion?"));
Lines 820-827 Link Here
820
    [% END %]
821
    [% END %]
821
    [% IF ( op_else ) %]
822
    [% IF ( op_else ) %]
822
        [% INCLUDE 'datatables.inc' %]
823
        [% INCLUDE 'datatables.inc' %]
824
        [% INCLUDE 'columns_settings.inc' %]
823
        [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %]
825
        [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %]
824
        <script type="text/javascript">
826
        <script>
825
            /**
827
            /**
826
            *  displayOther.
828
            *  displayOther.
827
            *  This function display the select or an textaera to write a reason.
829
            *  This function display the select or an textaera to write a reason.
Lines 831-850 Link Here
831
                $("#"+show+id).show();
833
                $("#"+show+id).show();
832
            }
834
            }
833
            $(document).ready(function() {
835
            $(document).ready(function() {
834
                $('#suggestiontabs').tabs({
836
                $('#suggestiontabs').tabs();
835
                    // Correct table sizing for tables hidden in tabs
837
836
                    // http://www.datatables.net/examples/api/tabs_and_scrolling.html
838
                columns_settings = [% ColumnsSettings.GetColumns( 'acqui', 'suggestions', 'suggestions', 'json' ) | $raw %]
837
                    "activate": function(event, ui) {
839
                [% FOREACH suggestion IN suggestions %]
838
                        $( $.fn.dataTable.tables( true ) ).DataTable().columns.adjust();
840
                    [% IF ( suggestion.suggestions_loop ) %]
839
                    }
841
                        KohaTable("[% suggestion.suggestiontype %]t", {
840
                });
842
                            "sorting": [[ 1, "asc" ]],
841
                $(".sorted").dataTable($.extend(true, {}, dataTablesDefaults, {
843
                            "autoWidth": false,
842
                    "aoColumnDefs": [
844
                            "columnDefs": [
843
                        { "bSortable": false, "bSearchable": false, 'aTargets': [ 'NoSort' ] },
845
                                { "sortable": false, "searchable": false, 'targets': [ 'NoSort' ] },
844
                        { "sType": "anti-the", "aTargets" : [ "anti-the" ] }
846
                                { "sType": "anti-the", "aTargets" : [ "anti-the" ] },
845
                    ],
847
                            ]
846
                    "sPaginationType": "full"
848
                        }, columns_settings );
847
                }));
849
                    [% END %]
850
                [% END %]
851
848
            [% FOREACH suggestion IN suggestions %]
852
            [% FOREACH suggestion IN suggestions %]
849
                // functions for [% suggestion.suggestiontype | html %] interactions
853
                // functions for [% suggestion.suggestiontype | html %] interactions
850
                $("#CheckAll[% suggestion.suggestiontype | html %]").click(function(e){
854
                $("#CheckAll[% suggestion.suggestiontype | html %]").click(function(e){
Lines 948-954 Link Here
948
        </script>
952
        </script>
949
    [% END %]
953
    [% END %]
950
    [% IF ( op_save )  %]
954
    [% IF ( op_save )  %]
951
        <script type="text/javascript">
955
        <script>
952
            $(document).ready(function(){
956
            $(document).ready(function(){
953
                calcNewsuggTotal();
957
                calcNewsuggTotal();
954
                $("#quantity,#price,#currency").on("change",function(){
958
                $("#quantity,#price,#currency").on("change",function(){
955
- 

Return to bug 16784