Skip to content

Commit

Permalink
[IMP] web_notify:t3894 Allow notify with sound
Browse files Browse the repository at this point in the history
  • Loading branch information
GabbasovDinar committed Aug 28, 2024
1 parent 5cdc126 commit e1ca00d
Show file tree
Hide file tree
Showing 12 changed files with 251 additions and 11 deletions.
17 changes: 17 additions & 0 deletions web_notify/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,21 @@ or
self.env.user.notify_default(message='My default message')
You can also add sound to your notifications by using the sound parameter. The sound parameter expects a string containing the URL path to the audio file that should be played when the notification is displayed.

Example:

.. code-block:: python
self.env.user.notify_success(message='My success message', sound='/<YOUR_MODULE>/static/audio/success.mp3' )
or

.. code-block:: python
self.env.user.notify_info( message='My information message', sound='/<YOUR_MODULE>/static/audio/info.mp3' )
The sound parameter can be used with any notification type (success, danger, warning, info, or default). If the sound parameter is not provided, the notification will be displayed without any sound.

The notifications can bring interactivity with some buttons.

Expand Down Expand Up @@ -146,6 +161,8 @@ Contributors

* David Vidal

* Cetmix OÜ <https://cetmix.com/>

Maintainers
~~~~~~~~~~~

Expand Down
5 changes: 3 additions & 2 deletions web_notify/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,16 @@
"name": "Web Notify",
"summary": """
Send notification messages to user""",
"version": "16.0.2.0.0",
"version": "16.0.3.0.0",
"license": "AGPL-3",
"author": "ACSONE SA/NV," "AdaptiveCity," "Odoo Community Association (OCA)",
"development_status": "Production/Stable",
"website": "https://github.com/OCA/web",
"depends": ["web", "bus", "base", "mail"],
"assets": {
"web.assets_backend": [
"web_notify/static/src/js/services/*.js",
"web_notify/static/src/**/*.js",
"web_notify/static/src/**/*.xml",
]
},
"demo": ["views/res_users_demo.xml"],
Expand Down
17 changes: 12 additions & 5 deletions web_notify/models/res_users.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,10 @@ def notify_success(
sticky=False,
target=None,
action=None,
sound=None,
):
title = title or _("Success")
self._notify_channel(SUCCESS, message, title, sticky, target, action)
self._notify_channel(SUCCESS, message, title, sticky, target, action, sound)

