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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc (-3 / +2 lines)
Lines 1-5 Link Here
1
<script type="text/javascript">
1
<script>
2
//<![CDATA[
3
    var CIRCULATION_RETURNED = _("Checked in");
2
    var CIRCULATION_RETURNED = _("Checked in");
4
    var CIRCULATION_NOT_RETURNED = _("Unable to check in");
3
    var CIRCULATION_NOT_RETURNED = _("Unable to check in");
5
    var NOT_RENEWABLE_OVERDUE = _("Not allowed: overdue");
4
    var NOT_RENEWABLE_OVERDUE = _("Not allowed: overdue");
Lines 47-51 Link Here
47
    var CURRENT = _(" (current) ");
46
    var CURRENT = _(" (current) ");
48
    var MSG_NO_ITEMTYPE = _("No itemtype");
47
    var MSG_NO_ITEMTYPE = _("No itemtype");
49
    var MSG_CHECKOUTS_BY_ITEMTYPE = _("Number of checkouts by item type");
48
    var MSG_CHECKOUTS_BY_ITEMTYPE = _("Number of checkouts by item type");
50
//]]>
49
    var MSG_CANT_CANCEL_ENROLLMENT = _("Unable to cancel enrollment!");
51
</script>
50
</script>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (+1 lines)
Lines 1001-1006 No patron matched <span class="ex">[% message | html %]</span> Link Here
1001
        [% FOREACH b IN relatives_borrowernumbers %]
1001
        [% FOREACH b IN relatives_borrowernumbers %]
1002
            relatives_borrowernumbers.push("[% b | html %]");
1002
            relatives_borrowernumbers.push("[% b | html %]");
1003
        [% END %]
1003
        [% END %]
1004
        var club_id = "[% club.id %]";
1004
1005
1005
        var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export");
1006
        var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export");
1006
        var MSG_CONFIRM_DELETE_MESSAGE = _("Are you sure you want to delete this message? This cannot be undone.");
1007
        var MSG_CONFIRM_DELETE_MESSAGE = _("Are you sure you want to delete this message? This cannot be undone.");
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt (-2 / +16 lines)
Lines 88-94 Link Here
88
                                            <a class="btn btn-xs btn-default" style="white-space:nowrap"  href="/cgi-bin/koha/clubs/templates-add-modify.pl?id=[% t.id | html %]">
88
                                            <a class="btn btn-xs btn-default" style="white-space:nowrap"  href="/cgi-bin/koha/clubs/templates-add-modify.pl?id=[% t.id | html %]">
89
                                                <i class="fa fa-pencil"></i> Edit
89
                                                <i class="fa fa-pencil"></i> Edit
90
                                            </a>
90
                                            </a>
91
                                            <a class="btn btn-xs btn-default" href="#" onclick='ConfirmDeleteTemplate([% t.id | html %], "[% t.name | html %]", $(this) ); return false;'>
91
                                            <a class="delete_template btn btn-xs btn-default" href="#" data-id="[% t.id | html %]" data-name="[% t.name | html %]">
92
                                                <i class="fa fa-trash"></i> Delete
92
                                                <i class="fa fa-trash"></i> Delete
93
                                            </a>
93
                                            </a>
94
                                        [% END %]
94
                                        [% END %]
Lines 196-202 Link Here
196
                                                        </a>
196
                                                        </a>
197
                                                    </li>
197
                                                    </li>
198
                                                    <li>
198
                                                    <li>
199
                                                        <a href="#" onclick='ConfirmDeleteClub([% c.id | html %], "[% c.name | html %]", $(this) ); return false;'>
199
                                                        <a href="#" class="delete_club" data-id="[% c.id %]" data-name="[% c.name | html %]">
200
                                                            <i class="fa fa-trash"></i> Delete
200
                                                            <i class="fa fa-trash"></i> Delete
201
                                                        </a>
201
                                                        </a>
202
                                                    </li>
202
                                                    </li>
Lines 248-253 Link Here
248
            } ));
248
            } ));
249
        });
249
        });
250
250
251
        $(".delete_template").on("click", function(e){
252
            e.preventDefault();
253
            var name = $(this).data("name");
254
            var id = $(this).data("id");
255
            ConfirmDeleteTemplate( id, name, $(this) );
256
        });
257
258
        $(".delete_club").on("click", function(e){
259
            e.preventDefault();
260
            var name = $(this).data("name");
261
            var id = $(this).data("id");
262
            ConfirmDeleteClub( id, name, $(this) );
263
        });
