Skip to content

Commit

Permalink
Feat Dynamic Fields TimeZone & Language for new users
Browse files Browse the repository at this point in the history
+ Language by `vars('language')`
+ + When add a user, the selected lang is same as back office lang
+ + Note : when change lang with bottom selector, go to default lang

+ Timezone by `moment.tz.guess()`
+ + See :
https://stackoverflow.com/questions/1091372/getting-the-clients-time-zone-and-offset-in-javascript#40435316

`Fix empty field language val for secretaries admin page`

More usefull and maybe for alextselegidis#1386 alextselegidis#1476 & alextselegidis#1390
  • Loading branch information
sudwebdesign committed Apr 24, 2024
1 parent b292e10 commit 35e03c2
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
8 changes: 4 additions & 4 deletions assets/js/components/appointments_modal.js
Original file line number Diff line number Diff line change
Expand Up @@ -424,8 +424,8 @@ App.Components.AppointmentsModal = (function () {
$address.val('');
$city.val('');
$zipCode.val('');
$language.val('english');
$timezone.val('UTC');
$language.val(vars('language') || 'english');
$timezone.val(moment.tz.guess() || 'UTC');
$customerNotes.val('');
$customField1.val('');
$customField2.val('');
Expand All @@ -449,8 +449,8 @@ App.Components.AppointmentsModal = (function () {
const defaultStatusValue = $appointmentStatus.find('option:first').val();
$appointmentStatus.val(defaultStatusValue);

$language.val('english');
$timezone.val('UTC');
$language.val(vars('language') || 'english');
$timezone.val(moment.tz.guess() || 'UTC');

// Reset color.
$appointmentColor.find('.color-selection-option:first').trigger('click');
Expand Down
4 changes: 2 additions & 2 deletions assets/js/pages/admins.js
Original file line number Diff line number Diff line change
Expand Up @@ -336,8 +336,8 @@ App.Pages.Admins = (function () {
$admins.find('.record-details').find('input, select, textarea').val('').prop('disabled', true);
$admins.find('.record-details .form-label span').prop('hidden', true);
$admins.find('.record-details #calendar-view').val('default');
$admins.find('.record-details #language').val('english');
$admins.find('.record-details #timezone').val('UTC');
$admins.find('.record-details #language').val(vars('language') || 'english');
$admins.find('.record-details #timezone').val(moment.tz.guess() || 'UTC');
$admins.find('.record-details #notifications').prop('checked', true);
$('#edit-admin, #delete-admin').prop('disabled', true);

Expand Down
5 changes: 2 additions & 3 deletions assets/js/pages/customers.js
Original file line number Diff line number Diff line change
Expand Up @@ -252,9 +252,8 @@ App.Pages.Customers = (function () {
function resetForm() {
$customers.find('.record-details').find('input, select, textarea').val('').prop('disabled', true);
$customers.find('.record-details .form-label span').prop('hidden', true);
$customers.find('.record-details #timezone').val('UTC');

$language.val('english');
$customers.find('.record-details #timezone').val(moment.tz.guess() || 'UTC');
$customers.find('.record-details #language').val(vars('language') || 'english');

$customerAppointments.empty();

Expand Down
4 changes: 2 additions & 2 deletions assets/js/pages/providers.js
Original file line number Diff line number Diff line change
Expand Up @@ -340,8 +340,8 @@ App.Pages.Providers = (function () {
$providers.find('.record-details').find('input, select, textarea').val('').prop('disabled', true);
$providers.find('.record-details .form-label span').prop('hidden', true);
$providers.find('.record-details #calendar-view').val('default');
$providers.find('.record-details #language').val('english');
$providers.find('.record-details #timezone').val('UTC');
$providers.find('.record-details #language').val(vars('language') || 'english');
$providers.find('.record-details #timezone').val(moment.tz.guess() || 'UTC');
$providers.find('.record-details #is-private').prop('checked', false);
$providers.find('.record-details #notifications').prop('checked', true);
$providers.find('.add-break, .add-working-plan-exception, #reset-working-plan').prop('disabled', true);
Expand Down
3 changes: 2 additions & 1 deletion assets/js/pages/secretaries.js
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,8 @@ App.Pages.Secretaries = (function () {
$secretaries.find('.record-details').find('input, select, textarea').val('').prop('disabled', true);
$secretaries.find('.record-details .form-label span').prop('hidden', true);
$secretaries.find('.record-details #calendar-view').val('default');
$secretaries.find('.record-details #timezone').val('UTC');
$secretaries.find('.record-details #language').val(vars('language') || 'english');
$secretaries.find('.record-details #timezone').val(moment.tz.guess() || 'UTC');
$secretaries.find('.record-details #notifications').prop('checked', true);
$secretaries.find('.add-edit-delete-group').show();
$secretaries.find('.save-cancel-group').hide();
Expand Down

0 comments on commit 35e03c2

Please sign in to comment.