Merge pull request #5871 from expsa/14.0-i18n-system_dashboard_classic-auto-20251229_121109
[FIX] system_dashboard_classic: fix issues and bugs
This commit is contained in:
commit
12085bc268
|
|
@ -931,3 +931,19 @@ msgstr ""
|
||||||
#: model:ir.model.fields,field_description:system_dashboard_classic.field_stage_stage__value
|
#: model:ir.model.fields,field_description:system_dashboard_classic.field_stage_stage__value
|
||||||
msgid "value"
|
msgid "value"
|
||||||
msgstr "القيمة"
|
msgstr "القيمة"
|
||||||
|
|
||||||
|
#. module: system_dashboard_classic
|
||||||
|
#: model_terms:ir.ui.view,arch_db:system_dashboard_classic.res_config_settings_view_form_dashboard
|
||||||
|
msgid "Work Timer Settings"
|
||||||
|
msgstr "إعدادات مؤقت العمل"
|
||||||
|
|
||||||
|
#. module: system_dashboard_classic
|
||||||
|
#: model:ir.model.fields,field_description:system_dashboard_classic.field_res_config_settings__dashboard_show_work_timer
|
||||||
|
#: model_terms:ir.ui.view,arch_db:system_dashboard_classic.res_config_settings_view_form_dashboard
|
||||||
|
msgid "Show Work Timer"
|
||||||
|
msgstr "إظهار مؤقت العمل"
|
||||||
|
|
||||||
|
#. module: system_dashboard_classic
|
||||||
|
#: model_terms:ir.ui.view,arch_db:system_dashboard_classic.res_config_settings_view_form_dashboard
|
||||||
|
msgid "Display live work hour countdown timer with real-time remaining hours"
|
||||||
|
msgstr "عرض مؤقت تنازلي لساعات العمل يُظهر الوقت المتبقي حتى نهاية الدوام"
|
||||||
|
|
|
||||||
|
|
@ -683,9 +683,11 @@ odoo.define('system_dashboard_classic.dashboard_self_services', function(require
|
||||||
// ACTIVE TAB HANDLING - Activate correct tab from context
|
// ACTIVE TAB HANDLING - Activate correct tab from context
|
||||||
// Used when returning from approval record view via breadcrumb
|
// Used when returning from approval record view via breadcrumb
|
||||||
// Note: 'context' here is actually the action object
|
// Note: 'context' here is actually the action object
|
||||||
|
// additional_context merges into context.context
|
||||||
// ============================================================
|
// ============================================================
|
||||||
var activeTab = (context && context.params && context.params.active_tab) ||
|
var activeTab = (context && context.context && context.context.active_tab) ||
|
||||||
(context && context.context && context.context.active_tab);
|
(context && context.params && context.params.active_tab) ||
|
||||||
|
(context && context.active_tab);
|
||||||
if (activeTab === 'to_approve') {
|
if (activeTab === 'to_approve') {
|
||||||
setTimeout(function() {
|
setTimeout(function() {
|
||||||
$('a[href="#to_approve"]').tab('show');
|
$('a[href="#to_approve"]').tab('show');
|
||||||
|
|
@ -1860,17 +1862,14 @@ odoo.define('system_dashboard_classic.dashboard_self_services', function(require
|
||||||
var self = this;
|
var self = this;
|
||||||
},
|
},
|
||||||
reload: function(options) {
|
reload: function(options) {
|
||||||
// Properly reload dashboard by triggering the action again
|
// Properly reload dashboard by triggering the registered action
|
||||||
// options.active_tab can be passed to specify which tab to open
|
// This ensures proper translation and breadcrumb behavior
|
||||||
var activeTab = (options && options.active_tab) || 'to_approve';
|
var activeTab = (options && options.active_tab) || 'to_approve';
|
||||||
this.do_action({
|
this.do_action('system_dashboard_classic.action_self_service_dashboard', {
|
||||||
name: _t('Self-Service'),
|
additional_context: {
|
||||||
type: 'ir.actions.client',
|
|
||||||
tag: 'system_dashboard_classic.dashboard_self_services',
|
|
||||||
target: 'main',
|
|
||||||
params: {
|
|
||||||
active_tab: activeTab
|
active_tab: activeTab
|
||||||
}
|
},
|
||||||
|
clear_breadcrumbs: true
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -244,8 +244,7 @@
|
||||||
<div class="o_setting_right_pane">
|
<div class="o_setting_right_pane">
|
||||||
<label for="dashboard_show_work_timer" string="Show Work Timer"/>
|
<label for="dashboard_show_work_timer" string="Show Work Timer"/>
|
||||||
<div class="text-muted">
|
<div class="text-muted">
|
||||||
Display live work hour countdown timer showing remaining time until end of shift.
|
Display live work hour countdown timer with real-time remaining hours
|
||||||
<br/><em>Updates every second with real-time progress bar.</em>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue