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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-clubs-tab.tt (-29 / +27 lines)
Lines 61-67 Link Here
61
<script>
61
<script>
62
    const borrowernumber = "[% borrowernumber | html %]";
62
    const borrowernumber = "[% borrowernumber | html %]";
63
</script>
63
</script>
64
65
<script>
64
<script>
66
    var clubs_dt_params = {
65
    var clubs_dt_params = {
67
        paging: true,
66
        paging: true,
Lines 69-105 Link Here
69
    $("#table_clubnoenrollmemnts").kohaTable(clubs_dt_params);
68
    $("#table_clubnoenrollmemnts").kohaTable(clubs_dt_params);
70
    $("#table_clubenrollments").kohaTable(clubs_dt_params);
69
    $("#table_clubenrollments").kohaTable(clubs_dt_params);
71
</script>
70
</script>
72
73
[% IF CAN_user_clubs_enroll %]
71
[% IF CAN_user_clubs_enroll %]
74
<script>
72
    <script>
75
    function loadEnrollmentForm( id, enrollent_id = 0 ) {
73
        function loadEnrollmentForm(id, enrollent_id = 0) {
76
        $("body").css("cursor", "progress");
74
            $("body").css("cursor", "progress");
77
        $('#clubs_panel').load('/cgi-bin/koha/clubs/patron-enroll.pl?borrowernumber=" + borrowernumber + " &id=' + id +'&enrollent_id='+ enrollent_id, function() {
75
            $("#clubs_panel").load('/cgi-bin/koha/clubs/patron-enroll.pl?borrowernumber=" + borrowernumber + " &id=' + id + "&enrollent_id=" + enrollent_id, function () {
78
            $("body").css("cursor", "default");
76
                $("body").css("cursor", "default");
79
        });
77
            });
80
78
81
        return false;
79
            return false;
82
    }
80
        }
83
81
84
    function cancelEnrollment( id ) {
82
        function cancelEnrollment(id) {
85
        $("body").css("cursor", "progress");
83
            $("body").css("cursor", "progress");
86
        const client = APIClient.club;
84
            const client = APIClient.club;
87
        client.enrollments.cancel(id).then(
85
            client.enrollments.cancel(id).then(
88
            success => {
86
                success => {
89
                if ( success.success ) {
87
                    if (success.success) {
90
                    $('#clubs_panel').load('/cgi-bin/koha/clubs/patron-clubs-tab.pl?borrowernumber=" + borrowernumber + "', function() {
88
                        $("#clubs_panel").load('/cgi-bin/koha/clubs/patron-clubs-tab.pl?borrowernumber=" + borrowernumber + "', function () {
91
                        $("body").css("cursor", "default");
89
                            $("body").css("cursor", "default");
92
                    });
90
                        });
93
                } else {
91
                    } else {
92
                        alert(_("Unable to cancel enrollment!"));
93
                    }
94
                },
95
                error => {
96
                    console.warn("Something wrong happened: %s".format(error));
94
                    alert(_("Unable to cancel enrollment!"));
97
                    alert(_("Unable to cancel enrollment!"));
95
                }
98
                }
96
            },
99
            );
97
            error => {
100
            return false;
98
                console.warn("Something wrong happened: %s".format(error));
101
        }
99
                alert(_("Unable to cancel enrollment!"));
102
    </script>
100
            }
101
        );
102
        return false;
103
    }
104
</script>
105
[% END %]
103
[% END %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/clubs-tab.tt (-46 / +72 lines)
Lines 69-139 Link Here
69
<script>
69
<script>
70
    const patron_id = "[% borrower.borrowernumber | html %]";
70
    const patron_id = "[% borrower.borrowernumber | html %]";
71
</script>
71
</script>
72
73
<script>
72
<script>
74
    function loadEnrollmentForm( id ) {
73
    function loadEnrollmentForm(id) {
75
        $("body").css("cursor", "progress");
74
            $("body").css("cursor", "progress");
76
        $('#opac-user-clubs_panel').load('/cgi-bin/koha/clubs/enroll.pl?borrowernumber=' + patron_id + '&id=' + id, function() {
75
            $("#opac-user-clubs_panel").load("/cgi-bin/koha/clubs/enroll.pl?borrowernumber=" + patron_id + "&id=" + id, function () {
77
            $("body").css("cursor", "default");
76
                $("body").css("cursor", "default");
78
        });
77
            });
79
78
80
        return false;
79
            return false;
81
    }
80
        }
82
81
83
    function cancelEnrollment( id ) {
82
        function cancelEnrollment(id) {
84
        $("body").css("cursor", "progress");
83
            $("body").css("cursor", "progress");
85
        $.ajax({
84
            $.ajax({
86
            type: "POST",
85
                type: "POST",
87
            url: '/cgi-bin/koha/svc/club/cancel_enrollment',
86
                url: "/cgi-bin/koha/svc/club/cancel_enrollment",
88
            data: { id: id, csrf_token: $('meta[name="csrf-token"]').attr('content'), },
87
                data: { id: id, csrf_token: $('meta[name="csrf-token"]').attr("content") },
89
            success: function( data ) {
88
                success: function (data) {
90
                if ( data.success ) {
89
                    if (data.success) {
91
                    $('#opac-user-clubs_panel').load('/cgi-bin/koha/clubs/clubs-tab.pl?borrowernumber=' + patron_id, function() {
90
                        $("#opac-user-clubs_panel").load("/cgi-bin/koha/clubs/clubs-tab.pl?borrowernumber=" + patron_id, function () {
92
                        $("body").css("cursor", "default");
91
                            $("body").css("cursor", "default");
93
                    });
92
                        });
94
                } else {
93
                    } else {
95
                    alert(_("Unable to cancel enrollment!"));
94
                        alert(_("Unable to cancel enrollment!"));
96
                }
95
                    }
97
            },
96
                },
98
            dataType: 'json'
97
                dataType: "json",
99
        });
98
            });
100
        return false;
99
            return false;
101
    }
100
        }
102
101
103
    [% IF ( Koha.Preference('OPACTableColExpandedByDefault') ) %]
102
    <<<<<<< HEAD
104
        var responsive_display = DataTable.Responsive.display.childRowImmediate;
103
        [% IF ( Koha.Preference('OPACTableColExpandedByDefault') ) %]
105
    [% ELSE %]
104
            var responsive_display = DataTable.Responsive.display.childRowImmediate;
106
        var responsive_display = DataTable.Responsive.display.childRow;
105
        [% ELSE %]
107
    [% END %]
106
            var responsive_display = DataTable.Responsive.display.childRow;
107
        [% END %]
108
108
109
            var Tables = $("#clubs-table-enrolled,#clubs-table-unenrolled");
110
            Tables.each(function(){
111
                $(this).kohaTable({
112
                    searching: false,
113
                    paging: false,
114
                    info: false,
115
                    responsive: {
116
                        details: {
117
                            display: responsive_display,
118
                            type: "column",
119
                            target: -1
120
                        },
121
                    },
122
                    columnDefs: [
123
                        { className: "dtr-control", orderable: false, targets: -1 },
124
                    ],
125
                });
126
    ||||||| constructed merge base
127
            var Tables = $("#clubs-table-enrolled,#clubs-table-unenrolled");
128
            Tables.each(function(){
129
                $(this).kohaTable({
130
                    searching: false,
131
                    paging: false,
132
                    info: false,
133
                    responsive: {
134
                        details: { type: "column", target: -1 },
135
                    },
136
                    columnDefs: [
137
                        { className: "dtr-control", orderable: false, targets: -1 },
138
                    ],
139
                });
140
    =======
109
        var Tables = $("#clubs-table-enrolled,#clubs-table-unenrolled");
141
        var Tables = $("#clubs-table-enrolled,#clubs-table-unenrolled");
110
        Tables.each(function(){
142
        Tables.each(function () {
111
            $(this).kohaTable({
143
            $(this).kohaTable({
112
                searching: false,
144
                searching: false,
113
                paging: false,
145
                paging: false,
114
                info: false,
146
                info: false,
115
                responsive: {
147
                responsive: {
116
                    details: {
148
                    details: { type: "column", target: -1 },
117
                        display: responsive_display,
118
                        type: "column",
119
                        target: -1
120
                    },
121
                },
149
                },
122
                columnDefs: [
150
                columnDefs: [{ className: "dtr-control", orderable: false, targets: -1 }],
123
                    { className: "dtr-control", orderable: false, targets: -1 },
151
    >>>>>>> Bug 41569: clubs - auto tidy
124
                ],
125
            });
152
            });
126
        });
153
        });
127
154
128
        $(".cancel_enrollment").on("click", function(e){
155
        $(".cancel_enrollment").on("click", function (e) {
129
            e.preventDefault();
156
            e.preventDefault();
130
            let clubid = $(this).data("id");
157
            let clubid = $(this).data("id");
131
            cancelEnrollment( clubid );
158
            cancelEnrollment(clubid);
132
        });
159
        });
133
160
134
        $(".load_enrollment").on("click", function(e){
161
        $(".load_enrollment").on("click", function (e) {
135
            e.preventDefault();
162
            e.preventDefault();
136
            let clubid = $(this).data("id");
163
            let clubid = $(this).data("id");
137
            loadEnrollmentForm( clubid );
164
            loadEnrollmentForm(clubid);
138
        });
165
        });
139
</script>
166
</script>
140
- 

Return to bug 41569