Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 31166: Digest option is not selectable for phone when PhoneNotification is enabled

Browse source 
Digests are not available via Talking Tech, but the artificial limit should not be in place for the non-TT phone notices. If only phone is selected, digest remains disabled.

Test Plan:
1) Apply this patch
2) Enable TalkingTechPhoneNotification
3) Verify behavior hasn't changed
4) Disable TalkingTechPhoneNotification, Enable PhoneNotification
5) Note disgest option is now selectable if only phone is selected

Signed-off-by: Evelyn Hartline <evelyn@bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Bug 31166: (QA follow-up) Remove debugging lines

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Bug 31166: (QA follow-up) Implement on OPAC side

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Squashed by RM
This commit is contained in:
Kyle Hall 2022-07-15 14:10:37 -04:00 committed by Tomas Cohen Arazi
parent b00c213876
commit 0622e118db
Signed by: tomascohen
GPG key ID: 0A272EA1B2F3C15F
3 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc
View file

@ -1,6 +1,10 @@
[% USE Koha %]
<!-- snippet for form to set borrower and patron category messaging preferences -->
<script>
var TalkingTechItivaPhoneNotification = [% Koha.Preference('TalkingTechItivaPhoneNotification') || 0 | html %];
var PhoneNotification = [% Koha.Preference('PhoneNotification') || 0 | html %];
</script>
<input type="hidden" name="modify" value="yes" />
<input type="hidden" name="borrowernumber" value="[% borrowernumber | html %]" />
<table>
@ -109,12 +113,12 @@
<input type="checkbox"
id="itiva[% messaging_preference.message_attribute_id | html %]"
name="[% messaging_preference.message_attribute_id | html %]"
value="itiva" checked="checked" class="active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" />
value="itiva" checked="checked" class="pmp_phone active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" />
[% ELSE %]
<input type="checkbox"
id="itiva[% messaging_preference.message_attribute_id | html %]"
name="[% messaging_preference.message_attribute_id | html %]"
value="itiva" class="active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" />
value="itiva" class="pmp_phone active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" />
[% END %]
[% END %]
</td>
@ -141,12 +145,12 @@
<input type="checkbox"
id="phone[% messaging_preference.message_attribute_id | html %]"
name="[% messaging_preference.message_attribute_id | html %]"
value="phone" checked="checked" class="active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" />
value="phone" checked="checked" class="pmp_phone active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" />
[% ELSE %]
<input type="checkbox"
id="phone[% messaging_preference.message_attribute_id | html %]"
name="[% messaging_preference.message_attribute_id | html %]"
value="phone" class="active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" />
value="phone" class="pmp_phone active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" />
[% END %]
[% END %]
</td>

6
koha-tmpl/intranet-tmpl/prog/js/messaging-preference-form.js
View file

@ -55,7 +55,8 @@ $(document).ready(function(){
}
function toggle_digest(id){
if ( $("#email"+id).prop("checked") || $("#sms"+id).prop("checked") ) {
let phone_checked = TalkingTechItivaPhoneNotification ? false : PhoneNotification ? $("#phone"+id).prop("checked") : false;
if ( $("#email"+id).prop("checked") || $("#sms"+id).prop("checked") || phone_checked ) {
$("#digest"+id).attr("disabled", false).tooltip('disable');
} else {
$("#digest"+id).attr("disabled", true).prop("checked",false).tooltip('enable');
@ -74,6 +75,9 @@ $(document).ready(function(){
$(".pmp_sms").click(function(){
toggle_digest(Number($(this).attr("id").replace("sms", "")));
});
$(".pmp_phone").click(function(){
toggle_digest(Number($(this).attr("id").replace("phone", "")));
});
// $('#memberentry_messaging_prefs [data-toggle="tooltip"][disabled]').tooltip();
});

13
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt
View file

@ -110,13 +110,13 @@
<td class="selectcol">
[% IF ( messaging_preference.transports_phone ) %]
<input type="checkbox"
class="phone"
class="pmp_phone"
id="phone[% messaging_preference.message_attribute_id | html %]"
name="[% messaging_preference.message_attribute_id | html %]"
value="phone" checked="checked" />
[% ELSE %]
<input type="checkbox"
class="phone"
class="pmp_phone"
id="phone[% messaging_preference.message_attribute_id | html %]"
name="[% messaging_preference.message_attribute_id | html %]"
value="phone" />
@ -259,7 +259,11 @@
$("#info_digests").tooltip();
function toggle_digest(id){
if ( $("#email"+id).prop("checked") || $("#sms"+id).prop("checked") ) {
let PhoneNotification = [% Koha.Preference('PhoneNotification') || 0 | html %];
let TalkingTechItivaPhoneNotification = [% Koha.Preference('TalkingTechItivaPhoneNotification') || 0 | html %];
let phone_checked = TalkingTechItivaPhoneNotification ? false : PhoneNotification ? $("#phone"+id).prop("checked") : false;
if ( $("#email"+id).prop("checked") || $("#sms"+id).prop("checked") || phone_checked ) {
$("#digest"+id).attr("disabled", false).tooltip('disable');
} else {
$("#digest"+id).attr("disabled", true).prop("checked",false).tooltip('enable');
@ -278,6 +282,9 @@
$(".pmp_sms").click(function(){
toggle_digest(Number($(this).attr("id").replace("sms", "")));
});
$(".pmp_phone").click(function(){
toggle_digest(Number($(this).attr("id").replace("phone", "")));
});
});