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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc (-1 / +1 lines)
Lines 1-6 Link Here
1
<tfoot>
1
<tfoot>
2
	<tr>
2
	<tr>
3
        <td colspan="9" style="text-align: right; font-weight:bold;">Totals:</td>
3
        <td colspan="10" style="text-align: right; font-weight:bold;">Totals:</td>
4
		<td>[% totaldue %]</td>
4
		<td>[% totaldue %]</td>
5
		<td>[% totalprice %]</td>
5
		<td>[% totalprice %]</td>
6
                <td colspan="3"><div class="date-select">
6
                <td colspan="3"><div class="date-select">
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc (+1 lines)
Lines 14-19 Link Here
14
                        <th scope="col">Due date</th>
14
                        <th scope="col">Due date</th>
15
                        <th scope="col">Due date</th>
15
                        <th scope="col">Due date</th>
16
                        <th scope="col">Title</th>
16
                        <th scope="col">Title</th>
17
                        <th scope="col" class="col_enumchron">Vol info</th>
17
                        <th scope="col">Item type</th>
18
                        <th scope="col">Item type</th>
18
                        <th scope="col">Checked out on</th>
19
                        <th scope="col">Checked out on</th>
19
                        <th scope="col">Checked out from</th>
20
                        <th scope="col">Checked out from</th>
(-)a/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js (+24 lines)
Lines 252-257 $(document).ready(function() { Link Here
252
                        return title;
252
                        return title;
253
                    }
253
                    }
254
                },
254
                },
255
                { "mDataProp": "enumchron" }, //bVisible: controlled by the fnInitComplete if enumchron is used in the table
255
                { "mDataProp": "itemtype_description" },
256
                { "mDataProp": "itemtype_description" },
256
                { "mDataProp": "issuedate_formatted" },
257
                { "mDataProp": "issuedate_formatted" },
257
                { "mDataProp": "branchname" },
258
                { "mDataProp": "branchname" },
Lines 399-404 $(document).ready(function() { Link Here
399
                    }
400
                    }
400
                }
401
                }
401
402
403
                doHideEnumchron(  $( oSettings.nTable ).DataTable() , oSettings.fnRecordsTotal() , '.col_enumchron'  );
404
402
                oSettings.aaSortingFixed = null;
405
                oSettings.aaSortingFixed = null;
403
            },
406
            },
404
        }).rowGrouping(
407
        }).rowGrouping(
Lines 487-492 $(document).ready(function() { Link Here
487
                            return title;
490
                            return title;
488
                        }
491
                        }
489
                    },
492
                    },
493
                    { "mDataProp": "enumchron" },
490
                    { "mDataProp": "itemtype" },
494
                    { "mDataProp": "itemtype" },
491
                    { "mDataProp": "issuedate_formatted" },
495
                    { "mDataProp": "issuedate_formatted" },
492
                    { "mDataProp": "branchname" },
496
                    { "mDataProp": "branchname" },
Lines 523-528 $(document).ready(function() { Link Here
523
                        fnCallback(json)
527
                        fnCallback(json)
524
                    } );
528
                    } );
525
                },
529
                },
530
                "fnInitComplete": function(oSettings) {
531
                    doHideEnumchron(  $( oSettings.nTable ).DataTable() , oSettings.fnRecordsTotal() , '.col_enumchron'  );
532
                },
526
            });
533
            });
527
        }
534
        }
528
    });
535
    });
Lines 544-546 $(document).ready(function() { Link Here
544
        } ).attr( 'checked', false );
551
        } ).attr( 'checked', false );
545
    }
552
    }
546
 });
553
 });
554
555
function doHideEnumchron (table, rowCount, colDefinition) {
556
    //Get the presence of a enumchron and hide the column if no enumchron present.
557
    var enumchronPresent = 0;
558
    var col_enumchron = table.column( colDefinition );
559
    var col_enumchron_data = col_enumchron.data();
560
561
    for(var i=0;i<rowCount;i++) {
562
        if ( col_enumchron_data[ i ] ) {
563
            enumchronPresent = 1;
564
            break;
565
        }
566
    }
567
    if (! enumchronPresent) {
568
        col_enumchron.visible(false);
569
    }
570
}
(-)a/koha-tmpl/intranet-tmpl/prog/en/js/holds.js (+23 lines)
Lines 39-44 $(document).ready(function() { Link Here
39
                        }
39
                        }
40
                    },
40
                    },
41
                    {
41
                    {
42
                        "mDataProp": "enumchron"
43
                    },
44
                    {
42
                        "mDataProp": function( oObj ) {
45
                        "mDataProp": function( oObj ) {
43
                            return oObj.itemcallnumber || "";
46
                            return oObj.itemcallnumber || "";
44
                        }
47
                        }
Lines 118-123 $(document).ready(function() { Link Here
118
                        fnCallback(json)
121
                        fnCallback(json)
119
                    } );
122
                    } );
120
                },
123
                },
124
                "fnInitComplete": function(oSettings) {
125
                    doHideEnumchron(  $( oSettings.nTable ).DataTable() , oSettings.fnRecordsTotal() , '.col_enumchron'  );
126
                },
121
            });
127
            });