def notify_danger(
self,
Expand All @@ -60,9 +61,10 @@ def notify_danger(
sticky=False,
target=None,
action=None,
sound=None,
):
title = title or _("Danger")
self._notify_channel(DANGER, message, title, sticky, target, action)
self._notify_channel(DANGER, message, title, sticky, target, action, sound)

def notify_warning(
self,
Expand All @@ -71,9 +73,10 @@ def notify_warning(
sticky=False,
target=None,
action=None,
sound=None,
):
title = title or _("Warning")
self._notify_channel(WARNING, message, title, sticky, target, action)
self._notify_channel(WARNING, message, title, sticky, target, action, sound)

def notify_info(
self,
Expand All @@ -82,9 +85,10 @@ def notify_info(
sticky=False,
target=None,
action=None,
sound=None,
):
title = title or _("Information")
self._notify_channel(INFO, message, title, sticky, target, action)
self._notify_channel(INFO, message, title, sticky, target, action, sound)

def notify_default(
self,
Expand All @@ -93,9 +97,10 @@ def notify_default(
sticky=False,
target=None,
action=None,
sound=None,
):
title = title or _("Default")
self._notify_channel(DEFAULT, message, title, sticky, target, action)
self._notify_channel(DEFAULT, message, title, sticky, target, action, sound)

def _notify_channel(
self,
Expand All @@ -105,6 +110,7 @@ def _notify_channel(
sticky=False,
target=None,
action=None,
sound=None,
):
if not (self.env.user._is_admin() or self.env.su) and any(
user.id != self.env.uid for user in self
Expand All @@ -122,6 +128,7 @@ def _notify_channel(
"title": title,
"sticky": sticky,
"action": action,
"sound": sound,
}

notifications = [[partner, "web.notify", [bus_message]] for partner in target]
Expand Down
2 changes: 2 additions & 0 deletions web_notify/readme/CONTRIBUTORS.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@
* `Tecnativa <https://www.tecnativa.com>`_:

* David Vidal

* Cetmix OÜ <https://cetmix.com/>
15 changes: 15 additions & 0 deletions web_notify/readme/USAGE.rst
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,21 @@ or
self.env.user.notify_default(message='My default message')
You can also add sound to your notifications by using the sound parameter. The sound parameter expects a string containing the URL path to the audio file that should be played when the notification is displayed.

Example:

.. code-block:: python
self.env.user.notify_success(message='My success message', sound='/<YOUR_MODULE>/static/audio/success.mp3' )
or

.. code-block:: python
self.env.user.notify_info( message='My information message', sound='/<YOUR_MODULE>/static/audio/info.mp3' )
The sound parameter can be used with any notification type (success, danger, warning, info, or default). If the sound parameter is not provided, the notification will be displayed without any sound.

The notifications can bring interactivity with some buttons.

Expand Down
11 changes: 11 additions & 0 deletions web_notify/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,16 @@ <h1><a class="toc-backref" href="#toc-entry-2">Usage</a></h1>
<pre class="code python literal-block">
<span class="bp">self</span><span class="o">.</span><span class="n">env</span><span class="o">.</span><span class="n">user</span><span class="o">.</span><span class="n">notify_default</span><span class="p">(</span><span class="n">message</span><span class="o">=</span><span class="s1">'My default message'</span><span class="p">)</span>
</pre>
<p>You can also add sound to your notifications by using the sound parameter. The sound parameter expects a string containing the URL path to the audio file that should be played when the notification is displayed.</p>
<p>Example:</p>
<pre class="code python literal-block">
<span class="bp">self</span><span class="o">.</span><span class="n">env</span><span class="o">.</span><span class="n">user</span><span class="o">.</span><span class="n">notify_success</span><span class="p">(</span><span class="n">message</span><span class="o">=</span><span class="s1">'My success message'</span><span class="p">,</span> <span class="n">sound</span><span class="o">=</span><span class="s1">'/&lt;YOUR_MODULE&gt;/static/audio/success.mp3'</span> <span class="p">)</span>
</pre>
<p>or</p>
<pre class="code python literal-block">
<span class="bp">self</span><span class="o">.</span><span class="n">env</span><span class="o">.</span><span class="n">user</span><span class="o">.</span><span class="n">notify_info</span><span class="p">(</span> <span class="n">message</span><span class="o">=</span><span class="s1">'My information message'</span><span class="p">,</span> <span class="n">sound</span><span class="o">=</span><span class="s1">'/&lt;YOUR_MODULE&gt;/static/audio/info.mp3'</span> <span class="p">)</span>
</pre>
<p>The sound parameter can be used with any notification type (success, danger, warning, info, or default). If the sound parameter is not provided, the notification will be displayed without any sound.</p>
<p>The notifications can bring interactivity with some buttons.</p>
<ul class="simple">
<li>One allowing to refresh the active view</li>
Expand Down Expand Up @@ -472,6 +482,7 @@ <h2><a class="toc-backref" href="#toc-entry-6">Contributors</a></h2>
<li>David Vidal</li>
</ul>
</li>
<li>Cetmix OÜ &lt;<a class="reference external" href="https://cetmix.com/">https://cetmix.com/</a>&gt;</li>
</ul>
</div>
<div class="section" id="maintainers">
Expand Down
70 changes: 70 additions & 0 deletions web_notify/static/src/components/audio_player.esm.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
/** @odoo-module alias=web_notify.AudioPlayer **/

import {Component, useState} from "@odoo/owl";

/**
* @typedef AudioPlayerProps
* @property {string} src URL of the audio file to be played
* @property {number} [volume=1.0] Volume level of the audio (from 0.0 to 1.0)
* @property {boolean} [loop=false] Whether the audio should loop
* @property {Function} [onEnded] Callback function to be called when the audio ends
*/

/**
* The AudioPlayer component is responsible for playing audio files with
* specified settings like volume and looping. It also provides the ability
* to trigger actions when the audio playback ends.
*/
export class AudioPlayer extends Component {
setup() {
this.state = useState({isPlaying: false});
this.audioElement = new Audio(this.props.src);

// Set audio properties
this.audioElement.volume = this.props.volume || 1.0;
this.audioElement.loop = this.props.loop || false;

// Start playing the audio
this.audioElement
.play()
.then(() => {
this.state.isPlaying = true;
})
.catch((error) => {
console.error("Audio playback failed:", error);
});

// Listen for the end of the audio playback
this.audioElement.addEventListener("ended", this.onAudioEnded.bind(this));
}

/**
* Stops the audio playback and triggers the onEnded callback if provided.
*/
stopAudio() {
this.audioElement.pause();
this.audioElement.currentTime = 0;
this.state.isPlaying = false;

if (this.props.onEnded) {
this.props.onEnded();
}
}

/**
* Handler for when the audio playback ends.
*/
onAudioEnded() {
if (!this.props.loop) {
this.stopAudio();
}
}

willUnmount() {
// Clean up the audio element and listeners
this.audioElement.removeEventListener("ended", this.onAudioEnded);
this.audioElement.pause();
}
}

AudioPlayer.template = "web_notify.AudioPlayer";
10 changes: 10 additions & 0 deletions web_notify/static/src/components/audio_player.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!-- Copyright 2024 Cetmix OÜ
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
<templates xml:space="preserve">

<t t-name="web_notify.AudioPlayer" owl="1">
<!-- No visual elements needed, audio is controlled programmatically -->
</t>

</templates>
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import {browser} from "@web/core/browser/browser";
import {registry} from "@web/core/registry";

export const webNotificationService = {
dependencies: ["bus_service", "notification", "action"],
dependencies: ["bus_service", "action", "notification_sound"],

start(env, {bus_service, notification, action}) {
start(env, {bus_service, action, notification_sound}) {
let webNotifTimeouts = {};
/**
* Displays the web notification on user's screen
* Displays the web notification with sound on user's screen
*/
function displaywebNotification(notifications) {
Object.values(webNotifTimeouts).forEach((notif) =>
Expand All @@ -31,12 +31,13 @@ export const webNotificationService = {
},
];
}
notification.add(Markup(notif.message), {
notification_sound.add(Markup(notif.message), {
title: notif.title,
type: notif.type,
sticky: notif.sticky,
className: notif.className,
buttons: buttons,
sound: notif.sound,
});
});
});
Expand Down
43 changes: 43 additions & 0 deletions web_notify/static/src/services/effect_service.esm.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
/** @odoo-module **/

import {registry} from "@web/core/registry";
import {AudioPlayer} from "../components/audio_player.esm";
const effectRegistry = registry.category("effects");

// -----------------------------------------------------------------------------
// Audio effect
// -----------------------------------------------------------------------------

/**
* Handles effect of type "audio_effect". It returns the AudioPlayer component
* with the given audio source URL and other properties.
*
* @param {Object} env
* @param {Object} [params={}]
* @param {string} params.src
* The URL of the audio file to play.
* @param {number} [params.volume=1.0] Volume level of the audio (from 0.0 to 1.0)
* @param {boolean} [params.loop=false] Whether the audio should loop
* @param {Function} [params.onEnded] Callback function to be called when the audio ends
*/

function audioEffect(env, params = {}) {
if (!params.src) {
console.warn(
"Audio effect requires a 'src' parameter with the URL of the audio file."
);
return;
}

return {
Component: AudioPlayer,
props: {
src: params.src,
volume: params.volume || 1.0,
loop: params.loop || false,
onEnded: params.onEnded,
},
};
}

effectRegistry.add("audio_effect", audioEffect);
58 changes: 58 additions & 0 deletions web_notify/static/src/services/notification_sound_service.esm.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
/** @odoo-module **/

import {registry} from "@web/core/registry";

/**
* The notificationSoundService is responsible for handling the playback of audio
* notifications when a new notification is added. This service integrates with
* the notification system and the effect service to provide audible feedback
* based on the type of notification.
*
* Dependencies:
* - notification: The service responsible for displaying notifications on the UI.
* - effect: The service that handles visual and auditory effects in the application.
*/

export const notificationSoundService = {
dependencies: ["notification", "effect"],

/**
* Starts the notification sound service, enabling sound playback for notifications.
*
* @param {Object} env The environment object, providing access to various services.
* @param {Object} services An object containing the dependencies (notification, effect).
* @returns {Object} The add function, used to add notifications with sound.
*/
start(env, {notification, effect}) {
/**
* Adds a notification with an associated sound effect.
*
* @param {String} message The message to be displayed in the notification.
* @param {Object} [options={}] Additional options for the notification, such as type, sound and etc
* @returns {Function} A function to close the notification.
*/
function add(message, options = {}) {
const sound = options.sound || false;
delete options.sound; // Remove sound option from the options before passing to notification

const closeFn = notification.add(message, options);

if (sound)
// Trigger the audio effect.
effect.add({
type: "audio_effect",
src: sound,
volume: 0.8,
loop: false,
onEnded: () => {
// Placeholder for any action after sound ends
},
});
return closeFn;
}
return {add};
},
};

// Register the notification sound service in the service registry
registry.category("services").add("notification_sound", notificationSoundService);
Loading

0 comments on commit e1ca00d

Please sign in to comment.