264
251
        function ConfirmDeleteTemplate( id, name, a ) {
265
        function ConfirmDeleteTemplate( id, name, a ) {
252
            if ( confirm( _("Are you sure you want to delete the club template %s? This will delete all clubs using this template and cancel patron enrollments" ).format(name) ) ) {
266
            if ( confirm( _("Are you sure you want to delete the club template %s? This will delete all clubs using this template and cancel patron enrollments" ).format(name) ) ) {
253
                $.ajax({
267
                $.ajax({
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-clubs-tab.tt (-36 / +2 lines)
Lines 21-27 Link Here
21
                    <td>[% e.date_enrolled | $KohaDates %]</td>
21
                    <td>[% e.date_enrolled | $KohaDates %]</td>
22
                    [% IF CAN_user_clubs_enroll %]
22
                    [% IF CAN_user_clubs_enroll %]
23
                        <td>
23
                        <td>
24
                            <button class="btn btn-xs btn-default" onclick="cancelEnrollment( [% e.id | html %] )">
24
                            <button data-id="[% e.id | html %]" class="cancel_enrollment btn btn-xs btn-default">
25
                                <i class="fa fa-remove"></i> Cancel enrollment
25
                                <i class="fa fa-remove"></i> Cancel enrollment
26
                            </button>
26
                            </button>
27
                        </td>
27
                        </td>
Lines 33-39 Link Here
33
[% END %]
33
[% END %]
34
34
35
[% IF clubs %]
35
[% IF clubs %]
36
37
    <h4>Clubs not enrolled in</h4>
36
    <h4>Clubs not enrolled in</h4>
38
37
39
    <table>
38
    <table>
Lines 52-58 Link Here
52
                    <td>[% c.description | html %]</td>
51
                    <td>[% c.description | html %]</td>
53
                    [% IF CAN_user_clubs_enroll %]
52
                    [% IF CAN_user_clubs_enroll %]
54
                        <td class="action">
53
                        <td class="action">
55
                            <button class="btn btn-xs btn-default" onclick="loadEnrollmentForm([% c.id | html %])">
54
                            <button data-id="[% c.id | html %]" class="load_enrollment btn btn-xs btn-default">
56
                                <i class="fa fa-plus"></i> Enroll
55
                                <i class="fa fa-plus"></i> Enroll
57
                            </button>
56
                            </button>
58
                        </td>
57
                        </td>
Lines 62-97 Link Here
62
        </tbody>
61
        </tbody>
63
    </table>
62
    </table>
64
[% END %]
63
[% END %]
65
66
[% IF CAN_user_clubs_enroll %]
67
<script type="text/javascript">
68
function loadEnrollmentForm( id ) {
69
    $("body").css("cursor", "progress");
70
    $('#clubs-tab').load('/cgi-bin/koha/clubs/patron-enroll.pl?borrowernumber=[% borrowernumber | html %]&id=' + id, function() {
71
        $("body").css("cursor", "default");
72
    });
73
74
    return false;
75
}
76
77
function cancelEnrollment( id ) {
78
    $("body").css("cursor", "progress");
79
    $.ajax({
80
        type: "POST",
81
        url: '/cgi-bin/koha/svc/club/cancel_enrollment',
82
        data: { id: id },
83
        success: function( data ) {
84
            if ( data.success ) {
85
                $('#clubs-tab').load('/cgi-bin/koha/clubs/patron-clubs-tab.pl?borrowernumber=[% borrowernumber | html %]', function() {
86
                    $("body").css("cursor", "default");
87
                });
88
            } else {
89
                alert(_("Unable to cancel enrollment!"));
90
            }
91
        },
92
        dataType: 'json'
93
    });
94
    return false;
95
}
96
</script>
97
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-enroll.tt (-31 / +2 lines)
Lines 28-66 Link Here
28
                [% END %]
28
                [% END %]
29
29
30
                <li>
30
                <li>
31
                    <a href="#" class="btn btn-sm btn-default" onclick="addEnrollment(); return false;">Finish enrollment</a>
31
                    <a href="#" class="btn btn-sm btn-default add_enrollment" data-borrowernumber="[% borrowernumber %]" data-club_id="[% club.id %]">Finish enrollment</a>
32
                    <a class="cancel" href="#" onclick="showClubs(); return false;">Cancel</a>
32
                    <a class="cancel cancel_add_enrollment" data-borrowernumber="[% borrowernumber %]" data-club_id="[% club.id %]" href="#">Cancel</a>
33
                </li>
33
                </li>
34
            </ol>
34
            </ol>
35
        </fieldset>
35
        </fieldset>
36
    </form>
36
    </form>
37
</div>
37
</div>
38
39
<script type="text/javascript">
40
function addEnrollment() {
41
    $("body").css("cursor", "progress");
42
    $.ajax({
43
        type: "POST",
44
        url: '/cgi-bin/koha/svc/club/enroll',
45
        data: $( "#patron-enrollment-form" ).serialize(),
46
        success: function( data ) {
47
            if ( data.success ) {
48
                $('#clubs-tab').load('/cgi-bin/koha/clubs/patron-clubs-tab.pl?borrowernumber=[% borrowernumber | html %]&id=[% club.id | html %]', function() {
49
                    $("body").css("cursor", "default");
50
                });
51
            } else {
52
                alert(_("Unable to create enrollment!"));
53
            }
54
        },
55
        dataType: 'json'
56
    });
57
    return false;
58
}
59
60
function showClubs() {
61
    $("body").css("cursor", "progress");
62
    $('#clubs-tab').load('/cgi-bin/koha/clubs/patron-clubs-tab.pl?borrowernumber=[% borrowernumber | html %]&id=[% club.id | html %]', function() {
63
        $("body").css("cursor", "default");
64
    });
65
}
66
</script>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt (-4 / +20 lines)
Lines 1-5 Link Here
1
[% USE Branches %]
1
[% USE Branches %]
2
[% USE AuthorisedValues %]
2
[% USE AuthorisedValues %]
3
[% SET footerjs = 1 %]
3
[% INCLUDE 'doc-head-open.inc' %]
4
[% INCLUDE 'doc-head-open.inc' %]
4
<title>Koha &rsaquo; Tools &rsaquo; Patron clubs &rsaquo;
5
<title>Koha &rsaquo; Tools &rsaquo; Patron clubs &rsaquo;
5
    [% IF club_template %]
6
    [% IF club_template %]
Lines 9-15 Link Here
9
    [% END %]
10
    [% END %]
10
</title>
11
</title>
11
[% INCLUDE 'doc-head-close.inc' %]
12
[% INCLUDE 'doc-head-close.inc' %]
12
<style type="text/css">
13
<style>
13
    .club-field,
14
    .club-field,
14
    .enrollment-field {
15
    .enrollment-field {
15
        border-top: 1px solid #DDD;
16
        border-top: 1px solid #DDD;
Lines 169-175 Link Here
169
                        [% END %]
170
                        [% END %]
170
                    </div>
171
                    </div>
171
                    <fieldset class="action">
172
                    <fieldset class="action">
172
                        <a href="#" onclick="$('#new-enrollment-field-template').clone().attr('id','').show().appendTo('#club-template-enrollment-fields'); return false;">
173
                        <a href="#" class="add_field">
173
                            <i class="fa fa-plus"></i> Add new field
174
                            <i class="fa fa-plus"></i> Add new field
174
                        </a>
175
                        </a>
175
                    </fieldset>
176
                    </fieldset>
Lines 209-215 Link Here
209
            </select>
210
            </select>
210
        </li>
211
        </li>
211
    </ol>
212
    </ol>
212
    <fieldset class="action"><a href="#" onclick="$(this).parent().parent().remove(); return false;"><i class="fa fa-trash"></i> Delete field</a></fieldset>
213
    <fieldset class="action"><a href="#" class="delete_field"><i class="fa fa-trash"></i> Delete field</a></fieldset>
213
    <hr/>
214
    <hr/>
214
</div>
215
</div>
215
216
Lines 236-242 Link Here
236
            </select>
237
            </select>
237
        </li>
238
        </li>
238
    </ol>
239
    </ol>
239
    <fieldset class="action"><a href="#" onclick="$(this).parent().parent().remove(); return false;"><i class="fa fa-trash"></i> Delete field</a></fieldset>
240
    <fieldset class="action"><a href="#" class="delete_field"><i class="fa fa-trash"></i> Delete field</a></fieldset>
240
</div>
241
</div>
241
242
243
[% MACRO jsinclude BLOCK %]
244
    <script>
245
        $(document).ready(function() {
246
            $("body").on("click", ".delete_field", function(e){
247
                e.preventDefault();
248
                $(this).parent().parent().remove();
249
            });
250
            $(".add_field").on("click", function(e){
251
                e.preventDefault();
252
                $('#new-enrollment-field-template').clone().attr('id','').show().appendTo('#club-template-enrollment-fields');
253
            });
254
        });
255
    </script>
256
[% END %]
257
242
[% INCLUDE 'intranet-bottom.inc' %]
258
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (+1 lines)
Lines 820-825 Link Here
820
        [% FOREACH b IN relatives_borrowernumbers %]
820
        [% FOREACH b IN relatives_borrowernumbers %]
821
            relatives_borrowernumbers.push("[% b | html %]");
821
            relatives_borrowernumbers.push("[% b | html %]");
822
        [% END %]
822
        [% END %]
823
        var club_id = "[% club.id %]";
823
824
824
        var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export");
825
        var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export");
825
        var MSG_CONFIRM_DELETE_MESSAGE = _("Are you sure you want to delete this message? This cannot be undone.");
826
        var MSG_CONFIRM_DELETE_MESSAGE = _("Are you sure you want to delete this message? This cannot be undone.");
(-)a/koha-tmpl/intranet-tmpl/prog/js/pages/circulation.js (-3 / +80 lines)
Lines 107-114 $(document).ready(function() { Link Here
107
        var fieldID = this.id.replace("clear-date-","");
107
        var fieldID = this.id.replace("clear-date-","");
108
        $("#" + fieldID).val("");
108
        $("#" + fieldID).val("");
109
    });
109
    });
110
110
    // Patron clubs
111
111
    $("body").on("click", ".cancel_enrollment", function(e){
112
        e.preventDefault();
113
        var id = $(this).data("id");
114
        cancelEnrollment( id );
115
    });
116
    $("body").on("click", ".load_enrollment", function(e){
117
        e.preventDefault();
118
        var id = $(this).data("id");
119
        loadEnrollmentForm( id );
120
    });
121
    $("body").on("click", ".add_enrollment", function(e){
122
        e.preventDefault();
123
        var club_id = $(this).data("club_id");
124
        var borrowernumber = $(this).data("borrowernumber");
125
        addEnrollment( borrowernumber, club_id );
126
    });
127
    $("body").on("click", ".cancel_add_enrollment", function(e){
128
        e.preventDefault();
129
        var club_id = $(this).data("club_id");
130
        var borrowernumber = $(this).data("borrowernumber");
131
        showClubs( borrowernumber, club_id );
132
    });
112
});
133
});
113
134
114
function export_checkouts(format) {
135
function export_checkouts(format) {
Lines 145-147 function validate1(date) { Link Here
145
        return false;
166
        return false;
146
     }
167
     }
147
}
168
}
148
- 
169
170
// Patron clubs tab, circulation.pl and moremember.pl
171
function loadEnrollmentForm( id ) {
172
    $("body").css("cursor", "progress");
173
    $('#clubs-tab').load('/cgi-bin/koha/clubs/patron-enroll.pl?borrowernumber=' + borrowernumber + '&id=' + id, function() {
174
        $("body").css("cursor", "default");
175
    });
176
177
    return false;
178
}
179
180
function cancelEnrollment( id ) {
181
    $("body").css("cursor", "progress");
182
    $.ajax({
183
        type: "POST",
184
        url: '/cgi-bin/koha/svc/club/cancel_enrollment',
185
        data: { id: id },
186
        success: function( data ) {
187
            if ( data.success ) {
188
                $('#clubs-tab').load('/cgi-bin/koha/clubs/patron-clubs-tab.pl?borrowernumber=' + borrowernumber, function() {
189
                    $("body").css("cursor", "default");
190
                });
191
            } else {
192
                alert( MSG_CANT_CANCEL_ENROLLMENT );
193
            }
194
        },
195
        dataType: 'json'
196
    });
197
    return false;
198
}
199
200
function addEnrollment( borrowernumber, club_id ) {
201
    $("body").css("cursor", "progress");
202
    $.ajax({
203
        type: "POST",
204
        url: '/cgi-bin/koha/svc/club/enroll',
205
        data: $( "#patron-enrollment-form" ).serialize(),
206
        success: function( data ) {
207
            if ( data.success ) {
208
                $('#clubs-tab').load('/cgi-bin/koha/clubs/patron-clubs-tab.pl?borrowernumber=' + borrowernumber + '&id=' + club_id, function() {
209
                    $("body").css("cursor", "default");
210
                });
211
            } else {
212
                alert(_("Unable to create enrollment!"));
213
            }
214
        },
215
        dataType: 'json'
216
    });
217
    return false;
218
}
219
220
function showClubs( borrowernumber, club_id ) {
221
    $("body").css("cursor", "progress");
222
    $('#clubs-tab').load('/cgi-bin/koha/clubs/patron-clubs-tab.pl?borrowernumber=' + borrowernumber + '&id=' + club_id, function() {
223
        $("body").css("cursor", "default");
224
    });
225
}

Return to bug 18530