122
128
123
            if ( $("#holds-table").length ) {
129
            if ( $("#holds-table").length ) {
Lines 130-132 $(document).ready(function() { Link Here
130
    });
136
    });
131
137
132
});
138
});
139
140
function doHideEnumchron (table, rowCount, colDefinition) {
141
    //Get the presence of a enumchron and hide the column if no enumchron present.
142
    var enumchronPresent = 0;
143
    var col_enumchron = table.column( colDefinition );
144
    var col_enumchron_data = col_enumchron.data();
145
146
    for(var i=0;i<rowCount;i++) {
147
        if ( col_enumchron_data[ i ] ) {
148
            enumchronPresent = 1;
149
            break;
150
        }
151
    }
152
    if (! enumchronPresent) {
153
        col_enumchron.visible(false);
154
    }
155
}
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (+2 lines)
Lines 791-796 No patron matched <span class="ex">[% message %]</span> Link Here
791
                    <th scope="col">Due date (unformatted, hidden)</th>
791
                    <th scope="col">Due date (unformatted, hidden)</th>
792
                    <th scope="col">Due date</th>
792
                    <th scope="col">Due date</th>
793
                    <th scope="col">Title</th>
793
                    <th scope="col">Title</th>
794
                    <th scope="col" class="col_enumchron">Vol info</th>
794
                    <th scope="col">Item type</th>
795
                    <th scope="col">Item type</th>
795
                    <th scope="col">Checked out on</th>
796
                    <th scope="col">Checked out on</th>
796
                    <th scope="col">Checked out from</th>
797
                    <th scope="col">Checked out from</th>
Lines 815-820 No patron matched <span class="ex">[% message %]</span> Link Here
815
                <tr>
816
                <tr>
816
                    <th>Hold date</th>
817
                    <th>Hold date</th>
817
                    <th>Title</th>
818
                    <th>Title</th>
819
                    <th class="col_enumchron">Vol info</th>
818
                    <th>Call number</th>
820
                    <th>Call number</th>
819
                    <th>Barcode</th>
821
                    <th>Barcode</th>
820
                    <th>Expiration</th>
822
                    <th>Expiration</th>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (+2 lines)
Lines 435-440 function validate1(date) { Link Here
435
                <tr>
435
                <tr>
436
                    <th scope="col">Due date</th>
436
                    <th scope="col">Due date</th>
437
                    <th scope="col">Title</th>
437
                    <th scope="col">Title</th>
438
                    <th scope="col" class="col_enumchron">Vol info</th>
438
                    <th scope="col">Item type</th>
439
                    <th scope="col">Item type</th>
439
                    <th scope="col">Checked out on</th>
440
                    <th scope="col">Checked out on</th>
440
                    <th scope="col">Checked out from</th>
441
                    <th scope="col">Checked out from</th>
Lines 467-472 function validate1(date) { Link Here
467
                <tr>
468
                <tr>
468
                    <th>Hold date</th>
469
                    <th>Hold date</th>
469
                    <th>Title</th>
470
                    <th>Title</th>
471
                    <th class="col_enumchron">Vol info</th>
470
                    <th>Call number</th>
472
                    <th>Call number</th>
471
                    <th>Barcode</th>
473
                    <th>Barcode</th>
472
                    <th>Expiration</th>
474
                    <th>Expiration</th>
(-)a/svc/checkouts (+2 lines)
Lines 76-81 my $sql = ' Link Here
76
        barcode,
76
        barcode,
77
        itemnotes,
77
        itemnotes,
78
        itemcallnumber,
78
        itemcallnumber,
79
        items.enumchron,
79
        replacementprice,
80
        replacementprice,
80
81
81
        issues.branchcode,
82
        issues.branchcode,
Lines 153-158 while ( my $c = $sth->fetchrow_hashref() ) { Link Here
153
        branchcode => $c->{branchcode},
154
        branchcode => $c->{branchcode},
154
        branchname => $c->{branchname},
155
        branchname => $c->{branchname},
155
        itemcallnumber => $c->{itemcallnumber}   || q{},
156
        itemcallnumber => $c->{itemcallnumber}   || q{},
157
        enumchron      => $c->{enumchron}        || q{},
156
        charge         => $charge,
158
        charge         => $charge,
157
        price          => $c->{replacementprice} || q{},
159
        price          => $c->{replacementprice} || q{},
158
        can_renew      => $can_renew,
160
        can_renew      => $can_renew,
(-)a/svc/holds (-1 / +1 lines)
Lines 115-120 while ( my $h = $holds_rs->next() ) { Link Here
115
        $hold->{barcode}        = $item->barcode();
115
        $hold->{barcode}        = $item->barcode();
116
        $hold->{itemtype}       = $item->effective_itemtype();
116
        $hold->{itemtype}       = $item->effective_itemtype();
117
        $hold->{itemcallnumber} = $item->itemcallnumber() || q{};
117
        $hold->{itemcallnumber} = $item->itemcallnumber() || q{};
118
        $hold->{enumchron} = $item->enumchron() || q{};
118
119
119
        my ( $transferred_when, $transferred_from, $transferred_to ) =
120
        my ( $transferred_when, $transferred_from, $transferred_to ) =
120
          GetTransfers( $item->itemnumber() );
121
          GetTransfers( $item->itemnumber() );
121
- 

Return to bug 13430