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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt (-7 / +26 lines)
Lines 127-139 Link Here
127
                "columns": [{
127
                "columns": [{
128
                        "data": "reported_date:reporter.firstname",
128
                        "data": "reported_date:reporter.firstname",
129
                        "render": function(data, type, row, meta) {
129
                        "render": function(data, type, row, meta) {
130
                            let reported = '<span class="date clearfix">' + $datetime(row.reported_date) + '</span>';
130
                            let reported = '<div class="d-flex justify-content-between align-items-start">';
131
                            reported += '<span class="reporter clearfix">' + $patron_to_html(row.reporter, {
131
                            reported += '<span class="reporter">' + $patron_to_html(row.reporter, {
132
                                display_cardnumber: false,
132
                                display_cardnumber: false,
133
                                url: true
133
                                url: true
134
                            }) + '</span>';
134
                            }) + '</span>';
135
                            reported += '<span class="date text-muted">' + $datetime(row.reported_date) + '</span>';
136
                            reported += '</div>';
135
                            return reported;
137
                            return reported;
136
                        },
138
                       },
137
                        "searchable": true,
139
                        "searchable": true,
138
                        "orderable": true
140
                        "orderable": true
139
                    },
141
                    },
Lines 141-151 Link Here
141
                        "data": "title:body",
143
                        "data": "title:body",
142
                        "render": function(data, type, row, meta) {
144
                        "render": function(data, type, row, meta) {
143
                            let resolved = ( row.resolved_date ) ? true : false;
145
                            let resolved = ( row.resolved_date ) ? true : false;
144
                            let result = '<a role="button" href="#" class="detail-trigger">' + row.title + '</a>';
146
                            let result = '<div class="d-flex justify-content-between align-items-start">';
147
                            
148
                            // Title link on the left
149
                            result += '<a id="title_' + row.ticket_id + '" role="button" href="#" class="detail-trigger">' + row.title + '</a>';
150
                            
151
                            // Updates count on the right, if it exists
145
                            if (row.updates_count) {
152
                            if (row.updates_count) {
146
                                result += '<span class="pull-right"><a role="button" href="#" class="detail-trigger"><i class="fa fa-comment" aria-hidden="true"></i> ' + row.updates_count + '</a></span>';
153
                                result += '<span><a role="button" href="#" class="detail-trigger"><i class="fa fa-comment" aria-hidden="true"></i> ' + row.updates_count + '</a></span>';
147
                            }
154
                            }
155
                            
156
                            // Hidden detail content
157
                            result += '</div>';
148
                            result += '<div id="detail_' + row.ticket_id + '" style="display:none">' + row.body + '</div>';
158
                            result += '<div id="detail_' + row.ticket_id + '" style="display:none">' + row.body + '</div>';
159
                            
149
                            return result;
160
                            return result;
150
                        },
161
                        },
151
                        "searchable": true,
162
                        "searchable": true,
Lines 166-191 Link Here
166
                        "render": function(data, type, row, meta) {
177
                        "render": function(data, type, row, meta) {
167
                            let result = '';
178
                            let result = '';
168
                            if (row.resolved_date) {
179
                            if (row.resolved_date) {
180
                                result += "<div>";
169
                                result += _("Resolved by") + ' <span>' + $patron_to_html(row.resolver, {
181
                                result += _("Resolved by") + ' <span>' + $patron_to_html(row.resolver, {
170
                                    display_cardnumber: false,
182
                                    display_cardnumber: false,
171
                                    url: true
183
                                    url: true
172
                                }) + '</span>';
184
                                }) + '</span>';
185
                                result += "</div>";
173
                                if (row.status) {
186
                                if (row.status) {
187
                                    result += '<div>';
174
                                    result += ' ' + _("as") + ' ';
188
                                    result += ' ' + _("as") + ' ';
175
                                    result += row._strings.status ? escape_str(row._strings.status.str) : "";
189
                                    result += row._strings.status ? escape_str(row._strings.status.str) : "";
190
                                    result += '</div>';
176
                                }
191
                                }
177
                                result += '<span class="clearfix">' + $datetime(row.resolved_date) + '</span>';
192
                                result += '<div>' + $datetime(row.resolved_date) + '</div>';
178
                            } else {
193
                            } else {
194
                                result += '<div>';
179
                                if (row.status) {
195
                                if (row.status) {
180
                                    result += row._strings.status ? escape_str(row._strings.status.str) : "";
196
                                    result += row._strings.status ? escape_str(row._strings.status.str) : "";
181
                                } else {
197
                                } else {
182
                                    result += _("Open");
198
                                    result += _("Open");
183
                                }
199
                                }
200
                                result += '</div>';
184
                                if (row.assignee) {
201
                                if (row.assignee) {
185
                                    result += '<span class="clearfix">' + _("Assigned to: ") + $patron_to_html(row.assignee, {
202
                                    result += '<div>';
203
                                    result += _("Assigned to: ") + ' <span>' + $patron_to_html(row.assignee, {
186
                                        display_cardnumber: false,
204
                                        display_cardnumber: false,
187
                                        url: true
205
                                        url: true
188
                                    }) + '</span>';
206
                                    }) + '</span>';
207
                                    result += '</div>';
189
                                }
208
                                }
190
                            }
209
                            }
191
                            return result;
210
                            return result;
(-)a/koha-tmpl/intranet-tmpl/prog/js/modals/display_ticket.js (-30 / +43 lines)
Lines 22-43 $(document).ready(function () { Link Here
22
            $("#resolveTicket").show();
22
            $("#resolveTicket").show();
23
        }
23
        }
24
24
25
        let title = $("#title_" + ticket_id).text();
25
        let detail = $("#detail_" + ticket_id).text();
26
        let detail = $("#detail_" + ticket_id).text();
26
27
27
        // Display ticket details
28
        // Display ticket details
28
        let display = '<div class="list-group">';
29
        let display = '<div class="list-group">';
29
        display += '<div class="list-group-item">';
30
        display +=
31
            '<div class="list-group-item list-group-item-secondary d-flex justify-content-between align-items-start">';
32
        display += '<div class="ms-2 me-auto">';
33
        display += '<div class="fw-bold">' + title + "</div>";
34
        display += '<div class="wrapfix">' + detail + "</div>";
35
        display += "</div>";
30
        if (assignee) {
36
        if (assignee) {
37
            display += "<span>";
31
            display +=
38
            display +=
32
                '<span class="pull-right"><span class="label strong">' +
39
                '<label class="label strong">' +
33
                __("Assignee") +
40
                __("Assignee") +
34
                "</span>: " +
41
                "</label>: " +
42
                "<span>" +
35
                assignee +
43
                assignee +
36
                "</span>";
44
                "</span>";
45
            display += "</span>";
37
        }
46
        }
38
        display += '<span class="wrapfix">' + detail + "</span>";
39
        display += "</div>";
47
        display += "</div>";
40
        display += '<div id="concern-updates" class="list-group-item">';
48
        display +=
49
            '<div id="concern-updates" class="list-group-item list-group-item-info">';
41
        display += "<span>" + __("Loading updates . . .") + "</span>";
50
        display += "<span>" + __("Loading updates . . .") + "</span>";
42
        display += "</div>";
51
        display += "</div>";
43
        display += "</div>";
52
        display += "</div>";
Lines 59-107 $(document).ready(function () { Link Here
59
                data.forEach(function (item, index) {
68
                data.forEach(function (item, index) {
60
                    if (item.public) {
69
                    if (item.public) {
61
                        updates +=
70
                        updates +=
62
                            '<div class="list-group-item list-group-item-success">';
71
                            '<div class="list-group-item list-group-item-success d-flex flex-column">';
63
                        updates +=
64
                            '<span class="pull-right">' +
65
                            __("Public") +
66
                            "</span>";
67
                    } else {
72
                    } else {
68
                        updates +=
73
                        updates +=
69
                            '<div class="list-group-item list-group-item-warning">';
74
                            '<div class="list-group-item list-group-item-warning d-flex flex-column">';
70
                        updates +=
71
                            '<span class="pull-right">' +
72
                            __("Private") +
73
                            "</span>";
74
                    }
75
                    }
76
                    updates += '<div class="d-flex">';
75
                    updates +=
77
                    updates +=
76
                        '<span class="wrapfix">' + item.message + "</span>";
78
                        '<div class="flex-grow-1 mb-0 wrapfix">' +
77
                    updates +=
79
                        item.message +
78
                        '<span class="clearfix">' +
80
                        "</div>";
79
                        $patron_to_html(item.user, {
81
                    updates += '<div class="d-flex flex-column ms-3 text-end">';
80
                            display_cardnumber: false,
82
                    if (item.public) {
81
                            url: true,
83
                        updates +=
82
                        }) +
84
                            '<span class="mb-1">' + __("Public") + "</span>";
83
                        " (" +
85
                    } else {
84
                        $datetime(item.date) +
86
                        updates +=
85
                        ")";
87
                            '<span class="mb-1">' + __("Private") + "</span>";
88
                    }
86
                    if (item.status) {
89
                    if (item.status) {
87
                        updates += '<span class="clearfix pull-right">';
90
                        updates += '<span class="mb-1">';
88
                        updates += item._strings.status
91
                        updates += item._strings.status
89
                            ? escape_str(item._strings.status.str)
92
                            ? escape_str(item._strings.status.str)
90
                            : "";
93
                            : "";
91
                        updates += "</span>";
94
                        updates += "</span>";
92
                    }
95
                    }
93
                    if (item.assignee) {
96
                    if (item.assignee) {
94
                        updates += '<span class="clearfix pull-right">';
97
                        updates += '<span class="mb-1">';
95
                        updates += $patron_to_html(item.assignee, {
98
                        updates += $patron_to_html(item.assignee, {
96
                            display_cardnumber: false,
99
                            display_cardnumber: false,
97
                            url: true,
100
                            url: true,
98
                        });
101
                        });
99
                        updates += "</span>";
102
                        updates += "</span>";
100
                    }
103
                    }
101
                    updates += "</span>";
104
                    updates += "</div>";
105
                    updates += "</div>";
106
                    updates +=
107
                        '<div class="text-end text-muted small mt-2">' +
108
                        $patron_to_html(item.user, {
109
                            display_cardnumber: false,
110
                            url: true,
111
                        }) +
112
                        " (" +
113
                        $datetime(item.date) +
114
                        ")" +
115
                        "</div>";
102
                    updates += "</div>";
116
                    updates += "</div>";
103
                });
117
                });
104
                updates_display.html(updates);
118
                updates_display.replaceWith(updates);
105
            })
119
            })
106
            .error(function () {});
120
            .error(function () {});
107
121
108
- 

Return to bug 37910